commit:     55ac7f1c13efa8e46302ca59cb40348601610af1
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  8 05:33:55 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jul  8 10:14:25 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55ac7f1c

sys-kernel/vanilla-kernel: Bump to 5.10.129

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 24242cc64f42..2bedcd6444d9 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -29,6 +29,8 @@ DIST linux-5.10.127.tar.sign 993 BLAKE2B 
c085f64d89b1f878a8554911091603131005508
 DIST linux-5.10.127.tar.xz 120415864 BLAKE2B 
46122653b3d5d1716c4e21a0571a26d73229264097fe94acfd1f8fc77691d83ddaf42b379a9d2000d379ac58644499443b035709d4e57d550e6eb2ca01053a22
 SHA512 
2456b564b3124491dff07f818bcf9ceb63becf4de618a2797e7d1e8b412bf296eaa69dee3d1f63c0cb5a5121776a23cf15a090204f5938d8a9c59bb0480cd146
 DIST linux-5.10.128.tar.sign 993 BLAKE2B 
e79fe715fafcdad93960bb402d16a0c38325693ae15f042d7231e4917da88011079a2982e3389b60adc2e5491d98fb785187e727251d07ae87730046f7b19f5d
 SHA512 
f60e75662c802b5aae5f59f3e69ebef5f6411097f54a659fe0e153ca90b890bbce691222c61444f2ec8c0d5e31098caac3b73d73f83dc66327e601c920be153a
 DIST linux-5.10.128.tar.xz 120435292 BLAKE2B 
f55bb329c8c577123dddd98eef91925f2804a463406313629f9ec993cc82718fb1bef82a921ce6ce6ef5483437468ae3051ec371316515ea6d34a29969e02fb9
 SHA512 
c652373845c58ed224fb51402326abc4f0bd6b237d6dfb132503b3352eebf4ef1cbbaa69b1e5a62c2297d194bef0538cdaf6334d8f334a0834d8701a0bc6f3d9
+DIST linux-5.10.129.tar.sign 993 BLAKE2B 
9face7bae64d60e9da9618e0406f6fcc271d2b71d488013aed292c99db29b50842cec615463a4e9d9051969fde97def583ccff404a502c1c78426054559a6d71
 SHA512 
0083c08ac87dbb3a24f828bcda65c7066b8fed12910e6220e7e80875988be567cd76ef8aca41bfa0425aa3c652ab89e42c5a6b11d3a905878a195ed496a8ad91
+DIST linux-5.10.129.tar.xz 120434312 BLAKE2B 
1394f92c7db5ce67978bd3f7a66c3481823fb84b6f8a0620843ac46de042e328829dd6366187abcd4b181d5802b230e37e4fb8ff657dbc5933bb87ddaa9bfe53
 SHA512 
fa3080b5f0f135d721b25786a658c984c454bc40e68b2c408a5bb23a21cf5f8b91deba9ee11480b89c8a0cd3d951f9217756b6aa0b14fd7aa51c14d1ee4a0e49
 DIST linux-5.15.48.tar.sign 991 BLAKE2B 
763026ae690c17bc2e1fee512fa792425a9bdc3ac15f35ffefb32d99adda90e1a0acb4bfa96528b1f90f50127b5a4cb86cb5a7b44fd8ad78f4d31312ed8ca9dd
 SHA512 
160bcdb7aa692c5413ac7b13bb6548c73b0d5256df8eda25d02d910d8de3b9afa27820da4c4273f7f7244265c92e1dca88f70ce7deeab7d9f670af49f1cd03ae
 DIST linux-5.15.48.tar.xz 126357096 BLAKE2B 
a23dd33dfac22741e5112961d92543a895c858be62c4e82a60b639e47c7b05e623c41a13a6c5157ec7b71ae1f152b381b7729f2bbaf03734cd40dfc0c27923f8
 SHA512 
6eee3ff3352a864a5d98295527056da0d6d52b5f566fd7858b2e12a5d0094efea0af484a7e8cdcb344bba343c5d95b5d19c0d2756dd3f38531712438223755b6
 DIST linux-5.15.49.tar.sign 991 BLAKE2B 
18117df94ba81e7581b1e20d9e97dbbc219680a7f14306e6943ab7165b93feb49bdb0f491e5a0b34f921c729bf368d475fbb4745b29ebc9130bb50583fac061d
 SHA512 
f64b92e792ba1834ad9604f756189bba6179f76257c58b69fe5121594584f413e44e4a77f0826461c23e0e9795ca4fd1f0a54bb562514d991552a7351c7abfb7

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