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 D7DFD158089 for ; Fri, 20 Oct 2023 03:49:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B709C2BC1D0; Fri, 20 Oct 2023 03:49:38 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 966472BC1A8 for ; Fri, 20 Oct 2023 03:49:38 +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 70E4B335D3A for ; Fri, 20 Oct 2023 03:49:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 77604B4E for ; Fri, 20 Oct 2023 03:49:35 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1697765058.94ebd8ef9443e3995d0ea96cba51678c74d02279.sam@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.5.8.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 94ebd8ef9443e3995d0ea96cba51678c74d02279 X-VCS-Branch: master Date: Fri, 20 Oct 2023 03:49:35 +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: cc27bd1d-f684-4e40-869a-68627f2ba674 X-Archives-Hash: 3ec0a3e36941d7a185b2f5592afea89d commit: 94ebd8ef9443e3995d0ea96cba51678c74d02279 Author: Sam James gentoo org> AuthorDate: Thu Oct 19 23:01:50 2023 +0000 Commit: Sam James gentoo org> CommitDate: Fri Oct 20 01:24:18 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94ebd8ef sys-kernel/vanilla-kernel: Bump to 6.5.8 Signed-off-by: Sam James gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-6.5.8.ebuild | 140 +++++++++++++++++++++ 2 files changed, 142 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index aec03ea7e23c..f17a45e686b5 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -31,3 +31,5 @@ DIST linux-6.1.58.tar.sign 989 BLAKE2B 122d097f99a6697f767aa4023bcf3b46cac6d1396 DIST linux-6.1.58.tar.xz 134984500 BLAKE2B 64d90b1be8b75385f3019d4f9e1bf807c7e2b0923d3575abe2ccef05a451b5742719ab6c76bcb03765ab7ea0dd15e8dc372d1841dc3132011cf04512c62b0182 SHA512 bbf1e0a41d10ec23485bf99d239dd08f2914660fc8ae6858ca01cea8689d9a3ccbb5e9dfae6d5b8283485055f9b1aaf35f98ff3ef80599a654885b317527121a DIST linux-6.5.7.tar.sign 987 BLAKE2B e6cdbc33ee1f522ed3f30e144902f3a62bc10763e55047637c647445db29faa4014eefdd7beb92d700ba79d6bbbcf22b682883afbb2a1f16a6541c854c061d7d SHA512 35ef9733fd0233ba60c693f49d7b8c7d08ef9bf6eabe601ac37fbb6310ed2174813b3b4f8cb0804a1e80d276e8871b249b0fdca4f730d26b96472dbd0269b333 DIST linux-6.5.7.tar.xz 138955500 BLAKE2B a9bed9907bf4b22c08df8a8beaaf923648e4f0f1a4b00c11012871094e7c06a127e54bc1935edb8afc92999456c01ebabd04bc542a0e2fa16de0852a5f4be681 SHA512 38eeff75ad99f43cf230cc440e53988646b86a5f06c08b8390722fa765c12cb97bd51ef39d28d7c2fcd982712bf76aec41e8dab9c3774d148dd9f0a33de10c8d +DIST linux-6.5.8.tar.sign 987 BLAKE2B a5cc0238804fd53c50b60c5919f81ce14ca70777d9687342bd50dc6ee7ce8d2bb3d513c7f40403b4766e00bdada0fdb808334011186232a9d696948d0058cef5 SHA512 3e3702923e4990f4b52c69a77f22da4d12b4e041f7e988b284e4d64e1346605d220449ba0e4ce8f9f87024a9b72f548aceb697a8d9f69736e50084d4402e4cfb +DIST linux-6.5.8.tar.xz 138985892 BLAKE2B 5d104cfd8f1f08b181ab85bb251e0a2fc1b37a791f396e83fab82ff5aeadc0c69a746359a6005dc766546c5a880235e1b4c477d67bd7b33ef6c4aaf4a8ea488b SHA512 d13b24b49b337238b09f7fba865082935836e6f3322694576b71776fd999b9ef45a5e4779bac4d0ce5303f0627ccb2889864a93532e9c20699acf0b35917beef diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.5.8.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.5.8.ebuild new file mode 100644 index 000000000000..4e53cde8ab8c --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.5.8.ebuild @@ -0,0 +1,140 @@ +# Copyright 2020-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KERNEL_IUSE_MODULES_SIGN=1 +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.5.4-gentoo +GENTOO_CONFIG_VER=g9 + +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://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 + + use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" ) + + kernel-build_merge_configs "${merge_configs[@]}" +}