commit:     a76a7e20d130bde493397727b22d884b94725367
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 15 11:01:23 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Sep 15 14:56:45 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a76a7e20

sys-kernel/gentoo-kernel: Bump to 5.15.68

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 2c2eeb0ca11c..7ba05d06d042 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -16,6 +16,8 @@ DIST genpatches-5.15-69.base.tar.xz 2924208 BLAKE2B 
fc4f14592624fe2516c917425c04
 DIST genpatches-5.15-69.extras.tar.xz 3932 BLAKE2B 
03a0b738dd90047356abd306bcdee18e7468d111dcff28cfe4bc39c7328d146c69178b1fdd19cef92c0076ad981e845f2ad37778a0907bcf0fa572011d747b08
 SHA512 
bf29f35d834d6113b68a3ab0a2c2ab2b241c2fa13e47f59669d23a6510cbfb29d24f5947582b2c24f2e4e3170e798d6d0a4171c47973399431a32b76a770488a
 DIST genpatches-5.15-71.base.tar.xz 2956404 BLAKE2B 
20b54274b121a6e15d8960cc62e63e822db1d5fcf3a3e2f3810b70026015b405af6c5840702e418a13da2a712653f06a3f5d8af3de2157e40f1b41c8e0299a44
 SHA512 
ca2e20c2b6db7b2d064730650c1645524558d91de787aa947849541f2a6b0d29c919307373b6ab0a62cccaa0bddfed382c7aaf5d4b00620e1ce97d4983ade3c9
 DIST genpatches-5.15-71.extras.tar.xz 3932 BLAKE2B 
53ae8469ceaf8524672ef9f7155dc092558135681438ca8dc233dcf99d458a538902ee805d8572b8ec47203966177e3cf199c47ba3ff48ceff7ae1e7844c2707
 SHA512 
c35adfff42a907787088d7756f77672f321b5311e08c639bf4fefa344517ea5f1d038e50bc3bbac3e321c16ad3b0ee9a35ca96f031820817ebe063b79a98a7fb
+DIST genpatches-5.15-72.base.tar.xz 2987972 BLAKE2B 
be108e6921f5a04605ab7c557e1ed50ce092a85eb36e6d60b4edc630457437eb89736dd992fb823522f3ca9c3ca530f3e437ad8f8b38a130bb56bc887070e1a5
 SHA512 
fdb5806584961dde27c7760ff4c20f6c7d08682bb998522a577dfa52a8fa021cea991c46db5efd1ab76e060e73bc38fb5728d0fae2c65f0846828c57779d6b39
+DIST genpatches-5.15-72.extras.tar.xz 3932 BLAKE2B 
00c700eb5307d1834977c88e134fc2bea16f258d6eb374e6cb6d85c522cbf1730d6e2e937e7abb392350de8aa3cff6811f5ac0d3b93822fbd9a43c20abb525c2
 SHA512 
a08ba388711c30d3c101ebbdfb671c63f85ce3d07ba4545c3b01b70687d65f31fd9a1afadecdc49f0d9b113c5596df878acebd425b868ffd9111a555d4ced47d
 DIST genpatches-5.19-10.base.tar.xz 709064 BLAKE2B 
26be5a66afbbcfec3ae5c857cfd20d33ed0c6e0084411205a7a624f6f63132ffc7482328a6dc21e77575008ffd36f63f92ccb8cc3330faf367f843f348f6d5a4
 SHA512 
4522c43ff92ba2a8709305f06f520c1b182ebfc8bee54f17769944b5ffe6d53dbb54499ac0dc66cc021a776102933f521dbd3b0918413f97c674f2f7055055a1
 DIST genpatches-5.19-10.extras.tar.xz 3804 BLAKE2B 
9f00a275e39e2f0566848c4f548e2ef338812e470056a7f07697ec4489d9cad0d065916778b04c08f00589ba3ad9b9933fa5d4e46fc694f394d441cfd2863b3c
 SHA512 
fc590ff0a2d34eefb6204ed69aaad56ddd7c5d6d856b47fdca20510e08196303cdf440d78af77d9fe596fefd90402f961ebdaf9ae8466171db844d081dfa4ae6
 DIST genpatches-5.19-8.base.tar.xz 643396 BLAKE2B 
c383c7efc908fa3e8ebdfb750d92df6adfa1e0d00f253eae40fb5db5b84f8848a5c1a4fdcda693da998b1ba9d1afb1019cbc2574ceff2b099d2125ead515efc3
 SHA512 
ebd5eaaefbd362d85fa8cb95b0ca4192bf7a0835ec58ea25def13e502f87f74bcc29219083f39b85462b262f526f771270b5a8d93ff49126e1653d948a9ccb9d

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.68.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.68.ebuild
new file mode 100644
index 000000000000..4ea02f952baa
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.68.ebuild
@@ -0,0 +1,131 @@
+# Copyright 2020-2022 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##*.} + 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