commit:     0b45b4015f2666f710014719dba7dbc7077ee2bb
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 21 17:51:17 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jun 22 05:08:01 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b45b401

sys-kernel/gentoo-kernel: Bump to 5.15.118

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

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-5.15.118.ebuild    | 134 +++++++++++++++++++++
 2 files changed, 136 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index c34f305d2740..58d281823ecb 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -14,6 +14,8 @@ DIST genpatches-5.15-122.base.tar.xz 4735096 BLAKE2B 
10746c787ab70dc82b688b87201
 DIST genpatches-5.15-122.extras.tar.xz 3932 BLAKE2B 
35fdaa40b4b4e297df7f8702ab017f4c49bbca2aedc652c6e5ba8fec6b1573a57d17a9c7b21f03b56b43d9bc888e3d55354ceb92e84dde0a89983dfa1c3ffc16
 SHA512 
176deb6aef0eb9dace274bc4ca0f29a8d657461583dc9133feb4272211f910313fbb69fed308705f00c1c6d86845f1e961ea0066b09b42cac75a3579b3d3ed14
 DIST genpatches-5.15-123.base.tar.xz 4796616 BLAKE2B 
77f5ece18ead48d21a9edca96a96387397e95994a9f33f12eb58b09f3732f6233955a656cd345799b758087d52412221af624638f4b5ba85df54454c03a54e2c
 SHA512 
81c918d213a7577089f8dbfa4ea2f7cdfff08950d6a7813baddd779542fc75d532a5519bf2fc4a2ab59d5a68e56129cded2549f8572043ac303ac8c4eb7090e6
 DIST genpatches-5.15-123.extras.tar.xz 3932 BLAKE2B 
708144e428faed3f92e76be99ae6ad3e492113f585d8d00fa099911bd528bef269636e10204317c2eccb159aef18365c8f920914617f7565bcc1e348f589f311
 SHA512 
93eb2ae79468046e6b056371e22b3102245ef297ac4c6db607efa2fc512e259355ce2ff96526fe212a2704d09902262471787390f837534745671d5daccc2b9e
+DIST genpatches-5.15-124.base.tar.xz 4885784 BLAKE2B 
7ae33a4205652539bb61901bb1c9f7d3c760eeb8f0cd50780f10c060f559d2cb695b12cf1626d11a043868bdc925b319412b9931585a230d0b6fb6eed9c25936
 SHA512 
1e01ee6d73d10cdf325fc7a9143f7a6bc1c2ee86db3f2e074cf0165094764c862a2b52d91edff510dd567a402e659dc3e136c623fea6346664737709d9893772
+DIST genpatches-5.15-124.extras.tar.xz 3932 BLAKE2B 
d995682455be830c9920de5bd7a0c51e1093df752e1ed4848fcec77924718f8a702ae754a0a9bdaf2c01190193778dcad33282fc8b8b0c1b63f5ea16e33ac317
 SHA512 
ff054292b61efaac5a9936aadf9de4eaafbb0be06e45a7b6f82855b52bf0695fdb576244dfda48b9c869b2fdfbc2cfd7d2e19ca50a4181efe9807c2048c96958
 DIST genpatches-5.4-251.base.tar.xz 5798892 BLAKE2B 
a519f23086a440d560e5301b77aa1a627e97d9c2545adddc6fdfe9b55b35dcbef285a6e92d4ab615b517177723875a53b6b5f1dc9c237dec3f23acb511e08be7
 SHA512 
c8d228cb18f2c64631ee5a40d7de58e78c7fd2c452f54101d0e6f67149d5d3df30076b461dada5bd862e4b97daf30a6d15c3f50526b46156d9ffca946b3c65d7
 DIST genpatches-5.4-251.extras.tar.xz 1812 BLAKE2B 
440f5d63b80e31753c46c2c2bb07bfdd257cac6847dfaed63a19c9e255da0e6ca31f5535718572afa143918bbab9d8651b0d8462f5bce619866d78acbc063682
 SHA512 
54d1ea7625daff0c8d50f8abfba616378d8bc4c62cdfdc03648bec9312803464d0c662bfa619c357a73247c00b22b9725896cec5aaefc66ef811e0f97ff62e91
 DIST genpatches-5.4-252.base.tar.xz 5808300 BLAKE2B 
d5cb4fe312f469a331269eca8604d9c43feca79bc6778af670fad859de3098c31cf0408fb58d95f233564e0ab2eff7a45ad041b8fc6bb97be0f93dd911224b62
 SHA512 
4970b66f064f53db230877fed6434e39aebb727438465667af6eca8603b712089830789c16bae5fe0249dfed0cb4bdbf1ce695cc7a1ebb6ab64bb61b1b38a5cb

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.118.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.118.ebuild
new file mode 100644
index 000000000000..3c2fe5f00808
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.118.ebuild
@@ -0,0 +1,134 @@
+# 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/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+       
https://dev.gentoo.org/~alicef/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 ~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