commit:     7599f9db4fe855d9a8a4719cd83c1533086be714
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  1 17:03:39 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Dec  1 21:57:59 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7599f9db

sys-kernel/gentoo-kernel: Bump genpatches to 6.6.3-r1

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-kernel/gentoo-kernel/Manifest                  |   3 +
 .../gentoo-kernel/gentoo-kernel-6.6.3-r1.ebuild    | 149 +++++++++++++++++++++
 2 files changed, 152 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index c23f0d55c70e..a971665ce3f9 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -36,7 +36,10 @@ DIST genpatches-6.6-3.base.tar.xz 214140 BLAKE2B 
8004fed867cbb854c681834b0d29733
 DIST genpatches-6.6-3.extras.tar.xz 3704 BLAKE2B 
b8d26172a7fe7a85bdb30d9812da3e76d9bc061597da43b66d514b6aa24fd1ca8047989196003488db13107002a727445fe6d5cc7160d795b9a6f0f2c43c0f8e
 SHA512 
964a49545c37d981049f2471ca9a29609e491550018b248ed7cc2775e32974ccd015f116533d0468652c9ee3af0f16831cc5ba2ba4c68bffa4e250826b9b11fa
 DIST genpatches-6.6-4.base.tar.xz 391588 BLAKE2B 
8691843486b8451cd16cf35b2c9053f623276ddf9375d0a41daedb1305a8d463f5e5578e99678c193c0644745029a6e7fbaef7f9e830599dfa6b28fb59d3ac3c
 SHA512 
cc1ba9cea75c42503c4d5dc48c41a4ae11dd05396b15e4ae8efee649c6c59a779fb5efb39e5a5b1e7b9dfaecd9b75ffe130c7650ed473adc2a7bef7bdd71400b
 DIST genpatches-6.6-4.extras.tar.xz 3704 BLAKE2B 
975ae6464f9583b51a14ce7276ee16bac1ac1facdf085b1dc7e8501a100bf5a7766dbfe37065d803d8c8ded68e3b657eafdd23be166ee5240cc67baee5089850
 SHA512 
9056a41cc5911f4857661d854d8b048307a4837cecde5c573a05750126392b8f64ab622ae3ca22694fffe49b1001cb2799a0e3a5b6b681c0e8aa567096619d89
+DIST genpatches-6.6-5.base.tar.xz 392288 BLAKE2B 
e6a9bf0886ad85754ec963185fa9204967b35c30450316ebde163c3376106db0aa75f44aac0e66fddfd487371cb37a2c5ec70bbf14bd7006369a73d1360d7880
 SHA512 
13833e3963fbd1ebd246c9290cfdf15dd9d62869cdcde7fb03688eba9260d2a0b8729c153d5eebd886f6e5c3b555f20764c8f8aaa36826f2823f1b97f1a8dd21
+DIST genpatches-6.6-5.extras.tar.xz 3704 BLAKE2B 
739d6f239b679f80f74475f10ae3a9e613558f93275b745cbc0d8f912e00d6b9a5753ad62193b20fb4401806c315782dd1ee33336434058e4fe0f5e7b90a124d
 SHA512 
149c0eaadc4575c839517dc8e42a5fbc91b896b22e43f21c057ea91240b05936ea7c32e2f8b9bd7c4d7d2bf2dd11abcd41185869837c160e7f8953dd7b3c150d
 DIST gentoo-kernel-config-g10.tar.gz 5035 BLAKE2B 
e965f157b6dadb9c6e355ebe5f9c56625ac69f34a70d6238cd56faf76f7a6583242ea61283c45f2d2cc807ce258c2d405130109ac6e28155849a73871691ea9a
 SHA512 
ad7419f1f183a0380896b3784ff4ab260ff850f2c055156c53f20d2bf3ea4350affaf37aef505e680928ae0f8882f12faeda02bdbd9fc26aed4aaae388290e95
+DIST gentoo-kernel-config-g11.tar.gz 5077 BLAKE2B 
dc17ded74f79baddd703a78084113b85e7130877b300b5fe60453cde515fe37c52ece7877049bb0ef384f74ecfc73d59d7d4a513f8fef7bf4f651599946383e8
 SHA512 
e91156765ef2a48396370f884fdecd7bb1d600e5167f6bad51130520f886e9198adae375adf3e40fa803abc5d5482057775fb0275ab2589bd8f94d8af4a03c4e
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B 
a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d
 SHA512 
7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
 DIST kernel-aarch64-fedora.config.5.15.19 242615 BLAKE2B 
94e59440681535e38137b71814e1ae53f57a347f62cf31e0c1c8571ae43d9ae9be9957743c8cbc9ec74850c964eaabefe6799a28bc311ea7b99ee31391b47fb1
 SHA512 
fb77d3b73a215f97d70cd6d8c96ed20e497786b99ed7d7a7f2ed60cc1251289c1a4c7e058c41b5efac62e4a9b4b3d917dbdb11585955bba2b6584981430f4ddb
 DIST kernel-aarch64-fedora.config.6.1.7-gentoo 252811 BLAKE2B 
f6bad0d23132bf0dfbaa25db928a95f39763b6500fd1df9b4aeca4351e3e75f185891c0df96b111ad840e4bac431d74a9b11e7344e766ab49715663c89e4dbfc
 SHA512 
41ebf195d8b656801d49c6bb693ebe1404b6725d70d88d93a75bc4af230030d65ef0701ea931846b022a3c598dcca068fbc38ecf6d064262b3f5b88e57060437

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.3-r1.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.3-r1.ebuild
new file mode 100644
index 000000000000..b83a3a8e868c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.6.3-r1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_MODULES_SIGN=1
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.6.1-gentoo
+GENTOO_CONFIG_VER=g11
+
+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
+
+       use secureboot && merge_configs+=( 
"${dist_conf_path}/secureboot.config" )
+
+       kernel-build_merge_configs "${merge_configs[@]}"
+}

Reply via email to