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 A1D4715800A for ; Sun, 23 Jul 2023 18:31:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 80A4DE07FE; Sun, 23 Jul 2023 18:31:22 +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 607E7E07FE for ; Sun, 23 Jul 2023 18:31:22 +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 2EAB4340C90 for ; Sun, 23 Jul 2023 18:31:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 653E1BFD for ; Sun, 23 Jul 2023 18:31:19 +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: <1690137068.0d21f717cab59816db9c8b8ba84fec5908ffbd89.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.1.40.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 0d21f717cab59816db9c8b8ba84fec5908ffbd89 X-VCS-Branch: master Date: Sun, 23 Jul 2023 18:31:19 +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: 10d35797-f846-4e1c-94c2-80a3d0f2bb5a X-Archives-Hash: 826afe10c7830624d4591192ea5f760e commit: 0d21f717cab59816db9c8b8ba84fec5908ffbd89 Author: Michał Górny gentoo org> AuthorDate: Sun Jul 23 16:22:25 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Jul 23 18:31:08 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d21f717 sys-kernel/vanilla-kernel: Bump to 6.1.40 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-6.1.40.ebuild | 137 +++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index af5dffc90808..2425ec06db39 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -34,6 +34,8 @@ DIST linux-6.1.38.tar.sign 989 BLAKE2B 9e1710fc446d8cf5fe7cf9ee933650955c28b2bce DIST linux-6.1.38.tar.xz 134926628 BLAKE2B 43f0fe3f8aeb03e5a2bf46b358b8dc4515765b70f56fb136847c78a80889bc2e163768d941500c285f40f705634b5fd3d6e0d81c10521fc351596c95db62490e SHA512 64834b8760d2ef3651ae293c499b110a1fe07591d956c8d5cbd8263fd8c173b6963b3faf2bab4c5e0583550185339c005775bd94884750e28fd7be6a16a17af9 DIST linux-6.1.39.tar.sign 989 BLAKE2B 0184192872b88fddd0a33badc8bdfb962c734b00514c8ff50c2a519e6aaa0322461283451294b66eca442f693a158da198772dfb0a8ac7a4bfb1f18f53fa67cc SHA512 f52a21870f20444945595290fd5d2cb6d0cc547d092c954c735a315fd0a9a9adb151491572118dbc2b204e0a2d0df305293aab70e100a24d0b6d145f452b1d09 DIST linux-6.1.39.tar.xz 134920328 BLAKE2B 36bb549b14ccff3bd1751ff8475e74a77f8f65d9531ca2379b1dd2ccfe9adcf6852a764d615c42b3ad8a91c0d96668ae970085ab889dd98e21789f54a2f7641e SHA512 20d468ae89b57dda82d7c7b814c3d8b1b510e1623775b09a8a0b0a8a0431461e0a1d2df2bfa01f3102932c8eef91405546898b50ec3e6f30015098bb39722b41 +DIST linux-6.1.40.tar.sign 989 BLAKE2B 04d8f778c9a8396ea0eb36f994f8055b98d3ce007efc203320f1d463763557883ef530333aae082ab3b8e36628b33ac359a2d7cf3456691d0981be346b79fa5c SHA512 e5ccb5ddf1ae17b35bad07910ff85f5c4dbecae420fb803873ba50ffe5877d0961ad07cc203b35e2efdeb2bed6e0ab70798efa50a86d50b49d02dc66094d9cad +DIST linux-6.1.40.tar.xz 134922240 BLAKE2B a85b3418f8b35889a9b825b46f097b319218ee28e0225abf9190ae3a7b6d8de89bb21d3033ea17ab6a71e10134ff25bd5252195a7d07041bf0e0a790d52e9fac SHA512 10fccd4e95d1cb882cfd11249d17a98168aa070a966cdde8bd021a238b0b17a6b2216feb480e0f0d80b22c2e02bb69657c19d48ddc7c3a908a29c016eaf158df DIST linux-6.4.3.tar.sign 987 BLAKE2B 7e81fb9189b3416708fb91b04fea1a061264803c0d9544be45875219a1d3f3d155283426569a39df348c47bc84b7fd663afc5cdb978cec39749ad402084d36db SHA512 850e6c64466bdcf63375ae8b6d657a30c7b0f1de7fc0bdf10e7ee45d59435bc49b93795a67e92c7b084572c4277915c1adde84fce35a72aedc39acc308b578a2 DIST linux-6.4.3.tar.xz 137785616 BLAKE2B d38cae9706127fa28cc55b50ceeba7601de3d1db648b934b9d33e0b439324790074b755b1de204586fa098a326f5c88f81550cff76489b2ea6505987fc243c56 SHA512 67a280d4d50ed9d9ddae1ab35cf24c2e9ada2e09cda4e54e79508c5399b8be4f9528a8a8c18d9042fff0c11f0109eaaa3bd50bc7174831be381299180eb0a908 DIST linux-6.4.4.tar.sign 987 BLAKE2B 91ac93299fc5cebb017243efc23a21d666473d30dd112802d63da60ec013aa07891610f57f77e359e197c5dc759982a023388b8ddedcc0976aebd604122a0d2a SHA512 7c50f1024a735a17a61719d1c14c228dcd6720c4bb6a0bd6372269068f79c9352a8e4942e32ec3ba721c9e07cd5058ef5d5791c4a03e4350d2dd1688d862df6e diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.40.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.40.ebuild new file mode 100644 index 000000000000..e3a0c5f7f691 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.40.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 +# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo +CONFIG_VER=6.1.7-gentoo +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://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[@]}" +}