commit:     4ac1f6757c3292514f952bb792b2ecf4c7068323
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  8 19:40:14 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug  9 01:58:57 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ac1f675

sys-kernel/vanilla-kernel: Bump to 6.1.44

Signed-off-by: Sam James <sam <AT> gentoo.org>

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 6a5e1676670d..3ef86b253553 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -44,6 +44,8 @@ DIST linux-6.1.42.tar.sign 989 BLAKE2B 
043e225f5e4f885cca43839bc17cb6cc721635ee0
 DIST linux-6.1.42.tar.xz 134942580 BLAKE2B 
27d506867a44764ca5fb71d36a1732ded064b8d24d2d53bd1b2158db53cc82283a390b46071ed0cd07fdd68a0fd60486e5ec231fc6247f87bc0bea9692d449f9
 SHA512 
b3a0c682bb2234c3ec36f6302f4b39dfd501e667c39d10e2f0994b3d3dfbdc461728686d4d451b798173a76fe2ae24d8a6ab43bf869e9291d1111975405db22c
 DIST linux-6.1.43.tar.sign 989 BLAKE2B 
d91ace1dd9a96d062fe09c532d142ca1ef42430849557a3b9d712e1b961448f9a7defa6173c617e32b826cd84158bf1f26b764ea34addecb54251c27da5c0567
 SHA512 
e676b7b8f1d7cd04700034ee8306b1c685e9ef5ccabe1a47fb51af9c53c70cfeeb58db52663851da1c0b0202938758b73a1acc8400033d868b57676c0109e39e
 DIST linux-6.1.43.tar.xz 134928316 BLAKE2B 
5fb33fd9a12280bfc83692c449c2169650d3b242298d0e6beb02f019443c3d3c91618786cb2a847d64d7b725f0fc28759608299e937821f1d3eb20a6e5137a38
 SHA512 
bba7d51a41a16e451e6c6dadd6e5eaccd6656a40ece6c6c60ea0a433ede31efd5a7b6942cbd4ad8b897d97e770b1bc49bed512dac5f02386745189f98a3894e2
+DIST linux-6.1.44.tar.sign 989 BLAKE2B 
64df7920da8d3e3f1ab30e5982ba1f61e33af3033aa83727ccd09629626c1398d4f5d179650a18541d37fda34e836160584001f8e96c8714efcae1f21e65cd39
 SHA512 
d5b5acbe0129a8cc02e7a321148715a6539d9cc194c8ccfbe8ae4d7453313a5c26353b04ec4cb70b79f59c6efd515a8bba0d6545b95b7d9fe1336e58ea48120c
+DIST linux-6.1.44.tar.xz 134937396 BLAKE2B 
dba5002b03d5c3288d24f7583d3655e0f298141fabdc2a05583f09dffd4dbc61f5003e13afb60a2b285930eae0417a85f655f8a75f2264d46784b7fd1ed85c7b
 SHA512 
c1c29b785ada9c34e7ca1b11ece4568953d636d097590c9b62d49762d60a9c2b430749c323bcd016e1759259267196cfe0f87322e3c748cf0b1d2e31b94da979
 DIST linux-6.4.6.tar.sign 987 BLAKE2B 
9fb1f9d3f27a1b03fe375ab6701b790c7277102e69308ed981547008ec20ea9175e82cfc44c88fd7eebae121bb28061b5cc85179920e13734fc2fd4c3f5aeca5
 SHA512 
3eaa7b723118a491a05642fee7ecb7c0ebc4ad203220da9ce1eff49837ce6feb225f1f985ba00d4e4199a1405e1779fc8aae854333288b5abd75ce982027d9be
 DIST linux-6.4.6.tar.xz 137830736 BLAKE2B 
a395218ffd3447a9b22d248c7dd69204115567185d91d4abb712f77ce0b90571bdbcf0ea845ed4adb30d0fd448341d95c8be6e3acf46d940477d8c55d681a669
 SHA512 
e9e9cf4fd99a7247123066ad4e9fdc2d7bd491e602790120c8045691d43aae4f225e832426f542bc5288b87371cf1d55efa529d649655f77d2d002113da7f0da
 DIST linux-6.4.7.tar.sign 987 BLAKE2B 
c12f0fde753c629010ce8c852b629b9fe73d8e1d51b53aa183038b43a4650a2e3bf82967a7d3fcf0fc3ce72e98e4ec535cc476360a858de1a646ed99c48766df
 SHA512 
fa144baf9c848272e7f4264865035bc1fc63ba0857c8ef5e68b14975cc2bc27b06e24bc072da5d9f7673ec181b09c18eda61c465c4bc48ac355ff45632370d8f

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