summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'gentoo.txt')
-rw-r--r--gentoo.txt25
1 files changed, 10 insertions, 15 deletions
diff --git a/gentoo.txt b/gentoo.txt
index 7b8db4d9ce23..2f58cd765bd6 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -26,23 +26,18 @@ or --ff-only on the command line to override the configured default per
invocation.
From https://anongit.gentoo.org/git/repo/gentoo
- 3dd9b5b6123..670dd82e2ff master -> origin/master
-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% (14558/86450) Updating files: 17% (14697/86450) Updating files: 18% (15561/86450) Updating files: 19% (16426/86450) Updating files: 20% (17290/86450) Updating files: 21% (18155/86450) Updating files: 22% (19019/86450) Updating files: 23% (19884/86450) Updating files: 24% (20748/86450) Updating files: 25% (21613/86450) Updating files: 26% (22477/86450) Updating files: 27% (23342/86450) Updating files: 28% (24206/86450) Updating files: 29% (25071/86450) Updating files: 30% (25935/86450) Updating files: 31% (26800/86450) Updating files: 32% (27664/86450) Updating files: 33% (28529/86450) Updating files: 34% (29393/86450) Updating files: 34% (29826/86450) Updating files: 35% (30258/86450) Updating files: 36% (31122/86450) Updating files: 37% (31987/86450) Updating files: 38% (32851/86450) Updating files: 39% (33716/86450) Updating files: 40% (34580/86450) Updating files: 41% (35445/86450) Updating files: 42% (36309/86450) Updating files: 43% (37174/86450) Updating files: 44% (38038/86450) Updating files: 45% (38903/86450) Updating files: 46% (39767/86450) Updating files: 47% (40632/86450) Updating files: 48% (41496/86450) Updating files: 49% (42361/86450) Updating files: 50% (43225/86450) Updating files: 51% (44090/86450) Updating files: 52% (44954/86450) Updating files: 52% (45072/86450) Updating files: 53% (45819/86450) Updating files: 54% (46683/86450) Updating files: 55% (47548/86450) Updating files: 56% (48412/86450) Updating files: 57% (49277/86450) Updating files: 58% (50141/86450) Updating files: 59% (51006/86450) Updating files: 60% (51870/86450) Updating files: 61% (52735/86450) Updating files: 62% (53599/86450) Updating files: 63% (54464/86450) Updating files: 64% (55328/86450) Updating files: 65% (56193/86450) Updating files: 66% (57057/86450) Updating files: 67% (57922/86450) Updating files: 68% (58786/86450) Updating files: 69% (59651/86450) Updating files: 69% (59881/86450) Updating files: 70% (60515/86450) Updating files: 71% (61380/86450) Updating files: 72% (62244/86450) Updating files: 73% (63109/86450) Updating files: 74% (63973/86450) Updating files: 75% (64838/86450) Updating files: 76% (65702/86450) Updating files: 77% (66567/86450) Updating files: 78% (67431/86450) Updating files: 79% (68296/86450) Updating files: 80% (69160/86450) Updating files: 81% (70025/86450) Updating files: 82% (70889/86450) Updating files: 82% (71269/86450) Updating files: 83% (71754/86450) Updating files: 84% (72618/86450) Updating files: 85% (73483/86450) Updating files: 86% (74347/86450) Updating files: 87% (75212/86450) Updating files: 88% (76076/86450) Updating files: 89% (76941/86450) Updating files: 90% (77805/86450) Updating files: 91% (78670/86450) Updating files: 92% (79534/86450) Updating files: 93% (80399/86450) Updating files: 94% (81263/86450) Updating files: 95% (82128/86450) Updating files: 96% (82992/86450) Updating files: 97% (83857/86450) Updating files: 98% (84721/86450) Updating files: 99% (85586/86450) Updating files: 100% (86450/86450) Updating files: 100% (86450/86450), done.
+ 670dd82e2ff..7344ade5c13 master -> origin/master
+Updating 670dd82e2ff..7344ade5c13
+Fast-forward
+ ...ibva-intel-media-driver-20.4.5_custom_cflags.patch | 19 ++++++++++++++-----
+ ...tel-media-driver-20.4.5_testing_in_src_test.patch} | 2 +-
+ .../libva-intel-media-driver-20.4.5.ebuild | 2 +-
+ .../libva-intel-media-driver-9999.ebuild | 2 +-
+ 4 files changed, 17 insertions(+), 8 deletions(-)
+ rename x11-libs/libva-intel-media-driver/files/{libva-intel-media-driver-20.4.5_tesing_in_src_test.patch => libva-intel-media-driver-20.4.5_testing_in_src_test.patch} (98%)
*** 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