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 7E8D215817D for ; Wed, 12 Jun 2024 13:06:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CB2D4E2A74; Wed, 12 Jun 2024 13:06:05 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 B18C9E2A74 for ; Wed, 12 Jun 2024 13:06:05 +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 B7D8E33BDC5 for ; Wed, 12 Jun 2024 13:06:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 531F9119 for ; Wed, 12 Jun 2024 13:06:03 +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: <1718197548.a23f5adee1390c1416c9b5d58ecff46e36c3fb6c.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.93.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: a23f5adee1390c1416c9b5d58ecff46e36c3fb6c X-VCS-Branch: master Date: Wed, 12 Jun 2024 13:06:03 +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: ec529195-2df2-46e1-ab41-4db4a9355fd0 X-Archives-Hash: c6e91ab6313e55488ff461af5a5f7d60 commit: a23f5adee1390c1416c9b5d58ecff46e36c3fb6c Author: Michał Górny gentoo org> AuthorDate: Wed Jun 12 10:40:39 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Jun 12 13:05:48 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a23f5ade sys-kernel/vanilla-kernel: Bump to 6.1.93 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-6.1.93.ebuild | 137 +++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 9a77173084df..642fab90aabb 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -50,6 +50,8 @@ DIST linux-6.1.91.tar.sign 989 BLAKE2B 2a6c93fa9a8e14dd41ef12e64eb735cd87cf27cfa DIST linux-6.1.91.tar.xz 135135820 BLAKE2B 1bb497a5c95baf9385639c822ac9696f05d573e226ccbe8047fed20def6776e8e64aba5187b44fd41cd86ebe0645b7770f3148632d07c36183b038d6fd50e699 SHA512 aa5349cc8b826d1110b31fc7d6e55c8c09d717c0ec0a7bf10de1586e294951cc724403b22f298a1ac73c9f1535b94c2d87ad6eae21ce5d4cad91e419e2d3fbfc DIST linux-6.1.92.tar.sign 989 BLAKE2B 7f97e584239403f76bad6f936b406909691547ffd50b81384debab3894d91d7996311a73dcbaaba3182fc1359dfbb4f1cd284dadae0cd319db2ede475c18fa56 SHA512 1e6f49ddcfbcc59ea6a2da37b7480bf54b3d5dad6ad70de0a2ed71882ffe51626f444133f8b0ee992cfa52fa9867f3db8942228e3dd50396ff0252b17cce045c DIST linux-6.1.92.tar.xz 135138980 BLAKE2B 5c3b5afefc3d4826d07d868cd30154db3148177195c416a2138c3e63638d26bc76fde22bd57f4ff805d2848056e3e868953359a6ab2d33b9e49e28cf178e0f89 SHA512 839663ad83d4448edddda5e16a09a035dd557489e8c5bd57dc1a120f6e9c2ef1c05b9a8c4da0222de28be26bd15a5f49092656091b3a0c97525279b4bb320e9b +DIST linux-6.1.93.tar.sign 989 BLAKE2B f6551f43a6560a1ee1972fdea79a55cd89dc988b59cc16607d400698d5e154bd430945a48853b9e8dc8f74fe1779d063adc1c155a5878b079b61c6d3f9baadf6 SHA512 2182629f398e6784d57110993bc10dcb4be5a11a241c6343fce99d2124cdd41b2d9fc4ef106aa97808eb2ed0a46cfaae390d96561eba41a6ef1b0e197e9f2f97 +DIST linux-6.1.93.tar.xz 135165348 BLAKE2B 8110161367b55390d16976fd3ac4c1499d05598dcbe0f069f08e76df9ef94056aedab93c78dd4617028fb6118e6479670f594178cebad6a389b01915ee2fb64d SHA512 9c4441369aea49031522e5f9664ba9b7d3af4624a761da67609ee5af92a034600d369887ad3ca3c6202b1f0163e1551c52a33e61a2f8d0eeecaa800912de0484 DIST linux-6.6.30.tar.sign 989 BLAKE2B a85b3b764503aad276019a702282ae29b3f84ea579b25be1ad0b4c41a3fbd46b356c4185a996f8a0ba80ea2fcf347adafcbd60907ea826855267fdfab73273d4 SHA512 d6ae1fb54e38ddcdffd6ada80602334a296d064b968e1ba4245c40ab703ad2a9c9e9531c6c3ee64091fcdbc927657014005d8690bc1e0f1a6b4038a0f24d5bd5 DIST linux-6.6.30.tar.xz 140183976 BLAKE2B 815c85dae71784bc1eb722fc7651abebf344a960f51c473daa50f51f9097b8d64c68c033a3d488f7780cebd29e360c6df6ceff255a1a07d18533d7d950e77db8 SHA512 1c1cb9449686fc334385e9997073503ac6312d6855e8ef26bb1e73267447cce14f1f0a22b5c585a0a3c6c8dd1ed0e3c246671773ab8990fdf3c2f081219a9212 DIST linux-6.6.31.tar.sign 989 BLAKE2B cf6ebd066fde8f62fd33e96219732e29f70c3bd97f1111cf9b31b8a1593ac13c2eb624d8c4e6ad1fb35a77998a7c42a4ac4d026eccde1090dcf54d48bc39ab27 SHA512 1d30414266bfaa390288fd4436562f28daecebbcf7a097f19240a5732b3a7c5248f56595ea9a6f312ffc5d7dd254a3a69b5ee36173c983c62fbe722bd5fdbca2 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.93.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.93.ebuild new file mode 100644 index 000000000000..2a01b55657d3 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.93.ebuild @@ -0,0 +1,137 @@ +# Copyright 2020-2024 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=g13 + +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=/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[@]}" +}