commit:     1c6987dc03adbbe6bf5e31875d529096761c6f12
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  3 15:14:05 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec  3 18:31:58 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c6987dc

sys-kernel/vanilla-kernel: Bump to 6.6.4

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

 sys-kernel/vanilla-kernel/Manifest                 |   3 +
 .../vanilla-kernel/vanilla-kernel-6.6.4.ebuild     | 140 +++++++++++++++++++++
 2 files changed, 143 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 19dab24b630b..6153602ef1ea 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -1,4 +1,5 @@
 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 gentoo-kernel-config-g3.tar.gz 4411 BLAKE2B 
00edc4b5dc943834bc7ee977382b2960160888db00a25c5a7f73968784aa39a2b3b69f0bbda89b3ce8eb55e746006cff2839481493ac8bfca6a21de2299564f7
 SHA512 
44beae869bebf5445655dafe1facc47c3dbe602b34c5bf2fa984a581bfe3250fa0df908b8807c333c2e66ab9d1a2bb8026e22140f2a1f522d0dd647c96ca4d5e
 DIST gentoo-kernel-config-g7.tar.gz 4625 BLAKE2B 
72ba0d038ee34ca5eb26d43bd373735aef3a50d02b414993ea05485e49d83d46df98a6cb0f6f3170a8ec0c99b557432fd9a11cbb92ff7c2837625a7f4469831e
 SHA512 
2d74a8ca9f5402b4290ed93cd3ddba04a7f2ff42c8d8d3f2cbbe22fc20daa0fca119368daa8af39b7a26b1b99e4e3187c3c5d95886a651675ad94ff98d686628
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B 
a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d
 SHA512 
7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
@@ -63,3 +64,5 @@ DIST linux-6.6.2.tar.sign 987 BLAKE2B 
ab95e7cb07242a79f94183fa3ac00414892114ff95
 DIST linux-6.6.2.tar.xz 140047368 BLAKE2B 
88fc55107834d4308d33547211a031674ffaa8e48e23d6612ba39430292b18073d49271bd3ce8c7be01d8c5668482cb1715071abfd9b1f75b06468a09f8f4eec
 SHA512 
8c4b1213912190a17c8f54f92dd4eb38e7641b637c9a0b440f2bcd6988d1e22aa2f7d06c4c942d851cc918143e0fc56cfe9821938d7a1c96030595da4d88b487
 DIST linux-6.6.3.tar.sign 987 BLAKE2B 
8ec23316d5a9e5a5ece7e2ef707f7e0aea1c40121ff8135bdc5211b7b314357847c8a89ccd9e8dbe9ac8fdd61600110d6964248a17158e039afb1ca971a156fc
 SHA512 
855dbbd68adaeaf43f1126e3df0076c856262b396243cdccba8a74ab4f37a2928fe676705ffdf0be0883a3f6052a9be442894857650eb4597455d073f929205e
 DIST linux-6.6.3.tar.xz 140044432 BLAKE2B 
cd0d70316592fface23a6eddb9d0f8b0c67593f5466388043ebd68613be4eabc3e7c712ce758fa63dd11603101d9d91e22b3552b436bbd1c76f8e19208d7bf22
 SHA512 
012ca973ad421571b4652cfa45afbed4f6693a7962a494f77e0eb13c4b9ea1c033525f0fc070ef45089e12d0bcf7f68cc5f0798f2b406a860c7541e1f600eeda
+DIST linux-6.6.4.tar.sign 987 BLAKE2B 
661f1f670b8cba873935cffd6c89ff31914370a90e9911c2c95f3c8d495be55129afbe8e74e0cc9bf0ae370fb663037f4c6617acac9e6135cb40ca68928e2dd7
 SHA512 
32c66878d75ebe269d52328e3a3240c2e52ba5f7b51e427a69c09e23d52a78202322384865f0ac4d99ec652ed8a1fa7cd77a8084f0f6a8ade1cde602709fbdce
+DIST linux-6.6.4.tar.xz 140014580 BLAKE2B 
75f20de7474f45966a32f7a1e5f9beadb2b4e111fe9c0ab769ccaa203e798f1a1b0ee05c3cb14de6bb609e2e9df1e238deeadfc21dbf08c6b407c9530bac11ef
 SHA512 
f2b7cc7442375f1015d16bd3b4d5c91b14c8720dddf7db51061f0f4f297a1e8ff4ef1e6fe21aeceb961d1747fd5f3eaab9fd18935a372515c5991222ac8c89a7

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.4.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.4.ebuild
new file mode 100644
index 000000000000..db6380a2a0d5
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.4.ebuild
@@ -0,0 +1,140 @@
+# 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 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.6.1-gentoo
+GENTOO_CONFIG_VER=g11
+
+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
+
+       use secureboot && merge_configs+=( 
"${dist_conf_path}/secureboot.config" )
+
+       kernel-build_merge_configs "${merge_configs[@]}"
+}

Reply via email to