commit: f1c386b703d8454ed4ce1f574b29df0eb6a3d69c Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Jan 7 15:08:17 2023 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Jan 7 17:27:10 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1c386b7
sys-kernel/gentoo-kernel: Bump to 6.1.4 Closes: https://bugs.gentoo.org/888187 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> sys-kernel/gentoo-kernel/Manifest | 3 + .../gentoo-kernel/gentoo-kernel-6.1.4.ebuild | 137 +++++++++++++++++++++ 2 files changed, 140 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index c8feb336d703..3acb650075c5 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -20,9 +20,12 @@ DIST genpatches-6.1-3.base.tar.xz 331284 BLAKE2B 66670841382237e0d222ba04fea65c9 DIST genpatches-6.1-3.extras.tar.xz 3808 BLAKE2B e4dbbeabac30e90a113041d4402bcb53d27a77408cdcf2e36dba448e680899efe7a62abd6b64574d778b8b058bba09ca0ae9830fc2ce4956cc2548dd243f00ef SHA512 17482b5ac89d4a2da96142195dbb6660295f0a2d8a321a92b1629d5f77e50c125115f2dbab6409867a989747dd28d6d42ca57d2f1e0193e731eb9d57ed5e1dd2 DIST genpatches-6.1-4.base.tar.xz 350692 BLAKE2B e310351161d4e0bbe0f498285da235a12b585fe5974b9dd35d6567af5eadcd291d63af5bfe036b7f0c03fb5a5c4285a7a4d771010474eba32a2bdd806f95b808 SHA512 42888c297a002e68575a4fb8f5de844418ff610b8770d544404b1c410c86f68f1a1c28c60d32ccea34c10d2ee8e0383e057cb24d4a99edaccbff6388570c5b24 DIST genpatches-6.1-4.extras.tar.xz 3808 BLAKE2B af64347e6fd2f640d86b0839feac7c6768489235fdaf6be7bc46ced24cd0e20490fd18b06096ddf2ad7ac70973339c895e75aa2ce3d19e368b87a4a0219fe54c SHA512 a0a94512517ece1bef28101433e3f59433c87a0e4b1f7c3937ae4f753a3d3c49f14e5a6780c9d4416082bf5282430e0386dd9bb72c924af72bd1fd902586ec0d +DIST genpatches-6.1-5.base.tar.xz 416352 BLAKE2B c3aedee62099a942b85016df0493ca1ca403efddc3c6b8c3e5d91246448cdc2a3626af200ee62865270f3ea5bb9dff131fed425fa78f6ecbaff08818e7a48022 SHA512 c3b8b2e58e4f6e5c7750d8c2bed54952feac33b319c318f562b8b5a894ff5d25ffe0149f5373f2b1655c1be6757eef8c6890460228f54828a42c59a1f869bf45 +DIST genpatches-6.1-5.extras.tar.xz 3804 BLAKE2B ef944c72d659c38fcf1d279693fa3c1a7e2aeca6fa5d706699dd3f862247d0f0ffa2522a326aa896b57eac985417d04ddb652a260a96924b97c6dbf9ae940562 SHA512 e7461ef3c47af3b6c4e9861a95dacd56b71bef7a518b69abc0ff94b40fb3beae0d3fc04a16ff80332cebcfd16eff0ffd334e02377d7e15bb1a824f51ee143173 DIST gentoo-kernel-config-g1.tar.gz 4283 BLAKE2B 44dd51ec45ebc71bffcd6d85a2fefba053f7bce8035057f0bbe928e24816ad4ba03c9bf67dcfcd6d6d1833c0a2ea93e0fd486c2093664dc41ccce316e1e60588 SHA512 3a45f28df9d457df0fe0d185da8b10f4e35f49dad75075e041e8cf3cf6972fecc8145cd557b0bf3a8dea20ddffae0194f88e61c1e5098fa0a5ca301d40aeea2e DIST gentoo-kernel-config-g3.tar.gz 4411 BLAKE2B 00edc4b5dc943834bc7ee977382b2960160888db00a25c5a7f73968784aa39a2b3b69f0bbda89b3ce8eb55e746006cff2839481493ac8bfca6a21de2299564f7 SHA512 44beae869bebf5445655dafe1facc47c3dbe602b34c5bf2fa984a581bfe3250fa0df908b8807c333c2e66ab9d1a2bb8026e22140f2a1f522d0dd647c96ca4d5e DIST gentoo-kernel-config-g4.tar.gz 4459 BLAKE2B 8a481315e427c2da5d14847bfa00e7904aec8cbe6dddde504bc4ce016a19b8c9f67d09dd1bc2f6feea22368b91555a74a045ae1d0f9aa1395616f008e74dbdc5 SHA512 c4b1d3a67cf614f0f9c0af4adaa23d97c0e91b467a1e69f88a0994760c187bfb403fffc0a5fdeb09f9fc4af849013f7f993cd55a8a4a82ba32309475f09deef5 +DIST gentoo-kernel-config-g5.tar.gz 4503 BLAKE2B 165733068786f274ac3bec94e0e29a10992f5a1b188970b2f7195348bb98ddcbd5d4dd45131b00d41c6bfd0bdfdaff1069debdbac560f92b9d62d30812d830df SHA512 565f6a35b534ee2e34e05769c95ac532aa6cb8e27073aaa8292fa3d19af8329f812e8a2d2c5c2696ac0fc28858e4461cde1644d0499f2563de43903b7043f386 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52 DIST kernel-aarch64-fedora.config.5.15.19 242615 BLAKE2B 94e59440681535e38137b71814e1ae53f57a347f62cf31e0c1c8571ae43d9ae9be9957743c8cbc9ec74850c964eaabefe6799a28bc311ea7b99ee31391b47fb1 SHA512 fb77d3b73a215f97d70cd6d8c96ed20e497786b99ed7d7a7f2ed60cc1251289c1a4c7e058c41b5efac62e4a9b4b3d917dbdb11585955bba2b6584981430f4ddb DIST kernel-aarch64-fedora.config.6.0.8-gentoo 249703 BLAKE2B d62624ff7072694a5ad98084925fbc892ac381fec0fce0aa01309df06ce9f115b0aaecf578a3e2ce6e6c3b25de9fe14d0c5b4ec2182fdf21dff30ed393ebbd8a SHA512 dc7d2aaa191f0ee2a61b563716c60dd1d62c741f16b6599dbc97a86e076cd5af7c93c264cf94ee4ab5570c7dc268ff50076372a8ffceeed4d0731b6b88757f9c diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.4.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.4.ebuild new file mode 100644 index 000000000000..f41dbd4530d6 --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.4.ebuild @@ -0,0 +1,137 @@ +# Copyright 2020-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit kernel-build toolchain-funcs + +MY_P=linux-${PV%.*} +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 )) +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo +CONFIG_VER=6.1.2-gentoo +GENTOO_CONFIG_VER=g5 + +DESCRIPTION="Linux kernel built 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 + https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz + amd64? ( + https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config + -> kernel-x86_64-fedora.config.${CONFIG_VER} + ) + arm64? ( + https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config + -> kernel-aarch64-fedora.config.${CONFIG_VER} + ) + ppc64? ( + https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config + -> kernel-ppc64le-fedora.config.${CONFIG_VER} + ) + x86? ( + https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config + -> kernel-i686-fedora.config.${CONFIG_VER} + ) +" +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86" +IUSE="debug hardened" +REQUIRED_USE="arm? ( savedconfig ) + hppa? ( savedconfig ) + riscv? ( savedconfig )" + +RDEPEND=" + !sys-kernel/gentoo-kernel-bin:${SLOT} +" +BDEPEND=" + debug? ( dev-util/pahole ) +" +PDEPEND=" + >=virtual/dist-kernel-${PV} +" + +QA_FLAGS_IGNORED=" + usr/src/linux-.*/scripts/gcc-plugins/.*.so + usr/src/linux-.*/vmlinux + usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg +" + +src_prepare() { + local PATCHES=( + # meh, genpatches have no directory + "${WORKDIR}"/*.patch + ) + default + + local biendian=false + + # prepare the default config + case ${ARCH} in + amd64) + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die + ;; + arm) + return + ;; + arm64) + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die + biendian=true + ;; + hppa) + return + ;; + ppc) + # assume powermac/powerbook defconfig + # we still package.use.force savedconfig + cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die + ;; + ppc64) + cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die + biendian=true + ;; + riscv) + return + ;; + x86) + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die + ;; + *) + die "Unsupported arch ${ARCH}" + ;; + esac + + local myversion="-gentoo-dist" + use hardened && myversion+="-hardened" + echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die + local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}" + + local merge_configs=( + "${T}"/version.config + "${dist_conf_path}"/base.config + ) + use debug || merge_configs+=( + "${dist_conf_path}"/no-debug.config + ) + if use hardened; then + merge_configs+=( "${dist_conf_path}"/hardened-base.config ) + + tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config ) + + if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then + merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" ) + fi + fi + + # this covers ppc64 and aarch64_be only for now + if [[ ${biendian} == true && $(tc-endian) == big ]]; then + merge_configs+=( "${dist_conf_path}/big-endian.config" ) + fi + + kernel-build_merge_configs "${merge_configs[@]}" +}
