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 0A014158099 for ; Wed, 29 Nov 2023 04:10:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 125402BC0BE; Wed, 29 Nov 2023 04:10:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EB7242BC0BD for ; Wed, 29 Nov 2023 04:10:14 +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 36F6C335D1B for ; Wed, 29 Nov 2023 04:10:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3712D13FB for ; Wed, 29 Nov 2023 04:10:11 +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: <1701227194.ce63421a8d8415c378bc397254780d57440f3886.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.64.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: ce63421a8d8415c378bc397254780d57440f3886 X-VCS-Branch: master Date: Wed, 29 Nov 2023 04:10:11 +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: 02d6369a-8e69-4fe3-ac34-c16ac1867bbd X-Archives-Hash: ff62d134bcef11c27b53eb960981085d commit: ce63421a8d8415c378bc397254780d57440f3886 Author: Sam James gentoo org> AuthorDate: Tue Nov 28 19:41:03 2023 +0000 Commit: Sam James gentoo org> CommitDate: Wed Nov 29 03:06:34 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce63421a sys-kernel/gentoo-kernel: Bump to 6.1.64 Signed-off-by: Sam James gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-6.1.64.ebuild | 146 +++++++++++++++++++++ 2 files changed, 148 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 3e25fb113e99..3e508e52c837 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -16,6 +16,8 @@ DIST genpatches-6.1-69.base.tar.xz 3845328 BLAKE2B 8712160e24a37b1333b7cb2314cc9 DIST genpatches-6.1-69.extras.tar.xz 3816 BLAKE2B beff365f70a79f0b89ffaf3807f69e770a2bc05baf568b80dff66d135d59557bb0463d2c914953722b0511a2e1b100b0c4b6181192b3ad42eb4f592c0b785eea SHA512 9fbf140b90103a750287f4ac94b3f1606a5f12d97626dbb8370b876e1894d5397f4af740885b07dd5c4e0616583f6c909bc881b9cd90c05cf1fef614a006a6bc DIST genpatches-6.1-70.base.tar.xz 3972184 BLAKE2B 4fecbaed663f02725423386867efcb5d92ada6fd1efa880bad4eb75c19285172e5faf8fde382287d76e0140cbb92b9befa547c8c8e761017e28aaa3cd368c012 SHA512 e197bbac9740394d4207d3e6261ae0ea755dee69e1b64e8ef16632b32a827ae994f0c197117346871d5fcfb44fe9cc919e5c0f3e4a94b8e3de2bf35bf6bdc8cd DIST genpatches-6.1-70.extras.tar.xz 3816 BLAKE2B 24fceb3a4d3482fe840ec8053badc22d06a8eb0091af745991ec729bde2dd99202122c149fe39553e3a0cc4e853c6d97d084d24a759172c643ceed829f2f6cf9 SHA512 381d9c79faf43a9c26991a3064096e90e7dbf027350c299b3a0afba6248b4cff4c7c58e6667528a33d77ed3b8e91516cd018f0aa4c9ae340bb441218e681a5af +DIST genpatches-6.1-71.base.tar.xz 4056620 BLAKE2B a33fe2f631e5fd240a519b1550c56986f236bd9034c1e6497da3b285332fc1429712716907d3246b00dac338ad1488b65c219e992fb35d2c8a1e2db35e3ca4ef SHA512 5e01e2a12719cd56ec0bab862eafd1409e637bf24da8ffabd31bdcee497b41466ad971cf229946a5bff116e71a224cf25024c47c74b00c16444302d25baf58a8 +DIST genpatches-6.1-71.extras.tar.xz 3816 BLAKE2B d52f8ef239c4bf9b7b21a48104025d0d2a54e567bd0dabc6fa2f71eaa16b5ad43040443623b3608f747d555b71325c64119f64a9f174ea47a6aab26325bae16d SHA512 51bc2d01212064a162867b51525f58dfcc44f21157919b85b676fae7426a0920635538bc8d1df22860f81681ba50316eabf57db00654e73d0b60912e4ef3a6fe DIST genpatches-6.5-12.base.tar.xz 720508 BLAKE2B 429f4fbc3292ab46250bc1716212f369f888ee0219ab19baaf8a7e3634c012bcaa64820639b5650b5346cc93fffb3b00c8ba5ad48c3f0030e5db6102646ca60f SHA512 1b5de16a305f7cddc3125be3786347a037e25b8b53ad05c35c8efd57e624dbd7cf152898c3084847d6c9b77f5bc6df378644434e877434d40ad4fb0d08d6a37d DIST genpatches-6.5-12.extras.tar.xz 3704 BLAKE2B 3d18f544a455d1184eb9687a5c53c7dd348b12f736313a3bb9d3417e0f4458a8e7f962451ede58f45016af700014fea87cc3336b30ede9f899dd75369eaadc57 SHA512 0a8c8a23d99962e5f0028ef1ee8ba79cd20af0ccf6b08e554405ee964cf542b6758d0e2456612a410d7fdfca5572e4af7c4d1c3b65a9b426412c1b480b2d6475 DIST genpatches-6.5-13.base.tar.xz 741136 BLAKE2B 3e13a5bb6effb4005e2c1e604722cffb27583aa78ba0642ae2eacb2f5905fc19fd16212b502196e58d0ee4064779623b44af03e34c6bef0635104bbdfa49253d SHA512 5b63c998dfe984b5435e7e951889dbd1bf4cab2d8db41e89978ffd06ca58ba3e8687e740bb42514e0da5e5ae19998234f87e8220d5eb550e21fb6bd7c665e139 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.64.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.64.ebuild new file mode 100644 index 000000000000..5eb6a81e331d --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.64.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=g10 + +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[@]}" +}