commit:     aac1033ead0e9f80b6dc11e26ac09711d2056ded
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 20 13:09:01 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Sep 20 16:55:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aac1033e

sys-kernel/gentoo-kernel: Bump to 5.15.69

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 9f647c164018..7d6d0b333547 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -4,6 +4,8 @@ DIST genpatches-5.10-153.base.tar.xz 4142480 BLAKE2B 
18d28cae57ea98f1ce9faf8e88a
 DIST genpatches-5.10-153.extras.tar.xz 3868 BLAKE2B 
4baa8ba350a6b0f02715d65646b00f24142e6c6be6a2270204b4e98ffbb3900b1a47bdfe741266013859b9119719c7b979e0035eb1bbfb154b39318727f56ca0
 SHA512 
b367c4dd3a3217d3d39a7e2f8850ed21fae2afaf508939b2da897f597f10b36a1a4375af20f07e305be0bbee89ae8787af3cc842562239af5c45430f2872cab9
 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.15-73.base.tar.xz 2997804 BLAKE2B 
8915a7983e7766c43e7e4fb91f38ba690e60df58fb8c7d6b5f833b21df459bf5949c35e510275c793f6987e70923cdfebde739f498ca16f772920e262f391172
 SHA512 
3859fc75041d4c7593104e158ecf833fb0ff07aedec5143623132114308d9c877a9f2a405d83cf442f0048c046c3fa3700f51ab836de448ecf2c7b4064630c61
+DIST genpatches-5.15-73.extras.tar.xz 3928 BLAKE2B 
df7fca514f8db011bc263a94cba0406c7b95d2befcdc2f50600b1e71fce6a4e7314624a4eda38ae2037f4eddfb6ca4873b407fd075ed4b5ce23bd326cd03c48f
 SHA512 
d4d5562d77ee0419bd17e0f447c84977a3adcb598655ea42eef83ab5452555dca4e2dee2355cf834c215cb22b12c9ef809da80108375d3a3aed09fff852681f2
 DIST genpatches-5.19-11.base.tar.xz 766852 BLAKE2B 
bc8fa5969dd4c75920a094b5135f60d728a36a431fb5213c338f6308761b7f8ce24e3991a2de70b7c2d87a9256cafa3b22db7c683e38fe10363b15043073092f
 SHA512 
6cd414842f48d9ecf85e0f07fd930e526db089720efaf95916b8ec9394f458a6b1bf178c8e55d6ecf9a7ec5520cc43c50cf1248a8c3467ed069594123586ee1c
 DIST genpatches-5.19-11.extras.tar.xz 3804 BLAKE2B 
3186d10e8a31ca501f36ae3e7945acbba7a17cd7d006b51a7a4136d2c1064efb070fb7870f4b1959eb87456131608b5d31a91987c79f8720b267537a38643211
 SHA512 
10c4b7c51bf4a891ee04826df0da29096e31601126435bcde168f7c3d32416395844e03d3fd55b9b225c7c8dc0216ae8691705c53786f06e0350f6fb1ec03f69
 DIST genpatches-5.4-218.base.tar.xz 5055868 BLAKE2B 
2dde93f13540d5268d3855b6c4b57f3746badb0db68564bd9f0a5b80cf63138dfb77a1d60be7c9256a36a7685e90299a8e28690debe2e8bad9e23e2d31dbe470
 SHA512 
884f469ef288aedaa2e9271fce5cbce8254247b64cc4e4594fd176b62f65133910f8e50d2458f8c822db5683beb02316b71c71e69c71ae2331baafe1d421f347

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