commit: e4207c14bf6df4332e9728820423fb5c00b9c2a5 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Dec 31 16:37:41 2022 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Dec 31 20:22:47 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4207c14
sys-kernel/vanilla-kernel: Bump to 6.1.2 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-6.1.2.ebuild | 134 +++++++++++++++++++++ 2 files changed, 136 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index c3196c288510..d343ef684c67 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -34,3 +34,5 @@ DIST linux-6.0.15.tar.sign 989 BLAKE2B 214ba7092718635f5dd39f2374615854c276e450e DIST linux-6.0.15.tar.xz 133929584 BLAKE2B 2d01f57c447ad7eecaa77a9b245ab1a79a35bdcede9d0b234dafd96d383a14a878868a6872d9c24cbc1a6a1332ccdeb15b492724063423ee833ccc56f9c5348d SHA512 1db7e086aaceabf12749728f100842c68886158202250cd9a582083488ee7073bc925f933f44b5c70a8f8c5bea48c73462da9ba979ef696005f16031d11312f6 DIST linux-6.1.1.tar.sign 987 BLAKE2B a240a6428c456557362103620cb9d0d9eb0eb57d7e46ad7aa8183eee673b5578a811642222388cf99a9728bc47e35d7489dd05728b36c939227a109435a0e7ea SHA512 a089b3bfc255fcf10594ace137ca2553e717dd231434b08039252c23c2c7242fc3037b49a8a6fa8d55a92c99173f448bdcabd6116f185ed31078f7455aaa23ba DIST linux-6.1.1.tar.xz 134730676 BLAKE2B 8d25e501419dfe800b9cbbe219c39883be67a80e015c1c6034e83a9b142aa16bfc4db14a788a5331f6c44c03ca013f0c73e028b207e2e424dff1d3924d9a58fc SHA512 c303f53ace62cf5b860934130fa5c34d2a43e7719959bcc3f2b7f0e753ecca550da4d0dc52409b6b6dc1c9c515cbab75427a15e51b58e9f8b1ce12982d82d629 +DIST linux-6.1.2.tar.sign 987 BLAKE2B 496c6817ca39458b0ef0853b84bcd89b5caa76b63739730056376713266d49298328342d1716980a244f00c57c74de03a6d36d6a80542590bb642ee2bb92e1e4 SHA512 c338bf4e330dab849c568a747209b8665e8cbb27ad7870eb26c41e66b828b2f8edeb03a3f02ac35523b1e2896f0156d5ba0f1f1900351dccaa1b4d5db6590317 +DIST linux-6.1.2.tar.xz 134757304 BLAKE2B 0bca96ecd7ef972ee436f790c84e7d35c4a592dfbf1bd27fd9d66c8d3aacab311bb4ee06c42f22079b20c7fbe8ae9df12844f699a673d7e534f76b5f5b6ce788 SHA512 a906c15b1eb4f3015b1d9a0e6a321b5a399e77ccd0127cb8caabbe7cb337e77a85a432bac4763ab5448d86dd319441eef865aad41939ca1f796663c2b52170e6 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.2.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.2.ebuild new file mode 100644 index 000000000000..bf548bba57b9 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.2.ebuild @@ -0,0 +1,134 @@ +# Copyright 2020-2022 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.0-gentoo +GENTOO_CONFIG_VER=g3 + +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[@]}" +}