commit:     020725bfc399677887a98eddb232c7d245ae4e9b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 25 13:00:16 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jul 25 15:51:41 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=020725bf

sys-kernel/vanilla-kernel: Bump to 6.6.42

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

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-6.6.42.ebuild    | 143 +++++++++++++++++++++
 2 files changed, 145 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 804a7be97170..b2f8a55b1b66 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -58,6 +58,8 @@ DIST linux-6.6.40.tar.sign 989 BLAKE2B 
295980cb36ca4a2d847bd7991fb7ab683f658a579
 DIST linux-6.6.40.tar.xz 140299288 BLAKE2B 
e64e9a6d37076dd565399b40af1977eedfa186a244041fcdfef6cee7b91d6a9e0883c3bfc9a1daa98f1f8cb99a33d5705a5f776cbb82aa95e26dee08228a2c62
 SHA512 
35509307428059cae4e6c0f0ba78a4423138243b4fcde719da36f5ed58852baa8f7468b3f773f4d11cb314f06d9bdd3ecda432aba31b49bfc61cd40aebefa7f8
 DIST linux-6.6.41.tar.sign 989 BLAKE2B 
91e81c3582abc1124f618d89cd68bd32b1372a3a54511b9f60159c0282fee1dd12422beb3bfe04c2d74cd0901a39dc3dda34e4f34269af2fa8d4f3603e373345
 SHA512 
3c1a498443999bda491832d6fe842a3ce83c65fcd9ee1fcc24beeaa273fe6dac0e0949151595ee02e04b62a904c6d0f3b1c972d41e01f58e0e2ce99bff4359cb
 DIST linux-6.6.41.tar.xz 140257040 BLAKE2B 
d71b2a108a600aba232d2cce9df0f8d0bd6408427be31e5185fd3dcbab36a847bc497eea6237974f76f6386d3e0dd216cd7ea3d2a9dc660bc5460042f1ab7328
 SHA512 
d623e13d482683c47b1e00e346658928597522b45fca94b6713e75dbd57deca92cf6b1189ddaadb7b37a04e509ff713eecc76f5a818f241e328635f77f09f504
+DIST linux-6.6.42.tar.sign 989 BLAKE2B 
6a97f25355d99bb3e85c3c60ba349baa5a7ee80dc3187bd4c8737f8d8bf53d3c4e9acdccf757568371f8234dc03c09359d0e90d0efdf1debdc039bf41e5f6000
 SHA512 
47be987aa60306623f3faad91cb64623d122a79f87074235d33e588f347a27c41741f5295c7252e3b1a543d1d651b33365cfc9bc728a35f56ee622c516926764
+DIST linux-6.6.42.tar.xz 140266944 BLAKE2B 
7a4537d37dab44dd04b973ff2ec3d2fa8407d270477213a745c50a624bca0370bd7229dbe796e4531ec4fa2731cc8b32bce1940a43f62d53d1d57aa51f5f9785
 SHA512 
3e7d8cb2e2996c19f6964eac9b8addfd083487c6eda59c89bc791fab486351fcd31bce8a4cd2feca30b9db220d117106e9a207147dc35a17381d3a94439412e9
 DIST linux-6.9.10.tar.sign 989 BLAKE2B 
c91b7e7d5d49fb3bc7563bfe302cbd1fef504da6ff151d4d96ce54a7808989c6c3064bf383e579e702c497bbadeb66e9658c18a75edef3382bbf5f2807e5f825
 SHA512 
95530a66459c94ad50106f0ce15640ce997aba320eb711031aad99c8a9f5a9006052a298fadfacb420550fdafd749e24a8c820d31c7315b65143e82c2d818161
 DIST linux-6.9.10.tar.xz 144133252 BLAKE2B 
e08cce7f271cfda05c5ad777d06cbb04b57fdb7992d10d24f9e0193cae185d02881cc089bab14639a058cae12d1f89ac79c7d0be528c077d8b09d385dd3fa616
 SHA512 
043885652363f935049744585d72fd7a1fac30baa6fc222f4ef8ca95b66d0ebf0c9492fdc9208009a849527076d1f6586ea557cde75aaa547e46e624ca759625
 DIST linux-6.9.11.tar.sign 989 BLAKE2B 
18272102fa858d3869b2b7a9482f557558c68170ff7893cb0d49740789afef627f7b97e7fd8dcd8c83e09a7820c0745b40687ed41bb5ae7fb1ac612b2683fabb
 SHA512 
b725a88bc1617bf888d15921e6a14fa7b5433271372daacc6631a692f993e1d5be553acc1c7f9c95b5b54d1f9a57d5cc05e36e8b5b2aeaa3aaee8ecf4464a08d

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.42.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.42.ebuild
new file mode 100644
index 000000000000..2de327030b51
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.42.ebuild
@@ -0,0 +1,143 @@
+# Copyright 2020-2024 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.12-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 ~loong ~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
+                       ;;
+               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
+                       ;;
+               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