summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'gentoo.txt')
-rw-r--r--gentoo.txt32
1 files changed, 18 insertions, 14 deletions
diff --git a/gentoo.txt b/gentoo.txt
index 2783211fd1ad..00642c36d7f8 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -15,21 +15,25 @@ pkgcore 0.12.28
$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gentoo
*** syncing gentoo
-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% (20029/89087) Updating files: 23% (20491/89087) Updating files: 24% (21381/89087) Updating files: 25% (22272/89087) Updating files: 26% (23163/89087) Updating files: 27% (24054/89087) Updating files: 28% (24945/89087) Updating files: 29% (25836/89087) Updating files: 30% (26727/89087) Updating files: 31% (27617/89087) Updating files: 32% (28508/89087) Updating files: 33% (29399/89087) Updating files: 34% (30290/89087) Updating files: 35% (31181/89087) Updating files: 36% (32072/89087) Updating files: 37% (32963/89087) Updating files: 38% (33854/89087) Updating files: 39% (34744/89087) Updating files: 40% (35635/89087) Updating files: 41% (36526/89087) Updating files: 42% (37417/89087) Updating files: 43% (38308/89087) Updating files: 44% (39199/89087) Updating files: 45% (40090/89087) Updating files: 45% (40674/89087) Updating files: 46% (40981/89087) Updating files: 47% (41871/89087) Updating files: 48% (42762/89087) Updating files: 49% (43653/89087) Updating files: 50% (44544/89087) Updating files: 51% (45435/89087) Updating files: 52% (46326/89087) Updating files: 53% (47217/89087) Updating files: 54% (48107/89087) Updating files: 55% (48998/89087) Updating files: 56% (49889/89087) Updating files: 57% (50780/89087) Updating files: 58% (51671/89087) Updating files: 59% (52562/89087) Updating files: 60% (53453/89087) Updating files: 61% (54344/89087) Updating files: 62% (55234/89087) Updating files: 63% (56125/89087) Updating files: 64% (57016/89087) Updating files: 65% (57907/89087) Updating files: 66% (58798/89087) Updating files: 66% (59444/89087) Updating files: 67% (59689/89087) Updating files: 68% (60580/89087) Updating files: 69% (61471/89087) Updating files: 70% (62361/89087) Updating files: 71% (63252/89087) Updating files: 72% (64143/89087) Updating files: 73% (65034/89087) Updating files: 74% (65925/89087) Updating files: 75% (66816/89087) Updating files: 76% (67707/89087) Updating files: 77% (68597/89087) Updating files: 78% (69488/89087) Updating files: 79% (70379/89087) Updating files: 80% (71270/89087) Updating files: 81% (72161/89087) Updating files: 82% (73052/89087) Updating files: 83% (73943/89087) Updating files: 84% (74834/89087) Updating files: 85% (75724/89087) Updating files: 86% (76615/89087) Updating files: 87% (77506/89087) Updating files: 88% (78397/89087) Updating files: 89% (79288/89087) Updating files: 90% (80179/89087) Updating files: 90% (80524/89087) Updating files: 91% (81070/89087) Updating files: 92% (81961/89087) Updating files: 93% (82851/89087) Updating files: 94% (83742/89087) Updating files: 95% (84633/89087) Updating files: 96% (85524/89087) Updating files: 97% (86415/89087) Updating files: 98% (87306/89087) Updating files: 99% (88197/89087) Updating files: 100% (89087/89087) Updating files: 100% (89087/89087), done.
+From https://github.com/gentoo/gentoo
+ c5ab908b9212..e1f34500f285 master -> origin/master
+Updating c5ab908b9212..e1f34500f285
+Fast-forward
+ app-crypt/loop-aes-losetup/Manifest | 6 +-
+ .../loop-aes-losetup-2.39.2.ebuild | 71 -------------
+ .../loop-aes-losetup-2.40.2.ebuild | 115 +++++++++++++++++++++
+ sys-fs/loop-aes/Manifest | 3 +-
+ .../loop-aes-3.8e-build-initrd_initfstype.patch | 76 ++++++++++++++
+ ...-aes-3.8e-build-initrd_prefer-l-a-losetup.patch | 42 ++++++++
+ .../{loop-aes-3.8b.ebuild => loop-aes-3.8e.ebuild} | 24 +++--
+ 7 files changed, 257 insertions(+), 80 deletions(-)
+ delete mode 100644 app-crypt/loop-aes-losetup/loop-aes-losetup-2.39.2.ebuild
+ create mode 100644 app-crypt/loop-aes-losetup/loop-aes-losetup-2.40.2.ebuild
+ create mode 100644 sys-fs/loop-aes/files/loop-aes-3.8e-build-initrd_initfstype.patch
+ create mode 100644 sys-fs/loop-aes/files/loop-aes-3.8e-build-initrd_prefer-l-a-losetup.patch
+ rename sys-fs/loop-aes/{loop-aes-3.8b.ebuild => loop-aes-3.8e.ebuild} (71%)
*** synced gentoo
- * Sync succeeded after re-adding
+ * Sync succeeded
$ 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