From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1496164-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 301F715A7D9 for <garchives@archives.gentoo.org>; Tue, 14 Mar 2023 14:38:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 16083E07C5; Tue, 14 Mar 2023 14:38:42 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 9ED17E07C9 for <gentoo-commits@lists.gentoo.org>; Tue, 14 Mar 2023 14:38:41 +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 6D497342FE3 for <gentoo-commits@lists.gentoo.org>; Tue, 14 Mar 2023 14:38:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F339E888 for <gentoo-commits@lists.gentoo.org>; Tue, 14 Mar 2023 14:38:38 +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: <1678804712.e3ad4a305c1ea27491b6aa221acbf7cfbb09d78e.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.4.236.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: e3ad4a305c1ea27491b6aa221acbf7cfbb09d78e X-VCS-Branch: master Date: Tue, 14 Mar 2023 14:38:38 +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: 039d04ce-1173-413c-9bb8-208a6cbb4c22 X-Archives-Hash: b3ffe8fa381890d64e23869986feda78 commit: e3ad4a305c1ea27491b6aa221acbf7cfbb09d78e Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Mon Mar 13 14:58:55 2023 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Tue Mar 14 14:38:32 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3ad4a30 sys-kernel/vanilla-kernel: Bump to 5.4.236 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.4.236.ebuild | 111 +++++++++++++++++++++ 2 files changed, 113 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index ee58f45d2e79..72f2d9116843 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -64,6 +64,8 @@ DIST linux-5.4.234.tar.sign 991 BLAKE2B 7de2660c6fe2001fc0c3b0f0c938c1490089f145 DIST linux-5.4.234.tar.xz 113019048 BLAKE2B 93efb145f53e9072c63169637361bfa74e40de999300f27a684cbaa23678f61593edf06b46a1d03c84d1881489b560c436827589ab04bdf92dadbd51c77dae87 SHA512 58684c5106b1fc6d50bb2297d7d6894babe79addc055e5e4c78805bd4da88e01f8751b64e4c410f60827d2562494fb333fb609e251264aa91e37d25f89e65559 DIST linux-5.4.235.tar.sign 991 BLAKE2B ae88749590d96de251d8c2579b00142a1e895beb4b242b4b2d6a37949110975ddbeb0d23805054c6d868bda55a7450b831cc3c0ca70a4a632da1c7e2aa2c9292 SHA512 52e9f706ac8640c3229a79386f7671929ad4e5e17ed0407cafc7ee015b963b37bd29c5472ba2bc422a3fcb732b643e4aec5730d8a6ff152bb4c83629224fbbd1 DIST linux-5.4.235.tar.xz 113006528 BLAKE2B 57ce56b8060d43e19de9b8b8a03a4bbc4ddce6e29c68b42172dfe181520eb279873269336a900da9568dae1d4d4dda2901435524af484709cc3b86f4b6df65d5 SHA512 37c0343bd57837fc1e42e761417c724ac4f74dd86f6c1712bda225cb1c9456bf28adaac1db561e32bb917b2c7f37693c0ad2e8a97f5d22a097379e5cf147ba7a +DIST linux-5.4.236.tar.sign 991 BLAKE2B efd7352ca03c80b7c81a1c794cbb4b050d1c5e7856e08e09ba3134c58b04c0c47f51ab6c81ca4da830fef4cf81f9fbc7798be6f0d76cf6ede892b2a1766bb0ef SHA512 b48da5093f8556306153f603bbbc718170ac5cdc0f14a2d8f1468ead08282ec90488f3b07305e6aea6b1d4cd891e2a655fba8f1db8e5fe31b8d6e5dfa54c3325 +DIST linux-5.4.236.tar.xz 113007788 BLAKE2B fa904f692d5e7b16592df5d1b44400788502613c3157e672d22262c52f65ad1b53cdade1fbd61cf1a122ce1ddd7461cb8b32de300c0fca7c7aee75fa7b3ee012 SHA512 ddc0c265b66ac33223d893689f8079e0f1a882f8b69433bfe8272e7888ba53cb87cb26771bea62a839b6d2cf042ecc40405c00a380d2d39cc796a40c3eecc5a3 DIST linux-6.1.12.tar.sign 989 BLAKE2B b55e15679dbf0a29dcd5ece9cb68fb2123132818810fd03492a6d8fc5556814bfc8604b38a25dd0b71acc4ea8f515ce60d36d6e24eb944fa8a48bc851b2c25f3 SHA512 7459ad3491bfcb2dccfde4a929da7b78e842dd34e0230ba49da152891b5157dcd54cf84696988da560cc918852b1d59b76f7184d39e7c444385e20266aed8b05 DIST linux-6.1.12.tar.xz 134848688 BLAKE2B 1ff8d14fa1544a9d613fe372073e6735cc9444383e598a1c6a546177e1a9516b7f5a0d16aac4fc141fef134ffe14a0e40ab5db4200c11c953fec7f70a7bc9079 SHA512 e870aa9038f0508c50af5329721a5649c3537deb333d18f006bbf6d3c310b64262630eed5682022b7eceece9ef0956d2c110555cc9257591b7a221d063976735 DIST linux-6.1.13.tar.sign 989 BLAKE2B 6a59d32b2782eae32371c306b251d30e79c4123d53ff7587a8a02ef4b3f1b46749609561c885a6c530ee83c5b22cb9ca816e14b767790e2a25ae0e4e9fb11b5e SHA512 63c6c8af47b6c08890553e8a8292fa423be470d00322d046cc5f104ade9fedeb17f74a606ce230aca053795f720d08fe102530897b53d81004bc4d34a1497aa4 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.236.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.236.ebuild new file mode 100644 index 000000000000..e60639c72379 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.236.ebuild @@ -0,0 +1,111 @@ +# Copyright 2020-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit kernel-build verify-sig + +MY_P=linux-${PV} +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +CONFIG_VER=5.4.21 +CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea +GENTOO_CONFIG_VER=g7 + +DESCRIPTION="Linux kernel built from vanilla upstream sources" +HOMEPAGE=" + https://wiki.gentoo.org/wiki/Project:Distribution_Kernel + 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/projg2/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.config + -> kernel-x86_64.config.${CONFIG_VER} + ) + arm64? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config + -> kernel-aarch64.config.${CONFIG_VER} + ) + ppc64? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config + -> kernel-ppc64le.config.${CONFIG_VER} + ) + x86? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config + -> kernel-i686.config.${CONFIG_VER} + ) +" +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~arm64 ~ppc ~x86" +IUSE="debug" + +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 + + # prepare the default config + case ${ARCH} in + amd64) + cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die + ;; + arm64) + cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die + ;; + 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.config.${CONFIG_VER}" .config || die + ;; + x86) + cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die + ;; + *) + die "Unsupported arch ${ARCH}" + ;; + esac + + echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die + local merge_configs=( + "${T}"/version.config + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config + ) + use debug || merge_configs+=( + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config + ) + [[ ${ARCH} == x86 ]] && merge_configs+=( + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config + ) + + kernel-build_merge_configs "${merge_configs[@]}" +}