commit:     a301b1987330e6fed6b1b5607e2fb766c82d8747
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 10 15:55:24 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Apr 10 19:10:44 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a301b198

sys-kernel/gentoo-kernel: Bump to 5.15.154

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index fcfaafa84c9b..340ef323ceb2 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -10,6 +10,8 @@ DIST genpatches-5.15-161.base.tar.xz 6394340 BLAKE2B 
9b30c56e1efcc866985caa44806
 DIST genpatches-5.15-161.extras.tar.xz 3936 BLAKE2B 
3bbf29d5ff26051c5f115439f42a07a3af47a681065e00561f8636aae51142b82b87d7e2879839d5abc7bec944b193aac31d2eed543275b94f47dca2eda38090
 SHA512 
20e5ac4f8e8903a86cefa2cbb3a4962f3dd60ab56f71397208622230ea1f4d481d703d6594fa9269e46d2369514d1c6deacfcfdbd97cd50ad9ee63c220f289b4
 DIST genpatches-5.15-163.base.tar.xz 6565400 BLAKE2B 
2ad4b5bf3b7654936bc9354d8f737435b8bb0cd0a8e12600cc453410ce99c5e41ee5659d19d1d0fd9939fccdee2ee584f7d73cfb05cc844f3097bf8907cde6f0
 SHA512 
b51d2aca5891582bc27f258f0de629230d793960548e385492d7b1e4cbabd2acb40c628a7d63c6182d31cc28c9a658f6a496997174a8116a14c5b2253fe921cb
 DIST genpatches-5.15-163.extras.tar.xz 3944 BLAKE2B 
61018af8eae6b9492e3ce11d26a33e0bb5207f05ea7353e4b843b2ccfcf67ef02c2f70833921573e13e5f11443733d64ffb15657cdbdc02696f03ac2e71c75c4
 SHA512 
69e5a999aa527472e3fb80ffbe0bbb9c9c3d81aa4a4e623d361febe3ed1c695ab647b9e4ae3e1978b12981636f7a1d7f0a65685ba140e6515e45ec3ed0747a70
+DIST genpatches-5.15-164.base.tar.xz 6702232 BLAKE2B 
2a65783ebd23392a767ded400280d9e47ea95c18f059b1d67b653aa800f63a50cfcdd996113036dc9f61648453d232003eaf9df0a42af18949e43f7669bd6558
 SHA512 
0eb957501c3a1cf2256585c90c81cb3e4b371a54640bd893f001bce949d1a3897eee055c090e1dc57033a691bd62af2b5418401ce8a44fb76a388bb629c5205f
+DIST genpatches-5.15-164.extras.tar.xz 3940 BLAKE2B 
f1a166e7982c6a6968a083fcf60b6e383d148c17562403035ed8168ba16d045e56384528694752cd614b7aeade23fda879ab298c704bb297278af554ea6caa93
 SHA512 
a78b7eb2a98194a08b836358be7b8249cc280216056caffd95cea98dbeb62e01c04012c864031d5f9f16bf132b154dfc4922a4550127192c8307ab61da3937d1
 DIST genpatches-6.1-90.base.tar.xz 4798868 BLAKE2B 
3898a35ee9d3ea977c455a8432d512ed9f282f3b961b0046b79843bac59b136d9834c6fc128c5fdd2ba28b1d25e98c47b67bc3c50287cb05a372ed34d2b8982b
 SHA512 
6bd2353dcb0caedfbd009f66d10e6201079c481101490fbe131168f0e46203446226c47a85059bcdeb8a3395ba79ed9ce0075c144ea8f94dffc0911958f679b4
 DIST genpatches-6.1-90.extras.tar.xz 3812 BLAKE2B 
466c0b796df7406c228fd4dbad20f84c2fb99203ccae1a9e018a15a0314dafb478ef89dbeefaa012b0873a06fe3398b7f17f68bf8275283cafd0d258d44c3572
 SHA512 
1744cb7d90176d3eb09195679b51eb0aadfe5a3452dc2d2b299262eb7aeda3071bd0bbdadab2c05bd266c288eee5580e4da1190f308e8755140d454226f32204
 DIST genpatches-6.1-91.base.tar.xz 4814756 BLAKE2B 
ec513671056ba3f42380e4f57115746c78ea26fe982bfdf9b0d7775938f90fed2d5c940ccc8bb90865874684104784631865b735ed6ca5cf069852611dd9db8e
 SHA512 
8a034d617f7639d0bcf4fef64b1fcdd91f158311c4af6ef5452c666e3202078925f293daa441493180b4932d371094927b56d1c7adc7bd45d21b47be6f4a3912

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.154.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.154.ebuild
new file mode 100644
index 000000000000..007ba37d5baa
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.154.ebuild
@@ -0,0 +1,141 @@
+# Copyright 2020-2024 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##*.} + 10 ))
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+GENTOO_CONFIG_VER=g11
+
+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