From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 A06C2158008 for ; Wed, 14 Jun 2023 15:05:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2AA1BE0973; Wed, 14 Jun 2023 15:05:57 +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 071ECE096F for ; Wed, 14 Jun 2023 15:05:56 +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 025F833BEAC for ; Wed, 14 Jun 2023 15:05:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3E161A97 for ; Wed, 14 Jun 2023 15:05:53 +0000 (UTC) From: "Michał Górny" 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" Message-ID: <1686755136.306832c5478e7e132837696cb1e21d3dc2006c1a.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.15.117.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 306832c5478e7e132837696cb1e21d3dc2006c1a X-VCS-Branch: master Date: Wed, 14 Jun 2023 15:05:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 624f194c-92f5-42df-a720-65abdad9fb2f X-Archives-Hash: a6933dacb03d18ace95d5d8c134b046f commit: 306832c5478e7e132837696cb1e21d3dc2006c1a Author: Michał Górny gentoo org> AuthorDate: Wed Jun 14 12:38:26 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Jun 14 15:05:36 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=306832c5 sys-kernel/vanilla-kernel: Bump to 5.15.117 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.15.117.ebuild | 137 +++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 7e59fa2e7b8a..69fb652abd69 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -40,6 +40,8 @@ DIST linux-5.15.115.tar.sign 993 BLAKE2B 668a30bb360c98839e15cc1f5fb4d0edf93fb81 DIST linux-5.15.115.tar.xz 126539524 BLAKE2B f31880a7155c0e8191bea0d2bfbc8faf9c1380dda83db01cb0b0b90dae7b05df1491497e5e34070f32ce7d8ab786c68fa4471e787b9da39860f3fb8658438564 SHA512 b15c96e7ce3cffb67da9071864194ae447524b6ab5c5416b7b05657a46fdbc64944d2c57697d5513e05bc505257d1309464a519a3f30e39c67103b6518c13794 DIST linux-5.15.116.tar.sign 993 BLAKE2B ad8fd0325268b7debe85ccba5d1576e9a9d260039a21a6e3aa0360e0f868d21aedd1b08138cebe5a2a5f83162558f400293eefa6ef6d9648a2f33d762b747688 SHA512 26419379d1955f9c724bc4d51d04605e9bddf222e23e8fd5e06b7cc84438e3dc11af3b1103a99dea9b2609e34e25e089708f1cd093c5808057e6029e7ab70512 DIST linux-5.15.116.tar.xz 126548212 BLAKE2B d92824cf8ecf4894f839a2235f972da70c5658bc220b084ce088093d101046a34331efb3cca48df20f2b6b5630d5ee1c0e38fdedb0bc0f88f7365beec3ccb1c2 SHA512 6a934b1c14582dd8c958d166bed74243b9dba84008d493a1d5f89a7f3b0dbdc676b8659993768752ce971174e0ba6d48d3785f0efe157a3309bc6d7fc4973831 +DIST linux-5.15.117.tar.sign 993 BLAKE2B 4408e841f53e2a2e54e6b2e2b8dc5d237ba51fbfffd601b33325dc73ff9cfa89c9084fd08c80e8edae7a83e9e789c3116374ed0f073b37ac34504bfdf152eeee SHA512 0fdc2d532852160b99c96cbaf872d83659942125f388915175705adf2bd94db446e2f05747a594d374dd772f6c415795bf25a2e309217354255e9ec506e600fe +DIST linux-5.15.117.tar.xz 126549496 BLAKE2B 293498fc749025b1b23523d73e6cf121fa35c0aeeb8110e123fd3a557bdcb8652189bce58d1d28bd00145a036f00e78149917d5a7c077e8fe5905d928ebc9ed0 SHA512 8001c5fe571e574633c939d2379de8dc165b16f7b4d284f9916ce7ee5d7027bd87d9251d7b499a18100db23a09a9fbd29c4ff3af6fe8ebecc4bf5b5de617d662 DIST linux-5.4.244.tar.sign 991 BLAKE2B 777eafb4445f043a94936c89bf5da610abbd10a4ba307ff9affdf74344bb5dcec93fd8a0aa8160afdbae67b732af8131740a6e8ecabef0360fc52c475a847ca1 SHA512 85c9b095616bb45705b741f4d0eccabfe50d0571a85362c1c36575f464011c6c5949344e4b170839e603f2dcdc73ab7ca2a47ff695b41b93fcec18bf4a46b2ce DIST linux-5.4.244.tar.xz 113008872 BLAKE2B 2837a01c9879fe2975330f051815bd688308cfca91ff29038db899c1749964ed68773ff72e78e2dfa065f3d763401a83c880b386debd90ed6cfce6e30ce79bfc SHA512 eb1b7bee8b29103b3678cb6b3a66401d68c4b2f2c69ea603a8bae920e14655dc41ac21d79fb9593ab479668eb669f0e4a1af8628ff33f5b91db2c820f9f80cc8 DIST linux-5.4.245.tar.sign 991 BLAKE2B 37fa9d8b93c228cb96e163b95d82bcbda8a0ca725553656935da4f9cd8d2d877ac74ad749c928f7ffb1a5e16a26fef5c3b4f2cb7fac7eed245597df420d48807 SHA512 d5991e7a52aa3201330c4afb0b02aef6e374ffd9cf82d6bf92d38c1418d3ac49c2b6b7f828915ade5682a33a4a1066dba5c30621639b14c787365104e03cbcee diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.117.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.117.ebuild new file mode 100644 index 000000000000..f68caf0fd433 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.117.ebuild @@ -0,0 +1,137 @@ +# Copyright 2020-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit kernel-build toolchain-funcs verify-sig + +MY_P=linux-${PV} +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +CONFIG_VER=5.15.19 +CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01 +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-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[@]}" +}