commit:     b39d5e48bd9d2a95c5d3c2a866d6af842c087aed
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 13 17:30:22 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Apr 14 02:18:53 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b39d5e48

sys-kernel/vanilla-kernel: Bump to 6.2.11

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

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-6.2.11.ebuild    | 137 +++++++++++++++++++++
 2 files changed, 139 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 3493211d3fca..225615e89280 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -84,6 +84,8 @@ DIST linux-6.1.23.tar.sign 989 BLAKE2B 
419f3bd6e476139813cb84fd8bca9ba57347940a6
 DIST linux-6.1.23.tar.xz 134868752 BLAKE2B 
49e806ad62fda82dba900c008fe84bb977ddfb9a40ec46a8dafb0f7ebe77f767143a0d029747e24b088f75ac83bb3177ed33dfe10ed2e29b980e4287ea9b3351
 SHA512 
6b57cff7222e3c193f5b54f8381b18ee3f15544a8c8cd8c5c5eb5504044e2ade93744c0324bd275beecbcc1dc4ec650aed4a563ca575aae764b14c785584f661
 DIST linux-6.2.10.tar.sign 989 BLAKE2B 
5e87f3049989c378759f28be42622fc880d211b68990bf0892f81137363d40abefc32ca2a3cbf27cc8b1ada5ede67e7c29f4a1c6f77af59a60f637454fc62c1e
 SHA512 
98bd960221afb83db7ad59fc693a2cbcc1394db0affb0a459af2fddfcc6ee441eceac9d322f60abe91258d45f88c6cb55fc884803167f8c706e826f0b9f7db72
 DIST linux-6.2.10.tar.xz 136456416 BLAKE2B 
3005c2644600e700892a6f20ed1e9f65b56b8891cabcf1acfe1432fb55aac86787f40fa7e197cf2519b8a8f5d737ed5638c7e1ab850b4694554a87be14b8a5cb
 SHA512 
56e55c4339f381fa4b99f50c647fb0c2339b366126f56ec91aa6a41b64b0d2f4cac2f18a0fd7a9b984616c1009e285ed9e128129d45d134c7c01918f11a846b7
+DIST linux-6.2.11.tar.sign 989 BLAKE2B 
d70a33f76f212dd29e2ce816510fa6e9382714786cf1d4e01fb1e88f0a32b288200673368534cb3faca2cfb22a4362dfa5d6afb7b0c15498b0b99ee11f8ebec6
 SHA512 
59195fe16a854b0f23a000517f5ac872269c41b3320c48f586ec3c61be3a17124c3d1f109a2826cd3cee5fa01f262b6e9e521520a6efa581b08e983352f86ad4
+DIST linux-6.2.11.tar.xz 136473816 BLAKE2B 
966102d551a6bd4b4df453d2b2ea801c8992536e030a17dab2b361def6ac0e45a63f8e348cf762e22be97be65a670f5c3fc71fe01c14badbca3197b367b4e140
 SHA512 
2ab70b29f2489fdd1807d81d9d3c12c9cea3e4822d3f9311090291187d35506913cca64c675fdf0cf34034e1e362e7f1989697589eb03a4080c3a4d218a98107
 DIST linux-6.2.6.tar.sign 987 BLAKE2B 
dc30795c15693b3ebdf05418aa418e4545d95731963035dbcc837367227e882a314a72a1e5110482df2b53d3ac54626384f4f7d26b41951b69f4413d76e01c73
 SHA512 
dd6ba22c6ad1a6ccb64b4b7cd77ef1ce8c6c5550026bdbda636f58e88ed91dc36aa7cf1c362ec1a42bb46d82369e5dd66a7aad1e663c20577b68d69962592887
 DIST linux-6.2.6.tar.xz 136460416 BLAKE2B 
6c8e064752a4c3fa16d3f8ee2cf05716e82b0154f67c198f10864174d95169c99396390094ee5b1ce661b74b7d1e749ff86796af53428006bb882ea17d7ad21b
 SHA512 
6164e45b003c9cf17e26a35cf43b20884fc0a5886bf759639cce414b4dc2af7da7a0d39a50b41ee7844cc52fc9e75190999a06880916dbcef68af35009006877
 DIST linux-6.2.7.tar.sign 987 BLAKE2B 
527bf1b3daf6b0d37f21c30a8bc4195193eb99119081ac47b1ce0973352acef64e706a9c321649929dd4e168bc553423912b4f2e41fa632bddd70290dca43fac
 SHA512 
63822c312e085859b1890a3b8da3edbbc30fb8048d7f3283fff9e2bafb8d107ac41e3d39726df41f35c701fe83a19c622d6c22287cdfbe0a94d5d0abaaf6e008

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.2.11.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.2.11.ebuild
new file mode 100644
index 000000000000..1ec99df30db5
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.2.11.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2023 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.2.6-gentoo
+GENTOO_CONFIG_VER=g7
+
+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=${BROOT}/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[@]}"
+}

Reply via email to