commit:     be271d5a8363cadb8a3bc26acd41c8db0756120f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 25 11:19:35 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Aug 25 15:30:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be271d5a

sys-kernel/vanilla-kernel: Bump to 5.15.63

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index cc394d5ce010..703ef4d0873c 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -40,6 +40,8 @@ DIST linux-5.15.61.tar.sign 991 BLAKE2B 
2b55c19796e82179efb226224861cae71de77343
 DIST linux-5.15.61.tar.xz 126415308 BLAKE2B 
5af05f98a2f563dc87fa4c41072da9405a0a7f0183a6b1f239e9dbf597f146d63223287e5cf0635e4a9f9fb027ffa06400217f9387686a1356675921b34520da
 SHA512 
d2af99cab1b4fbc4ec43460662ec85a7a6f43cd20b8945de8168c5fcb1499afddf6468bdb5ccf89b2e487088d3b129650b77eae484718d2914698a82fc40135a
 DIST linux-5.15.62.tar.sign 991 BLAKE2B 
a331735f9cc48bd92f6752fedc98cde577f1321c741d25912ff97b041de9d6d1ec12095a58037b124d2c5008b0656bfb8e68bd1e3963fb48f7a2e9d0c8a3b3d8
 SHA512 
3e8707715e6b62b42144aab8f7376f5874d917f1bceaa472764a4cabc70acbc323cbc93aa8b866208b152ccb8062e31fb5c222231287cbc67834ba1fe47affc1
 DIST linux-5.15.62.tar.xz 126434476 BLAKE2B 
c8059b8f1e0c3ac7f146e8174fe8768d4e4caaa0f21a043f02998d512b66a6e61ad970661784b354162eafdb8abd7f9301042e16ac278d525a232264283ee3af
 SHA512 
e238ae6ff597d874bfa01451bd179648b82735cdae8af2d262f69557fb3d23e934de38ff2438b76af828e831d4780c6533e2b0a192a1e60f35d42bf2fe27f8df
+DIST linux-5.15.63.tar.sign 991 BLAKE2B 
855d118b3164e1ea14789647f173000eaaee7dfc27f27da497c1b6fb787b35d47269d2c233f0a79aa3560be7a1c9571b2c52a8a78fce1d73f400d9d21a17b7c3
 SHA512 
99f256fc013ee63c918eb521e741347c958a8ba018d5136e960686952fbb510416a80413d3dacc5a994220e6d8866a427ed8476ec172f48c03f34be4b93f33ac
+DIST linux-5.15.63.tar.xz 126441480 BLAKE2B 
95264d45411bb0ba30b0eadc2847075d0763bdc22aa86b250861ea18066a1b16b88627c61d0829d7b0a21e9e478df064a54b343ecb2065b37a011bc0cad986c6
 SHA512 
a1b33476484b9ca7a105d07b70835ad7e7e670750e6beb428ce23fe1bd853d66cd8a1ffca9ee736a98a42b98191d290127e628d33118be971c661e2fc6faf8ca
 DIST linux-5.18.16.tar.sign 991 BLAKE2B 
5309ae0d80fbec35f4fcdfb82e3f1fd99c96ad53b82efe4ef95f0f7ee5f04be1e97f69bfe664080ff92fe21b327dc72e723515c0fe43fa52f6a43d1894454a34
 SHA512 
01edeffc25b4221907f0b57aca694361ff5cf5fd6235750422b23d95241b2a1b2cd3ba0fa4b8a895e1996df49d577654a16cb302c798e8c7365ec536088f6660
 DIST linux-5.18.16.tar.xz 129844784 BLAKE2B 
60e9cc780af70242eaf3b41374acd8c11bb388a9aa17341aa98674e31a72cbd1c6ecf80158476fd762ed8955c6ded9a3ce8cd782ce0c956ddc3031c7487da686
 SHA512 
cc6813dc2c2bf8125159368e7b0b2812be220fd23cea98ec12ca727f3e032d313c80fc103abc55aa879c70105629dc54f14eed8e6fdfe00b9246bb850f86f5bf
 DIST linux-5.18.17.tar.sign 991 BLAKE2B 
ec46e8df0d2b2fa10b13a54284f46e058d2bb395599ebcaf5b5071b7ad61ec81673a73da4a5c09bd6603802d53f49b087e843f8b07b3b3529eaf12d3538e8c13
 SHA512 
053365b23cc7468b96b89ce56a788f6b67257727f35ff851a2a2006b9ff5b606c4d8c007553e0b62bec5989ba67667a3d47a169f4db9ee18cb35b2e5d860b582

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.63.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.63.ebuild
new file mode 100644
index 000000000000..13b58c5c9839
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.63.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/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