sandikata / ROKO__

16 stars 8 forks source link

cachyos-sources-6.3.4.ebuild patch fail #36

Closed antonellocaroli closed 1 year ago

antonellocaroli commented 1 year ago

it seems that the patch does not apply

[ebuild     U  ] sys-kernel/cachyos-sources-6.3.4:stable::antonellocaroli [6.2.5:stable::antonellocaroli] USE="bore -build -high-hz% -prjc -symlink -tt (-latency%*)" 0 KiB

Total: 1 package (1 upgrade), Size of downloads: 0 KiB

Would you like to merge these packages? [Yes/No] y
>>> Recording sys-kernel/cachyos-sources in "world" favorites file...

>>> Verifying ebuild manifests

>>> Emerging (1 of 1) sys-kernel/cachyos-sources-6.3.4::antonellocaroli
 * patch-6.3.4.xz BLAKE2B SHA512 size ;-) ...                                                                                                                                       [ ok ]
 * linux-6.3.tar.xz BLAKE2B SHA512 size ;-) ...                                                                                                                                     [ ok ]
 * >>> Preparing to unpack ...
>>> Unpacking source...
>>> Unpacking linux-6.3.tar.xz to /var/tmp/portage/sys-kernel/cachyos-sources-6.3.4/work
 * Excluding Patch #5010_enable-additional-cpu-optimizations-for-gcc.patch ...                                                                                                      [ ok ]
 * Excluding Patch #5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch ...                                                                                                  [ ok ]
 * Excluding Patch #5011_enable-cpu-optimizations-for-gcc8.patch ...                                                                                                                [ ok ]
 * Excluding Patch #5012_enable-cpu-optimizations-for-gcc91.patch ...                                                                                                               [ ok ]
 * Excluding Patch #5013_enable-cpu-optimizations-for-gcc10.patch ...                                                                                                               [ ok ]
 * Applying patch-6.3.4.patch (-p1) ...                                                                                                                                             [ ok ]
>>> Source unpacked in /var/tmp/portage/sys-kernel/cachyos-sources-6.3.4/work
>>> Preparing source in /var/tmp/portage/sys-kernel/cachyos-sources-6.3.4/work/linux-6.3.4-cachyos ...
 * Applying 6.3-cachyos-base-all.patch ...                                                                                                                                          [ ok ]
 * Applying 6.3-bore-cachy.patch ...                                                                                                                                                [ ok ]
 * Applying 6.3-bore-tuning-sysctl.patch ...                                                                                                                                        [ ok ]
 * Applying 6.3-eevdf.patch ...
patching file Documentation/admin-guide/cgroup-v2.rst
patching file include/linux/rbtree_augmented.h
patching file include/linux/sched.h
Hunk #1 FAILED at 549.
Hunk #2 succeeded at 791 (offset 6 lines).
1 out of 2 hunks FAILED -- saving rejects to file include/linux/sched.h.rej
patching file include/uapi/linux/sched.h
patching file include/uapi/linux/sched/types.h
patching file init/init_task.c
patching file kernel/sched/core.c
Hunk #2 FAILED at 4455.
Hunk #3 succeeded at 4764 (offset 57 lines).
Hunk #4 succeeded at 7517 (offset 57 lines).
Hunk #5 succeeded at 7541 (offset 57 lines).
Hunk #6 succeeded at 7688 (offset 57 lines).
Hunk #7 succeeded at 7729 (offset 57 lines).
Hunk #8 succeeded at 7820 (offset 57 lines).
Hunk #9 succeeded at 8031 (offset 57 lines).
Hunk #10 succeeded at 8271 (offset 57 lines).
Hunk #11 succeeded at 11214 (offset 62 lines).
Hunk #12 succeeded at 11247 (offset 62 lines).
Hunk #13 succeeded at 11469 (offset 62 lines).
1 out of 13 hunks FAILED -- saving rejects to file kernel/sched/core.c.rej
patching file kernel/sched/debug.c
Hunk #3 succeeded at 584 (offset 3 lines).
Hunk #4 succeeded at 600 (offset 3 lines).
Hunk #5 succeeded at 819 (offset 3 lines).
Hunk #6 succeeded at 1042 (offset 3 lines).
patching file kernel/sched/fair.c
Hunk #1 succeeded at 50 (offset 3 lines).
Hunk #2 FAILED at 57.
Hunk #3 FAILED at 95.
Hunk #4 FAILED at 122.
Hunk #5 FAILED at 190.
Hunk #6 succeeded at 401 (offset 105 lines).
Hunk #7 succeeded at 469 (offset 105 lines).
Hunk #8 succeeded at 733 (offset 105 lines).
Hunk #9 succeeded at 937 (offset 105 lines).
Hunk #10 succeeded at 946 (offset 105 lines).
Hunk #11 succeeded at 954 (offset 105 lines).
Hunk #12 succeeded at 1011 (offset 105 lines).
Hunk #13 succeeded at 1107 (offset 105 lines).
Hunk #14 succeeded at 1296 with fuzz 2 (offset 113 lines).
Hunk #15 succeeded at 3694 (offset 113 lines).
Hunk #16 succeeded at 3733 (offset 113 lines).
Hunk #17 succeeded at 5033 (offset 113 lines).
Hunk #18 succeeded at 5189 (offset 113 lines).
Hunk #19 succeeded at 5222 (offset 113 lines).
Hunk #20 succeeded at 5233 (offset 113 lines).
Hunk #21 succeeded at 5270 (offset 113 lines).
Hunk #22 succeeded at 5294 (offset 113 lines).
Hunk #23 FAILED at 5219.
Hunk #24 FAILED at 5232.
Hunk #25 succeeded at 5429 (offset 137 lines).
Hunk #26 succeeded at 5469 (offset 137 lines).
Hunk #27 succeeded at 6473 (offset 137 lines).
Hunk #28 succeeded at 6502 (offset 137 lines).
Hunk #29 succeeded at 6543 (offset 137 lines).
Hunk #30 succeeded at 7994 (offset 140 lines).
Hunk #31 FAILED at 7891.
Hunk #32 succeeded at 8110 (offset 148 lines).
Hunk #33 succeeded at 8118 (offset 148 lines).
Hunk #34 succeeded at 8133 (offset 148 lines).
Hunk #35 FAILED at 8030.
Hunk #36 succeeded at 8412 (offset 153 lines).
Hunk #37 succeeded at 8430 (offset 156 lines).
Hunk #38 succeeded at 8685 (offset 156 lines).
Hunk #39 succeeded at 12195 (offset 156 lines).
Hunk #40 succeeded at 12352 (offset 156 lines).
Hunk #41 succeeded at 12362 (offset 156 lines).
Hunk #42 succeeded at 12393 (offset 156 lines).
Hunk #43 succeeded at 12463 (offset 156 lines).
Hunk #44 succeeded at 12470 (offset 156 lines).
Hunk #45 succeeded at 12582 (offset 156 lines).
Hunk #46 succeeded at 12681 (offset 156 lines).
Hunk #47 succeeded at 12814 (offset 156 lines).
Hunk #48 succeeded at 12863 (offset 156 lines).
8 out of 48 hunks FAILED -- saving rejects to file kernel/sched/fair.c.rej
patching file kernel/sched/features.h
Hunk #1 FAILED at 1.
Hunk #2 succeeded at 27 with fuzz 2 (offset 8 lines).
Hunk #3 succeeded at 99 (offset 8 lines).
1 out of 3 hunks FAILED -- saving rejects to file kernel/sched/features.h.rej
patching file kernel/sched/sched.h
patching file tools/include/uapi/linux/sched.h                                                                                                                                      [ !! ]
 * ERROR: sys-kernel/cachyos-sources-6.3.4::antonellocaroli failed (prepare phase):
 *   patch -p1  failed with /var/tmp/portage/sys-kernel/cachyos-sources-6.3.4/files/6.3/6.3-eevdf.patch
 * 
 * Call stack:
 *               ebuild.sh, line  136:  Called src_prepare
 *             environment, line 1886:  Called eapply '/var/tmp/portage/sys-kernel/cachyos-sources-6.3.4/files/6.3/6.3-eevdf.patch'
 *             environment, line  722:  Called _eapply_patch '/var/tmp/portage/sys-kernel/cachyos-sources-6.3.4/files/6.3/6.3-eevdf.patch'
 *             environment, line  660:  Called __helpers_die 'patch -p1  failed with /var/tmp/portage/sys-kernel/cachyos-sources-6.3.4/files/6.3/6.3-eevdf.patch'
 *   isolated-functions.sh, line  112:  Called die
 * The specific snippet of code:
 *          die "$@"
 * 
 * If you need support, post the output of `emerge --info '=sys-kernel/cachyos-sources-6.3.4::antonellocaroli'`,
 * the complete build log and the output of `emerge -pqv '=sys-kernel/cachyos-sources-6.3.4::antonellocaroli'`.
 * The complete build log is located at '/var/tmp/portage/sys-kernel/cachyos-sources-6.3.4/temp/build.log'.
 * The ebuild environment file is located at '/var/tmp/portage/sys-kernel/cachyos-sources-6.3.4/temp/environment'.
 * Working directory: '/var/tmp/portage/sys-kernel/cachyos-sources-6.3.4/work/linux-6.3.4-cachyos'
 * S: '/var/tmp/portage/sys-kernel/cachyos-sources-6.3.4/work/linux-6.3.4-cachyos'

>>> Failed to emerge sys-kernel/cachyos-sources-6.3.4, Log file:

>>>  '/var/tmp/portage/sys-kernel/cachyos-sources-6.3.4/temp/build.log'

 * Messages for package sys-kernel/cachyos-sources-6.3.4:

 * ERROR: sys-kernel/cachyos-sources-6.3.4::antonellocaroli failed (prepare phase):
 *   patch -p1  failed with /var/tmp/portage/sys-kernel/cachyos-sources-6.3.4/files/6.3/6.3-eevdf.patch
 * 
 * Call stack:
 *               ebuild.sh, line  136:  Called src_prepare
 *             environment, line 1886:  Called eapply '/var/tmp/portage/sys-kernel/cachyos-sources-6.3.4/files/6.3/6.3-eevdf.patch'
 *             environment, line  722:  Called _eapply_patch '/var/tmp/portage/sys-kernel/cachyos-sources-6.3.4/files/6.3/6.3-eevdf.patch'
 *             environment, line  660:  Called __helpers_die 'patch -p1  failed with /var/tmp/portage/sys-kernel/cachyos-sources-6.3.4/files/6.3/6.3-eevdf.patch'
 *   isolated-functions.sh, line  112:  Called die
 * The specific snippet of code:
 *          die "$@"
 * 
 * If you need support, post the output of `emerge --info '=sys-kernel/cachyos-sources-6.3.4::antonellocaroli'`,
 * the complete build log and the output of `emerge -pqv '=sys-kernel/cachyos-sources-6.3.4::antonellocaroli'`.
 * The complete build log is located at '/var/tmp/portage/sys-kernel/cachyos-sources-6.3.4/temp/build.log'.
 * The ebuild environment file is located at '/var/tmp/portage/sys-kernel/cachyos-sources-6.3.4/temp/environment'.
 * Working directory: '/var/tmp/portage/sys-kernel/cachyos-sources-6.3.4/work/linux-6.3.4-cachyos'
 * S: '/var/tmp/portage/sys-kernel/cachyos-sources-6.3.4/work/linux-6.3.4-cachyos'
antonellocaroli commented 1 year ago

Sorry I only just saw that you stopped developing this ebuild

sandikata commented 1 year ago

Stopped due to upstream related things. You still can have cachyos-sources from another repository.

https://data.gpo.zugaina.org/x0rzavi/sys-kernel/cachyos-sources/cachyos-sources-6.2.11.ebuild

Maybe you will be able to update it to recent version. Currently, i am developing xanmod for gentoo.