commit:     fd616408f87187ad340302daea2859304fac05c9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri May 12 01:39:27 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri May 12 11:50:05 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd616408

sys-kernel/vanilla-kernel: Bump to 6.1.28

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 299b190ab971..60aa8f98af9d 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -53,6 +53,8 @@ DIST linux-6.1.26.tar.sign 989 BLAKE2B 
d0643c70d59f845548dd346d3bfbdaccb6ae19587
 DIST linux-6.1.26.tar.xz 134853116 BLAKE2B 
ab5340a444c0af1b44c5d994a8d26ae69ba298ff9e125365a00f7dacbbbc35ebf0d45332da843998540879722958a718d94c74ff204b930c7f54eed8188b59a6
 SHA512 
342f2882189c82311b2abd8588bb8eb43fdcd7fd94d4168dd392c10c68be51a3a927c18b4b4fc45d8f56e3cdb2949ffa31a6e613182cdb24278d7f99e8ce8913
 DIST linux-6.1.27.tar.sign 989 BLAKE2B 
e4577ac0dfe088818c81764fd430d288308aaa7dedda6859cb35db15098c9dd21b47d5327da1d321bd6d7f3100a60381b1758c34a877088678d329fcadba7530
 SHA512 
37f2f75c2cf8a8088d52e0905400922ae6a01917111252a9314418d4f8d63b2d954c497c098f214917f578d95f8f50b5654c9ff44d89dbcb4dc0e45f43947639
 DIST linux-6.1.27.tar.xz 134888224 BLAKE2B 
5d7ec9a6a2652abbe4afb70174a63f58d495291d522087f9adb33864063ce54e219fd6e426793077a346338ccb4d9d753a60cb76b448146fb592ff17c2618792
 SHA512 
657c241c8e4d62dabf7f1789c342352f757655129b8b21d92d3a90859d24f5f05f33aa39491851f690f7d9b0ba9234c47907ae05e1cb32a8d00fcf11ff71c61b
+DIST linux-6.1.28.tar.sign 989 BLAKE2B 
c3ac2b197c826885b5b03eb9e908cb3d4465ed53cb5434af045ba7f184acfb810b5254d16ecb72ea47123efa7fb8ea03d67ca945df4ae3b37858f4829674aa6f
 SHA512 
31ff5857d2055a0c289d049b873e428757b8ddbd2e7978751ba4dd1161466f8a5965062b9e0c0d0186a8cc73399140d272fdf5d78063bd52c355d141b8b76462
+DIST linux-6.1.28.tar.xz 134884320 BLAKE2B 
f840274d9e1c5af90292bce6afb8b8b1a81b4f8ef82691a1cf28ca2d6cf680913c2668ddb086e1fa4ba4112e9d8118a674231374c14a06a911ddb3d2cf8ac3fb
 SHA512 
7215e62df10847e8bce432880e0756e8a5f56eb8b8abb54f9e1eb8871ce7bd56d765be0f9a40a8dae4d135b2f9a0dab7f6b3d2691d73b0c47f05811194dee8bd
 DIST linux-6.2.13.tar.sign 989 BLAKE2B 
9109ab0ebdd93de0906382f65c4ff7da00ebfb94cc5fc12aa6896ca291816a51fc3d3284e25d943909e99635d716327c14828c33ff070dea3de5ada8260c98d9
 SHA512 
fd59cd27174a984b0fad3b2288a9cac311f178272ed0a4f21d5ebe51e0d2b55efeaed07d3be32999be53c7d0687084ebcde9bc714cf04ffafd0c9bb64a3a6c2f
 DIST linux-6.2.13.tar.xz 136481716 BLAKE2B 
94d9032a12ff0f1df819d39ee411f6ba52f4dfafaa0c217f32f15b111f0e342561624de90492caceacf07e550f76fdccea3278e46c7c1b0468cf398569d81001
 SHA512 
fa44de0d4023595e36eed1e5af69a445a44fbe98c51a6f67ed53085d9ccb6d4bced66f0496bce203cf4b2f780ec8172eaf856e323c747229d75de5e9dc950be3
 DIST linux-6.2.14.tar.sign 989 BLAKE2B 
aee0a80be752237fa2061ae5199265b74d57c8ad7f62687e16e8b1ac67240bae32492b4e6ad3cab9d7021d7428bad2c4fb17b307a3cf505a8d22a3a998eb26c5
 SHA512 
a0cc0604925381f7489b52a8620c92304c8ac31edb0694d5c138980c672329e45ffdf69f48cbde9faa37eb2d8a51df80ddc761638b10d89a2d76b8f78b9c51e3

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.28.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.28.ebuild
new file mode 100644
index 000000000000..e3a0c5f7f691
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.28.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
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.1.7-gentoo
+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://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+                       -> kernel-x86_64-fedora.config.${CONFIG_VER}
+       )
+       arm64? (
+               
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+                       -> kernel-aarch64-fedora.config.${CONFIG_VER}
+       )
+       ppc64? (
+               
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+                       -> kernel-ppc64le-fedora.config.${CONFIG_VER}
+       )
+       x86? (
+               
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/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