commit:     b9018ab2fd68d53862170837acdb1b89d59e0c56
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  5 13:32:56 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Sep  5 17:43:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9018ab2

sys-kernel/gentoo-kernel: Bump to 5.15.65

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 6f38999aea25..ac2ecd162636 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -8,6 +8,8 @@ DIST genpatches-5.15-67.base.tar.xz 2856328 BLAKE2B 
a92c3afb5e0a6605587744c68b3b
 DIST genpatches-5.15-67.extras.tar.xz 3936 BLAKE2B 
168a92a9db40e6014864a96aff71fb87b351d7127c5eedc8e062e753ae65d7ebc628e9b0eded328f17e88562592d80522ccdd31a549c8104aee51e2833f81134
 SHA512 
0f2bdfa87ec2a610870089c903b301dc86dac52f4969386074a439be90674c4835800cf9250d8844b1ec3df88cc8dc0b31e4582ea309b7c817066a1341c692b2
 DIST genpatches-5.15-68.base.tar.xz 2897744 BLAKE2B 
e1aebd74737e787df999aabb0153b7aab4b5df05d049e9a6260a3bacf8e827b4f767fe6fe8d07bea71a0e5ee7655d864da67736c17756ec1119a66fc58a4b82a
 SHA512 
79996709882f76cae25639f273f2829d5ae671714f699008d7fbed68595e7cdd93e9d79c801e9f1eaf6ea89fbfe9df3302773e6f728f8cb5de4bd69b36fea65d
 DIST genpatches-5.15-68.extras.tar.xz 3932 BLAKE2B 
34fd77b8464322ad369de5b86dd8dc83ce7510bca139d4e6036b0b2ab34d1c80698b5f965e44a09dd25ee3b4d80abbccc5920e7984803be2451281c74ff735ea
 SHA512 
970a1e5a03f786d05bb1ae9217a467442f16344fffcf2c77a2572c6db656b0fcd5b3329eae193999c47bbb45c8b02f0fd9010760ef74a6aacc474729f0ee9369
+DIST genpatches-5.15-69.base.tar.xz 2924208 BLAKE2B 
fc4f14592624fe2516c917425c04eaeb7e45073fb77e5830fefee93e3d25c448c8a523862ae89cab99220599c7ab5992d03cb5f81354236f77bc2e21ee802fe9
 SHA512 
ebfcc2c23304a6b316ecf226fab1200cedc7893093c99ca50cca4c1ad393dc5abcaaa0f2d4789909425a8eae2ebf57d4651f95eddfe40ac39522c95de59961d9
+DIST genpatches-5.15-69.extras.tar.xz 3932 BLAKE2B 
03a0b738dd90047356abd306bcdee18e7468d111dcff28cfe4bc39c7328d146c69178b1fdd19cef92c0076ad981e845f2ad37778a0907bcf0fa572011d747b08
 SHA512 
bf29f35d834d6113b68a3ab0a2c2ab2b241c2fa13e47f59669d23a6510cbfb29d24f5947582b2c24f2e4e3170e798d6d0a4171c47973399431a32b76a770488a
 DIST genpatches-5.19-8.base.tar.xz 643396 BLAKE2B 
c383c7efc908fa3e8ebdfb750d92df6adfa1e0d00f253eae40fb5db5b84f8848a5c1a4fdcda693da998b1ba9d1afb1019cbc2574ceff2b099d2125ead515efc3
 SHA512 
ebd5eaaefbd362d85fa8cb95b0ca4192bf7a0835ec58ea25def13e502f87f74bcc29219083f39b85462b262f526f771270b5a8d93ff49126e1653d948a9ccb9d
 DIST genpatches-5.19-8.extras.tar.xz 3808 BLAKE2B 
8cad0dd5deaca8f8b379c96cfad02add0cfe7498f17e84d11e6b809e366ae0476734bd003b287456459febe2ff4c1fa7b3e54c47243cd571a34ffb1cd927a1ea
 SHA512 
a183d09ba7b1fc3f89b7754709df8d093ba70b09f71e237844214d65bc5821b6328c436c7ef697c30bfd38fc833bd178497190a2e73914a03ec0dfa4cbcdf7f2
 DIST genpatches-5.4-216.base.tar.xz 5015752 BLAKE2B 
fd736588b9cbf9ba0a48ad838a17eda669e56d9d0ec4dd903f5bcd31ffa2c428d14ebc7bc35a709b3da7bf7f22403c5b01a9314dda60ef955d7674af836e2481
 SHA512 
62cd9deb29f863babbc9dc5116e5c5bcb34c0f29325276da80fc9b040004ba9fcfcde380779bf8ea8039f3098da88c59e7fdcd2d0f6d6aa5034df59ac9b55914

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.65.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.65.ebuild
new file mode 100644
index 000000000000..64c99e19532c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.65.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##*.} + 4 ))
+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/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