commit: 977bfb129098893fd75471467f14863cc536e78a
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 8 14:48:35 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Apr 8 18:05:35 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=977bfb12
sys-kernel/gentoo-kernel: Bump to 5.15.33
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel/Manifest | 2 +
.../gentoo-kernel/gentoo-kernel-5.15.33.ebuild | 131 +++++++++++++++++++++
2 files changed, 133 insertions(+)
diff --git a/sys-kernel/gentoo-kernel/Manifest
b/sys-kernel/gentoo-kernel/Manifest
index 32ee4e2c02ba..56726cf9be4a 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -2,6 +2,8 @@ DIST genpatches-5.10-117.base.tar.xz 3165564 BLAKE2B
0e41b33af63a5b6da920d194166
DIST genpatches-5.10-117.extras.tar.xz 3872 BLAKE2B
bbac7edcded53e4205c58e1404692b753d57f306b98bfd7e718206e25a947b2e1e565ae33712b64f9b24333df30c32c975af71c5a9d11bfb836216a27dfdc782
SHA512
b192de56c873740d963fa6689f7d9dc177b25cbaa2847adff2d3a5ea7c6c541161c4518f389f7a5f2294b878dabc0d06844bf4e45cffc87ce8f9649d55a4312e
DIST genpatches-5.15-35.base.tar.xz 1306764 BLAKE2B
5ea5655e825b9196663a7bb830ef34d74da7c9f922f7a71b46f7bc8755adacddd3b55f57e85b29532d6936ca481699ffae36642401e34293b4c6a445abb92db7
SHA512
50030f2dafba3e7fd16df7a6dd275fdbede772273009d1f1055dc904dc7afe947e92e9a32274c337938edd35073adc2e101d18a6ccd39529461d703af3e20566
DIST genpatches-5.15-35.extras.tar.xz 3876 BLAKE2B
5b14c88d66ede25e8417bdebc3c822d2f3755a13f21cef8a95088c97bba42a44357c98d13ce5a40e3aeb128ec0716540e893b108bf1f73256cb45250cd7ef43c
SHA512
bdd8c5a700e9902cb7db17094fcc220eaca4774639d73e8496ac061fbba9fb80f6aa136aa9e87331a636af6146737fdec3c21249da7a18b5fec4d82de559e24f
+DIST genpatches-5.15-36.base.tar.xz 1545664 BLAKE2B
367785e90aeba2a5498c5a17443429bd6650ab40390db6feb349eb54431e36ddecdfb031785f74355e5cdd7105636bffc8c0a86821ea36ee257d40cc0fc54d31
SHA512
63191671b4b41fb4a45d0535782bf638976e520e227ac6e924ce7e783e67ed02c8f127574f263d9373cb5d79591f1de209d09ceb47ba6ce34acb57c6a991857a
+DIST genpatches-5.15-36.extras.tar.xz 3876 BLAKE2B
f89575d6d88ba1299252281092d13235643cfcdf2ae99571a3e813e39b1609fc2faa85dd07b81be81223bd0e83cd0a1c10c1e84be54a6c4f6563b901d98e673d
SHA512
9127a39fc8ebbd78274ff838625eaf5c5500c1380a7cc84356af6fdff161123000f30f91ed31a0264d49ab08353a004e8cdd67ff08413a272e2f496c36e41988
DIST genpatches-5.16-20.base.tar.xz 772164 BLAKE2B
f29e052926e6c72417d93b7e114f7dd688def99891508b358414ea3930e3761d6e79e7d09722c4479ab7e0d495d53cbc1084270f8782a579d4ed56f58caa157c
SHA512
00a034d6a2a79daf856c0cf8e6dd30753d89b95fb9de9a5aff4f5a0dad651eb53eea24aef7c582f866749ad3fc533ed7087f7dfd11600fef8cebf85d2cc9c58b
DIST genpatches-5.16-20.extras.tar.xz 3800 BLAKE2B
c815ea22d067c98f82650726a6c8a2e937c7bddb8b941e9d54c3014f4d8ea173cb1e54e76e23b6f767ae247fafbe02a8def6f39e5c6523e8c8cb12f098b8a34e
SHA512
788ad08dfb0639c5ad42bb761d99bb534fdc5a9be54e9cededf90e0da34f13089b82609d8c7ccddc6fc1a28b913d4012c0e44b6768c84927e582f3a04be7ae55
DIST genpatches-5.16-21.base.tar.xz 1076736 BLAKE2B
a5c6a42aba796d3f6fac0bdff544ee952d1cb63374864fca43a4fe57efb09407b8aafb54a692298173b66b5d267b9a8fdbafe614f48c1af4b4ecea2e951db975
SHA512
3a2df76cefcb1c8b6b4e65c82328a499757db5e50a33e9fd68b7d6044981f73f7cd0427b582b4477d1207898e3e2344d2c4c1afafdef17dfccf9e787a17b6dba
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.33.ebuild
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.33.ebuild
new file mode 100644
index 000000000000..08f017d05ffa
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.33.ebuild
@@ -0,0 +1,131 @@
+# 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##*.} + 3 ))
+CONFIG_VER=5.15.14
+CONFIG_HASH=8cc461d9cfb256bb831225bb38e29fa944bd890f
+GENTOO_CONFIG_VER=g1
+
+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/${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[@]}"
+}
