From 7942a157038186fd71b4d067bff9c34cb207f8a1 Mon Sep 17 00:00:00 2001 From: Yachen Wang Date: Tue, 19 Nov 2024 09:30:39 +0800 Subject: [PATCH] sys-kernel/xanmod-{kernel, sources}: bump to 6.11.9 --- sys-kernel/xanmod-kernel/Manifest | 6 +- ...1.4.ebuild => xanmod-kernel-6.11.9.ebuild} | 6 +- sys-kernel/xanmod-sources/Manifest | 6 +- ....4.ebuild => xanmod-sources-6.11.9.ebuild} | 59 ++++++++++--------- ....11.4.ebuild => dist-kernel-6.11.9.ebuild} | 0 5 files changed, 40 insertions(+), 37 deletions(-) rename sys-kernel/xanmod-kernel/{xanmod-kernel-6.11.4.ebuild => xanmod-kernel-6.11.9.ebuild} (98%) rename sys-kernel/xanmod-sources/{xanmod-sources-6.11.4.ebuild => xanmod-sources-6.11.9.ebuild} (54%) rename virtual/dist-kernel/{dist-kernel-6.11.4.ebuild => dist-kernel-6.11.9.ebuild} (100%) diff --git a/sys-kernel/xanmod-kernel/Manifest b/sys-kernel/xanmod-kernel/Manifest index b01c5a9809a..8168a90473d 100644 --- a/sys-kernel/xanmod-kernel/Manifest +++ b/sys-kernel/xanmod-kernel/Manifest @@ -1,4 +1,4 @@ -DIST genpatches-6.11-5.base.tar.xz 531212 BLAKE2B c9e98632ebd2e74f59dfee66d13f9e4cb515d87fd5f6db946aa577e6fab49251b6d374cb1cafb66b2139a8b75c683ed58557745c8f17e18b14f7bbb417579fcb SHA512 a53eab3075e55c7a7ab82f99fa853f08b054ed0fc95d9008b17b5571e370ffaa53b87662bacec8a4f5309309e89df1282f6b5747df595c8617fdde74c1222cfb -DIST genpatches-6.11-5.extras.tar.xz 4056 BLAKE2B a09e9802239237005410082eb6c4294a13cb3d415be4bd83aaea52ff37f472d4ab743fda02c8cff76a12e232044a91fe2ba83e0e46055edf28a5f473cf7f863c SHA512 3556b2f09e4f9e328bb04fb1e40b26038ef98864741b517f222c98fbb75975b34ce5d091df571f4e65b707fc8a74eb395f687a20f9f8ea0d617c4c8ccf8fa288 +DIST genpatches-6.11-11.base.tar.xz 775800 BLAKE2B 96407b5f017dc4f59e07dc51d26222ecfa70c4575fd511d273bf603f69aeb826d811d73e51b9425fc3986a369a1a1ea2dcad49d0064d27c586262f5ec2c1b2f0 SHA512 0148bf938c34d063ba68c3de1535c2e7ae7d1c66e75ce3d9106ade4696ef391511dc3342b5919f3eb84976ba334123ef1ab1ae3c63a2a63186e02f08c9cb096c +DIST genpatches-6.11-11.extras.tar.xz 4060 BLAKE2B fda21856e2eb78f116cb26c24bce03c7fe60d0756610351351047f9fffa97ab327851adb1a5aa9ad7c9c63838a64a5498c5343b7499e452f0e3dac6cd17c7e45 SHA512 63d82a5a17472ac3e5f4c0bdb1cb706c0a1dd4e0d0bc2af2868a55e8fcc0138bdaef675b195988c00665a4d61f3c0940f669caa8809fbec17e0127962975c0e6 DIST linux-6.11.tar.xz 146900704 BLAKE2B e7750c0878d71a56a0ce52d4c4c912199dad5bf5e2e8f872585a6494afbb37cbd852e612a6858936d2dc9b7776a3933818f540db408d57e90d18ea5249bba7ab SHA512 329c1f94008742e3f0c2ce7e591a16316d1b2cb9ea4596d4f45604097e07b7aa2f64afa40630a07f321a858455c77aa32ba57b271932ddcf4dc27863f9081cea -DIST patch-6.11.4-xanmod1.xz 633368 BLAKE2B 996b590361ac27aeb136775f9973ef36326cc1d3247626408bfa87f8591865e4294cb17ec1cd7c350dbf53c53ecf585fa83e3bea7b17d0d9ae733f6906f96709 SHA512 98fb5e6ce10f9a47aa1a6772c6054d3591186f207a42e6281ca9aec8585dea68fb2bc3c91e737363eb8e62548b195892a532ccd2a6c6b4dfcb5b43a8a60056d2 +DIST patch-6.11.9-xanmod1.xz 858648 BLAKE2B 0ffcf70e17896cd3d80b6c10b6308a8f7c66e20372d88cfa7cc5648ed9d73f965032b93168b9e0fc5d2fe1747fc54b465fc2a11e75608144d0d19870e52a2e59 SHA512 c8bedb5bca746d063d27fb4a5b3c26f05086909515f5cb4b461e6b41db14103731d0e715b974cc8090109d4d97e597e608d7cec1934b07246ea954a99431a73c diff --git a/sys-kernel/xanmod-kernel/xanmod-kernel-6.11.4.ebuild b/sys-kernel/xanmod-kernel/xanmod-kernel-6.11.9.ebuild similarity index 98% rename from sys-kernel/xanmod-kernel/xanmod-kernel-6.11.4.ebuild rename to sys-kernel/xanmod-kernel/xanmod-kernel-6.11.9.ebuild index 09fe8123c9a..85af1691619 100644 --- a/sys-kernel/xanmod-kernel/xanmod-kernel-6.11.4.ebuild +++ b/sys-kernel/xanmod-kernel/xanmod-kernel-6.11.9.ebuild @@ -7,7 +7,7 @@ inherit kernel-build toolchain-funcs MY_P=linux-${PV%.*} #Note: to bump xanmod, check GENPATCHES_P in sys-kernel/gentoo-kernel -GENPATCHES_P=genpatches-${PV%.*}-$((${PV##*.} + 1)) +GENPATCHES_P=genpatches-${PV%.*}-$((${PV##*.} + 2)) XV="1" DESCRIPTION="XanMod lts kernel built with Gentoo patches and cjktty" @@ -59,10 +59,10 @@ src_prepare() { rm "${WORKDIR}"/*${MY_P}*.patch local PATCHES=( - # genpatches - "${WORKDIR}"/*.patch # xanmod patches "${WORKDIR}"/patch-${PV}-xanmod${XV} + # genpatches + "${WORKDIR}"/*.patch ) default diff --git a/sys-kernel/xanmod-sources/Manifest b/sys-kernel/xanmod-sources/Manifest index b01c5a9809a..8168a90473d 100644 --- a/sys-kernel/xanmod-sources/Manifest +++ b/sys-kernel/xanmod-sources/Manifest @@ -1,4 +1,4 @@ -DIST genpatches-6.11-5.base.tar.xz 531212 BLAKE2B c9e98632ebd2e74f59dfee66d13f9e4cb515d87fd5f6db946aa577e6fab49251b6d374cb1cafb66b2139a8b75c683ed58557745c8f17e18b14f7bbb417579fcb SHA512 a53eab3075e55c7a7ab82f99fa853f08b054ed0fc95d9008b17b5571e370ffaa53b87662bacec8a4f5309309e89df1282f6b5747df595c8617fdde74c1222cfb -DIST genpatches-6.11-5.extras.tar.xz 4056 BLAKE2B a09e9802239237005410082eb6c4294a13cb3d415be4bd83aaea52ff37f472d4ab743fda02c8cff76a12e232044a91fe2ba83e0e46055edf28a5f473cf7f863c SHA512 3556b2f09e4f9e328bb04fb1e40b26038ef98864741b517f222c98fbb75975b34ce5d091df571f4e65b707fc8a74eb395f687a20f9f8ea0d617c4c8ccf8fa288 +DIST genpatches-6.11-11.base.tar.xz 775800 BLAKE2B 96407b5f017dc4f59e07dc51d26222ecfa70c4575fd511d273bf603f69aeb826d811d73e51b9425fc3986a369a1a1ea2dcad49d0064d27c586262f5ec2c1b2f0 SHA512 0148bf938c34d063ba68c3de1535c2e7ae7d1c66e75ce3d9106ade4696ef391511dc3342b5919f3eb84976ba334123ef1ab1ae3c63a2a63186e02f08c9cb096c +DIST genpatches-6.11-11.extras.tar.xz 4060 BLAKE2B fda21856e2eb78f116cb26c24bce03c7fe60d0756610351351047f9fffa97ab327851adb1a5aa9ad7c9c63838a64a5498c5343b7499e452f0e3dac6cd17c7e45 SHA512 63d82a5a17472ac3e5f4c0bdb1cb706c0a1dd4e0d0bc2af2868a55e8fcc0138bdaef675b195988c00665a4d61f3c0940f669caa8809fbec17e0127962975c0e6 DIST linux-6.11.tar.xz 146900704 BLAKE2B e7750c0878d71a56a0ce52d4c4c912199dad5bf5e2e8f872585a6494afbb37cbd852e612a6858936d2dc9b7776a3933818f540db408d57e90d18ea5249bba7ab SHA512 329c1f94008742e3f0c2ce7e591a16316d1b2cb9ea4596d4f45604097e07b7aa2f64afa40630a07f321a858455c77aa32ba57b271932ddcf4dc27863f9081cea -DIST patch-6.11.4-xanmod1.xz 633368 BLAKE2B 996b590361ac27aeb136775f9973ef36326cc1d3247626408bfa87f8591865e4294cb17ec1cd7c350dbf53c53ecf585fa83e3bea7b17d0d9ae733f6906f96709 SHA512 98fb5e6ce10f9a47aa1a6772c6054d3591186f207a42e6281ca9aec8585dea68fb2bc3c91e737363eb8e62548b195892a532ccd2a6c6b4dfcb5b43a8a60056d2 +DIST patch-6.11.9-xanmod1.xz 858648 BLAKE2B 0ffcf70e17896cd3d80b6c10b6308a8f7c66e20372d88cfa7cc5648ed9d73f965032b93168b9e0fc5d2fe1747fc54b465fc2a11e75608144d0d19870e52a2e59 SHA512 c8bedb5bca746d063d27fb4a5b3c26f05086909515f5cb4b461e6b41db14103731d0e715b974cc8090109d4d97e597e608d7cec1934b07246ea954a99431a73c diff --git a/sys-kernel/xanmod-sources/xanmod-sources-6.11.4.ebuild b/sys-kernel/xanmod-sources/xanmod-sources-6.11.9.ebuild similarity index 54% rename from sys-kernel/xanmod-sources/xanmod-sources-6.11.4.ebuild rename to sys-kernel/xanmod-sources/xanmod-sources-6.11.9.ebuild index 02bf19796b5..a93c2d0e51b 100644 --- a/sys-kernel/xanmod-sources/xanmod-sources-6.11.4.ebuild +++ b/sys-kernel/xanmod-sources/xanmod-sources-6.11.9.ebuild @@ -2,15 +2,16 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="8" +ETYPE="sources" K_WANT_GENPATCHES="base extras" #Note: to bump xanmod, check K_GENPATCHES_VER in sys-kernel/gentoo-sources -K_GENPATCHES_VER="5" -K_SECURITY_UNSUPPORTED="1" -K_NOSETEXTRAVERSION="1" -ETYPE="sources" -inherit kernel-2 +K_GENPATCHES_VER="11" + +inherit check-reqs kernel-2 detect_version +detect_arch +MY_P=linux-${PV%.*} DESCRIPTION="Full XanMod source, including the Gentoo patchset and other patch options." HOMEPAGE="https://xanmod.org" @@ -22,40 +23,42 @@ SRC_URI=" ${GENPATCHES_URI} ${XANMOD_URI}/patch-${OKV}${XANMOD_VERSION}.xz " +S=${WORKDIR}/${MY_P} LICENSE+=" CDDL" KEYWORDS="~amd64" +pkg_pretend() { + CHECKREQS_DISK_BUILD="4G" + check-reqs_pkg_pretend +} + src_unpack() { - universal_unpack - mkdir "${WORKDIR}/genpatches" || die - for i in ${K_WANT_GENPATCHES}; do - tar xf "${DISTDIR}/genpatches-${KV_MAJOR}.${KV_MINOR}-${K_GENPATCHES_VER}.${i}.tar.xz" \ - -C "${WORKDIR}/genpatches" || die - done - - rm "${WORKDIR}"/genpatches/*linux-"${KV_MAJOR}"."${KV_MINOR}"*.patch - - UNIPATCH_LIST="" - for i in $(dir "${WORKDIR}"/genpatches/*.patch); do - UNIPATCH_LIST+=" ${i}" - done - - UNIPATCH_LIST+=" ${DISTDIR}/patch-${OKV}${XANMOD_VERSION}.xz" - unipatch "${UNIPATCH_LIST}" - unpack_fix_install_path - env_setup_kernel_makeopts - cd "${S}" || die + default +} + +src_prepare() { + kernel-2_src_prepare + rm "${S}/tools/testing/selftests/tc-testing/action-ebpf" + # delete linux version patches + rm "${WORKDIR}"/*${MY_P}*.patch + + local PATCHES=( + # xanmod patches + "${WORKDIR}"/patch-${PV}-xanmod${XANMOD_VERSION} + # genpatches + "${WORKDIR}"/*.patch + ) + default } pkg_postinst() { elog "MICROCODES" elog "Use xanmod-sources with microcodes" elog "Read https://wiki.gentoo.org/wiki/Intel_microcode" - kernel-2_pkg_postinst } -#pkg_postrm() { -# kernel-2_pkg_postrm -#} +pkg_postrm() { + kernel-2_pkg_postrm +} diff --git a/virtual/dist-kernel/dist-kernel-6.11.4.ebuild b/virtual/dist-kernel/dist-kernel-6.11.9.ebuild similarity index 100% rename from virtual/dist-kernel/dist-kernel-6.11.4.ebuild rename to virtual/dist-kernel/dist-kernel-6.11.9.ebuild