summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'gentoo.txt')
-rw-r--r--gentoo.txt41
1 files changed, 14 insertions, 27 deletions
diff --git a/gentoo.txt b/gentoo.txt
index 44225ecaadbf..7db573b0ddf2 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -15,34 +15,21 @@ pkgcore 0.12.24
$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gentoo
*** syncing gentoo
-From https://github.com/gentoo/gentoo
- 4dcab49aee70..4300e0dc2b19 master -> origin/master
-Updating 4dcab49aee70..4300e0dc2b19
-Fast-forward
- dev-lang/php/Manifest | 2 +-
- dev-lang/php/files/php-8.3.9-gd-cachevars.patch | 68 ++
- .../files/php-8.3.9-optional-png-testfixen.patch | 1277 ++++++++++++++++++++
- dev-lang/php/metadata.xml | 3 +
- .../php/{php-8.3.8.ebuild => php-8.3.9.ebuild} | 89 +-
- net-fs/autofs/Manifest | 2 -
- net-fs/autofs/autofs-5.1.8-r1.ebuild | 132 --
- net-fs/autofs/autofs-5.1.9.ebuild | 124 --
- net-fs/autofs/files/autofs-5.1.8-dmalloc.patch | 53 -
- .../autofs/files/autofs-5.1.8-mount_conflict.patch | 30 -
- net-fs/autofs/files/autofs-5.1.8-nfsv4-mount.patch | 88 --
- profiles/arch/x86/package.use.mask | 5 +
- profiles/features/wd40/package.use.mask | 2 +
- 13 files changed, 1413 insertions(+), 462 deletions(-)
- create mode 100644 dev-lang/php/files/php-8.3.9-gd-cachevars.patch
- create mode 100644 dev-lang/php/files/php-8.3.9-optional-png-testfixen.patch
- rename dev-lang/php/{php-8.3.8.ebuild => php-8.3.9.ebuild} (92%)
- delete mode 100644 net-fs/autofs/autofs-5.1.8-r1.ebuild
- delete mode 100644 net-fs/autofs/autofs-5.1.9.ebuild
- delete mode 100644 net-fs/autofs/files/autofs-5.1.8-dmalloc.patch
- delete mode 100644 net-fs/autofs/files/autofs-5.1.8-mount_conflict.patch
- delete mode 100644 net-fs/autofs/files/autofs-5.1.8-nfsv4-mount.patch
+You are not currently on a branch.
+Please specify which branch you want to merge with.
+See git-pull(1) for details.
+
+ git pull <remote> <branch>
+
+!!! failed syncing gentoo
+ * Sync failed with 1
+ * Will try to re-create
+$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gentoo
+*** syncing gentoo
+Cloning into '/var/lib/repo-mirror-ci/sync/gentoo'...
+Updating files: 22% (20154/89187) Updating files: 23% (20514/89187) Updating files: 24% (21405/89187) Updating files: 25% (22297/89187) Updating files: 26% (23189/89187) Updating files: 27% (24081/89187) Updating files: 28% (24973/89187) Updating files: 29% (25865/89187) Updating files: 30% (26757/89187) Updating files: 31% (27648/89187) Updating files: 32% (28540/89187) Updating files: 33% (29432/89187) Updating files: 34% (30324/89187) Updating files: 35% (31216/89187) Updating files: 36% (32108/89187) Updating files: 37% (33000/89187) Updating files: 38% (33892/89187) Updating files: 39% (34783/89187) Updating files: 40% (35675/89187) Updating files: 41% (36567/89187) Updating files: 42% (37459/89187) Updating files: 43% (38351/89187) Updating files: 44% (39243/89187) Updating files: 45% (40135/89187) Updating files: 46% (41027/89187) Updating files: 47% (41918/89187) Updating files: 47% (42554/89187) Updating files: 48% (42810/89187) Updating files: 49% (43702/89187) Updating files: 50% (44594/89187) Updating files: 51% (45486/89187) Updating files: 52% (46378/89187) Updating files: 53% (47270/89187) Updating files: 54% (48161/89187) Updating files: 55% (49053/89187) Updating files: 56% (49945/89187) Updating files: 57% (50837/89187) Updating files: 58% (51729/89187) Updating files: 59% (52621/89187) Updating files: 60% (53513/89187) Updating files: 61% (54405/89187) Updating files: 62% (55296/89187) Updating files: 63% (56188/89187) Updating files: 64% (57080/89187) Updating files: 65% (57972/89187) Updating files: 66% (58864/89187) Updating files: 67% (59756/89187) Updating files: 68% (60648/89187) Updating files: 69% (61540/89187) Updating files: 70% (62431/89187) Updating files: 70% (63195/89187) Updating files: 71% (63323/89187) Updating files: 72% (64215/89187) Updating files: 73% (65107/89187) Updating files: 74% (65999/89187) Updating files: 75% (66891/89187) Updating files: 76% (67783/89187) Updating files: 77% (68674/89187) Updating files: 78% (69566/89187) Updating files: 79% (70458/89187) Updating files: 80% (71350/89187) Updating files: 81% (72242/89187) Updating files: 82% (73134/89187) Updating files: 83% (74026/89187) Updating files: 84% (74918/89187) Updating files: 85% (75809/89187) Updating files: 86% (76701/89187) Updating files: 87% (77593/89187) Updating files: 88% (78485/89187) Updating files: 89% (79377/89187) Updating files: 90% (80269/89187) Updating files: 91% (81161/89187) Updating files: 92% (82053/89187) Updating files: 93% (82944/89187) Updating files: 94% (83836/89187) Updating files: 95% (84728/89187) Updating files: 95% (85425/89187) Updating files: 96% (85620/89187) Updating files: 97% (86512/89187) Updating files: 98% (87404/89187) Updating files: 99% (88296/89187) Updating files: 100% (89187/89187) Updating files: 100% (89187/89187), done.
*** synced gentoo
- * Sync succeeded
+ * Sync succeeded after re-adding
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 gentoo