commit:     405105e9d803657d522f6986a44c5ccf0e998818
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  8 14:12:55 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Dec  8 18:17:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=405105e9

sys-kernel/vanilla-kernel: Bump to 5.15.7

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

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-5.15.7.ebuild    | 124 +++++++++++++++++++++
 2 files changed, 126 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index bb8b7f8c60f3..7c9c5c6664ff 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -54,6 +54,8 @@ DIST linux-5.15.5.tar.sign 989 BLAKE2B 
64814f119b9f6759690c0ca590255e902038b956d
 DIST linux-5.15.5.tar.xz 121927760 BLAKE2B 
2921b549a44ff4202ab96d35d6b7ce99bef914db5c1dba066fb7c4b146ef987d1aed53d0773fbe07cd6bb3b964d40b6f3f8c47f6a04149ea1c64e2f8f87343bb
 SHA512 
7b9a78c734a24e8b67f93c8de65fb57cce498f18f4ce6a5c4cff0b834407dbf66cda6834118e67cfef3101979f2df78a7cc45854d943ffecee60a990783497df
 DIST linux-5.15.6.tar.sign 989 BLAKE2B 
66874a91544bf7e83d9346fae63d004bb7f9872170d48c2843b7ec505a74b9a43505bf8dc032f303ce6208affe054c4db50b8ae2e2866bdc8dc25a0cfaa7a5cb
 SHA512 
8e2296e9f80ca5f24d4a0c8d735d55bd4373ed4aeea80b0242407e82fbae7f29e827cff0e2bd9f97a50846dcaa83f3160a96b917c0dec4241d80de6013fea9a2
 DIST linux-5.15.6.tar.xz 121926656 BLAKE2B 
dedcff13b0829b9bdfc4998a9bedcf932dee48ade3bef722ccbd8fc7bef9832462ac2f1064b77926f86d93c7035634db8ba8f6c1e2d957ff749b34e218c565c7
 SHA512 
0f69e98590e796a3ec3e04340fc41954f1cdb7a5859da8efec1ba4a6498760778744e6243d068bc91343e3e7029239ff2e9ee2572f458c6b0e31c23f3686b5f5
+DIST linux-5.15.7.tar.sign 989 BLAKE2B 
ec05b433a08136f39daa80c857bf340e3364f22efd841df4993976ece992e7605b2dcb1404adc3b77b1e260f0b948ce5c21a8edf9dcd71ba7ca3b8e817ed3c5b
 SHA512 
2e8c21680f8b58d6cc5de6c46d409a1a9edf49a2647aa2d107581e04b5edde4b48a8f1fba53e7dfe6c3fe77941b3cace72b1c9cb59caacfc4a8734ffcd192898
+DIST linux-5.15.7.tar.xz 121945332 BLAKE2B 
66894c8d2001bccfbfc9d31d2f68fef64826c088676df94136a4dcf158962c146cc668490d342c2e8bf914903be69f5b4fbc1cd264b844a8d966059bf34fac6f
 SHA512 
7f3e68f367ef4b56e39ffa48be29aa8c7eb6070294e9975bf60b068a518012b798469984a2ba894487e6f5a5701b91fba94413cc26e3258c81ffd759000ac7c0
 DIST linux-5.4.158.tar.sign 991 BLAKE2B 
533dbce299037f4b4fdb79a8562cad9d05ce4027b15ab0611d7901929051c333555caf4eefd621d28b8daf1101df9f557c47bb06c65701a880f0ab55b5226e0d
 SHA512 
4bd5618db8dbbfe5c8f3810c9afd48b019bdb5ad10fa8e63e5ffd6f25558dae52475ac36444407b5350f7bd88bb307a3fa84abf594aa098a7f4e049d672f49e7
 DIST linux-5.4.158.tar.xz 109178500 BLAKE2B 
2f17825064e6dd718b3ed71014c9442fa4970066b496a81b059a8f84d22d1c5522569aa672ce08597a56150eff6315f19e7d0eb56eccdd8d9505f1cd1f6ad901
 SHA512 
ccbf29c70315055ec7f63eb29262970c68162f2e12046cb45ec17aacf0950e0ed8e60a236744f2fdbd4fe5a0b14e62cdbbb345c32b089e5172feb5e170faa14d
 DIST linux-5.4.160.tar.sign 991 BLAKE2B 
fee86930c4de94769f5c0f4baa4e268412873abf5ac80007aee6452e9a7ba340983b96e7ad5ae91298a245c0ba1541a389fe6070299d6183a05009e38c51dfbf
 SHA512 
5c9b13103e2b7115854d32cfc39b508ef9f0c9fb74a8d83af63b3b514ae280ff6c6e8e576e35bb7ded3d848cf19baf33eafcab7c651002bcd235af5d86118586

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.7.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.7.ebuild
new file mode 100644
index 000000000000..e43d6a3e4513
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.7.ebuild
@@ -0,0 +1,124 @@
+# Copyright 2020-2021 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.3
+CONFIG_HASH=6950ef54b415886e52dcefe322ffd825c9dc15bc
+GENTOO_CONFIG_VER=5.15.5
+
+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/v${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 ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+       !sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+       debug? ( dev-util/pahole )
+       verify-sig? ( app-crypt/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
+                       ;;
+               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