From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1351897-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 80E18158086
for <garchives@archives.gentoo.org>; Thu, 23 Dec 2021 00:12:31 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id E5E002BC001;
Thu, 23 Dec 2021 00:12:27 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id E1BE92BC008
for <gentoo-commits@lists.gentoo.org>; Thu, 23 Dec 2021 00:12:26 +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) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 47CC334305D
for <gentoo-commits@lists.gentoo.org>; Thu, 23 Dec 2021 00:12:24 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id A2ECF262
for <gentoo-commits@lists.gentoo.org>; Thu, 23 Dec 2021 00:12:22 +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: <1640218331.9bd4bd1af88f5efad0cea742ec8400c3d0feec9b.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.88.ebuild
X-VCS-Directories: sys-kernel/vanilla-kernel/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: 9bd4bd1af88f5efad0cea742ec8400c3d0feec9b
X-VCS-Branch: master
Date: Thu, 23 Dec 2021 00:12:22 +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: 83e6747d-e256-4606-a945-4c11a27295d7
X-Archives-Hash: 8f2b0fd7b770f4ca488944ecf8627812
commit: 9bd4bd1af88f5efad0cea742ec8400c3d0feec9b
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 22 15:01:56 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Dec 23 00:12:11 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bd4bd1a
sys-kernel/vanilla-kernel: Bump to 5.10.88
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-5.10.88.ebuild | 130 +++++++++++++++++++++
2 files changed, 132 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index d5a5297cefc8..1b62dc06017b 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -25,6 +25,8 @@ DIST linux-5.10.85.tar.sign 991 BLAKE2B a15ca5ba6b75d8ab118c7c578a33d47224f9b2c9
DIST linux-5.10.85.tar.xz 116476312 BLAKE2B 629b8423f29454b25a76165933ff82a50d8d80826465529814465862869a0721775f344c738731cc3895cad11043efdf76ed909c1db5782f55c608599a118064 SHA512 9c8d9fc12c48c7c1c4691ca95de4f06c148686618013546d848a3d463261961e473ac9abe909ba3b79d1bbd5291153c797cde577b10990c825ab14cc1ee0c21c
DIST linux-5.10.87.tar.sign 991 BLAKE2B 757d7e7869bbb45994fa77cf6ad97be184abbe7060e09d80b41ae224f44504e350ced5c11614f7708960f10b6b2b77ca8b74d056436617a32e3f25f020bfbf0d SHA512 52a1f21ca87ffc86f8886814457987b35fd7b515611367c24a08c536788522a8a74caeb9b2130f28f52df02a5985f85a08eb5c95b1e64eedb76aba37f4e04fa8
DIST linux-5.10.87.tar.xz 116483412 BLAKE2B c9a624641fad9c48289db27d35a4ce8afe2ad70287deea308a4a20abd0fba1247ba2985ba2c7bfa2f894e3b834510feb1f35f062788c093f629803faaa1cef4a SHA512 97fe37bd52d7d02519ed06737e94a5fcefff944e26e69b90abc4a7ee91fce031ad0778b0211365c225da57a2eb1bbc0236cb3482635137149ad5c5a2bf22e382
+DIST linux-5.10.88.tar.sign 991 BLAKE2B 8ba7edd3b3d0b96c5b9ab70d4290952c41327edd7e7cf707b84eca94714a1cf05577d8b6d8d7d419986ae384a268f36157edefe6b950a08aad08fc37d061102b SHA512 2c609b8baddd47db61091b9284a4786b1a22fb2848ec2d51a2b7b73232148a0e948ed35fcb39a7bff646f90ab6be28d81e12bd8358cd3161a88beeea8762d306
+DIST linux-5.10.88.tar.xz 116476744 BLAKE2B 89a496f0ec427061c04a5568bdfdf04ad4ca55b3c81853ae9f64d53608efd39d55d8f2074f7dbeb9424f6b9cf9b5d9674b98a05d24414dc0ccb076a9f9d27685 SHA512 b4400a65dee1e5e7bafff69012078e81467e9a7aeba0eaaa84137e7056b5b79893eb62ef4309a340b23770d3785a7d236e837e6f39f24e58db00a8b4d9190a4f
DIST linux-5.14.21.tar.sign 991 BLAKE2B 159182d90911e738c0693c839441f679b66fa3e75c61bb55251552b1ebb7bf6ad018d66d0a83a8f88935b88c1f39fea1207a94f3fd4af3d1e5d148cf9293baf9 SHA512 1c2639bfec52b2f8cfc69504b7f474d1d7a96dc1793e8cd77a6160718a5f381c5e57e42339bd5361e83b86c84cda2500d18615bfc210bbe989c0560b275f4918
DIST linux-5.14.21.tar.xz 120726436 BLAKE2B ced805df81421f328e2e08d50a33bf6ba54092e95c84d7c1c8ec25ad909c183f82c9966a074c274dd0d13b069b87c12c6f6d5593faf3c0813c4369f90fc4a24f SHA512 0f428cb7273de5b440b610b1a3709563e4ed955afb4df084750a8b43c45e5b000a5906780ff7079a8324fac0a8b7ecace778ab8bbf0511fba92d4dad160d7f87
DIST linux-5.15.10.tar.sign 991 BLAKE2B 22e5f6b14793a97fcdf0b7f1e109d726cf541dccfb27c44fae4f39b76b4ffad2834171fd40e803bcad1a2a7ce6fc5a6754c7e1387e65991043d679619095915d SHA512 2580426744f80d756a57566fef7cd0d410e85c69514fcd1986dd40b82743342cb7ce0dbae0e8de56d8393037534cf5c8af6cc70f750b71b44a6204731c9c50c9
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.88.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.88.ebuild
new file mode 100644
index 000000000000..ee6eb2c658fe
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.88.ebuild
@@ -0,0 +1,130 @@
+# 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 ~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
+ ;;
+ ppc)
+ # assume powermac/powerbook defconfig
+ # we still package.use.force savedconfig
+ cp "${WORKDIR}"/linux-*/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[@]}"
+}