commit:     8cb84c3680a4be5b5edbd4539d486e4278ca0f51
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 19 17:31:48 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Mar 19 18:49:16 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cb84c36

sys-kernel/gentoo-kernel: Bump to 5.15.30

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

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-5.15.30.ebuild     | 131 +++++++++++++++++++++
 2 files changed, 133 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 14ac109e4fba..aa12070febb4 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -14,6 +14,8 @@ DIST genpatches-5.15-30.base.tar.xz 1252580 BLAKE2B 
75ba5a37233bd80d4526fb2f8dd5
 DIST genpatches-5.15-30.extras.tar.xz 3872 BLAKE2B 
5bc792aea4f44f106687826ad6dc5474037b743ff20f8ae72b94b117877a81a93e2ce209cbd7a730920a3d548f1dd6155bbfa24ced46bbaba8c7352392de9611
 SHA512 
b727a9d4dbd24478479f86acffe0d1f074c1bf12dc19087c615de03a3e7e6efb8b0144476f480d1c87cfba0dc2097330af1234a2a194276ac9244058ea38b966
 DIST genpatches-5.15-31.base.tar.xz 1285168 BLAKE2B 
3ca09c8deeb3487fd69fe1b26ba36410c67f7c0728767999f640dd8b1655956ec4bbee2006052ded21da4f83fdba736a26610399a7580c874b1bceeda62e9564
 SHA512 
6330597eac5391f12fa6821d66d36fae95465fbf53d15404cca1e2496601116fbc2688fcea7e4093e00aeb241efbb1a22f4f925b5d96748004abb50ae0b21c6f
 DIST genpatches-5.15-31.extras.tar.xz 3876 BLAKE2B 
47b21170f3fe46257b20f4cd63288a8f61a3600746883baa2931253d2924696e4d445404746f1a656adfa390ddf8f24780ec6688aa835467deb75dfa0d9f2fb4
 SHA512 
c0f866410b3436f5c45c117f1dc49e3b1d99d77d41de66ca6d08213daf6bf3eb1e8875e75e1674c3f78c7beddb6dfa2d47dc9fb75f8dfedd169f1c3478b74db1
+DIST genpatches-5.15-32.base.tar.xz 1289524 BLAKE2B 
4fc3b82df9a96c5e91cfb93bc68597afa1524bc8c1a49f9a803d72610307551b9675b4e014c5ffd0b3e273b2a660546f274b27ab5425e9aa6eafd03719e5ed74
 SHA512 
277957056d9c8c8cc8f6a5a26582f35ae594c26e6e29b755b9214a91624eafb2917c67a612c231d8862831f4aeb34a725502c57e9063432d9597e24abf913947
+DIST genpatches-5.15-32.extras.tar.xz 3876 BLAKE2B 
6dc352a080f10cafc7a24503d515a451996a3c6940b7cb44dd661bee0125ff993b1c4594e808a087b2d15e640b8b921b37a4607e0e8312645fd0ba5c84fd214c
 SHA512 
8d6565a8a5a39267b682d592cf757dcfe2e7f33789fe26a596ad5d400f1821f37081a37bd25cb6fc8cea28e83448cef937e772b138314fb239ba83a288e94d44
 DIST genpatches-5.16-12.base.tar.xz 589172 BLAKE2B 
97e255628a387adc723a6f9bd5430860b1b9beeee2e7cf7a3106ef7219bf7d9ecce1b640181c277b725ee967846e7531bd9e0be1310ab63a43eb321b9dacd402
 SHA512 
7d298161666cae130bfd21fa1279245048cf59d78b9f237c063e0f3d4de47584736ea02267e96a948169c7c91b8b4d2b699136765b8a3118fdbd77cfb20192ad
 DIST genpatches-5.16-12.extras.tar.xz 3800 BLAKE2B 
d9c10bc2a613a2bb665c5c9f5cdb3be1383762f366066f65921fa2e52a8de492493a13ddec71d18925a90450c17f1ec185e7e19adf3400420723894dcd8e576d
 SHA512 
2be8582426c64d37916ce072cfa6f30310628dff165c7d292be94be4a7124ce39c2a6ea6370ca0190aea0f0841693ba57cb9109c9340e50a4cbfca835a498670
 DIST genpatches-5.16-14.base.tar.xz 685420 BLAKE2B 
2d2152d6bd21f08de875946418c528aba0a319cf1a8cf13d8db56755c86482f0377c751a75123be1b955795163ee488a5d4faefde80025124fbb06dfbc6b8a24
 SHA512 
2bb3d401571d423f7028845063bb98590a0588c7da91a97d4b7ad77e0a20dd30af691fea1d54e4f8f987205072d558890cdb212b55688e32fb135aea10b6c047

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.30.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.30.ebuild
new file mode 100644
index 000000000000..4534244b9df2
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.30.ebuild
@@ -0,0 +1,131 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+CONFIG_VER=5.15.14
+CONFIG_HASH=8cc461d9cfb256bb831225bb38e29fa944bd890f
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/";
+SRC_URI+="
+       https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+       
https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+       
https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+       
https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+               -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+       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 ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+       !sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+       debug? ( dev-util/pahole )
+"
+PDEPEND="
+       >=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+       usr/src/linux-.*/scripts/gcc-plugins/.*.so
+       usr/src/linux-.*/vmlinux
+       usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+       local PATCHES=(
+               # meh, genpatches have no directory
+               "${WORKDIR}"/*.patch
+       )
+       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="-gentoo-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