commit: 483709db21df1dad8d8884c6ea490bdc99e1d63c Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Thu Jul 11 14:27:25 2024 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu Jul 11 14:35:19 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=483709db
sys-kernel/gentoo-kernel-bin: Bump to 6.9.9 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> sys-kernel/gentoo-kernel-bin/Manifest | 6 + .../gentoo-kernel-bin-6.9.9.ebuild | 164 +++++++++++++++++++++ 2 files changed, 170 insertions(+) diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest index 069a51a127ba..604a47d35591 100644 --- a/sys-kernel/gentoo-kernel-bin/Manifest +++ b/sys-kernel/gentoo-kernel-bin/Manifest @@ -20,6 +20,8 @@ DIST genpatches-6.6-45.base.tar.xz 2573196 BLAKE2B a6ff1fdc5c661f28d45e8297a325d DIST genpatches-6.6-45.extras.tar.xz 4048 BLAKE2B dd86fb162ed81abf47e1fe88e238d67d557294b9502dedf9d3d405e52e014ba9852ea48ef7ab62a255996cc0a3506599b07c76a20b217764c31e2efa0a636872 SHA512 8cd9e82c2c33eb625c86181e47cdf9be5a3246db140174792cb38c68e44a39103bd42964560d8af659a9f44117fd40b804927a544c32780fcbb7a023cba9bfb3 DIST genpatches-6.6-46.base.tar.xz 2606596 BLAKE2B f8b284a798b7f734ae39e8ac349598f8a7ac0902dd66264c1de754fc43c275e8e785097f9ad479e63cab0705bc9c8f917b91fdb4acf196fc9e032675d2dd72d7 SHA512 d7b62bb4c570b5fcccbdb27ab0da65c2309038d3ac31ccbf48df0ac32ef057b52046ad502ba02ec6c0cb4f3ac2e6ac0d4f97ced6adb85c96a89f31881a34b848 DIST genpatches-6.6-46.extras.tar.xz 4048 BLAKE2B 235f71efef27116556f2d7b6e7bd8c9ffcbfbc798fe87a59d69f672094830b13fa0e6ceb900eacc5ca250e92cfb410998af70939df9317c76f6291e2446020c9 SHA512 10f0f98d2c5a63371f8225e677f3e12a2e4f54b892dd6f64f3ed0c7cb8956671dc4bced0128d66bc0f2e61e1cb3c590a9d43270237d8457c2825cff1b8e236e1 +DIST genpatches-6.9-10.base.tar.xz 602768 BLAKE2B 614634ed1d1132be830e91a13dc509022a6a476b678f63dd4f3c428e7c37eec46f47a32f927f3895ff65a6ab5b046a3b0ca2df88a94678f898292d0970859734 SHA512 7826d46d8faaf64fb268f8dc940621f434f8729e706b4178adac2a2c353bccd854e5fea6c3489d5d0c48d469d6f6e26befa01d5a0deaba48f3e6140eb096de5e +DIST genpatches-6.9-10.extras.tar.xz 4052 BLAKE2B 607bede5f0c3d38f72fba841861caf6f90e7f0068373d951a6aa21a29cb7523bcd6faeeb5602c6a7395a802d35e657aaee1172582ecddd0c4143fc21ea9c4b3c SHA512 b9e59d200cb06ea3287557e1ca1cf7116df61019f423fa8149195d36d7d2b143265341bef5430c4f761b0926ad823775cb2c83c852d22dc4acdb0d9628da12bc DIST genpatches-6.9-9.base.tar.xz 548708 BLAKE2B e0130d225056f77c92e566eef9db643ecdef6faf2f81e8329859830850bb5409e212aca0ab0da85b9b1e3377121221259044dac650986ec05feac46f4d588a5d SHA512 714016638f866b536b85edd24e3e44513048591aa270dbee1460c5893b3e8b0508f299d86a202deacd10f105c0da48038d78219226b2808e17012d1811df391e DIST genpatches-6.9-9.extras.tar.xz 4048 BLAKE2B 7be69cb63abf9df9267bc61e3e365672dbd1c0b3568d48bf949b660ff1abb483b28846eb36a162ddd9bd91473c25462440fd41a7ba3bac70467ad45fa88fdd29 SHA512 955cd846bb020d08888aac04ebc5c1e56429e11ac59601a3e068971ad05aee59b75a24722dc7fe2645ef4414424d21e117e2eeb24ae72a5949476a213f3383fa DIST gentoo-kernel-5.10.220-1.amd64.gpkg.tar 63283200 BLAKE2B abfa4447a66dbade52e79edebe0bf1fe6d9be7a3ae6eef0510b45b19ca6f209dd46ad8426defb9935ef10485d8704634dc45d411c2760a92af8692ba16f3d34d SHA512 8ee2d79de3c54036d4302ac542438c73132f88a803c56159c96a4fce63fb6208a299ac3310aba5ca30c3fa504f71a60ce365a06c867d884e2da104ea57cf2eb5 @@ -70,6 +72,10 @@ DIST gentoo-kernel-6.9.8-1.amd64.gpkg.tar 159160320 BLAKE2B f54c76780fdec033d8ce DIST gentoo-kernel-6.9.8-1.arm64.gpkg.tar 129792000 BLAKE2B 7df88f8fda6a34699ae60ad3c12e20fdd957a8a07bb0880a634a94b91b5d803d35ac493862ff35a85426b62e1d8c7affd4728aa87d5e3d911ab73b39c1dd54c7 SHA512 b27e2854f7b5a5b4a179578c6228c3a11c50c7deb37cc0ae8bf0c1f8bf60c64a8990fd09111769c642072079df6b1b083ce305519212bc3816bcccb6ee89ecad DIST gentoo-kernel-6.9.8-1.ppc64le.gpkg.tar 70758400 BLAKE2B 782a74d7edd731773abdd128adcf720215c5bb7ee7dffeeecc9bfe0f04b0500584f69469277f5f86f9d4ea447975fff26403b680bc52b1d3e21e033f54cde94a SHA512 923badad678f818ff30fd753508d1bd53990a1c3166879a01dbc1e841355fc783a6e9c79e3d5a9ab075f223828f7206decd1a36fd2370a4ecfaf354d5821abd8 DIST gentoo-kernel-6.9.8-1.x86.gpkg.tar 74874880 BLAKE2B 39c2742f2ba08d0ab6f4b3184830a30dfa0fad03e8cad1f05708475933d333b8324297d894418cf9432e93b1596efc04c39292fa716e318b978388bd6964d8ca SHA512 0c508885cad09f7180e4e8494d242399170a151cc0ad62a597d011a10ad6f92b2fdb74c4a4125177bee390660184b747f485c8e184657e03b67ce862bfbf0039 +DIST gentoo-kernel-6.9.9-1.amd64.gpkg.tar 159006720 BLAKE2B d96f5282fdd757b5ccbc194ff24e0f1d100b059d1136fc67d712e79a360252bb07245cdf8ba390be33ba0df6edf4526aa46ec328a3ef7d70a94e7302bcdb177e SHA512 72e0335226f8584c0841e49cd13e668791bae932d0e575181eaf94704aa09db085263dcf7376b8511a302eba60ac6e6cf0ebd7f4cc1dcd0eb71123aaefca4488 +DIST gentoo-kernel-6.9.9-1.arm64.gpkg.tar 129781760 BLAKE2B 0a182e3866f4a1eb39100af8fd49f30e6b4c19dec301630ce0ee2f37b0c3c6c6a713b868367c4d74adb217f04d51f9b1866d20d75560d91847221ea4aed9262c SHA512 fb91f2ab7910afe15a9a857e54c637db6cc1d077c54027c0edbc519df4c83ab995b3a7c54f10045a1f0cadbb30be469c20fcd1b73b9e043014353a2050bb7757 +DIST gentoo-kernel-6.9.9-1.ppc64le.gpkg.tar 70737920 BLAKE2B a2b50dd5a01ef3a04b18ad7fe688ddbaea5ee8e21d430ce394bef682b1481d8cd4d808056d15ddd474111bc232caaf9154e4cc484dad7e5c4d4960cb2f9ed358 SHA512 4f50115c996a1f12c697893b1984156b9e6c9c3670323d8f667663c65f2e64beb86aa39b7a0499387ed22e920da7bead969321c16588b6296522d6d84b87ca1d +DIST gentoo-kernel-6.9.9-1.x86.gpkg.tar 74874880 BLAKE2B 1d1cda231db1bd8341b1301ee175f36165d4f34a25e494a527f4e640e17cd8c363eea6f3a28bb46b8beb45a38470cc6521072dd5551c9bace390bf53a19144b9 SHA512 dede5b0f00ae2b4f8fdd501b470b5d8fa3e52a3494de63c9881d48b4611de751fc0de3642bf6abd73410196004713a7e923bc87ee08cd9be220108db80905de0 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.9.9.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.9.9.ebuild new file mode 100644 index 000000000000..1503fa4fb5d1 --- /dev/null +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.9.9.ebuild @@ -0,0 +1,164 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KERNEL_EFI_ZBOOT=1 +KERNEL_IUSE_GENERIC_UKI=1 +KERNEL_IUSE_SECUREBOOT=1 + +inherit kernel-install toolchain-funcs unpacker + +MY_P=linux-${PV%.*} +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 )) +BINPKG=${PF/-bin}-1 + +DESCRIPTION="Pre-built Linux kernel with Gentoo patches" +HOMEPAGE="https://www.kernel.org/" +SRC_URI+=" + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz + amd64? ( + https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar + -> ${BINPKG/-2/-1}.amd64.gpkg.tar + ) + arm64? ( + https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar + -> ${BINPKG}.arm64.gpkg.tar + ) + ppc64? ( + https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar + -> ${BINPKG}.ppc64le.gpkg.tar + ) + x86? ( + https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar + -> ${BINPKG}.x86.gpkg.tar + ) +" +S=${WORKDIR} + +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" + +RDEPEND=" + !sys-kernel/gentoo-kernel:${SLOT} +" +PDEPEND=" + >=virtual/dist-kernel-${PV} +" +BDEPEND=" + app-alternatives/bc + app-alternatives/lex + virtual/libelf + app-alternatives/yacc +" + +QA_PREBUILT='*' + +KV_LOCALVERSION='-gentoo-dist' +KPV=${PV}${KV_LOCALVERSION} + +src_prepare() { + local PATCHES=( + # meh, genpatches have no directory + "${WORKDIR}"/*.patch + ) + cd "${MY_P}" || die + default +} + +src_configure() { + # force ld.bfd if we can find it easily + local LD="$(tc-getLD)" + if type -P "${LD}.bfd" &>/dev/null; then + LD+=.bfd + fi + + tc-export_build_env + local makeargs=( + V=1 + + HOSTCC="$(tc-getBUILD_CC)" + HOSTCXX="$(tc-getBUILD_CXX)" + HOSTCFLAGS="${BUILD_CFLAGS}" + HOSTLDFLAGS="${BUILD_LDFLAGS}" + + CROSS_COMPILE=${CHOST}- + AS="$(tc-getAS)" + CC="$(tc-getCC)" + LD="${LD}" + AR="$(tc-getAR)" + NM="$(tc-getNM)" + STRIP="$(tc-getSTRIP)" + OBJCOPY="$(tc-getOBJCOPY)" + OBJDUMP="$(tc-getOBJDUMP)" + + # we need to pass it to override colliding Gentoo envvar + ARCH="$(tc-arch-kernel)" + + O="${WORKDIR}"/modprep + ) + + local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}" + local image="${kernel_dir}/$(dist-kernel_get_image_path)" + local uki="${image%/*}/uki.efi" + if [[ -s ${uki} ]]; then + # We need to extract the plain image for the test phase + # and USE=-generic-uki. + kernel-install_extract_from_uki linux "${uki}" "${image}" + fi + + mkdir modprep || die + cp "${kernel_dir}/.config" modprep/ || die + emake -C "${MY_P}" "${makeargs[@]}" modules_prepare +} + +src_test() { + local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}" + kernel-install_test "${KPV}" \ + "${WORKDIR}/${kernel_dir}/$(dist-kernel_get_image_path)" \ + "${BINPKG}/image/lib/modules/${KPV}" +} + +src_install() { + local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}" + local image="${kernel_dir}/$(dist-kernel_get_image_path)" + local uki="${image%/*}/uki.efi" + if [[ -s ${uki} ]]; then + # Keep the kernel image type we don't want out of install tree + # Replace back with placeholder + if use generic-uki; then + > "${image}" || die + else + > "${uki}" || die + fi + fi + + # Overwrite the identifier in the prebuilt package + echo "${CATEGORY}/${PF}:${SLOT}" > "${kernel_dir}/dist-kernel" || die + + mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die + + # FIXME: requires proper mount-boot + if [[ -d ${BINPKG}/image/boot/dtbs ]]; then + mv "${BINPKG}"/image/boot "${ED}"/ || die + fi + + # strip out-of-source build stuffs from modprep + # and then copy built files + find modprep -type f '(' \ + -name Makefile -o \ + -name '*.[ao]' -o \ + '(' -name '.*' -a -not -name '.config' ')' \ + ')' -delete || die + rm modprep/source || die + cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die + + # Update timestamps on all modules to ensure cleanup works correctly + # when switching USE=modules-compress. + find "${ED}/lib" -name '*.ko' -exec touch {} + || die + + # Modules were already stripped before signing + dostrip -x /lib/modules + kernel-install_compress_modules +}