commit:     2578d4c553f65448d1cafb1da6d6c05455470fc7
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 20 13:24:15 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 17:24:29 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2578d4c5

sys-kernel/gentoo-kernel: Bump to 5.15.35

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-5.15.35.ebuild     | 131 +++++++++++++++++++++
 2 files changed, 133 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 9148a8edb110..60b77fd12ce2 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -10,6 +10,8 @@ DIST genpatches-5.15-36.base.tar.xz 1545664 BLAKE2B 
367785e90aeba2a5498c5a174434
 DIST genpatches-5.15-36.extras.tar.xz 3876 BLAKE2B 
f89575d6d88ba1299252281092d13235643cfcdf2ae99571a3e813e39b1609fc2faa85dd07b81be81223bd0e83cd0a1c10c1e84be54a6c4f6563b901d98e673d
 SHA512 
9127a39fc8ebbd78274ff838625eaf5c5500c1380a7cc84356af6fdff161123000f30f91ed31a0264d49ab08353a004e8cdd67ff08413a272e2f496c36e41988
 DIST genpatches-5.15-37.base.tar.xz 1619460 BLAKE2B 
56c3671c4d6915ca183f92b19b7fe1de2bbccb05c1b231884b49b559fac0a33521ef12c6d75fcee3a37b898480ee77eb7f8fc93b83cf27660330e7b3de1be7a0
 SHA512 
59e25b62ddbddb0dc92bc44d9092d2d6f2262e582d526f20d07452a520e4176534e129b7882d98e441bd72f32a1b1f2ce9b64c7f1b9f4966f5c7fb27a50e6984
 DIST genpatches-5.15-37.extras.tar.xz 3868 BLAKE2B 
11ac96d133b2c44ca77eb51cab739195e9fb252a2a3e6e2ad241f9ef6568ae1cf3dad9b7411522253c1e779c048807d478d6bac71d7aab9a147dac5dd81f77a9
 SHA512 
f8f0b48e170f5170d44947e52d548fb66f302bd97e7414cfb7e4668b2af76b48be0d0d2552345f397ff830246472193deac056020f128d98fafe04128d1c195f
+DIST genpatches-5.15-38.base.tar.xz 1659188 BLAKE2B 
782c4471d6e2cd69db1320e1f13caa438a9b535bc91710ce46c22c06a48effb07ce5bcd023b7ab25f3a7ac48bfe92352ecea46449dc7fb2557c10fbf9d9b8b5d
 SHA512 
4a5f8ecd7557fb9040b8a7d151cd2afcd3f8b15f4b8c1a7cc9d56c18ef21f900603a80d7d155e7981ba780597766f8612e45ffe3f1906104b478f49b9b5135f9
+DIST genpatches-5.15-38.extras.tar.xz 3868 BLAKE2B 
8e23e08f6c89179b1ebc9d6727e1292c012a495588ef298d3b0a9c2372a90c54683314e5975f9ec9ee2539ab6f4b03e33a37793ab5b2a7205feee416558d9ee8
 SHA512 
77077a57146e44f9b038e56e4f21c1fe0eb903bd415c037546f72106a8e7545085405cf15d8f31c7a318113ae1104e84c0bfe6015778fe482f822e671e14d002
 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.35.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.35.ebuild
new file mode 100644
index 000000000000..86083de8d7e5
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.35.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.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+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[@]}"
+}

Reply via email to