commit:     13cd71762342cdb45bf8c76f0136050d5f3cd9b5
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 16 17:03:21 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Dec 16 20:52:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13cd7176

sys-kernel/vanilla-kernel: Bump to 5.10.86

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

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-5.10.86.ebuild   | 125 +++++++++++++++++++++
 2 files changed, 127 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 42d3a028e312..a6096008a9e1 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -48,6 +48,8 @@ DIST linux-5.10.84.tar.sign 991 BLAKE2B 
26c63b10c0cbc91753a31bbcee350aa5208a0d6a
 DIST linux-5.10.84.tar.xz 116471800 BLAKE2B 
6ae790887669980cfc545e88f87033f42f97efa353e0e429498edd7804c767c9b70f4bf30ae9de5e9ebfbb8f1f7b947cee560c2eb3199676be11edaf5adbf559
 SHA512 
33ac25c433c212fe5a43fc97ed01b67b638cf55144713780039d027c8475dd0e16f6a1c596dfac7e3699fc4a0156462664a2baf790a9d5aa45872a463fe5c1c0
 DIST linux-5.10.85.tar.sign 991 BLAKE2B 
a15ca5ba6b75d8ab118c7c578a33d47224f9b2c9382190ca1656c66e5391b6865c7a88cd33f6e28f0e905ac40995992c7d356fc666f692355bdf8dfb603d8fcd
 SHA512 
6142795d2e689a4a4140122ec1559db02e78fd6c766e9d3ac4bafbbde2b4ab12bfeb7b6d7be91ce19b6e04e488eb15b90f3f56f83e2c999b7b64d37b7867bea8
 DIST linux-5.10.85.tar.xz 116476312 BLAKE2B 
629b8423f29454b25a76165933ff82a50d8d80826465529814465862869a0721775f344c738731cc3895cad11043efdf76ed909c1db5782f55c608599a118064
 SHA512 
9c8d9fc12c48c7c1c4691ca95de4f06c148686618013546d848a3d463261961e473ac9abe909ba3b79d1bbd5291153c797cde577b10990c825ab14cc1ee0c21c
+DIST linux-5.10.86.tar.sign 991 BLAKE2B 
94e8b69fd6132c0265c0352e462fba2765ecf237891b89f98acd8af544048f89ddc14235878dc5c42b87b53649f86be6301e58b3b4e3489eb9ba3762ad79a512
 SHA512 
b0b21ee58ccb91b469590c9ca69f87bab3291df3ed99bd5db0c0512bec650e02634c616cc3579ea05b5f76695cffa7a237b7674abfd09cfa2ee176bb3294d1c2
+DIST linux-5.10.86.tar.xz 116476576 BLAKE2B 
9a0a55a922f3fb14d39bff0ac1175664f4557534e0432425b6e6efba78b6b601df4e202efea119f919d3d81d58e6d6edbe903fdf0875925889cbf78fbc7f0ae2
 SHA512 
55c35f56dfffc4c05acb36cb02d0c444095ce50f09c46a68f94edf45a78de246c62d03786b36c6a55fa9378be2f62bf87d4b366c45d296facd0298bd3212b7b5
 DIST linux-5.13.19.tar.sign 991 BLAKE2B 
d26b1e733f84725318d8dbf1e9fcade7beeadc38a4a07aebf6be653ab0dff5c0a5533b5591e753745aeeeaa7650b2bf0d1942878b2243aac01b68d0ca81f8367
 SHA512 
a4c5ad726818ad7bcb87c3b6621abecdb17ea14ba6cc8686bf36ace3c0d16f8c5353b4f02f0b02b60967957d13172c3fa60b1415ce3d2dd1c0f8a852127a6c4e
 DIST linux-5.13.19.tar.xz 119374060 BLAKE2B 
6a05829867d75705e0282418bd68c1b60a4f2cdced39803458d67c975f8aa3ed455300c19300d7c7cfad71d2e5750b0b0750f825aacb0fb3794eb5b7b3189cc6
 SHA512 
77f6279fe7de3c0dd35946b991fa190aa70f5e806fa6188a0a676dad0939e2a20136b3dfc659dcac7870b387ead328fcdc287c8a25b63120bea1ac960117990e
 DIST linux-5.14.20.tar.sign 991 BLAKE2B 
fa20d7bdb19b223294ee48d85a9ed8077ed81be85a0fa50a50d357d1440f4f832d336d0a1bb97f4cca11c70de206cb142d1c15781adbfb73d16a740e59c34105
 SHA512 
2ea744e2ef312303fde620a80d70bde1f3f3ae3991e69e78464809456f1d17587c9a745b64c3c8cc5e2cab41962a9674be4a72baa6d0dcc5cae0e0ce18199850

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.86.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.86.ebuild
new file mode 100644
index 000000000000..73b31c51857f
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.86.ebuild
@@ -0,0 +1,125 @@
+# 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.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+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