commit:     5487eedf3129108bd1980433a23f7e9ef484b044
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 30 15:29:56 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Aug 30 18:20:09 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5487eedf

sys-kernel/vanilla-kernel: Bump to 5.10.193

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 74148283c8f4..c9b6ff5b2000 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -30,6 +30,8 @@ DIST kernel-x86_64-fedora.config.6.4.3-gentoo 233494 BLAKE2B 
15481955940dc58447f
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 
0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200
 SHA512 
f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.10.191.tar.sign 993 BLAKE2B 
e1111d38fdcb966d68938bcd63d04fc2d40f43e572451b14898b9166de1cb1a11b24b125bb5dadf09322218cae28d72fa20bc871e44be27552ddd529cc88be2f
 SHA512 
ab5a67772fe50b598f97af77ede90f8f460ef5cc7e18d65114ed472b814d4a8a27e8056be162f3c524f9cb6c55bf6cd3a6e608b9207152d53239e972330485e6
 DIST linux-5.10.191.tar.xz 120603864 BLAKE2B 
721f760a73fc2e429272e95b288d7e0c6f95cbd6ae3d87384ec534b2a294b52f8c980170dd5c6f22955225dd6aa35797a2702a17b2a1c9438d0c134d6cf003f9
 SHA512 
d80b71f27bfb70b574d944c3d1cc6ec31a42bf9764967eeaaeeab4e40248efed4e2269012d6d8f9c598a3573e6a996833c35499abe60d50dab82c3a73721984d
+DIST linux-5.10.193.tar.sign 993 BLAKE2B 
4f64430a8d9c6343f8ee2bb6c85b32180f5599c7216aefa2e087c55f3f20225f4adf110a358cbe86f73fc51251b4230c289ce25d9d0e15ac1b0251828db11e1a
 SHA512 
04342ff5d69fa43122a236b770b0037677452409d676fc70432bc56be2e6c145542416e077038e1ed95fa434b3d4a7bc973d7cccbe62097174841297a0b1b050
+DIST linux-5.10.193.tar.xz 120602696 BLAKE2B 
d7aaa4496a1233a34b76e3b08207276079f11447244dc2128c582aac0d1f594e0f9d6c095c8575fc4a7c03e58e40d47c26ad72012dc1fe6653dbd1f8007c4954
 SHA512 
169c18c52b97f98b7cf3524b5dc89a69bc36aa54e9c935d68e5b46963b99d9bd8eee5ba52fedd1798e28960a9e842e7aff9ca68caa330b0e954686917779740e
 DIST linux-5.15.127.tar.sign 993 BLAKE2B 
84310652ba933bb13ff2b0442eaedfcc56d94e0adceef77009abd7bdc2d614d1c61c83041b57adb62ac6591e7e127cb65f2557a29e6c89a616b84f07e89611ab
 SHA512 
b34247621ce40eb2131b1c5c320d0ffe706010439b81238a1d28c9bddee69c0ca7575f90c7df86a92af4a6da520f42624e5cc39462eb0abc6de74a006d08af9e
 DIST linux-5.15.127.tar.xz 126542840 BLAKE2B 
3c5f6ec2b917099deff2bafc2c144f06ddf2274f02ccee386cbde34323b7b7dc01b82f5914b0165c2e9dad48a13f4fbd22aedb25e7a07533be3becf90e7b7a9e
 SHA512 
5245a87e10c986657d42dc78d0789905c1e61cc0af5ef619f0ed73788b0192375a8996a340e693604305cfd15ba202023fa4f4575ad4a7a5a38edf73aac892cc
 DIST linux-5.15.128.tar.sign 993 BLAKE2B 
29542245fc2dbda9c586685c3248ab2563819c58c130afc3d54e579d13d094591f7b586308cb5564b81ecb968cb839863babc917f88f1feda785adbe8c8c870f
 SHA512 
ee6c022bed702db161a3cd05bf5688a9ddbcd175dd426ba3f6ad0261508ad15b11ce584a1d1d97f8828c800b70c4583085cfdf7cd21a5b07a08f2e95ee1ed791

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.193.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.193.ebuild
new file mode 100644
index 000000000000..3d406f474e2f
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.193.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
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+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://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