commit:     83de3ad0464d381c37843344433afaed40544949
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  5 15:02:09 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jan  5 20:18:40 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83de3ad0

sys-kernel/vanilla-kernel: Bump to 5.10.206

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 8ea73f58178c..b21f870759ee 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -18,6 +18,8 @@ DIST kernel-x86_64-fedora.config.6.1.7-gentoo 228685 BLAKE2B 
e68236ccc1d51b2aff8
 DIST kernel-x86_64-fedora.config.6.6.4-gentoo 244310 BLAKE2B 
af982d23c80d1b19f84622298fef525cb0b51680d0f064c8cc940be33b55aeba6e8ee913d13bf33287167a48891e6e26ae8ce4f5a1644714132801f4a8b7c319
 SHA512 
913a9f9aec6898dc3a86611539835861b8d1f1380f699fdcadf52457619d5e6fdde4b9866a6216c50dc5a337cc09fef7b3a00a989cc6f9ab512dcedb15dba8ff
 DIST linux-5.10.205.tar.sign 993 BLAKE2B 
834896e7c7dc3bb8ee0cb66303956c6955a42a203826d4b4c0a2acfa0388fbbf5780b7c363d6f22e84712a3b63a231c2b69538d463f797343b51816702ace966
 SHA512 
d71a88170e1ad38956d7f528a8a3d842e4f40c9543c9006da7ab21f6ce5b2a98e12dd2ed18b6c4f6a52812261a601dab18f410bef407a3613670aa9eac4bf7e8
 DIST linux-5.10.205.tar.xz 120632532 BLAKE2B 
12f94ecd38282581345a1cd497f1f67b90f68b12bd9a5eb5c920e97114536d8c138154fe4a27634194a75c27539bc04af3674bfe590c8a43cbe211d39148b2c8
 SHA512 
681aca65c239a3d6020861b399b1a5548bbe832016c40862529e08dc7078c5f709e11811e6d6bcffbbf0a86c7eea2bb911870f899729312e04653f0c235a3b09
+DIST linux-5.10.206.tar.sign 993 BLAKE2B 
5d3874901b5194646fd5f9c73b6fe723b346cdc3f6e80d51c681623c1b15998c369437c3a16cf5b08408ebd8889a487967f5a5cb5322d15d7378e60d4bbd1483
 SHA512 
e6682e38094aa233fb78bec96846e6644d4b40a7a8c45d0115c0f830ec734c0347df89e263e8853d3e942a8182d31ce0fb3ae716e1e07abc361996ff1f056eba
+DIST linux-5.10.206.tar.xz 120639412 BLAKE2B 
60475da100a677cf59846437d85106aaf9fec1db8c0e4cac61c0a3bbb35280021c22a8ce8659b5d0cf44cecfde9936f095bb3064a348080d1764ae4357406f17
 SHA512 
48b04c27f183fc90fb7ccebba62d4e99bd3272e7f2618c0bd8ea864b89acfb2b4b4f69361774c960685267b52b70c4f7454dfcc61f64e9781939e2374870ee4e
 DIST linux-5.15.145.tar.sign 993 BLAKE2B 
34a28ff96ea10ff95320f528def79964f03076556188cf37aa61fdfbf3ac88097ebcfc69a6459ad51cc5eac65e23b9a57e6effbe5610b64cf357980ffeeb843e
 SHA512 
d9d7134ca047a9d96cfecfaa3c3eb6d52e26a1949736e334576dda665c3b6a6c759d9572b8898b94442cbb3b130f1308f9bc71474a2c5b888498528126710d82
 DIST linux-5.15.145.tar.xz 126579464 BLAKE2B 
f8481b1fec05a75a10d32c512f0600f3a359008b30dce3bac35b00928750650faae013e26bb23d6634618e86f2a700d0342c68869c960c76ead4d415e2c1bd05
 SHA512 
f5b7acf9ed52b70bcc564e0b13b95e9a352196074b093513c7c74ad7f8bdd3c8938a2860c993590b5289690ac344af94c7a99c496218ce597525671c395d5a72
 DIST linux-6.1.69.tar.sign 989 BLAKE2B 
354a497dc3ba0b2c00f374f3339b3970b95b0a83b933d0ad24f3855129379a7a7829b381a0b9aa5eb9c899cb99f8ff4912f28841653a9436cd2149d118116ef2
 SHA512 
b19b5c33c40ad494181f75141653b77ff9ae0ede9e183da5e124f973e500a9d87824057153b3835cea29f3f33cae60b6ea4f3b3506b2d2c3941750834e760f57

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.206.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.206.ebuild
new file mode 100644
index 000000000000..9c5b591d7e2d
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.206.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2024 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
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+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://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+                       -> kernel-x86_64-fedora.config.${CONFIG_VER}
+       )
+       arm64? (
+               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+                       -> kernel-aarch64-fedora.config.${CONFIG_VER}
+       )
+       ppc64? (
+               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+                       -> kernel-ppc64le-fedora.config.${CONFIG_VER}
+       )
+       x86? (
+               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/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
+
+       kernel-build_merge_configs "${merge_configs[@]}"
+}

Reply via email to