commit: 94f65bd36650fe1487a68beda0f95a5f0c920a2f
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 5 13:52:15 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Feb 5 17:28:06 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94f65bd3
sys-kernel/vanilla-kernel: Bump to 5.16.6
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-5.16.6.ebuild | 132 +++++++++++++++++++++
2 files changed, 134 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index ff75aa3f9d60..d21ff1bf1f18 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -34,6 +34,8 @@ DIST linux-5.15.19.tar.sign 991 BLAKE2B
80e62e341cc1c25f890bba25dfb1872842a9e665
DIST linux-5.15.19.tar.xz 126226608 BLAKE2B
80f03833a90fa8dc233ecd6b75824adb5c529518ba47a95a7fc6d6547a5e1772e29ef88691516482f0185c46df26cd78eb3048bc865511e8dbbab661f6b1f851
SHA512
58dcdf71bd8d8dcaf2932b6b86a8421046d0780361ad6c4f2eadf3ce1805f106da894d0a6a62cb0919186a11659d7ba36cbe0e956d5ea7a5419e6f43698248b0
DIST linux-5.16.5.tar.sign 989 BLAKE2B
a55d8da745785fb479519fd9daf745bae4be54e2b8c135b9f51af38035b273de86bc54dbb7598f98d3bebad995889a779bd88f9d65b2ade44d9bc995ba5ab2a6
SHA512
414f71b299c7624604d1e4b5cc894c888cefded016249d2cefda54727e043152a6abf1a62daccd4934348965c4a574ecad6b098d38774b114098a6d74d9f6921
DIST linux-5.16.5.tar.xz 127552076 BLAKE2B
9eccc20c59a93aa21349ce99b88638de8bb0589037e91143d23932cb5312878bac7ae95adfd0f95b79ad0085f74109577427675320e4a2548f8762661dcdc8e4
SHA512
bb87573623a275a8860728e9586f0e63aba7bd868de55ce27871f615e9b174aeb18c3faefc41e3d656bc998768fa3e3c6097e9d39c32fea48d3769f46c48a2f2
+DIST linux-5.16.6.tar.sign 989 BLAKE2B
49eab210f7029b8a24cbaec467cd5b1ead4b22a00d3132fcc619aa9c0ed126cbf3f763f8af49447a4a258d990a5a707880e2b5705b4310c066aaf41a54086384
SHA512
b1f241b097bb7678b06b361f35060c1d0846d5a3001b98238b7a81c3fa965b9eb8af13144bd6f4914fc47b16f2810ddc7b25c60605aeb99fa03a705f5c024b2e
+DIST linux-5.16.6.tar.xz 127541436 BLAKE2B
ad852ae600f033fbdec4d507a523dc12d0b230c9c498d5147d39c707516b6bccc15fc23bca75c6b1ca17a02647de3074b1a8d03fc62ac8081ff78c1507e7f504
SHA512
5fd0b2f0ff7d8f6f96f0b979b391baae97488385ef92cbb1d86bd49471ecc5c08e543f01b760f30df4a5b5551889b1aa3a3b801f97fef9230d65d17470f64c48
DIST linux-5.4.173.tar.sign 991 BLAKE2B
c4a1ea4cb4dc7e4654fd5b2405fb1fecfaa0421d778b056c5c9a64a37931e7019f25e7f27c50a74af90dc49f295c9ec63c589a4a80c27b0eccd2920b6ccb7867
SHA512
92f822a73d3f9e62dc5c79f97407ec127e1844cb5fbfb087ae803ddcecfa377daada2bf866aa104a405c3883b055f70020922b90aa1f8cbb4600e56e00504159
DIST linux-5.4.173.tar.xz 112885592 BLAKE2B
1c1511e730e42d80b7e6ef2f48ff9c990285f3e05cc18876b6c4901979ff85940283354c84db5dcad81a52efc7c516040243b03d9692291e1a6c3b48059079da
SHA512
9ca63cd8e68df9556a7126a535337205f6cc3e83f79908d6805287e44565f7638683b969d2d40a2badba0d18547712b675fa42a64236d3d24c4fb142175e0a2c
DIST linux-5.4.174.tar.sign 991 BLAKE2B
3a76dfaac9eccb8e1d7d6e494796c103457c0ab196f0e6ba77fd7b89c75a505522599e86d68e55eec5a2e8aac2715bf9c3f0c211642b65446915c3c5dfdbd35a
SHA512
e99359a4beef8ec531378d7a0b397fdd887a96938757661280ab60041bfb27ea09414de176c958860f502f5ecfce4fae57d457bfd9c990b2f361ddac3d7c47c5
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.16.6.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.16.6.ebuild
new file mode 100644
index 000000000000..d3e927d16582
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.16.6.ebuild
@@ -0,0 +1,132 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.16.5
+CONFIG_HASH=07359bfbe209ebc2bf6ff2f7b52eb69cc36e21fb
+GENTOO_CONFIG_VER=5.15.5
+
+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/mgorny/gentoo-kernel-config/archive/v${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://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+ -> kernel-x86_64-fedora.config.${CONFIG_VER}
+ )
+ arm64? (
+
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+ -> kernel-aarch64-fedora.config.${CONFIG_VER}
+ )
+ ppc64? (
+
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+ -> kernel-ppc64le-fedora.config.${CONFIG_VER}
+ )
+ x86? (
+
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+ -> kernel-i686-fedora.config.${CONFIG_VER}
+ )"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+ !sys-kernel/vanilla-kernel-bin:${SLOT}"
+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[@]}"
+}
