commit: 28f2dcd59d99718c9df094f4bc870006c6601484
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 11 12:01:48 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jul 11 14:35:08 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28f2dcd5
sys-kernel/vanilla-kernel: Bump to 6.1.98
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-6.1.98.ebuild | 137 +++++++++++++++++++++
2 files changed, 139 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index 69659e30c78f..16c89502021a 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -32,6 +32,8 @@ DIST linux-6.1.95.tar.sign 989 BLAKE2B
abd402b54ac2dca9b1e6d7df1fd4db8690d584c13
DIST linux-6.1.95.tar.xz 135134536 BLAKE2B
3334f93a646017d22cac7374033acda5fd0df41de9d415d172a2c31f770d28ec16a388bc61d0577b53db4642bb31db472efd5ecee354a4b36e64a9c2df706604
SHA512
b6997281f9909483ed16a1b3998da6ad9f64c1c524db558663f17ed38987f42d8b1431de8c6ba354e30f7da2f8237b675fd4fa341d8218fcfaf2a5b9ac84b2d8
DIST linux-6.1.97.tar.sign 989 BLAKE2B
5314822c4096f8d3dfd37a680bd8c278b60cc086d7c2567912d81c6a27ff73c1cb7db42f7eec1049996a855593333b0dc7be882dd5713d2a30cad9da8c70b81e
SHA512
5f37bf0f27faf0fa13219109b202f139b875155f6f4e938625aa8b67b6a7ddcbbbb3364638192739e78d08c621a47afa5eec7e0f67193eaae8b337611774d633
DIST linux-6.1.97.tar.xz 135133628 BLAKE2B
16cb37ecf36c188f8324ba71abfadd818b5209b6d957701babc9545f0f5455f50e90d6bb30213aef21b8a07011a11bb4293a436d92ad13adc3f0089e1ab13462
SHA512
0688fed5cfe71137fb4072e25cdcccd4d2105c54314b72b30de3716a595d0adf1e2a9867f96bcc12b49958b081d404dca35a36747dd924ac510b001da5217b43
+DIST linux-6.1.98.tar.sign 989 BLAKE2B
be83fd5d7c323b69450992ca460af2a7f937297ad7bfd00d96afdd4fe87101c896f0dba21b863454331d0732c2ba33ff235b0d335a3145d5a7ebffb0f5b4dd90
SHA512
7745a5ecf35d5f7ae386a290ab5532ef1509e75454ccedcc064e66e53642a6e0f55daeb26c9fff97476d1187d3d1ecd736671c068203cc4531afdd81df666f10
+DIST linux-6.1.98.tar.xz 135161992 BLAKE2B
18f868d7578be707da10e86b4c74793656d53f133819c6c03355689f9480c47c6c46008f7d7ea55020cfe0e7808fc6a0240fc55ab4642573d619d174adfb57d9
SHA512
3d0670c347595993f615945cda4cedc589782d2c1c4b3be01dcb62c81428e7895c775cfcd10d0f64e9e4fa0e60638752edc07c0bfc78ae243f6e483ef2320436
DIST linux-6.6.35.tar.sign 989 BLAKE2B
d5a5dfeb1e92c11107b71d6b2965d2a595e51fd3244abce72f9fdd0cd4405b562602695015e3cb8944f9ac0d999566c0007569b5141cb5f42d32458c20166f0a
SHA512
dc98406c4b15a0e15623694e88b881cdbf082ae48f8e737d96bbeb1cec1c8ca6c9c5448b359447c6bfe34e8f1f6807efaa114dbe23097079e5046996134aad8c
DIST linux-6.6.35.tar.xz 140269708 BLAKE2B
93fff6421875329ab7d7ad2f0a0d3d1377c1eb42df295638c967eced3551b08986445b5e47b9d3bd1b24f93d3feeed43b1aba77f6912dc13449d956be3616571
SHA512
a94a75eec75f43fcab56a425927eeb299ec8eb72a056b26e9c629ec66fc5b65badf0403612549dfd4bc01b620451924ec30b980403a47cf723e98ab57775b6d2
DIST linux-6.6.37.tar.sign 989 BLAKE2B
bf4db9046bb721ea6020c967e67592fcd0c6fbc3b2675275d567181e901495115e2199d83a811a9f825b70b00cc977dba25a3e26556f2325903ca8a106731eb3
SHA512
df30b7a643b58093ef0fa8ba6da0c0c8254fcca72443da03702293b20e668ada73a2fbf37eed4b64fd1d5d243f106055b0dc6728bed577df31ffbe71eb1caf9f
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.98.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.98.ebuild
new file mode 100644
index 000000000000..2a01b55657d3
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.98.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2024 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=g13
+
+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[@]}"
+}
