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 615F415814C for ; Fri, 20 Oct 2023 03:49:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DE74E2BC02D; Fri, 20 Oct 2023 03:49:38 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 C63A52BC02D 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 D67EE335CB7 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 C29581298 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: <1697765059.cec2b32bdaae81cc4ba004715f3a29a4fe9810f4.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-kernel/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/gentoo-kernel/Manifest sys-kernel/gentoo-kernel/gentoo-kernel-6.1.59.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: cec2b32bdaae81cc4ba004715f3a29a4fe9810f4 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: 25e896e4-a23e-43c0-b803-23e1a7009004 X-Archives-Hash: 419f2cae28bae705cd6df87e3cedc669 commit: cec2b32bdaae81cc4ba004715f3a29a4fe9810f4 Author: Sam James gentoo org> AuthorDate: Thu Oct 19 23:06:02 2023 +0000 Commit: Sam James gentoo org> CommitDate: Fri Oct 20 01:24:19 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cec2b32b sys-kernel/gentoo-kernel: Bump to 6.1.59 Signed-off-by: Sam James gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-6.1.59.ebuild | 146 +++++++++++++++++++++ 2 files changed, 148 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 85affd0f298e..7e954acac1fd 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -6,6 +6,8 @@ DIST genpatches-6.1-64.base.tar.xz 3729008 BLAKE2B 10f4366a8fe83ca0609c0e2654e6c DIST genpatches-6.1-64.extras.tar.xz 3816 BLAKE2B 315826af9d3e7abbef0314f962e2df50f9d183555ec5fb956fa7c9820435042e3c3a72a5ad766a3441543c54986ffbfdae8ff0a4deecb2a72851237108eaee71 SHA512 5a384aa4f6aff1a3410090873f9321ca1c6bcdb48dfefeaf7c2746b950ad22c7a745c60389ec49b99a249cb62c91d517389d5d91c844509dce5cd45a67b47edb DIST genpatches-6.1-65.base.tar.xz 3729228 BLAKE2B e2f41ebb95ca74bc5d37f950e088d2d790c09613728d86a58c31867954748d5ce57f484acfde262bb70c2d42538241b6b05cb9befd7efd6ee10a276fa79e4c3b SHA512 815a57b87978d2a0196146ff4e2ff6a7e95d10c74727d458f9cbaeddded3c99c78a24524b8cf1fa0f1297e5bc7f3c9cd743b19f12938478f3f3faa3a68c7e431 DIST genpatches-6.1-65.extras.tar.xz 3816 BLAKE2B 78f99a28e607a207731a34036931d663c1815ba00bbbf0d83dcac5597733b705f2239baf44b1b454da38303c7b9b4663c8de9024f7bb51d71f155d5b3d948cb5 SHA512 e228dde9f67ff74e02dfeac5ddea5f2f0122f4a7f09a6499ff8ee27ca1eafbdfbf09a756fac212de49702f01bcef8e25be1872c62986d393aa55cc7274d906a4 +DIST genpatches-6.1-66.base.tar.xz 3766288 BLAKE2B 3cf0a62fbfcd492e5c16b4158bcf7dfaecf7cc8df376e308ad606d8203022e04a0375a2c9a4fe58bf37bafbfd4a1ccacbb8939fc166590089884ba9989929430 SHA512 69418fe7fe88958d95bdcfb142e6350363180ede26cc44e035a0fdba12d2a8cc542a0ed7789572677eba29f9905af8720c8ddfa13e8257b129bfa95641e72f50 +DIST genpatches-6.1-66.extras.tar.xz 3816 BLAKE2B 8b2f2aa2f65d427c4ec39cdb988200d31d360f2ffde6f633838b0c3437c4efe8438e01ccd8e2de57d7f164c32d509e35a8be1ac4818841a7719a3cdce9e47717 SHA512 7f40e6153812cfe74de8ce376d4ae02868b6f246027cbce67e0714a139e60b4aa32743876c180f3b7b07e9b6fd07d2138e21ff5e6ced9571d29bf3e647b615c4 DIST genpatches-6.5-10.base.tar.xz 631564 BLAKE2B 7a9fe483c7a6a040af5a1fc0fd99dd7d575a380240268bb61d68caf95613d53fac46edf6cb18633b6dd2e803c9360d3cc13f0160e6ccaf811ac8420f7dd30771 SHA512 506abb2a66c51e45ad3ebab0c3b921faaa890640c7236eed377aeb27dff9da552088ea8d8192b4f2e142c510c7d565a5c8431444fb39bd82948ec0e696c4b083 DIST genpatches-6.5-10.extras.tar.xz 3704 BLAKE2B 4bfee3cf5f3af32c02f4df2b91437258a4bed38c4cd1fc8f8467020ffe1835ec86dee58a10d2e1775fdd6392c6a28552ea3a90ff5fd36504ed43cb7787ea7e5e SHA512 48589be11fcc969fd3f46475f8aa53047f191c5fec66918e84d178e14f531c209300808f7c2ddb479fb8409a344f205f59b72dd18b6d79d1ca924eab10f81f85 DIST genpatches-6.5-9.base.tar.xz 574412 BLAKE2B 339dc1d19a323c2143fdd394b324e8d73b6e21b833e48096b6ae312b188bd9f39811fcd7b93f900c6ceb6982eb6ca108b2ec617b8dc98fe2ec255ec3b002e31a SHA512 42873d29784c0d85434d7eee81ef2000a42164e20ef74c875b81ed8df96ec3632261485c38e17ffa41d94df200b69d8d0e663eb8c90ea741234e860aad9026e3 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.59.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.59.ebuild new file mode 100644 index 000000000000..803053479832 --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.59.ebuild @@ -0,0 +1,146 @@ +# Copyright 2020-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit kernel-build toolchain-funcs + +MY_P=linux-${PV%.*} +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 7 )) +# 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=g9 + +DESCRIPTION="Linux kernel built with Gentoo patches" +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://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz + https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz + 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 ~riscv ~sparc ~x86" +IUSE="debug hardened" +REQUIRED_USE=" + arm? ( savedconfig ) + hppa? ( savedconfig ) + riscv? ( savedconfig ) + sparc? ( savedconfig ) +" + +RDEPEND=" + !sys-kernel/gentoo-kernel-bin:${SLOT} +" +BDEPEND=" + debug? ( dev-util/pahole ) +" +PDEPEND=" + >=virtual/dist-kernel-${PV} +" + +QA_FLAGS_IGNORED=" + usr/src/linux-.*/scripts/gcc-plugins/.*.so + usr/src/linux-.*/vmlinux + usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg +" + +src_prepare() { + local PATCHES=( + # meh, genpatches have no directory + "${WORKDIR}"/*.patch + ) + 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 + ;; + riscv) + return + ;; + sparc) + return + ;; + x86) + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die + ;; + *) + die "Unsupported arch ${ARCH}" + ;; + esac + + local myversion="-gentoo-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[@]}" +}