commit:     a63c880604d080dfc755607824231168a4381a6a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 27 13:48:06 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 17:06:48 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a63c8806

sys-kernel/vanilla-kernel: Bump to 5.10.113

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 90e0edbd1c8b..115c185dc21c 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -23,6 +23,8 @@ DIST linux-5.10.109.tar.sign 993 BLAKE2B 
e8676c541d825ce58f124da1279b1a2cc12fc5f
 DIST linux-5.10.109.tar.xz 120392556 BLAKE2B 
3bd903b54977d942cb69d4eabaccaee3d8ce36bb68633715751752920ee87d80a6eb63779bf54809d8579145a769ebe7795881d266d2e22ae8c6c6a132f664b9
 SHA512 
0a035a72096c6076c47c93c885dbbf0f59315ea7acf1289305a98d6d585d9622115b38fb32634cc72929fd200eb7a4f5debb076c681afec999dbe49ef67438e2
 DIST linux-5.10.112.tar.sign 993 BLAKE2B 
b2cfb536a4533e0add641331d1403ad653bea5e68d9875e77a7314c322040e3fc8106b7ded6d0e5810dbb348a953f5aff0fafab5da8f8283cbeab50b6789a4dc
 SHA512 
546626fb22f73eb9023a61556e30558888b83ca29c4656e78902746a7631d5c99de931a639d126b23cdede942a9f6a046e13afc4b625c34f8d121f63fc4e3f96
 DIST linux-5.10.112.tar.xz 120409860 BLAKE2B 
380e1c4cf7b846e5fc95f9d773b561c020fd6bfba5e21e050e29d069a9a34c41b882bfe27d58e3acb0f2330718d08939e93e7078376fe49a72b3e05429a51402
 SHA512 
95c6146b5b7b51ce9ea586162b22237f88ba6a6008867e14f7975daf24056a3bcaa482e050837baf18efa4da5dd06b9159e591e2d70f7c55f6dfa23c607b1df0
+DIST linux-5.10.113.tar.sign 993 BLAKE2B 
076662f2ab09e172f5aef9817beda56753a35c0d48f12d3d096871dca8af6b85f635c1de6d562be0719b475ae66074b659f7a855825c09889bc18d5f9b659784
 SHA512 
c82e59dcb47cc8acf4d08e148ba91bebdf4e4c35a4ec5405ec5401165583d4c509fa287817cc343345da8f24a4cf7ec7e0b8277653f6d230c81beb32eca75fc3
+DIST linux-5.10.113.tar.xz 120410360 BLAKE2B 
bfd4cac707bc8232767aafc0e666ed9fe23951802b87998aded0197a2141d2db20d33f8961e4e03159fd4c397466049ebaa9d47f1f7c512a42739b07e6c899a7
 SHA512 
7099c83243f707d66ac09bf7215aa3fbc63957c2636fa63f287e526de210952c4106de411201e2ac001aa46c73c05cd4892e633911cfa30b96db7613f832b81f
 DIST linux-5.15.32.tar.sign 991 BLAKE2B 
3aecd518f4fe5e9135b802ac280fc2400f3912360dcfe0a5cbbc377a99bf77a55588de1974ae7d99bbbd67d50172b3a5a644b5376b1ba67ed97cf3bb414a856c
 SHA512 
5c18849083f2bc17d1419282559f3fe445885ba412a60cd7c70336341f1b3511e6687ac420708748f0e4b1ef2632c19f4fee1333c0565826b851a7f1b4dfaa57
 DIST linux-5.15.32.tar.xz 126254900 BLAKE2B 
37db43d3fae8d56cfc9b4f9bd3a76f450b401cbe643c89191de4ab442cc0910fa2d67f2cddd2069d517fb426f6437ff7e05b43ff2a314da04f883d25e354dff2
 SHA512 
6d8955a6b71be155b153db0a43f75822f1f30f339445958828e1611648c8c6e0001cb118e9016a7119de80c28286b3e060da675aa73174a7a262fc8b537aacaf
 DIST linux-5.15.35.tar.sign 991 BLAKE2B 
f457f0a24ac80d24ec0894dc3869a170e2c9f6264b3f491b0f84aac535cb0759a7f3df258a43f85875e523e62002c508f66f60555ef4efdd58c61f955e40a73a
 SHA512 
6cb30052e392bf46bef6ff49a2c9e3f2fa6e6d68f7e6c492ac849b56816b68009418f0fd6662fa5f8e3ca5397a23b5ade96ed67ab6f5a62e3553278debff2048

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.113.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.113.ebuild
new file mode 100644
index 000000000000..96cb3e86fc4b
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.113.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.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+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