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 5D94215815E for ; Thu, 1 Feb 2024 15:41:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 353D1E2A54; Thu, 1 Feb 2024 15:41:03 +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 162D4E2A54 for ; Thu, 1 Feb 2024 15:41:03 +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 ED45434321E for ; Thu, 1 Feb 2024 15:41:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5033A14C3 for ; Thu, 1 Feb 2024 15:41:00 +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: <1706802050.ecafad8c259a03d1e259ac55ba47571d8f61e620.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.15.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: ecafad8c259a03d1e259ac55ba47571d8f61e620 X-VCS-Branch: master Date: Thu, 1 Feb 2024 15:41:00 +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: 22ed59db-ce65-4b61-b155-9268faf8e298 X-Archives-Hash: dddf21d0fa62ff8d8fb6acdf427d2b2b commit: ecafad8c259a03d1e259ac55ba47571d8f61e620 Author: Michał Górny gentoo org> AuthorDate: Thu Feb 1 12:55:09 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Feb 1 15:40:50 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecafad8c sys-kernel/vanilla-kernel: Bump to 6.6.15 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-6.6.15.ebuild | 143 +++++++++++++++++++++ 2 files changed, 145 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 3e0266ef5951..035f80c0db90 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -37,6 +37,8 @@ DIST linux-6.6.13.tar.sign 989 BLAKE2B dfb90ac9bdb9f4eaff9eb507dab9a0b111f5e036d DIST linux-6.6.13.tar.xz 140067168 BLAKE2B 1d644e48fa4fd3740712130b0d5756b75d70471cda2a7206083434ec89d288bd7487e633c8954ec038e3784d56d7a787e6cab1c93e5fbfcfc0b44a7b55b0debd SHA512 c1598bb1116528525004a677e571117d2b5156cf8f60c84f73e11d9010032b1fd5aaf8e5d286679019db55abb699c2f55de2dbb332c0a96f6337eebd56220863 DIST linux-6.6.14.tar.sign 989 BLAKE2B 1d358aad96d5cc4184cd4f3b4016708e94593bce28072678a9d3b371164212ca15df100bdaa212b842a1aa4d88c7f3504113c9463ea66434cebdf00af2e6eff2 SHA512 4929cba31d9617739de2917d13dfda82c6fa04937a4bd92a55a7d9440ede2c5fe9709bea63f7656c8fea5076b3f936f50391fb2c0ff42828f45584c468575fbf DIST linux-6.6.14.tar.xz 140076972 BLAKE2B d4c804f804562db0439e75d0a9605e0da55f80103d11087ced20486cc0813e4840ec928dc55e33ae654509e593236d6a62fc1a0d4b911a1d943b5e13b525267e SHA512 304d737dac6d6628da0a54b3c8b30a7a25e4293a99d6d7a3b1231234dbe76f19dabae3e62abaf858c01d3f815066ed5ba65e1af0aa83b9761f9addc25fe58894 +DIST linux-6.6.15.tar.sign 989 BLAKE2B 51bb977ee6300e457afbd8cd6c9f1f0a6143545673f6d9af379fb087dec7b9527da3dae8eea94e989c621274079b0ad2d817f902dfcc2289da231e4932e60c24 SHA512 208c0d2e9e12ada60a2fbc8245e0fe7cb4fc3c375bd06d47d81af6612bbed245458bf0c3f46e66393786727b5e064c8f5348493eb270954d3fe66970afb04bfb +DIST linux-6.6.15.tar.xz 140110740 BLAKE2B a630bc7b2463bdc312f8936210a54e92bbe4136fc78995c18d0ccafbcdb27cce5b7b0d4a6ba10c378e14e86855ee7e76e355acc0580f7441e4df64e7dbd8a4b7 SHA512 2169111430b6041969593bf61911e53ce6b45db83d289336c0afaa3654886e11bfc4781042a15d64c85b0f984138d52c99636368a7d024864f0f41f873c5782e 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.15.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.15.ebuild new file mode 100644 index 000000000000..c3a2f8b2f96a --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.15.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[@]}" +}