commit:     21aed3c8a4d5ce1b471f5b044f2493ac88c353d8
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 22 03:09:58 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Dec 22 14:13:38 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21aed3c8

sys-kernel/vanilla-kernel: Bump to 5.10.161

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

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-5.10.161.ebuild  | 134 +++++++++++++++++++++
 2 files changed, 136 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 5c2d71e66ae0..cb0e881ef29f 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -24,6 +24,8 @@ DIST linux-5.10.159.tar.sign 993 BLAKE2B 
102b3a17297dcf024b72499563f716b50349171
 DIST linux-5.10.159.tar.xz 120503752 BLAKE2B 
5ca970ad105304f4c2afbd75ebbe750b87793e9830834b034fe195811df3e1a060c3752a99f53a1cf9d1ce1f6e877e08e638833a1e3d797181adc5a45ec56178
 SHA512 
8427677bd7248abf560dba5402a395a51afb1e47cbeb4f34afddbdacc29b4c92648d651bfc04ec85f16b96b9b8d8d46dbbdec7d112c84f967ffc271633274542
 DIST linux-5.10.160.tar.sign 993 BLAKE2B 
d445a61fd7117e2875830bba05d60d84b9c77e83d25a72707e4f987d53206ecd05b232d08bc9f3864c286b0370e600412c52bac75705fc549bbeb45edd712c45
 SHA512 
f5331dd0a79cb88d83a3a260152ec58c38a5ad8d8466dfc42c614f2e1cdb81847ad92043eac726cfbca2f5351151008785ea56349e9d80bf8e1405645743dfe9
 DIST linux-5.10.160.tar.xz 120522072 BLAKE2B 
34eb54371a27650a03903175ddbc45952f49808f48a9c5fe69e5d6a2b77ed7171818137c13a020df9df3ec7981d1ee510c8492ba35d2ace739eedf3fe8ab71ef
 SHA512 
cfbae7c9a332286fd3122bb785808f3d7edb6d94ab17f3d263a4cb19f614633085e9e4f595368d263b80a8218d186911792631b8eecfa9c4c91a31315598b28f
+DIST linux-5.10.161.tar.sign 993 BLAKE2B 
9237c5037a39e92c2eca9b2c16de865ca5ad1155fe937e781027aeab18d353c4fbdafaa912c27e73c6f64a4e788b8f1cf5b0317572dbd87dfee27074bb715679
 SHA512 
9fd26a9b250f38d395d9206a7d87f4b710a72774284a48b99f9fada48e241a513bebc8552247f951d498d453fd32fc06a93987e95548f39c861a0671d1fc9e0c
+DIST linux-5.10.161.tar.xz 120516432 BLAKE2B 
b35e08b3ed843fe0d0ea2a08728f192ab795b61438a60c148097c8bc00c1bdc9b6bca925bf4e3cd124ac3c5d50920f2bf1a481c24a97b8787c012e3df993d8bb
 SHA512 
aad3c70cc6eef39623ba038e74fc5435764ab81cf8782d44ab07c50f50c66f303d1cd49b439aee46193caaa43f4c322924691ea5e3ac2b01142420efe11700d5
 DIST linux-5.15.83.tar.sign 991 BLAKE2B 
337debf039fbbcd813e4f1ae586776ef09c5d8ed1d7b7e4724136f7ee316356df012b0b9baa8c7bbd08f60df07fea5a4f81c33b5be510af8f255415b7ff501ea
 SHA512 
1880f288732819ff0e47cdc8dc4a4c20450a1b0ba8476fb97fc5d956ef4889be3b87cf4386aed4ee2e3fa7f37749247730087b099a187f7d11a700d05531748e
 DIST linux-5.15.83.tar.xz 126480920 BLAKE2B 
37a926b2878218e95073e2820c4d1a9dc773a1715c8ef819d6b914ec672e0caed92cf9ef27405ddea083b8bfcb9de9142c269a29c0845140241de244035b0737
 SHA512 
61b12dcdecc96b4fff3cb2596a3da345efb8c6930ffba7ed73930e6c15b1519d8d44a4e86cf281b41c81d993f7f7ba0fe7b6513863fea298039d63cc819ef4e6
 DIST linux-5.15.84.tar.sign 991 BLAKE2B 
a1e14f6d1bda8288c5170436387af7bf4d35deef2da3e0af30ae025e3e3801ace99c2d52e15add896845b20e9eb8ed8098d27899fbd23a19b236eaed9cef431d
 SHA512 
d68510da8e8da8d081ac2710d32bdd5f17d74f45e0bf7f977fcd531ed920b75d3dd0aa7bdc963509610fd3da8bdb652de6dd30c80c402318e35b43c4905040b4

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.161.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.161.ebuild
new file mode 100644
index 000000000000..beb11365e70a
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.161.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 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=g1
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="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=${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