commit: ccce3098adb2794ab2745617b52ef83d264cb225 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Mon Apr 29 18:46:21 2024 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Mon Apr 29 19:48:18 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccce3098
sys-kernel/vanilla-kernel: Bump to 6.1.89 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-6.1.89.ebuild | 137 +++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 7903bf8b7e6b..11fa031e5756 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -30,6 +30,8 @@ DIST linux-6.1.87.tar.sign 989 BLAKE2B 5dcbdf95424d5042049065e865ab2864b252edded DIST linux-6.1.87.tar.xz 135155024 BLAKE2B 42f5f28cc22db9200a1a1fbc8ffe63434e61d4d954ea86d364bd1adab6b882f530983778f3a2db51be5d33d8fa302c1e29badf45440c142e10456055afb1f0e0 SHA512 5c5b8910f27229768292e4c5737a988e8cf3b19e787c2dff3c15bba268b28c3f99b2169ea48256b692cfbd259ef48b9f6e836ad9b306a8e2230bc7bdb3f64613 DIST linux-6.1.88.tar.sign 989 BLAKE2B 82761c4c89269c66d493eb93a83c6964a29ded1eba0d72eee4328a5c67e678403605ef4433457a26f9befb5067d350f9a71f111d11ece103110e70a669be8a3d SHA512 5830a9a15c0f4c4b8cdd1d28f6f8193bb57eaccf4257346ff2e274da2bf4dc0f36d0c5c4e31a329c3698dd0ce17f584a4712a04c59368709210e8c1e4173be6a DIST linux-6.1.88.tar.xz 135145404 BLAKE2B 0ac898718d521af80aaaf59e7c85d199006b155cfd48e3a102a8b11162eef88eeb388265970f211cf33655bab71303364b5b81f1a32e2b7892039843c14ee6bd SHA512 ba706f7c2c09c00413f919092d4ac1da67cb2f922ae63ea97932bebbf1188d49aee3bea08ef61df1dbe7b0c0ed6bf3b63866ce881f53edf2701f7da174fbc958 +DIST linux-6.1.89.tar.sign 989 BLAKE2B 7509887cb90a00ab894aa681f6ce47da5678bd74794ff009e6e33143fc006e76cb287beee32382d729489a0b776708d2a9117672989710e4216eeebaa984aa7d SHA512 2e3a79b38cd2be727d66fa9c5fee06c1a45352c85dae7a32ed384967a7905cb4679b95fc71501c8c25753f1e5f984742ac6f3683ee6b617186707d4836aba66a +DIST linux-6.1.89.tar.xz 135148796 BLAKE2B 5b37ef931dee4ae271c2b1b2818cfa0fb19a1efd231e5a75fdd4ac67f474a21dd4e7f4f7324696ec2b0f9ce3b6c6d36325c5a53807834abdb8baae5f8ce6711b SHA512 dc25ca0201f18b7bf673f73df3a4d96ab7c38d2c60efd3c0f176e8439bf700d2c52c5a6f4b46491cc702103cab5b8a7d7763b502bbdff2678d7e220baf7d45a9 DIST linux-6.6.28.tar.sign 989 BLAKE2B 6e33458ee45ac75a58f1c40d2684d32d791a828a6fe9b8f73f47822c900f179c451c8782c187911016a277fcaf8d5867b690fa9d047b8cab91231cc9484876e0 SHA512 a74f1c948aaf2096f148df2d0adffd4ee64610b8552826e90365f3c95e3a8c6ac0c74766debf81bf584fec19da3dd198ab125c79443ef4a2233abecc2670d3bc DIST linux-6.6.28.tar.xz 140212188 BLAKE2B 688c9b46f36a0ef8dedbfe27681878216e9b11faa05bb3f8a5f257d6536df2a3260c2ecac33d67b6b1a27dfb747a86ae8911a0bc2c6376f062fd04595e05b199 SHA512 fdf6def06de85656f8aa010edfb8b2f7f71cdeef9a70b5b35511833fbcf0e4fbfafb6224acfdf475975bc4bc8f05d0291745af5a6ae752a70cbd09ae2d3d17a8 DIST linux-6.6.29.tar.sign 989 BLAKE2B 84228e96923cfc36873e3e91083665cda51e1d32267b7452eddc034866da945606a5cd3fc1f75cd8022e6ee0596f3cda4baec7d8691a61f9c4fb81847d26e2cd SHA512 d6f28b767db05b3844242b24aa188e304cc5c38095a51c8ff23f99841a20dddd9c798b73196fca9569a8eb03b166e259ec2036e83badc95fed76010f07058b6c diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.89.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.89.ebuild new file mode 100644 index 000000000000..beee28bb2c07 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.89.ebuild @@ -0,0 +1,137 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit kernel-build toolchain-funcs verify-sig + +MY_P=linux-${PV} +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo +CONFIG_VER=6.1.7-gentoo +GENTOO_CONFIG_VER=g12 + +DESCRIPTION="Linux kernel built from vanilla upstream sources" +HOMEPAGE=" + https://wiki.gentoo.org/wiki/Project:Distribution_Kernel + https://www.kernel.org/ +" +SRC_URI+=" + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz + https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz + verify-sig? ( + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign + ) + 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 ~x86" +IUSE="debug hardened" +REQUIRED_USE="arm? ( savedconfig )" + +BDEPEND=" + debug? ( dev-util/pahole ) + verify-sig? ( sec-keys/openpgp-keys-kernel ) +" +PDEPEND=" + >=virtual/dist-kernel-${PV} +" + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc + +src_unpack() { + if use verify-sig; then + einfo "Unpacking linux-${PV}.tar.xz ..." + verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \ + < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x)) + assert "Unpack failed" + unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz" + else + default + fi +} + +src_prepare() { + 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 + ;; + x86) + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die + ;; + *) + die "Unsupported arch ${ARCH}" + ;; + esac + + local myversion="-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[@]}" +}