commit:     4384b3ac0725323052077e4835033ea146122cb4
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 20 17:24:04 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Dec 20 20:20:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4384b3ac

sys-kernel/vanilla-kernel: Bump to 6.1.69

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 46bbe7bae32e..52b205a18521 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -32,6 +32,8 @@ DIST linux-6.1.67.tar.sign 989 BLAKE2B 
49ccb2381c3612e2ea982b029fe52d9decb068f9c
 DIST linux-6.1.67.tar.xz 135053964 BLAKE2B 
8c21a626545b20d173d21373358a35399531ba7b53ffadf635059a2ccbee669b04dbbc6d30a3e854ce1ff14445dc06d00518d585bf5e044e6dfc3d06095a997d
 SHA512 
adbe4b5dc952eba848ce446547b07fa0eb1127f98051d4504aa2a533520cf96f6b135b2087b89e4a8b0eaf8172cf6f31fe49cca4cc594d75762ffebde62c53cb
 DIST linux-6.1.68.tar.sign 989 BLAKE2B 
646b5742ce3e7225e3f1a8f436a21aa4975c3d8827f928db6fc1ca3e609dea865471b1c84102ef3f6f38698f5f93e25e00a154d62358857670dcb63fd95f0bd6
 SHA512 
6a5969de6f305766904b54629137549a70a4124d1f2eec880f4d5a4baa71709024d0124387de22b272aaf98f0e93ccde1f9ffa1df010a168b4ae761ab970be0e
 DIST linux-6.1.68.tar.xz 135037496 BLAKE2B 
35aaad87cf0fc957b2e9123e13c9971bfb5f04eeaecf4ff04d1fa3484556f12ed2dedc8beb8bf4d859f6f8dfab691cea7c46bffb2490e6de788933a91262d5e4
 SHA512 
249b3272af9bf6f8f2dc65859dd6e7cb150ac0521a52d482fc854db2d5268d559c40c64a413a9baa4870cfaff823c5fd1762e22370ee63ce10b2abe2a4bd2c33
+DIST linux-6.1.69.tar.sign 989 BLAKE2B 
354a497dc3ba0b2c00f374f3339b3970b95b0a83b933d0ad24f3855129379a7a7829b381a0b9aa5eb9c899cb99f8ff4912f28841653a9436cd2149d118116ef2
 SHA512 
b19b5c33c40ad494181f75141653b77ff9ae0ede9e183da5e124f973e500a9d87824057153b3835cea29f3f33cae60b6ea4f3b3506b2d2c3941750834e760f57
+DIST linux-6.1.69.tar.xz 135035040 BLAKE2B 
21038f291c7eb06f6fbe866132c0805d5784e3ed53dd089cfe97c95569701776d20e84f39e6d687ec7ddc06db9608045a16bc5b204a8a95f6fd269a1e8f41cc9
 SHA512 
70afe2642b58cb0a1a5b38867e00052b3236f7701d9d006f0d95c66f204935453e997bd8b4d28c890617e745e08610d39933ef0798ede13f230485a8222b9819
 DIST linux-6.6.5.tar.sign 987 BLAKE2B 
88ce36e009471c9dc796f2ed36012a7e76d2d9e6e4f5a62b996019a131b37ac14916d949e964a1dd4824e6daed562011b87764f996bd756deba87b7a7ce1fafe
 SHA512 
2cdb44bac311b64138170158e49157dab631b21fe7b938770ed92f096dc6d4c9ef68e6003f3d84b1ee62903e88c3dfc28b734d97f60bbca0e83385b2e27d8d01
 DIST linux-6.6.5.tar.xz 140039516 BLAKE2B 
9d66d720f2f037cfd480835ab38807fe5aabcff09bd210c5cb0dc80bd3e1182434df9f04a286df4e8cbc508ac984ecba12d2098a3296e3aac60afad94c085876
 SHA512 
364df8c838a17742c67c4a919a4e8dbed2212bb5658f63d32d8c94ab765bf0b4e33ec524c0988427edf3d2bdfc7c04d1929024206131e26e04ce19d61ef6a89e
 DIST linux-6.6.6.tar.sign 987 BLAKE2B 
56f75ef6ce549a3e35f9f774d0d9819e8755237851743bfa53277f6f3f3fc1d9753c27c86466a4f2b8abbd3a8d7c3be7a3007a61d2f47fc39644b913f6a89a0d
 SHA512 
97e185e532d49a531a143596720c062b2e73acb17f1fde0ca96be5465b07a2286092c3084e00c0bfeec118413331342e88ad5c2a5ff220b0ea79af008182d82d

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.69.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.69.ebuild
new file mode 100644
index 000000000000..50ecf4f88f6e
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.69.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=g11
+
+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=/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