commit:     9d74f69ab6926d322750a143e1cdebb32d64945d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 18 12:07:08 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jan 18 16:21:22 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d74f69a

sys-kernel/vanilla-kernel: Bump to 5.10.164

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 5b5005f5f987..bbfc01295d70 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -23,6 +23,8 @@ DIST kernel-x86_64-fedora.config.6.1.2-gentoo 228931 BLAKE2B 
9cecffddfc2799acbd2
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 
0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200
 SHA512 
f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.10.163.tar.sign 993 BLAKE2B 
e085bd8633c659a431f1d6cf070761238e2cd52b63421be67870009afbb90316cdf5ad6c58cce17614cb0a06f067f5daf22d864aa00bd9940b59deba0b31a294
 SHA512 
6e6d962157828fddbae6c98d00c27d22efb3a2cfbb45d3dccc86ca1a73e6d70f80e5a58f92469e18a5448237e40b77c995623deff88fc328ff333d48fa91dbac
 DIST linux-5.10.163.tar.xz 120553276 BLAKE2B 
a9806d2fcc28783976a78d5f1fb4d10f1523f0fce35c5bb04485cf54db843b505350be3dbd31bba2b528289bfc97cd2719b54756512409fd03a158f37cc1940b
 SHA512 
8c405ccc8e0ab1748058d7e135ccde5501500d535fb8c2023c4c6a399be8957e5d6f9398ff30769078bc8699509db333f158f79fb8a6e7b816aa1ec413ba8ea1
+DIST linux-5.10.164.tar.sign 993 BLAKE2B 
cfce5733bed718ddff6fa41091db7a00f3a4b08dc4dbc12a46eea98cebaf67b8e595bd92ab44d36212aa6fbbed44c3908de7c5d6e5737a186ec36309c9e66b9e
 SHA512 
2e3df6768b6f8986b80b281fde639cb9ff356fe61150d3269827770940a44ac49764ea07696d76a6c7eb9c537489cdd7c3f7bcfaed14f0add5038ff7b29f1e1e
+DIST linux-5.10.164.tar.xz 120570784 BLAKE2B 
ada524ee102ce8f6fcf75f58bd288a50927f523f3e483a6cd3c1f3d0bbf5bb27853a1c851fd5ec0e2f210b8a6f7192d163bbc9731671a3f2c71438356cb7e17a
 SHA512 
f3f2df99b5a7d32da240ceeb0da77f4f3b3514c16e8553ee93b05b99234ce059bd67ef43c8b02718b906de98f02b1bb3866f132647bcf2ab3fc4a19ddfea49dc
 DIST linux-5.15.88.tar.sign 991 BLAKE2B 
928ea938758c904971cde08ea5d390ee483eda4ad5c7ced83d606e219d823966bd6ea745c64b2c954e81d444369507d57cfa3b54e18e433d9733325007fca93e
 SHA512 
b9f1744190bdcb220d8a17b295784aa34ca0ab7035d4fc832dab0605ce665dcc9ac356ceefdf47a2996dfd33b05b0ec8a2dcd66c785146c756cca74ad10ad0a2
 DIST linux-5.15.88.tar.xz 126523892 BLAKE2B 
26ec7427e3370c417a048ca76f394cd9aeb25f6cf8b6bbceb074707a85c75f668c8d70c9f1b19cd05ce33212f259736ac1b554793ead30a007d1745d4329879c
 SHA512 
2ecb84f7800a6fe22577f890c403e2bad383a1638b6a176c20cd8d1311ea433c016e08ef00d1441099c1dba974d82c4211acc190c8d59aaa9feb12588af1b348
 DIST linux-5.4.228.tar.sign 991 BLAKE2B 
4edd63de96c2cceeedf8b20ab4696fb4c8b8e45916d95ea9279de4911874e4537aa8f8acc4014545746d4546bce66843a3e56d56c90592e730e4ae1165c1486d
 SHA512 
72be75fbf5704706d6d772a50646550e3d54458044e5fe5a49afa7dd98360f30b0a4e345744e691b09d8951712d1d766d050846fa7ce13bbf4f1e9dd26063d4d

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.164.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.164.ebuild
new file mode 100644
index 000000000000..ea9242645ebf
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.164.ebuild
@@ -0,0 +1,134 @@
+# 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
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=g5
+
+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