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 45722158020 for ; Sat, 26 Nov 2022 15:08:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 40112E089C; Sat, 26 Nov 2022 15:08:27 +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 1233BE08AD for ; Sat, 26 Nov 2022 15:08: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 E59C03414B9 for ; Sat, 26 Nov 2022 15:08:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3E14B766 for ; Sat, 26 Nov 2022 15:08:24 +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: <1669475297.2ff54270c34c42cf742c22bac4053ae293ff2c4a.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-6.0.10.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 2ff54270c34c42cf742c22bac4053ae293ff2c4a X-VCS-Branch: master Date: Sat, 26 Nov 2022 15:08:24 +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: 07c99ff9-abe4-4258-88c6-c7edae1bd8e1 X-Archives-Hash: 1ec3871097752f23337421a836484224 commit: 2ff54270c34c42cf742c22bac4053ae293ff2c4a Author: Michał Górny gentoo org> AuthorDate: Sat Nov 26 12:58:24 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Nov 26 15:08:17 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ff54270 sys-kernel/vanilla-kernel: Bump to 6.0.10 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-6.0.10.ebuild | 134 +++++++++++++++++++++ 2 files changed, 136 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index ddfdffdb5524..2b46b2828e93 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -38,5 +38,7 @@ DIST linux-5.4.224.tar.sign 991 BLAKE2B dc31a065cb747f537923a743d84a473e37244131 DIST linux-5.4.224.tar.xz 112963056 BLAKE2B 8fb9e729fb6642c5824b32f28cbdcc774d1dd0c1240dac4644aa7030a6171f4f4795e92eef6aeb03f4e92acd26a4ac8fd785ed76610ef63c83a61067b7264427 SHA512 fc54140a20eace0d2191b2ce99415459c16877440a37d101cf628fd92f224536d1f5fbb1f3d2ccb07204df577aea06c913ffcef974690cb93c768991a8bf160b DIST linux-5.4.225.tar.sign 991 BLAKE2B 7979abcf47899c61a9a661d73bcb07b097507e3e2ad41aecb8385e445fe64e2d59053b9fb5f9a1db43f4c1104bb05c860a9522b89db5bb4b811983dfd93bc75e SHA512 5096ae43b0773d3ea80637b8c5a5816ddf45f4d48af9bcd5970e2ed3543c678a1db5232834107fb308f2043ab0d5a7684ffe19807900e3d3e0de9d50f63d8365 DIST linux-5.4.225.tar.xz 112975708 BLAKE2B 1fcc64d4a71f4c1b9ae282fabd37a542f53b78b023cedf657a9649b5a1091b27677acee778c28b7919dfb634e4e2494f868ba7ceced2ae4fc5f3d901b9b02b2a SHA512 2519e9ca893014253e7af9e1e99168693c50c2c39a819a65105dc70f5ad6906d9348a61009c0575ffccc625b7df49c6e1c51bd141bf7b9f64c4ad9f5a173ed4c +DIST linux-6.0.10.tar.sign 989 BLAKE2B b61afc42b98f495da3e93ad800a8256fa330c5538e52a68ef4bcab382e3a0dc423e89024b2840e7063857f3db82ceaa06ec21d84f8efc51c65c1090e12de7a9c SHA512 90a8d3cec46b748eac6113e338fd26f19d2e4851487361ab38fe2d6a6abd0f6afc8db18d913a0978a774f26297cad944fd5f0dbca9a176462a2995742b7d76a1 +DIST linux-6.0.10.tar.xz 133913388 BLAKE2B f061e3f871e5925bbe8f829c1dd7cac72afcb59fa2fc76226268c32eb990c8637b7dadf56c9f9608f0828debf8a7af519b7f1aa2a37e82d64b97f4f95bbd3f76 SHA512 f25b2a778be1f0879b152ce01d33c344e6fcb670b48d85d6d287a2d3b244fd248b0b775639cf8101c166adb19f8daccaf0e88815b5efefb6355ff2741a1888ef DIST linux-6.0.9.tar.sign 987 BLAKE2B ccec935f65a836b1f646eccbb453312b4f9e84d06e4f3aa33ed7b8aae03fd8c3f4e505c6560dbac58d2741df991cfab43c014b6175fe94014f758aa434502a44 SHA512 5d5ecb51ae1a0e40f7b505fc14a6a5665efcefd7363dd9d71bffbe4a72ed2498a79d99c1ce7f80712d8cf753d2bba5f0069447385be74994638657b5a4bc7fbd DIST linux-6.0.9.tar.xz 133911648 BLAKE2B 23ad9036cc771135c4f6bcb17950ec61e182981c4bff596062aa92cfccc66c316b35598e7a162ca4c346ca6b18796e2c5fd8112b05544fdde062faa0c3a82305 SHA512 8269caa07b39c668085c9e956a6924c93b698fef7a927ba59a85e615b4be6828b10dd72502e9a1eedb5a4ef1a271ca78a5dea255be6dd0960536e1574ef7f678 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.0.10.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.0.10.ebuild new file mode 100644 index 000000000000..d2f94947b12d --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.0.10.ebuild @@ -0,0 +1,134 @@ +# Copyright 2020-2022 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 +# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo +CONFIG_VER=6.0.8-gentoo +GENTOO_CONFIG_VER=g3 + +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/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://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config + -> kernel-x86_64-fedora.config.${CONFIG_VER} + ) + arm64? ( + https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config + -> kernel-aarch64-fedora.config.${CONFIG_VER} + ) + ppc64? ( + https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config + -> kernel-ppc64le-fedora.config.${CONFIG_VER} + ) + x86? ( + https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/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[@]}" +}