commit:     54b37c02ae7980fe6d574e3b74c316fbb898d755
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon May  9 11:53:42 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon May  9 15:01:06 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54b37c02

sys-kernel/vanilla-kernel: Bump to 5.15.38

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 9153da6e2588..49ae0b0fc66f 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -31,6 +31,8 @@ DIST linux-5.15.36.tar.sign 991 BLAKE2B 
7d7ac1237d1a06b4e55347c74089e1c05ef58ba6
 DIST linux-5.15.36.tar.xz 126289244 BLAKE2B 
fa9f4b4a4aa6f59155e5cbc3e355700ee4db4498053a6fca8e753b609f94a9c3ad947dd17a0bb6ba050b1dbafddb153096a79d07ee96e3fe3782166424045be2
 SHA512 
687f111226270080b7e8868972589755eb2f22bc396a56c23d663f2225c7aaab7e2c9bd0b66ea70364b35306ec43ac349ff9afcacbc1803b67734be0d752a973
 DIST linux-5.15.37.tar.sign 991 BLAKE2B 
224f222dda3d7221a32b575ae52fe0ea36cf5315860ede2bf8b16ff3e9ab6c03f05fc5604c99da9abe44ebb9af0726731449c7d827dbc29bba5c9af81088108a
 SHA512 
cb775ec01ee9d1de53a0b958c804f8bf7d84185438e4a63e94b805dc0dbdababf0ec85489b8314303a78386090afee30525b9993dc669334dc131b65ead7305c
 DIST linux-5.15.37.tar.xz 126314716 BLAKE2B 
41fa48151cf9ba20aaf9161ff1bc48a890a165107784e41e9e7535093ea7fb833ed5d0ff75534bd721ff1c80dc52d55b3585c3473917c665ee4d0f107d7e1e41
 SHA512 
afc84a10b96e70b859ec328f8d803d7e270264c8649492899292b92650840586c08e1df3196af41c09185e68f2d400cdc302bd0a474cd4ee86c34979098fae48
+DIST linux-5.15.38.tar.sign 991 BLAKE2B 
7df327224ade127429be8188fe510a075add14b8e276e83218d02c0b7330199c136ea7f00d8fe8ffb8859bb2933f97d78e30cbf9399b21e1e33eadf41613255c
 SHA512 
20b32fcbb58472cf7b5821df6635f0d186e6758f23363e987daa59f1e3a83520a6bbceaed45ff1c2e4dcbc7f075d6e547cc26688016bbfa0c824fe950d99dbfd
+DIST linux-5.15.38.tar.xz 126323716 BLAKE2B 
60f564ec7b896a2cae631735400f467ae0095c67fcb94f5415c38f0863b71babe435df15c19938f19cb083849d686404b362bab5922e8743569e547c556909a2
 SHA512 
9db4817e02e8e1328d5dd27d1655ef49e3e357fe733fbfa8baac95ffc215aac33328321e4c1b8c6219580d3f288ceacf9e8d97681ed533519dfd3880ba9ca9a7
 DIST linux-5.17.5.tar.sign 989 BLAKE2B 
72791ecee72367cb6eb883295dbe8dbb1d9d16b137fec43947df60e7a551415e74a93b7eaa1e568617e54e6fbabebb3f7582597c08eef9060d8a70d1d20f0a4d
 SHA512 
d9bec5b8fafc3c33154498f5ff3d5bb432124d89c531cf650d4b0a8bf0c008fe2bed7a3228514a97225b43ebe641b3d5d8011ef01f2914d01a6ad2ef2fe0b861
 DIST linux-5.17.5.tar.xz 128430464 BLAKE2B 
253dff70d1f41a8d7483d98dfc374ef11367e7a07db0584787742b5a929458c3a52c81373622aa34f0421af3e4e270ba7f187e0421b3b124db43248f5ac04a36
 SHA512 
9a0b97b0179094fa4c3f91ad1f94ac274b4b7946b3c5112995fd5f60b263389772491f1a756186bb638ee868d42ccd7449cb9aa3227f1637949b6b54418c6bab
 DIST linux-5.4.188.tar.sign 991 BLAKE2B 
544964d936af5ac8f877b2fd9fd3e858e1ea7bd82880ffed88493cc737a914285cfab6ec58019e42fbab3997b19148f4ec0925872179cecc1b7be62a02de6a04
 SHA512 
01fe913ef0da173dade0e0858f8032b01376223b1d99d381fc7118b38ed70cfba93435b97ce3e41f45159e952dd31db3a0bd67cdd32117379fd8847b236f05b2

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.38.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.38.ebuild
new file mode 100644
index 000000000000..0ef902726d5d
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.38.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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=g1
+
+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/mgorny/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