commit: a4f70d1e5ea930a7a21e2078bb94144ba32acc8b
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 5 13:52:25 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Feb 5 17:28:07 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4f70d1e
sys-kernel/gentoo-kernel: Bump to 5.16.6
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel/Manifest | 2 +
.../gentoo-kernel/gentoo-kernel-5.16.6.ebuild | 126 +++++++++++++++++++++
2 files changed, 128 insertions(+)
diff --git a/sys-kernel/gentoo-kernel/Manifest
b/sys-kernel/gentoo-kernel/Manifest
index 0ff9ba5f8f34..1b32aba046d7 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -16,6 +16,8 @@ DIST genpatches-5.15-21.base.tar.xz 979868 BLAKE2B
217af3325d15020a43cc661746272
DIST genpatches-5.15-21.extras.tar.xz 3876 BLAKE2B
4c07b166a474bc11502de000f1bb00d8f0c25914a7877b2a94db844c694e0e7a4c757e8a10880eff40438b97214326ba50e716070d79ce1ef7f68c65d876da39
SHA512
384a2111655d8fd78a2f6165e99be0c74b36cf90333a465a4bb4cb6cda5ba32e1d435958987094a2d1407f02df7331ff2bd4fccace4f0a6ebe0c300692598f41
DIST genpatches-5.16-6.base.tar.xz 410464 BLAKE2B
19e5c3718dc8bd9b10f42b4448da16717f95da8a5ca33145bec2703c850ecfe4978144530823319bce945287642a44d368eef24448b45b12d28f5fe450325e99
SHA512
80c38fece09b566dbb65b02beeba3b895c41f18fec08ab9b09a6200450a88be8fb10c04dd80c88dadb13e3aff56f2e5983063cd2d852d9f1fd7ed92113e74887
DIST genpatches-5.16-6.extras.tar.xz 3800 BLAKE2B
43e9801bfd91b817bc56eeeecf9a86c77ef00c3899a13d78b022dc119c4130d2635fb801b1e638877b68bb17c2ce57edea5d14f8a93acc165c715dc0f5615173
SHA512
cb4570ee5ff2dee8a8e992c7f9d173e4b4c7a680cc8225a53ed9e16887d7ceee3ca7a461aed80bbdbd90dc236b26b1094ee6be207afe1bd15117dbb4025b9c9f
+DIST genpatches-5.16-7.base.tar.xz 421780 BLAKE2B
a4d43c5c598c6c263330acf21502866f0d6698e409b51f48c1690e98204e786d4ca8cca252dded8ea276124e9ee0598e912d42cc458ddf096239f3b97cbf392f
SHA512
e76e4ffe549b2533f8c1674963a6fe22f70ef169f46ec13681efe896f1141b6a0341f942856a6ba934e2749589fa68512870e727e2fd411b7d2f5e4cb9b86594
+DIST genpatches-5.16-7.extras.tar.xz 3800 BLAKE2B
2ca7dd167d60ee036ae8a9fcc2258719c701cc2a64e8a62e150ce369f2d7ab4284148987f22cd6deedbdac8bfa9d72cda36c7dbfd5e353034c0d79601c923b78
SHA512
3fae1914f2d5cfe03a72d24abfeb5bdc2c0387f050fa0b50f15a20f26afbe4dc1b79bcd619451c858845a06221cb3226e5c026e554120828d133e1f9f126d586
DIST genpatches-5.4-177.base.tar.xz 4317444 BLAKE2B
e7ad5f0a561dc50a11aa3720c3096230d8209c58a523da7f6f0fb1b0c8ed903780d74c48edc2791f8d8ba7fdc946ef0fc506d73ff3f86e9e2bfb4c05609d4456
SHA512
0e04707f1f5e85b53f425d54c74d9483d33280769d1cdd5122e34d19dfea1fcf0cf258d84579f3f169a1f620d9107a7d454970da313806c5edbad8a6d8632c9d
DIST genpatches-5.4-177.extras.tar.xz 1784 BLAKE2B
e840ca0c6b2dd9399ff4f0d03e828bbb42f53528e1c13b2825c5439cbccdc36577f029caccf91690857cd6e4901cebd98cc27e2ad2d0644c7503822563f38d0c
SHA512
a17abf06bb76236986b9a86f671dc60544b39fc47736aca69359e6d68699a52a3e72b1a2ebd57f78602114e9d1f5a201f37121bd6917f50c9d06e385b194cb20
DIST genpatches-5.4-178.base.tar.xz 4382260 BLAKE2B
f43573bed5925ddad264a150c6bf7e769771cbb89ec56c0c07f73375c19386ebd15b538b12b89c9e18ad3592b1be038288f8bc4e8ee4365fe92c118d81e3a5a7
SHA512
26fec31e23bb0758ec4a5c5542868795172d7717dcb1323cb9a930cb9b60c860cd033836d9ef80ab327a85656f4a70a46a597ffdb8e9ad27f7431d1bd1944b31
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.16.6.ebuild
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.16.6.ebuild
new file mode 100644
index 000000000000..8cb5db5233d1
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.16.6.ebuild
@@ -0,0 +1,126 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
+CONFIG_VER=5.16.5
+CONFIG_HASH=07359bfbe209ebc2bf6ff2f7b52eb69cc36e21fb
+GENTOO_CONFIG_VER=5.15.5
+
+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/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+ -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+ 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/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
+ ;;
+ 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[@]}"
+}
