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 1764F159C96 for ; Thu, 25 Jul 2024 15:51:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 058DEE2AD3; Thu, 25 Jul 2024 15:51:53 +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 D053FE2AD3 for ; Thu, 25 Jul 2024 15:51:52 +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 C0AC134072E for ; Thu, 25 Jul 2024 15:51:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1CE3C1E65 for ; Thu, 25 Jul 2024 15:51:50 +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: <1721922702.bbaced3759805e141777377f40f5a6f2adc5cd34.mgorny@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.6.42.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: bbaced3759805e141777377f40f5a6f2adc5cd34 X-VCS-Branch: master Date: Thu, 25 Jul 2024 15:51:50 +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: db2f4e78-de92-45cb-acc9-d6224fb37e1a X-Archives-Hash: 1a8c1acc8ad2859d228b60c9f2f9b633 commit: bbaced3759805e141777377f40f5a6f2adc5cd34 Author: Michał Górny gentoo org> AuthorDate: Thu Jul 25 13:00:37 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Jul 25 15:51:42 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbaced37 sys-kernel/gentoo-kernel: Bump to 6.6.42 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-6.6.42.ebuild | 153 +++++++++++++++++++++ 2 files changed, 155 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index fb7b452740be..18b96f78c321 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -32,6 +32,8 @@ DIST genpatches-6.6-47.base.tar.xz 2606912 BLAKE2B 9ab2547e43d9d17ce67824dbb5eac DIST genpatches-6.6-47.extras.tar.xz 4052 BLAKE2B 8cb744f165c0ebb88d4a8eb097c6f45c550d6eb984fa06902980c7276863fb6b5b7c1e760a9f6904f58178977f7e10a12626a20f83df4a2121379a26d1182ca7 SHA512 9f7c53624e9ca9bad3f36a114b3da3aa5d3c1a7c92bfb85d862814900303a58d2a6280a9ab9a0c3f342930a1354b579e94cf5eecbb379d31c7666925c1ae9cfd DIST genpatches-6.6-48.base.tar.xz 2633356 BLAKE2B 3ece4f33cce7380d247fe1f3182e2a516a8e63ce1952e30593f228afd4f11b67d838a0374698b1c3f48992ce04f4b55fcc258c8a41bf2821e01b6c4bd4829d07 SHA512 2a514a91d3e7b8e51330f6852edab7d8481dfbfc84fad4415141dc3d0c68865f19724480a2403e86e080d368004d26669f365de233b6dbe9f664946dc168e853 DIST genpatches-6.6-48.extras.tar.xz 4052 BLAKE2B a5aa357ab175db9a16bb4eaae879d8439634ea41e525b9aac80e51ee51305399aa5f7597f126017ab856649d06a90f2e38e50663f258585793a429f20192c28f SHA512 9dfe341e12629b049ed97ebcec3aff60907c5e4e4cfc6f0ad1eeed2f6b7c66535c95d486b3252cade4f92b7beec76fe2343a71af415fd3160374be5b99076197 +DIST genpatches-6.6-49.base.tar.xz 2664860 BLAKE2B b6117aea15e733852794addb703b28f26a8d9afbffc8d576ca11f272d00627e8254c039565221db39a1bbaf9010eaefe9608e9c2906219c78508f301eae7cb93 SHA512 d87482a0667a4578235366951704b8408c1f2ff91c2f2c823dab0302a85c0ca007a9c0acef17a4c231dd3d14c1392e3b18d9816f72ddf9afe54ade8613075d8d +DIST genpatches-6.6-49.extras.tar.xz 4060 BLAKE2B 4a63f3dcfd864b303a90247bb34de3071ec3f8be751df06e0c42e48ed3299939aa2b58a64669d091adc751cb8cb296f98d17cd421e263f7da22997e9fde3f2ae SHA512 518eb6d8e295919db80748c07bcc59300eea0a0961d71e8618de9fa4371d6266e51d437521c183014ba92a35f1408c53306f5b7c6d82dd0e644209b1b73c12db DIST genpatches-6.9-10.base.tar.xz 602768 BLAKE2B 614634ed1d1132be830e91a13dc509022a6a476b678f63dd4f3c428e7c37eec46f47a32f927f3895ff65a6ab5b046a3b0ca2df88a94678f898292d0970859734 SHA512 7826d46d8faaf64fb268f8dc940621f434f8729e706b4178adac2a2c353bccd854e5fea6c3489d5d0c48d469d6f6e26befa01d5a0deaba48f3e6140eb096de5e DIST genpatches-6.9-10.extras.tar.xz 4052 BLAKE2B 607bede5f0c3d38f72fba841861caf6f90e7f0068373d951a6aa21a29cb7523bcd6faeeb5602c6a7395a802d35e657aaee1172582ecddd0c4143fc21ea9c4b3c SHA512 b9e59d200cb06ea3287557e1ca1cf7116df61019f423fa8149195d36d7d2b143265341bef5430c4f761b0926ad823775cb2c83c852d22dc4acdb0d9628da12bc DIST genpatches-6.9-11.base.tar.xz 636320 BLAKE2B c1a730341ca150f9f698300f59f43d1f4ab2af44745ccd060033702112caa9941a0021e23f9a470cdb0fec51e76779a20e451b2b058943c12e153acbaca4b770 SHA512 e3b40a773a2c58914b25534949f9e05542eb1712b823bf84287ed546e44c9d6e830aadd4c61d4e2a72b1e2b071387a9d1131cfc9f43ee9e26d9a14785b248758 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.42.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.42.ebuild new file mode 100644 index 000000000000..4f603a059b70 --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.42.ebuild @@ -0,0 +1,153 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KERNEL_IUSE_GENERIC_UKI=1 +KERNEL_IUSE_MODULES_SIGN=1 + +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.6.12-gentoo +GENTOO_CONFIG_VER=g13 + +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} + +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~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 + ;; + 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 + ;; + 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 + + use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" ) + + kernel-build_merge_configs "${merge_configs[@]}" +}