diff options
Diffstat (limited to 'gentoo.txt')
| -rw-r--r-- | gentoo.txt | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/gentoo.txt b/gentoo.txt index 6f4ffb0baed3..bfdd1b6db620 100644 --- a/gentoo.txt +++ b/gentoo.txt @@ -25,22 +25,23 @@ preference for all repositories. You can also pass --rebase, --no-rebase, or --ff-only on the command line to override the configured default per invocation. -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> - -*** syncing gentoo -!!! failed syncing gentoo - * Sync failed with 1 - * Will try to re-create -$ pmaint sync gentoo -Cloning into '/var/lib/repo-mirror-ci/sync/gentoo'... -Updating files: 16% (14362/89457)
Updating files: 17% (15208/89457)
Updating files: 18% (16103/89457)
Updating files: 19% (16997/89457)
Updating files: 20% (17892/89457)
Updating files: 21% (18786/89457)
Updating files: 22% (19681/89457)
Updating files: 23% (20576/89457)
Updating files: 24% (21470/89457)
Updating files: 25% (22365/89457)
Updating files: 26% (23259/89457)
Updating files: 27% (24154/89457)
Updating files: 28% (25048/89457)
Updating files: 29% (25943/89457)
Updating files: 30% (26838/89457)
Updating files: 31% (27732/89457)
Updating files: 32% (28627/89457)
Updating files: 32% (29405/89457)
Updating files: 33% (29521/89457)
Updating files: 34% (30416/89457)
Updating files: 35% (31310/89457)
Updating files: 36% (32205/89457)
Updating files: 37% (33100/89457)
Updating files: 38% (33994/89457)
Updating files: 39% (34889/89457)
Updating files: 40% (35783/89457)
Updating files: 41% (36678/89457)
Updating files: 42% (37572/89457)
Updating files: 43% (38467/89457)
Updating files: 44% (39362/89457)
Updating files: 45% (40256/89457)
Updating files: 46% (41151/89457)
Updating files: 47% (42045/89457)
Updating files: 48% (42940/89457)
Updating files: 48% (43344/89457)
Updating files: 49% (43834/89457)
Updating files: 50% (44729/89457)
Updating files: 51% (45624/89457)
Updating files: 52% (46518/89457)
Updating files: 53% (47413/89457)
Updating files: 54% (48307/89457)
Updating files: 55% (49202/89457)
Updating files: 56% (50096/89457)
Updating files: 57% (50991/89457)
Updating files: 58% (51886/89457)
Updating files: 59% (52780/89457)
Updating files: 60% (53675/89457)
Updating files: 61% (54569/89457)
Updating files: 62% (55464/89457)
Updating files: 62% (56068/89457)
Updating files: 63% (56358/89457)
Updating files: 64% (57253/89457)
Updating files: 65% (58148/89457)
Updating files: 66% (59042/89457)
Updating files: 67% (59937/89457)
Updating files: 68% (60831/89457)
Updating files: 69% (61726/89457)
Updating files: 70% (62620/89457)
Updating files: 71% (63515/89457)
Updating files: 72% (64410/89457)
Updating files: 73% (65304/89457)
Updating files: 74% (66199/89457)
Updating files: 75% (67093/89457)
Updating files: 75% (67406/89457)
Updating files: 76% (67988/89457)
Updating files: 77% (68882/89457)
Updating files: 78% (69777/89457)
Updating files: 79% (70672/89457)
Updating files: 80% (71566/89457)
Updating files: 81% (72461/89457)
Updating files: 82% (73355/89457)
Updating files: 83% (74250/89457)
Updating files: 84% (75144/89457)
Updating files: 85% (76039/89457)
Updating files: 86% (76934/89457)
Updating files: 87% (77828/89457)
Updating files: 88% (78723/89457)
Updating files: 89% (79617/89457)
Updating files: 90% (80512/89457)
Updating files: 90% (81358/89457)
Updating files: 91% (81406/89457)
Updating files: 92% (82301/89457)
Updating files: 93% (83196/89457)
Updating files: 94% (84090/89457)
Updating files: 95% (84985/89457)
Updating files: 96% (85879/89457)
Updating files: 97% (86774/89457)
Updating files: 98% (87668/89457)
Updating files: 99% (88563/89457)
Updating files: 100% (89457/89457)
Updating files: 100% (89457/89457), done. +From https://anongit.gentoo.org/git/repo/gentoo + 5e4f0bd76cd..ff03def2900 master -> origin/master +Updating 5e4f0bd76cd..ff03def2900 +Fast-forward + .../files/jfsutils-1.1.15-check-for-ar.patch | 10 +++ + .../jfsutils-1.1.15-format-security-errors.patch | 40 ++++++++++++ + sys-fs/jfsutils/files/jfsutils-1.1.15-gcc10.patch | 71 ++++++++++++++++++++++ + ...ils-1.1.15.ebuild => jfsutils-1.1.15-r1.ebuild} | 28 +++++++-- + sys-fs/jfsutils/metadata.xml | 7 ++- + 5 files changed, 149 insertions(+), 7 deletions(-) + create mode 100644 sys-fs/jfsutils/files/jfsutils-1.1.15-check-for-ar.patch + create mode 100644 sys-fs/jfsutils/files/jfsutils-1.1.15-format-security-errors.patch + create mode 100644 sys-fs/jfsutils/files/jfsutils-1.1.15-gcc10.patch + rename sys-fs/jfsutils/{jfsutils-1.1.15.ebuild => jfsutils-1.1.15-r1.ebuild} (56%) *** syncing gentoo *** synced gentoo - * Sync succeeded after re-adding + * Sync succeeded $ git log --format=%ci -1 $ git show -q --pretty=format:%G? HEAD $ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo |