commit: 844228e01a9d7c7b504f2a30faca6f56ac1f706c
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 23 15:56:03 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Sep 24 02:28:35 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=844228e0
sys-kernel/vanilla-kernel: Bump to 6.1.55
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-6.1.55.ebuild | 137 +++++++++++++++++++++
2 files changed, 139 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index 435a49a57242..91a8394867cd 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -58,6 +58,8 @@ DIST linux-6.1.53.tar.sign 989 BLAKE2B
23422a15489e91f8bfc11500d96fdb54796fcf683
DIST linux-6.1.53.tar.xz 135006964 BLAKE2B
c5c082fa08e331ae968e27f6a0aed41f7793ea38c3a32311e4f9b7dda3cf1ce74dfd7f3e4c783f0dd4269b543eddd53e086e523d324da5e7a996aa4d8e6701ea
SHA512
270f8e9102740edda3510aa5e8da5943f9831a87d6e9f0f6aa590a5a2fab09b1a91b54413ce936dc3695bea8bfdd8df0721bd9c5fb834b9c7a95653401b2652a
DIST linux-6.1.54.tar.sign 989 BLAKE2B
872d696f0bc7a110b6503db9ba20e18d55e8501ce0cc98fc9c28404ec2fde11685ace4c8868b88f9da74b3049df63907bee53a6648e4066d59929813dffc852a
SHA512
95365ee539df4335e9bba8f87db07bb4df48bb6e546e3f2070fd756c2bfe67ca4908ed086438461f4e8f5aaabaa78867c2c86d380ad45b077d16a3bdf686c113
DIST linux-6.1.54.tar.xz 134989636 BLAKE2B
a2e7fd5f1369247357e53cbd5982df879f5b8d2cfdd9aeb5f714ef75528db2ab7245f35981da45ff7f17ba7b24ac1190dc5e402f5a7e759a4f39cbc61f87b4ac
SHA512
fcdcddd3001be94737a06208be39dce4ba31a51ac3f05ef492bfee1827d18a0d73f9ce3cb1b01a253f148a525cd16fc1278a99d25eeffcdaef8da0b64821b171
+DIST linux-6.1.55.tar.sign 989 BLAKE2B
d10c453aea7debd92cc2ff13c70d19dfcea71646898199b2fd6c3b9e3a6f901f487c4e0da1fa0bfe76848e68c7897acfb103ca03ca0ace9d51fce9ac32d8b6b3
SHA512
bb351e432efa185a25c1d9cc0728d46edf59a6269192399260e97a9ab5c789896378a1d8194e3051c023233ce6d7e882cca52bd860e265a7b9b1a59a1b3f0006
+DIST linux-6.1.55.tar.xz 134978840 BLAKE2B
60e806a9bc02c69e60e5ff5fcabf26622054cc48f372c60ad62f5a4e1c67c50632c017037b9d96657d124e9651eb80a367ef8fb85256eb68faad0dfd249bf1da
SHA512
047d98b1aed8201d5d0d29228e6cbc0984cfb7b77e6f5584ad94431c644db8ce099445d63e7f5b6b6fd9b031176bf9448c3c99863273c9e178170af7cbe0d20f
DIST linux-6.4.16.tar.sign 989 BLAKE2B
80ee957ebeaf7d242311cb51c358e8fa762873a22789b4bb3a260ccef3e2228c310d3f5f8f05169c782dcaff6519fc18ee0a9c3e5692d0954c9294ee0f8f3e56
SHA512
c0a50aa599be6c04e2fbc538517ae0f32b2f3abc7201b4ad3e43717f8d0d86ae70cb31d3e0dabf38d8ab7066f505683301c70d97502435fb12ee177725a27647
DIST linux-6.4.16.tar.xz 137890316 BLAKE2B
02a07a8d53866e3e2b369b8c48ef83e4f9af0deb5edfc25aedc99cfb523219155bb76a72cd26efcc0a81b47c87f9cb32fa393891e0b1a8decdefd360c515b41b
SHA512
6ff4f95a98c66b3e6fb9e583d913f333076200c00a403b72363a82ec8f0130a7836daa73248489d6e2dc185fc71022186e305f8e78ea73db46c600e8b886a1eb
DIST linux-6.5.3.tar.sign 987 BLAKE2B
3741f840dc2cd951b78bb32d6fa38e7c9959203c40040b6d6dd230f982958fcc9361f06df1afa33765f37993df7fbcb06d6a58330c183631f26d25c1888d99c2
SHA512
18c3a957ecfd051a469cff6851cdcf51df782d65aba172c9b2be9f9c8089ed9204c52e647c7eda68ca5343e47fbbec66569501caa913df6962971a74ea941a59
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.55.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.55.ebuild
new file mode 100644
index 000000000000..aaebef705bd8
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.55.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=g9
+
+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[@]}"
+}
