2024-05-13T17:00:00Z

1 files changed, 21 insertions, 97 deletions

diff --git a/CachyOS-kernels.txt b/CachyOS-kernels.txt
index 614011da0125..19859aec9360 100644
--- a/CachyOS-kernels.txt
+++ b/CachyOS-kernels.txt
@@ -17,104 +17,28 @@ pkgcore 0.12.24
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync CachyOS-kernels
 *** syncing CachyOS-kernels
 From https://github.com/Szowisz/CachyOS-kernels
-   ebfb594..771349e  main       -> origin/main
-Updating ebfb594..771349e
-Fast-forward
- sys-kernel/cachyos-sources/Manifest                |     1 +
- .../cachyos-sources/cachyos-sources-6.9.0.ebuild   |   255 +
- .../files/6.8.9_rc4/0009-zstd.patch                | 18652 ++++++++
- .../cachyos-sources/files/6.9.0/0001-aes.patch     |  3815 ++
- .../files/6.9.0/0002-amd-pstate.patch              |  1207 +
- .../cachyos-sources/files/6.9.0/0003-bbr3.patch    |  3386 ++
- .../cachyos-sources/files/6.9.0/0004-block.patch   |   512 +
- .../cachyos-sources/files/6.9.0/0005-cachy.patch   |  6922 +++
- .../cachyos-sources/files/6.9.0/0006-deckify.patch |  4163 ++
- .../cachyos-sources/files/6.9.0/0007-fixes.patch   |   601 +
- .../cachyos-sources/files/6.9.0/0008-ksm.patch     |   440 +
- .../cachyos-sources/files/6.9.0/0009-ntsync.patch  |  3208 ++
- .../cachyos-sources/files/6.9.0/0010-zstd.patch    | 18652 ++++++++
- .../files/6.9.0/all/0001-cachyos-base-all.patch    | 42906 +++++++++++++++++++
- .../files/6.9.0/auto-cpu-optimization.sh           |    51 +
- sys-kernel/cachyos-sources/files/6.9.0/commit      |     1 +
- sys-kernel/cachyos-sources/files/6.9.0/config-bore | 11890 +++++
- .../files/6.9.0/config-bore-sched-ext              | 11890 +++++
- .../cachyos-sources/files/6.9.0/config-deckify     | 11890 +++++
- sys-kernel/cachyos-sources/files/6.9.0/config-echo | 11890 +++++
- .../cachyos-sources/files/6.9.0/config-eevdf       | 11890 +++++
- .../cachyos-sources/files/6.9.0/config-hardened    | 11599 +++++
- .../cachyos-sources/files/6.9.0/config-rt-bore     | 11890 +++++
- .../cachyos-sources/files/6.9.0/config-sched-ext   | 11890 +++++
- .../misc/0001-Add-extra-version-CachyOS.patch      |    26 +
- .../files/6.9.0/misc/0001-le9uo.patch              |   465 +
- .../files/6.9.0/misc/0001-ntsync.patch             |  3193 ++
- .../cachyos-sources/files/6.9.0/misc/0001-rt.patch |  6008 +++
- .../6.9.0/misc/0001-spadfs-6.9-merge-v1.0.19.patch | 14176 ++++++
- .../files/6.9.0/misc/0002-slab.patch               |   110 +
- .../misc/intel/0001-intel-thread-director.patch    |  2058 +
- .../misc/nvidia/0001-NVIDIA-Fixup-GPL-issue.patch  |    35 +
- .../0001-NVIDIA-take-modeset-ownership-early.patch |    91 +
- .../files/6.9.0/misc/nvidia/0001-nvidia-545.patch  |   104 +
- .../misc/nvidia/make-modeset-fbdev-default.patch   |    31 +
- .../misc/nvidia/nvidia-drm-hotplug-workqueue.patch |   104 +
- .../files/6.9.0/sched/0001-bore-cachy-ext.patch    |   861 +
- .../files/6.9.0/sched/0001-bore-cachy-rt.patch     |   861 +
- .../files/6.9.0/sched/0001-bore-cachy.patch        |   861 +
- .../files/6.9.0/sched/0001-bore.patch              |   840 +
- .../files/6.9.0/sched/0001-echo-cachy.patch        |  5886 +++
- .../files/6.9.0/sched/0001-echo.patch              |  5886 +++
- .../files/6.9.0/sched/0001-prjc-cachy.patch        | 11572 +++++
- .../files/6.9.0/sched/0001-prjc.patch              | 11572 +++++
- .../files/6.9.0/sched/0001-sched-ext-eevdf.patch   | 27448 ++++++++++++
- .../files/6.9.0/sched/0001-sched-ext.patch         | 25599 +++++++++++
- sys-kernel/cachyos-sources/script/get_files.py     |     1 -
- 47 files changed, 317388 insertions(+), 1 deletion(-)
- create mode 100644 sys-kernel/cachyos-sources/cachyos-sources-6.9.0.ebuild
- create mode 100644 sys-kernel/cachyos-sources/files/6.8.9_rc4/0009-zstd.patch
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/0001-aes.patch
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/0002-amd-pstate.patch
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/0003-bbr3.patch
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/0004-block.patch
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/0005-cachy.patch
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/0006-deckify.patch
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/0007-fixes.patch
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/0008-ksm.patch
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/0009-ntsync.patch
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/0010-zstd.patch
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/all/0001-cachyos-base-all.patch
- create mode 100755 sys-kernel/cachyos-sources/files/6.9.0/auto-cpu-optimization.sh
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/commit
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/config-bore
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/config-bore-sched-ext
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/config-deckify
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/config-echo
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/config-eevdf
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/config-hardened
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/config-rt-bore
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/config-sched-ext
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/misc/0001-Add-extra-version-CachyOS.patch
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/misc/0001-le9uo.patch
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/misc/0001-ntsync.patch
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/misc/0001-rt.patch
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/misc/0001-spadfs-6.9-merge-v1.0.19.patch
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/misc/0002-slab.patch
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/misc/intel/0001-intel-thread-director.patch
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/misc/nvidia/0001-NVIDIA-Fixup-GPL-issue.patch
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/misc/nvidia/0001-NVIDIA-take-modeset-ownership-early.patch
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/misc/nvidia/0001-nvidia-545.patch
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/misc/nvidia/make-modeset-fbdev-default.patch
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/misc/nvidia/nvidia-drm-hotplug-workqueue.patch
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/sched/0001-bore-cachy-ext.patch
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/sched/0001-bore-cachy-rt.patch
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/sched/0001-bore-cachy.patch
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/sched/0001-bore.patch
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/sched/0001-echo-cachy.patch
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/sched/0001-echo.patch
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/sched/0001-prjc-cachy.patch
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/sched/0001-prjc.patch
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/sched/0001-sched-ext-eevdf.patch
- create mode 100644 sys-kernel/cachyos-sources/files/6.9.0/sched/0001-sched-ext.patch
+ + 771349e...34390f6 main       -> origin/main  (forced update)
+hint: You have divergent branches and need to specify how to reconcile them.
+hint: You can do so by running one of the following commands sometime before
+hint: your next pull:
+hint:
+hint:   git config pull.rebase false  # merge
+hint:   git config pull.rebase true   # rebase
+hint:   git config pull.ff only       # fast-forward only
+hint:
+hint: You can replace "git config" with "git config --global" to set a default
+hint: preference for all repositories. You can also pass --rebase, --no-rebase,
+hint: or --ff-only on the command line to override the configured default per
+hint: invocation.
+fatal: Need to specify how to reconcile divergent branches.
+!!! failed syncing CachyOS-kernels
+ * Sync failed with 1
+ * Will try to re-create
+$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync CachyOS-kernels
+*** syncing CachyOS-kernels
+Cloning into '/var/lib/repo-mirror-ci/sync/CachyOS-kernels'...
 *** synced CachyOS-kernels
- * 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 CachyOS-kernels