commit:     5b45677434ddea96ea46e6b7634b151e14502574
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 14 13:45:58 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Dec 14 18:27:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b456774

sys-kernel/vanilla-kernel: Bump to 5.10.159

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 0518a50c7ad6..9c85d0c854e0 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -30,6 +30,8 @@ DIST linux-5.10.157.tar.sign 993 BLAKE2B 
833fb80728f064329ae8c620b64df6b7aeb72d1
 DIST linux-5.10.157.tar.xz 120509492 BLAKE2B 
7fba765d729366a7f1f3c2c4441af1a9a1bc382d6cd4d579b47f09df6c49d9083ae395b61558776dfd5ac0e3017375c72b1d47585d0a32cea0ebc6b34e3c37e7
 SHA512 
2a77da776d3ee668ca42f87542c5e4a15c806b35949de4b25d9afe0aa79514aad459d16d1a7d6547312ea6173d25250dc867a75f7f66b738b959e47f4724d988
 DIST linux-5.10.158.tar.sign 993 BLAKE2B 
237cdc0e11ed324e39587117d5c4132019b858ba46e1fb7d1dc579ce4c371fd19a2e05f2786a4e3d07348494f10e7f024ab89f5c2a9fb783e5f38daa9dc60019
 SHA512 
1654834834b3ff94b8085aab1e5f5cbc5a36104332c28d313a29f749f80f95b0e8911ee91304a4b2ead117ce1cbc0303b30834cc8906ad53f367cc3307044b98
 DIST linux-5.10.158.tar.xz 120510028 BLAKE2B 
370b99fa0953482269a1d1dc2a8ebf81175b0c10472c271802b6ddee6262502034245df807487d0f1f92c24ca675f1be129a2099654001543a7e2d24c2378c12
 SHA512 
45bcb3c145500607d6328662776a5bd4e2fabe882677fefb5fcbf0377504ed1ca4ccddf1aff0a0f6b85ab79f6e9f91fb1377c33a7e14c7f352fa02ec40e67f4e
+DIST linux-5.10.159.tar.sign 993 BLAKE2B 
102b3a17297dcf024b72499563f716b5034917158bdc1cd59173983f0b9f170b9bea49062da0a891505fe7c8bf8ef2667a9ead69b68ebf0ffb528b5e20d7958a
 SHA512 
d544a5c7ac258c2ee2dfeec258eb502446a59520100c8fa16c7d4e1b4ee66931c795863aa6073b3b54e2e3ec968e1612cd046862add08f9199cef01fa37abf46
+DIST linux-5.10.159.tar.xz 120503752 BLAKE2B 
5ca970ad105304f4c2afbd75ebbe750b87793e9830834b034fe195811df3e1a060c3752a99f53a1cf9d1ce1f6e877e08e638833a1e3d797181adc5a45ec56178
 SHA512 
8427677bd7248abf560dba5402a395a51afb1e47cbeb4f34afddbdacc29b4c92648d651bfc04ec85f16b96b9b8d8d46dbbdec7d112c84f967ffc271633274542
 DIST linux-5.15.77.tar.sign 991 BLAKE2B 
9f4d4e7d3f21a02f95771d7931212f026ed2543c8e7e6c6e96fa83b87eca089c18f131a9242519e13b1c4ce01ae86503097e6ad1b79316c203184166d27d468e
 SHA512 
eecda297590a14f010af600cd757cbede856665d6bd09fb9f95b88ea2650bf4ec18ba7366348d66e898237812311a757f1d640986815dca49bad7869027682af
 DIST linux-5.15.77.tar.xz 126468704 BLAKE2B 
dcb7d95f577be18735f14c1a75148579af40bc35e57228eb7d35453cc8ddf9b6f9f71a7a15608be22049557ba307eabf5df42504f95cd6f414711733ff6b0738
 SHA512 
3b557ad399606deb2e00077da7c57af534ff5bd395297db534a9c643ff6e95b29b315d15bcb453255875785264347949a7e52ef3a676b7dd12db10764a6a5646
 DIST linux-5.15.79.tar.sign 991 BLAKE2B 
49494481a44ee6917f39b985a08f544e3295ece6c1b143cf27248b10975e4c2610d5f7102c9df1606478ae18689429d6971ceccb78e8a06f1d76746628cfe243
 SHA512 
6bf59132c8d773d663209266393b5d327fb60ab7dc6f150aba1ba32cd1c4a47304a28a548114999d208cd24fb14418181317eb6dc7c37c840a489aa934ed5c7f

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.159.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.159.ebuild
new file mode 100644
index 000000000000..beb11365e70a
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.159.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