commit:     379542615ec4fdc6be141e99a1dac4384edc55cf
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 14 14:27:48 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jan 14 17:25:15 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37954261

sys-kernel/vanilla-kernel: Bump to 5.15.88

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 03c1afa77875..d6a3c98aaa2e 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -40,6 +40,8 @@ DIST linux-5.15.86.tar.sign 991 BLAKE2B 
18dd86da143bb3e3afa28e9de2778ed384d44988
 DIST linux-5.15.86.tar.xz 126498884 BLAKE2B 
6d088a5abcc1a8c56c2fdf05932f757ad5bbca48f5e60f5a302b2513186b7519af44daeebcb2ac96bd30967c58967426a3b33f492b22b5db7d75d3bd81411eb4
 SHA512 
5acbf5e7ff56484b8a4eda3f7e1662029eb2bc7621082386887ba893bef172da49512f1a6e05c590c32e591c3d8b1a41c6a11fc1befe5196f28e60c9f0a7b22f
 DIST linux-5.15.87.tar.sign 991 BLAKE2B 
c1151b495ac95643e4508424a7ca7e0b845d0a7dd5b8a1c0059698450905461203128909c0b06f65dfaf5bc40b16150c12c8543631c35d452ff5875c048d8f25
 SHA512 
958080d6e5508c91e1131005f3d004d54f95c3b9f1ace941721f149ffed3ecd8974c1a15b3ed191f904bdefde33c0f5bb13f697261dfa48f61d1a0b6fa18411d
 DIST linux-5.15.87.tar.xz 126508400 BLAKE2B 
3a98b315a0734500971de4a6d1e5d9e66ea7a5ec84db54fc5f84a89d00b071deaf29a4d4ceae46da71db566d5539d0ed7037d0038f4fbd3c59f18416bc004b4b
 SHA512 
f5e9d5eb2555c6a879ff11d30d355da18e91693b9eb7c42249f30da170a568b9d3878cf83ed0a25b1210f20fba907539653a8101872a111438f7cc7df6f70f7e
+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
 DIST linux-5.4.228.tar.xz 112978736 BLAKE2B 
ade9b21e3f434435230e31d67d39ea07d15d92cdf932b3b181fc532669f10ebd2f0eb7d5fb20ae9eae93c782f10db5ab3454bb13c01694f674f83146bcae8187
 SHA512 
f3fa33da1df3dd10ba9536d30b8aebf92796abe84872c402776c94b35bf3efb4256a6c3f0267bd97741db9853352d1b22bcb42d7d03f167960804bb9f7407601
 DIST linux-6.0.15.tar.sign 989 BLAKE2B 
214ba7092718635f5dd39f2374615854c276e450ee81b8811b2e5a9dcff300eb38c4acbda4ebc1dcc0d7a2866e4a6bea8c2e5280309428164df8294bc616f8b3
 SHA512 
f39bebbb1d60ab7457e861ac7005a5cb975cb53519d777ff66119d2ca087f9a654cf1f11ecb4f7b58af6da574c698dccc69c9daa99ded277da178593c5fdaf76

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.88.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.88.ebuild
new file mode 100644
index 000000000000..7aa02200877c
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.88.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.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+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