commit:     bec50997a4e880df45c515dcf4505778103a8e6d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 23 16:23:42 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 18:31:11 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bec50997

sys-kernel/gentoo-kernel: Bump to 5.15.121

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

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-5.15.121.ebuild    | 141 +++++++++++++++++++++
 2 files changed, 143 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 8ed09dfaa587..4a2d0d8e052c 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -2,6 +2,8 @@ DIST genpatches-5.10-196.base.tar.xz 5560912 BLAKE2B 
3ea2ff034bce2b1a5b42080393a
 DIST genpatches-5.10-196.extras.tar.xz 3868 BLAKE2B 
f027bd1bbb5a706efd42d205324820aeefba91a7f6098d726b7e4abb0778f4b48601b045cd3c329fb76b5d1fc365caa6d43696008454166c6cb6ec21d58bfa02
 SHA512 
1016e558435900761b6e64b094f617ba3900b027ac178497195744e0954bc8e9adc6de9e73718fb0ed6b5fc9e774e44df0403a667d03deedc01ef31230f0579d
 DIST genpatches-5.15-126.base.tar.xz 4920632 BLAKE2B 
b35059e13c2c9fab04f23fd8b41ad37dc1eae2d7e8e505c87506109471e0546f68428c06065da496be3a9213a4e3ad288dd507d7b71b5d9549d7f1c60c378ab2
 SHA512 
3bcce914eaffcae0f732267f3d4cbef1592a4cbce4ed7277e6aa1b791f006fbbd0858e788ebdaba9502b871c0c9750e74df7b05e98f68318932090f7a9cbfb38
 DIST genpatches-5.15-126.extras.tar.xz 3936 BLAKE2B 
7bc9d712efe225829760abd48dfac3bf1556750189f99dd77590fdac8d4f5aa1491a49da029e9faf6dcabeb32aa0b2b725223566bddd3d43a41ca0432348420e
 SHA512 
f196a93dc976eba4bf3a8fe5d52229de0e4a4cde31c58be63be35ab65c4753969e4f0ff86b77ef0d7375392b55cfecfa93a4d963d79f3c5753efbfede6a19a17
+DIST genpatches-5.15-127.base.tar.xz 5054384 BLAKE2B 
d6f7f2c26d4cc35c62243d3e59a6f7c6a03243dcdaba6abc76d36d35f83f2f38618f821a6c42a34563043e1382a448c2d53d6fb52b71195a4913fb80fc602a7a
 SHA512 
e73bfbff7218f9d5ce2ce82ec04b401cf013b8ba58fb08b0fc6a8c35fd146e1e1a899a291b2eb5c2100721f95def82aa2294fb67032143371bd9a4f2cbd0a0d7
+DIST genpatches-5.15-127.extras.tar.xz 3932 BLAKE2B 
f818f3a46a46793a5726e7931c989e64bd61e077718fac4c7125efb93f4301de930a6fd5c3a9b18cb53a0339539e5973650056dd9b4a4a9e66e6877124bcd925
 SHA512 
6552611103653e8b26a951ede5b6133fe22d1c3f6d21aa9f381ef309fc82aa2edbfc3857e10066125dd0f9db3b62aa1e6fc2fd9a16e033eed1ec975f4e64128d
 DIST genpatches-5.4-256.base.tar.xz 5956736 BLAKE2B 
f1f5f42e5383da96ac4dbbe9cf7d8ff8c7194c10d33b914ba36d29e98291752354597951eeea197f11ed05feff4c83f777c49fca71332c2276612cc6b69f1bd9
 SHA512 
888ded20e68dd0ef134c9558c4edd8490cf73b84fa9f9efc1dc70144ad5accfe560200592dc93ac5d5919bdc7cd9f70a3832d46b9466a136ebe51cce75b069ae
 DIST genpatches-5.4-256.extras.tar.xz 1812 BLAKE2B 
3942c845d2159bb2fc927c5f19a3d5fc0cd7abee0a1102e07a4bb657a213527575fac692ec408f12f679e3a1e791087237baaa6199e92d8062bcc4576fd142c1
 SHA512 
6242d77b0a7de7542395a5461e6aa8b2a2003f77ab81b1931511f36b42b914bad839ff2683154371118bbd81953de0604d23d75f662437686da694dbb610c8e3
 DIST genpatches-6.1-44.base.tar.xz 2683644 BLAKE2B 
d0264b6d6456fb2e6a67c1240cd3fbb95eef61701bf953df6e25e37a12fb12702b57f66e30ac757f28d9d1bcd0f2fbc38775d5b73922504084ff95f9fda1d78f
 SHA512 
e3777a612facad029782fe63abc702af06197521fcf90f4c80311fd7ad94739209573c7de910dfaeafd88948c2c3f3d29bb27f4fa1069475295b6f5b29e14116

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.121.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.121.ebuild
new file mode 100644
index 000000000000..ad2d0803bd9c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.121.ebuild
@@ -0,0 +1,141 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="
+       https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+       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/projg2/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 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="
+       arm? ( savedconfig )
+       hppa? ( savedconfig )
+       sparc? ( 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
+                       ;;
+               sparc)
+                       return
+                       ;;
+               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