summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'calculate.txt')
-rw-r--r--calculate.txt21
1 files changed, 10 insertions, 11 deletions
diff --git a/calculate.txt b/calculate.txt
index 2973776415e5..9d334b055937 100644
--- a/calculate.txt
+++ b/calculate.txt
@@ -8,18 +8,17 @@
'status': 'unofficial'}
$ pmaint sync calculate
From git://git.calculate.ru/calculate/overlay
- 153ceab08..3aad96201 master -> origin/master
- * [new tag] 1928 -> 1928
-Updating 153ceab08..3aad96201
+ 3aad96201..317b7047f master -> origin/master
+ 3aad96201..317b7047f develop -> origin/develop
+ 3aad96201..317b7047f update -> origin/update
+ * [new tag] 1929 -> 1929
+Updating 3aad96201..317b7047f
Fast-forward
- profiles/default/package.keywords/depends | 2 +-
- profiles/default/package.keywords/dev-python | 1 -
- profiles/default/x86/package.mask | 1 +
- .../sys-kernel/calculate-sources/5.4/11-update-4 | 7 +
- .../5.4/4502_futex-wait-multiple.patch | 326 ---------------------
- 5 files changed, 9 insertions(+), 328 deletions(-)
- create mode 100644 profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/5.4/11-update-4
- delete mode 100644 profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/5.4/4502_futex-wait-multiple.patch
+ .../5.4/3000_revert-0546a29c.patch | 156 ----------
+ .../5.4/4502_futex-wait-multiple.patch | 326 +++++++++++++++++++++
+ 2 files changed, 326 insertions(+), 156 deletions(-)
+ delete mode 100644 profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/5.4/3000_revert-0546a29c.patch
+ create mode 100644 profiles/templates/3.6/6_ac_install_patch/sys-kernel/calculate-sources/5.4/4502_futex-wait-multiple.patch
*** syncing calculate
*** synced calculate
* Sync succeeded