Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-kernel/
Date: Wed, 13 Oct 2021 21:27:53
Message-Id: 1634160455.eb54fe7636d3646ee19d56fd3184a917fe2770fc.mgorny@gentoo
1 commit: eb54fe7636d3646ee19d56fd3184a917fe2770fc
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Oct 13 18:54:57 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 13 21:27:35 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb54fe76
7
8 sys-kernel/gentoo-kernel: Bump to 5.14.12
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-kernel/gentoo-kernel/Manifest | 2 +
13 .../gentoo-kernel/gentoo-kernel-5.14.12.ebuild | 105 +++++++++++++++++++++
14 2 files changed, 107 insertions(+)
15
16 diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
17 index fb33d09ecc6..a51246c2eb9 100644
18 --- a/sys-kernel/gentoo-kernel/Manifest
19 +++ b/sys-kernel/gentoo-kernel/Manifest
20 @@ -16,6 +16,8 @@ DIST genpatches-5.14-11.base.tar.xz 446596 BLAKE2B c7ea616d473fb6e07af15ad0cd400
21 DIST genpatches-5.14-11.extras.tar.xz 3848 BLAKE2B 05f652b6f3f4052b5992c747ce8354c8bc6ab64a7197150c223f868c0060a55c289dca650d3dadc804bd39cc661dab56d7d8086c5dd9715723f17c19320960b2 SHA512 509e95a8dc4a1e2d1e28388575664006bc5c19eb5aa05e45999838c7cbaec875d784a85f852e3207a37047fb27fd5733a01f95c4d488ff1275661343cf5694ee
22 DIST genpatches-5.14-12.base.tar.xz 459100 BLAKE2B ba32bf5be3d9e3e332659281495ecbe1b4cb683e1b5c3d1ab490d03ff3eee47db33e4f3f1c9c25f50230adaf267c23b01161d243c3acb2312352a40c8328b606 SHA512 1adc3a9ea9c7b3bbb89de6fb219f1cd0d6fb02c6f866c4a5519e70452799069d99e1b2491560bc408706ba40b0ab6cccaecfd34a1f11f76fcd8e5ee1cb78cc1b
23 DIST genpatches-5.14-12.extras.tar.xz 3848 BLAKE2B 0bac1f83f9ebdc3b6860516313ca95d5ad2e1515bc587a3e6010bdbbd2bf3e55fe3acb835989ea874608149c3efcedf172451322ba5e5df821970cbd210a69ab SHA512 9e4c5445b0883680ff28e24d2b7af4d6dbd4d2f54c33583c5b91e0629caa5cac02b02996c52cf277909f057c8bd2f41342cd57f9e6ba9d8b4a8895fd70bcabaa
24 +DIST genpatches-5.14-13.base.tar.xz 502028 BLAKE2B 54de53dff2214469b24b173b17aa6a4cfa2ac50d8834434c0e50c5538484e7a16c3822b677572e4d2bb444266196a272487df0264c2fc4bd25e6fc6a7b63fb8c SHA512 205d403607618c0ea1e82ac9ba48cd1e90e961e92e282a5bc2723408ddd7a85ca871e91b23cff37c3108f37f4040fbe063928161cabb175c78b7175ba8b60974
25 +DIST genpatches-5.14-13.extras.tar.xz 3848 BLAKE2B d595a77078bd8740dc61a5e2f35d75f19015e2d4b30716f484bc961b9631a994a3b1a8367a1ed2d1c46d3bea601013e4488870cec202dbd5b63cffaf5078ce36 SHA512 b1abcde0b14f51d60ae27e885f7b912b8531ee77fb9b6b4c2e062f5feb1eddc2687965c949ea675c1c425561244e1a3011a1c092404ce86b171ea60991c7cd2e
26 DIST genpatches-5.14-8.base.tar.xz 315608 BLAKE2B 1a19a4aa497580d5d1ceed952899f0f19b13fa36a585206c1ce9b3c348754f6c94aeb7a697fadeda88ecd9e2b35e7d9061601bfbbc720cce00030b3b0de5d26f SHA512 5d131854f01730a807eba05109270f80d40b5f9db4fc7a9f9041200eb0025e4ef436a6df51d2020ae4cb737ff2846e080a318c92975be1d54a17e99131d6771a
27 DIST genpatches-5.14-8.extras.tar.xz 3852 BLAKE2B 6ec8bdf43eca6d43f5e88f19e15c23e056d5f5144a5c746e3eb20170c445de82e465bdc5ef85f95a1c65582c458110437287d8f31022132fa092096147540c88 SHA512 d6a65dbe36ea6c5eb20f3df047493e3e3e31b27e4a812c9541e50deb4bfbe795de3f8eba4d901bf34a013d46ead22f849b77f3c2bd305f2b28cd039459f6c43f
28 DIST genpatches-5.14-9.base.tar.xz 349596 BLAKE2B 801a5a1aec2e0cd1b52f1c21fd3349f91f8bbfd33c40892b28679ca89799f5589d333e5227674fed3326d0094f5932959427e31e5dc847aec261ebf164d2954d SHA512 a8463a1cda8084afd1e6613ba160c9a75b1a136331217627f9a6b7876f33e9bd4947cd6c059f481612962e430ef530fac246e8b48c38ca8f505b949296390590
29
30 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.12.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.12.ebuild
31 new file mode 100644
32 index 00000000000..1248c26d4b9
33 --- /dev/null
34 +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.12.ebuild
35 @@ -0,0 +1,105 @@
36 +# Copyright 2020-2021 Gentoo Authors
37 +# Distributed under the terms of the GNU General Public License v2
38 +
39 +EAPI=7
40 +
41 +inherit kernel-build toolchain-funcs
42 +
43 +MY_P=linux-${PV%.*}
44 +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
45 +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
46 +CONFIG_VER=5.14.6
47 +CONFIG_HASH=416de8884575795f040923fb460e7fc5e5d67102
48 +GENTOO_CONFIG_VER=5.13.4
49 +
50 +DESCRIPTION="Linux kernel built with Gentoo patches"
51 +HOMEPAGE="https://www.kernel.org/"
52 +SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
53 + https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
54 + https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
55 + https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
56 + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
57 + amd64? (
58 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
59 + -> kernel-x86_64-fedora.config.${CONFIG_VER}
60 + )
61 + arm64? (
62 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
63 + -> kernel-aarch64-fedora.config.${CONFIG_VER}
64 + )
65 + ppc64? (
66 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
67 + -> kernel-ppc64le-fedora.config.${CONFIG_VER}
68 + )
69 + x86? (
70 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
71 + -> kernel-i686-fedora.config.${CONFIG_VER}
72 + )"
73 +S=${WORKDIR}/${MY_P}
74 +
75 +LICENSE="GPL-2"
76 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
77 +IUSE="debug hardened"
78 +REQUIRED_USE="arm? ( savedconfig )"
79 +
80 +RDEPEND="
81 + !sys-kernel/gentoo-kernel-bin:${SLOT}"
82 +BDEPEND="
83 + debug? ( dev-util/pahole )"
84 +PDEPEND="
85 + >=virtual/dist-kernel-${PV}"
86 +
87 +QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
88 +
89 +src_prepare() {
90 + local PATCHES=(
91 + # meh, genpatches have no directory
92 + "${WORKDIR}"/*.patch
93 + )
94 + default
95 +
96 + # prepare the default config
97 + case ${ARCH} in
98 + amd64)
99 + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
100 + ;;
101 + arm)
102 + return
103 + ;;
104 + arm64)
105 + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
106 + ;;
107 + ppc64)
108 + cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
109 + ;;
110 + x86)
111 + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
112 + ;;
113 + *)
114 + die "Unsupported arch ${ARCH}"
115 + ;;
116 + esac
117 +
118 + local myversion="-gentoo-dist"
119 + use hardened && myversion+="-hardened"
120 + echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
121 + local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
122 +
123 + local merge_configs=(
124 + "${T}"/version.config
125 + "${dist_conf_path}"/base.config
126 + )
127 + use debug || merge_configs+=(
128 + "${dist_conf_path}"/no-debug.config
129 + )
130 + if use hardened; then
131 + merge_configs+=( "${dist_conf_path}"/hardened-base.config )
132 +
133 + tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
134 +
135 + if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
136 + merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
137 + fi
138 + fi
139 + kernel-build_merge_configs "${merge_configs[@]}"
140 +}