commit:     d9af432740a52b43adcbab5decccd8c0c13aba5a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 24 08:58:15 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 15:30:49 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9af4327

sys-kernel/vanilla-kernel: Bump to 5.15.90

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 4b563668186e..4aa84d0aca8b 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -32,6 +32,8 @@ DIST linux-5.15.88.tar.sign 991 BLAKE2B 
928ea938758c904971cde08ea5d390ee483eda4a
 DIST linux-5.15.88.tar.xz 126523892 BLAKE2B 
26ec7427e3370c417a048ca76f394cd9aeb25f6cf8b6bbceb074707a85c75f668c8d70c9f1b19cd05ce33212f259736ac1b554793ead30a007d1745d4329879c
 SHA512 
2ecb84f7800a6fe22577f890c403e2bad383a1638b6a176c20cd8d1311ea433c016e08ef00d1441099c1dba974d82c4211acc190c8d59aaa9feb12588af1b348
 DIST linux-5.15.89.tar.sign 991 BLAKE2B 
79d90af0bc18768e9a09ebf159713d59e708ec23ddb99662b67ca7edec6871dec70ec624a98db404b59f0daf9bd5559e5488f8280c2e1fe83218a6e99f6bd450
 SHA512 
77846c9c18aedd5f8dea54208cc65067cb85a88532f812c19bf510d34e03d0f4599c4d1182d799c982ec63d235ca0af474b2817ef8d45e2e4bc51aa8092329b8
 DIST linux-5.15.89.tar.xz 126486920 BLAKE2B 
02c7a8f02d98c029e8b6d159d6add4ad8348158c8beb33f3f88c98ac4f74ef0fab4ed341ac7c2475d82b1ebd6ce602ea2039a28a7f196f1b627eec9518cc91be
 SHA512 
bba35a99ff120759671fe2873b7c5cd74251dc557d4d7df553f5a55f9e622c28a4dde464ae43daaa613fe757b10b1bca1129790f8ad3aac1c8ee2e8665b30fad
+DIST linux-5.15.90.tar.sign 991 BLAKE2B 
4bf285971970b04b8540e84feabb7c5fe0db8001afdbe766823b1a213b17f885766eaf71f85d30faf362441890b1ed65d65e4b4678872aaa18d57393fe2d8291
 SHA512 
b3ef99b0a4d9971e0901c831e5f9d2faac49e74554bd455eee0d0a0d5784f92a3e292cca90347d660e8a55285fa19aaa829f78df5e6fcc1eb6d3540d30e0b24d
+DIST linux-5.15.90.tar.xz 126497084 BLAKE2B 
a3c6147b4c39ec7de24f3564f0878fc8b72f0c69cc3ae3f964487b7da0821c54a3e714b0a6fbf55edf6555a515b9de967980984ab07646ee805d6c8c17cf4b73
 SHA512 
ef0e9e249ace8b9c006377a5169558f68dec4cdf455394809b1c9095081e3b00da53ee9cff13810a93533531736bcbdf335f0118021b6a8e92eae521de5097b7
 DIST linux-5.4.228.tar.sign 991 BLAKE2B 
4edd63de96c2cceeedf8b20ab4696fb4c8b8e45916d95ea9279de4911874e4537aa8f8acc4014545746d4546bce66843a3e56d56c90592e730e4ae1165c1486d
 SHA512 
72be75fbf5704706d6d772a50646550e3d54458044e5fe5a49afa7dd98360f30b0a4e345744e691b09d8951712d1d766d050846fa7ce13bbf4f1e9dd26063d4d
 DIST linux-5.4.228.tar.xz 112978736 BLAKE2B 
ade9b21e3f434435230e31d67d39ea07d15d92cdf932b3b181fc532669f10ebd2f0eb7d5fb20ae9eae93c782f10db5ab3454bb13c01694f674f83146bcae8187
 SHA512 
f3fa33da1df3dd10ba9536d30b8aebf92796abe84872c402776c94b35bf3efb4256a6c3f0267bd97741db9853352d1b22bcb42d7d03f167960804bb9f7407601
 DIST linux-5.4.229.tar.sign 991 BLAKE2B 
eb0661f4b438e0fd40b61ba1472516f7f321edea790a650a1e80ed4a66d504db7896d3c23ca22946db2c8480a61da650f41a46e9551776ba7dfd3871a775947f
 SHA512 
233778e0f61f1086dba340248c336efece761e59da300c1ce7397d577c58cd2c6667eb2975dc92e4dc2ef355e3d50239de6069fd87ba1038f9cb31d9ab46e51a

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.90.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.90.ebuild
new file mode 100644
index 000000000000..00b04e6f2d47
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.90.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 verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+GENTOO_CONFIG_VER=g6
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/";
+SRC_URI+="
+       https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+       
https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+               -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+       verify-sig? (
+               https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 
1).x/${MY_P}.tar.sign
+       )
+       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 )"
+
+BDEPEND="
+       debug? ( dev-util/pahole )
+       verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+       >=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+       if use verify-sig; then
+               einfo "Unpacking linux-${PV}.tar.xz ..."
+               verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+                       < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar 
-x))
+               assert "Unpack failed"
+               unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+       else
+               default
+       fi
+}
+
+src_prepare() {
+       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="-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