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 15972158041 for ; Fri, 23 Feb 2024 17:36:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C75A1E2A11; Fri, 23 Feb 2024 17:36:34 +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 A3C59E2A11 for ; Fri, 23 Feb 2024 17:36:34 +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 B0ED53430A9 for ; Fri, 23 Feb 2024 17:36:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4026814D5 for ; Fri, 23 Feb 2024 17:36:31 +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: <1708709778.33aedf8594ee52b25cc4da4fca65d39771ec5151.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.6.18.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 33aedf8594ee52b25cc4da4fca65d39771ec5151 X-VCS-Branch: master Date: Fri, 23 Feb 2024 17:36:31 +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: ed09fc7f-7917-4b6d-a57a-f540af7a6c69 X-Archives-Hash: 9058b06b34fedb208c316cc451872995 commit: 33aedf8594ee52b25cc4da4fca65d39771ec5151 Author: Michał Górny gentoo org> AuthorDate: Fri Feb 23 13:41:10 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Feb 23 17:36:18 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33aedf85 sys-kernel/vanilla-kernel: Bump to 6.6.18 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-6.6.18.ebuild | 143 +++++++++++++++++++++ 2 files changed, 145 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 37429b84a3ba..f9def459ade2 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -57,6 +57,8 @@ DIST linux-6.6.16.tar.sign 989 BLAKE2B c221ca55eda0e14bda90972ac53ea8a16b163bdfe DIST linux-6.6.16.tar.xz 140120184 BLAKE2B 4fd12cdf4c11d1a4c01531acbb14748863ed15671873d49eb95c79dbc01c4dcccbfcd30318794489249868ded31059dd1ad16ad76e29db6d364ecdb331e91baa SHA512 3823a776f8e4aefdec75dce7c959adcb038ab0776d8d7e60fb79626d2d9410c0a334df71b1cd10499ed9ba82d7e50cec415c3f2b821b33f53171ca00b1a3b7f1 DIST linux-6.6.17.tar.sign 989 BLAKE2B d537c69e3439d180266e66884edd75db76c1d2652761eb1e10c4c803fb263e525571c08ad963169bddfd215af85aa0761c802fb36a63117af1a44ef48725b3d8 SHA512 2f8973b5af67968f6e8fae31c579eda2a0749b819f3bdb8f53a0ed8bd3fde899dc9f208e58c6bc29d0fd969056b0ee84cf46284f0e033d9de5406126288b02b5 DIST linux-6.6.17.tar.xz 140132040 BLAKE2B 6713c390edf4a91fea8a50202bb0204e372673b66cf4987dd52412e7a63a90a09807f23363afbc4b52b11d2df2969e5e950d8d27dbb19bf2b1ac0bb5cbb6b456 SHA512 91a6ec0d1e371cad5703bc65016fd930a5da74ca4d862eecdab08846b455b42a6845531322af65d8805210d88dd74c327ca6de1166ed250aa546918e5412c470 +DIST linux-6.6.18.tar.sign 989 BLAKE2B f0eae28658352534ec059c50491c511f0179380b94dc8918c477a6fca356a1724c5ceb964928f9809bcff38966db568b7653c680a74fb5a57e5285d7078711d9 SHA512 b68bb98510d7c4313e379d65ec726a15be59b02acafd6da9d6f5f6d36e140ff53d0d28cecbd309a589129dadf2e30f2cfecd1952aee50deaa83e62d8f9a96729 +DIST linux-6.6.18.tar.xz 140194352 BLAKE2B 516f2b4d1c3023265a844b632cd4246bc99ed07b69d01d9d9366ded1001170f2b41f07d199d470d24dce9519148a52943b8bbc2d9c7797f6a2716d85ca85c91d SHA512 7453d9ae753345e9312ad01da7805f68c1fb04f33aaec58ac3ba08e4b7af132c19e1822d8635fb747eb2d72cc8d89c89f3e5b7ff2e2207903cb2eb8b7dc5e884 DIST linux-6.7.1.tar.sign 987 BLAKE2B b031b0ce27e336830785ce2e404a2766ee31489c95dd494e1308be47c500ecf99dcb4923d73629008ac8eb47840448a074512fa0b6a8b657d653952ef2ae0807 SHA512 54202d384166d3669417a978fdd27c8428ec8d23ecdc31f029e86f812a601977771e0a202b8e83fb2ab725a1a0cbea917fb042dce93465ca17da83cfd74a5c6e DIST linux-6.7.1.tar.xz 141405060 BLAKE2B 080f19034a9f5519e3212c723492849f3a2e019c310615b40e636cad39c89369fd91fd1129750266a1cf9683c0762a3ff52942045066d62f927642c443b94c76 SHA512 59374585fe35f1dc0906052ad7c74acfd6beabd334665b79432c39bda8fa28c3290df54d69eb63281a2d07aca1ea8cc3aa0acf0911dc9d763c20f89cce7afdb5 DIST linux-6.7.2.tar.sign 987 BLAKE2B 273794bef8b277a5f36adafb69302dd4987e7491bdc1dd596a0a1911ad0fcb6e8ac80aedb364982cbd1ff6c808bb64cd29d889cdaa5a32ebda38a86789c26842 SHA512 ef8751c0b8712f6d93c050077af043a726f0f6170449a030d007415a30ca8f543458b1f4c20548465119f567fce63be753b07ce1e9fa94bc7d2534897600581a diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.18.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.18.ebuild new file mode 100644 index 000000000000..c3a2f8b2f96a --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.18.ebuild @@ -0,0 +1,143 @@ +# Copyright 2020-2024 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.6.12-gentoo +GENTOO_CONFIG_VER=g11 + +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 ~loong ~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=/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 + ;; + loong) + 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[@]}" +}