From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1363623-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 93730158087
for <garchives@archives.gentoo.org>; Tue, 1 Feb 2022 22:03:31 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 8D5232BC054;
Tue, 1 Feb 2022 22:03:30 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 60E712BC054
for <gentoo-commits@lists.gentoo.org>; Tue, 1 Feb 2022 22:03:30 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 2A51D3430F3
for <gentoo-commits@lists.gentoo.org>; Tue, 1 Feb 2022 22:03:29 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id AD3942C3
for <gentoo-commits@lists.gentoo.org>; Tue, 1 Feb 2022 22:03:27 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" <mgorny@gentoo.org>
Message-ID: <1643752995.ceb44b07c1df194727398e6fb97a3fb38c10369c.mgorny@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/vanilla-kernel/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-kernel/vanilla-kernel/Manifest sys-kernel/vanilla-kernel/vanilla-kernel-5.10.96.ebuild
X-VCS-Directories: sys-kernel/vanilla-kernel/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: ceb44b07c1df194727398e6fb97a3fb38c10369c
X-VCS-Branch: master
Date: Tue, 1 Feb 2022 22:03:27 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 4b892a87-e90b-4605-af7b-9a1efc14fb24
X-Archives-Hash: 33d1ad44d74295a809888bd02a08e3ae
commit: ceb44b07c1df194727398e6fb97a3fb38c10369c
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 1 19:04:12 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Feb 1 22:03:15 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ceb44b07
sys-kernel/vanilla-kernel: Bump to 5.10.96
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-5.10.96.ebuild | 133 +++++++++++++++++++++
2 files changed, 135 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index d141e4b301c5..c97f230dc7ff 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -18,6 +18,8 @@ DIST linux-5.10.94.tar.sign 991 BLAKE2B a4925ddb6304cb86a84353121989bd4b959bc2c7
DIST linux-5.10.94.tar.xz 120378928 BLAKE2B 274f1c14cda832d5e24a221c563302c5a5c2411d1411202226bcc92cac7bca537c61c648f675ba1653cd45993e3516bd91506c1b250f42311ee5db55b172705a SHA512 745ac65480ea5524f7e3285c23c56788ba91ea220d63e7e68335c73ccd45759987165bbbb8be6dc6894011ce6300589e482aa9fe43fb0a1073253c537be173f8
DIST linux-5.10.95.tar.sign 991 BLAKE2B 246d285573410c0e7a3ac59481bc603292a6e15d904192d5382c8bb4edb1e336e9128e714ec43a32508dfebaab8fd76290777cb3933f84e93556b73c91f8399d SHA512 baf839a20e5be9270eca1f2e0a02752a694f609d93bb4985b22d32613cfbf1659e35716902fb1aa26a266982388b8168945acdd134891f33b56e08b21c011eb6
DIST linux-5.10.95.tar.xz 120386860 BLAKE2B a9ff30ac71b2255afd674f441be52cdbb4d417046840ea2e751f0906c26f59d23eb1ffea7ce66254835bcbb7db22bb4018f01c2c003d24678435415d8454ddc2 SHA512 4dba546ec60634372bde1b70c1c50e3ba71bd0a73f04012faa8c4b55ddb217c2fed7fafffdfa2cdfd78a1792e3f776583a813e6cd9f16b38fa87a734c8303041
+DIST linux-5.10.96.tar.sign 991 BLAKE2B f831c2a0879f1e0fe6e157cbaaeacd654d594de5493818cddc80654b71c0306a4895f382c0353afa6cdb6e8694df5ea6d96124216c20c414b296e92103163528 SHA512 659fba26e1bb6d3a3ee2f128db487ec5036bfe410c3135c1d504e2a87480960c3c52f989974f534298edfc1166be979e3a6b301990f04aa3bfffb80f8d639d4e
+DIST linux-5.10.96.tar.xz 120375044 BLAKE2B 71c2a44c7a170532b787e5c60496a41d5173e7d34e0f5d60808e450f9e91204c52e2dcfce4e63eca44383ebd42cc2ab1021b7f110db03fa5d5f7596c9e53bb60 SHA512 c852b38613dd8dbcf2638854d0f953655a7c720d9a3bf4774cde61609040214358ce9f67ad94fac117f1815b4adc9ed8dd7423388c29acdc2a675b06219499ac
DIST linux-5.15.16.tar.sign 991 BLAKE2B 0523e495f73946be58c751189eeac9eeeff5eb9869a9798bc742fcb08359529cc43e2bd991e998cefdc6f4ab3e3e8f8da7a8ee56b25bae266f2f144af236f568 SHA512 7ca0a4db533570a8ea8c12a3ca477adad8be94020da33a6e666676d5dc5a7b7f3e6eab4772a0122d1cf3bda39294f42ed2429798414d41cc5c89ab9ceee8a901
DIST linux-5.15.16.tar.xz 126178716 BLAKE2B 73b2f6a135c89db2ffbba8d8271761df3b98e0c844821367a3e009d67a5df27d11f02265eae34229b699c7308d4cf505f0f4a751a8135b6a6f0bf46929cbb785 SHA512 a2e3dbd92b2079a64af4d4a17db998381b5afe41ffb8b6b7fb43a69eb93b1c6d766b4b8ebba287d45f3de8392e4808cca5a7ccd5da5d42f7f58a57bf17ce5d10
DIST linux-5.15.17.tar.sign 991 BLAKE2B fc33eb461f03a37408dc5fffa8360da639c0d6e30ecc60eb25879cf8988dd500a76b38e90b880311cfecae150b81491353dcc5da8241e5bbc4e212ab78ef46ca SHA512 e68799de99982a71c8ee92200606ae5072cf58c8980bdcf2637bc75bd612344fdd0c893ffedcdec650d1f3474eda4d8df3083ca27c16124d6d72ee5d00ca0288
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.96.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.96.ebuild
new file mode 100644
index 000000000000..a462d2e337ec
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.96.ebuild
@@ -0,0 +1,133 @@
+# 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=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 ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+ !sys-kernel/vanilla-kernel-bin:${SLOT}"
+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[@]}"
+}