commit:     664d43957e0171a97f694e962806575d402f0650
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu May 25 12:43:38 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May 25 14:38:26 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=664d4395

sys-kernel/gentoo-kernel: Bump to 5.15.113

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 975a0bcc266f..c8514e712d71 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -8,6 +8,8 @@ DIST genpatches-5.15-117.base.tar.xz 4520724 BLAKE2B 
a495289b18d587d3a02d792644d
 DIST genpatches-5.15-117.extras.tar.xz 3928 BLAKE2B 
6dfd1c20d2f57e42fc28d69bd28d89b30da88a7528849a5504b1d4bf2aa6aec1df6419c68214acbaf971513ee7889bb8647c6b7f294f50da817195380ed8a862
 SHA512 
b7c95365023067b437751c8f1963f971cdb1cddbc6571bfea841e38d11f4f800f47dc732e8840ac5399ca9aa62e600234200ecbe3f8dc0dd63fe084d4c08b3a0
 DIST genpatches-5.15-118.base.tar.xz 4596840 BLAKE2B 
d33cfad9149f4f80c98c649c52b794d03619a4d5c6d9923c93b4ce3d7cdb6f0fbf3ba08f1f3c3b93cdfa37d0163ee31f779bf232d36a0b34fcbf5d72c2bf5113
 SHA512 
5f51627047fa24a1a2dd548c4e2a2b8a7da2315ea06818d7ef9f592d7166baf65f80098ce5b24d243471a0aa8b644c590e4cf4b36f06053d7479f0da079ac10e
 DIST genpatches-5.15-118.extras.tar.xz 3936 BLAKE2B 
b74dd7b0194cf6881ef699d0b1db858bb8c44780d5263cbf136f9d181a48420ae31886cd762f819a91b21a2f2acb83f3c46b1950dc53367d8efebe8c86a9317b
 SHA512 
1a3671f3abf8ae04afe50639fe27dfbc07f9f51b297effcd587704f88efda801d3df3255f9d04acbdf4bfac9986a2788a54f4e9fe22344aa0166bbc3de260880
+DIST genpatches-5.15-119.base.tar.xz 4664324 BLAKE2B 
8d594786237d670753f237a4948f5d0e7a85c9f5762f082fdc65dbdad9bdf84422c110d7da2defa10eb548fb03cf42420d54dba7c8b62d51bd1ae04446294783
 SHA512 
8cc047640fc20b1cf9a91809f0ab4ffcdc00e69441f52c7a14d411b254f6cd7e6921dc1e037402341dfb443cfc08a3032540dd1fb8c2c5288a15100eaee896de
+DIST genpatches-5.15-119.extras.tar.xz 3932 BLAKE2B 
fe9680afdaf4153177cbb2380361b18fa252f26a93f57b64e14fd761774596576ff3269bca33fbc6f41dc58d2804e67a664d44167dcd75f8f63c33ff7cc3da75
 SHA512 
ce0a62af36ef19b6543eaf84491447d65d11bf560ec6db450545b5b88d37552cd3933aed20afb0912e12671fa11de6e5efac6d668f593eac3cc4078d170d3c7a
 DIST genpatches-5.4-249.base.tar.xz 5692112 BLAKE2B 
8057ddb24ebbd5ee1b4fb5f5a36b295c4e8ab857e407c5b9e061780e1d23ecca7ab5adfb10ca4f6733a7776c2aa6e353419257c255b07bc991ecb6857aa31555
 SHA512 
b0057da850ab5368dcbf2b454d408b72204150cc2643e087d2f084c3074de22ce36fa4c319552b90d9059ba279e8dc6551cd6348c3616275b050167bfdb58023
 DIST genpatches-5.4-249.extras.tar.xz 1812 BLAKE2B 
b6b7bccf77851a17e8b514439a50c44de954ff461af71414c325ca5c0a65d7a79ee92f7a8b708afd28a3433acddd13aa3bbd5afcd82b4181e57ea05b008d7090
 SHA512 
c4977abc2bbb1c2319e9d2e4aed38419f9e2a70813e5f28d2b799533fc945574d9fee21c881b6dd4926a9c2ebe74ae414ada4993e3fcbd117b6536f983533282
 DIST genpatches-5.4-250.base.tar.xz 5760352 BLAKE2B 
a0780e42391ad416839c34d85f079f11e9bf1579a293ea1bbdeb95e08e76d1d3f7956fcf9c83eb85223016bd4816d23c87e0b345bcb61b5076e5bbbd42024244
 SHA512 
8dd686658217cda074e0731c84d3e8c63bfa914b7e607eab28ab46c8cba647591fcd0a726108a08c826290e9edb01f29b6bd135af0991d818666a853764eb11d

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.113.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.113.ebuild
new file mode 100644
index 000000000000..f45f633a3dbc
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.113.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/~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 ~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