commit: 8bbb1de7aef8fd66dc6a5fc03becbe0bcdfaa256 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Wed Jan 18 12:08:23 2023 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Wed Jan 18 16:21:27 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bbb1de7
sys-kernel/vanilla-kernel: Bump to 6.1.7 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-6.1.7.ebuild | 134 +++++++++++++++++++++ 2 files changed, 136 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 52070591c570..20507cbb9da9 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -35,3 +35,5 @@ DIST linux-5.4.229.tar.sign 991 BLAKE2B eb0661f4b438e0fd40b61ba1472516f7f321edea DIST linux-5.4.229.tar.xz 112993120 BLAKE2B 746a722876f8e7c06596a06e1b026e294e368e1483b4d367f8d6214571f7d526191ded2afa725e8dc158d947a00c79840c4454d1a2a103512679b781f5ab5867 SHA512 3dda77f5af8a9b02ac6310770e9c43f06f2083da731c24140de90b6df62227f33fc88a47c110015d6504d849315effc5fef21e6d685052cc68d4459416350d16 DIST linux-6.1.6.tar.sign 987 BLAKE2B 3d47959aff69520879ce9f2d63b2e9f3d8c0f33c9a5e9caa98902df1d37115e87627470680250f256f80aaf3a3152d11b42658e0c89ead28ef1b88df2aa77b8d SHA512 8b31481f4e8034f453129f98d8caadedfd771d7a9ba23c2e41c2f932261263183ddf78ceafea3f38c14f441c2c857caad0ab98056da510d78a21d2fc35774ba7 DIST linux-6.1.6.tar.xz 134782796 BLAKE2B 47fdcc432bd473b3948bc4b618caa329887026b86029dfad055a9d4dd5cccfdd86df48bed7dec7f9f1a037cf955e9c024f368600b5ee8bbb0a46e4620abbde10 SHA512 b162ef2033485796fcdef5613c3a11aa7fb23faa590a1d5391e29af4526dbbad49554d7a7d94f5c5bd7cb9f25b8f73e898684b4bbe9a1e45fc181e7d0fd3e0b2 +DIST linux-6.1.7.tar.sign 987 BLAKE2B 7f7ec4620b38c7435afb5255b1f002de4307463e6be36614a5e2352c6f672255d16288c8760ffc0f9bb015997ee401c89db458bf004c961a7584f99dd87f31a2 SHA512 5dfc368eb50c27a87de1615a1284b353f5cdfa26ef9878c85c4b3643bc11749f8f0ccd337834e58f5f25b1332238c54322799da9adc3ab9118317f3fdaec2aa4 +DIST linux-6.1.7.tar.xz 134784056 BLAKE2B 13c970a5780fd4ed97a0ff5d7c13e2f5cfebf608199ae94973f3a8a109bb961f1effb45bd61a687f5faaf784a84b4c88b5a4bb75b7a1a943f44cab9b6ad37ce1 SHA512 8b9bb3fbbea2d61314145cf6e4e1140372821a1e9ff79c4da363039c54fe73481106a5a85df0141dd449f4a21e946093a7430b14896b601c5a8b1f776107b35c diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.7.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.7.ebuild new file mode 100644 index 000000000000..2b1628c7d41b --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.7.ebuild @@ -0,0 +1,134 @@ +# Copyright 2020-2023 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.2-gentoo +GENTOO_CONFIG_VER=g5 + +DESCRIPTION="Linux kernel built from vanilla upstream sources" +HOMEPAGE="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=${BROOT}/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[@]}" +}