1 |
commit: a5a503a35bcfc4fdc6415952d0bf16c071576058 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 31 16:39:43 2022 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 31 20:22:49 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5a503a3 |
7 |
|
8 |
sys-kernel/vanilla-kernel: Bump to 6.0.16 |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
sys-kernel/vanilla-kernel/Manifest | 2 + |
13 |
.../vanilla-kernel/vanilla-kernel-6.0.16.ebuild | 134 +++++++++++++++++++++ |
14 |
2 files changed, 136 insertions(+) |
15 |
|
16 |
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest |
17 |
index d343ef684c67..87bec7965037 100644 |
18 |
--- a/sys-kernel/vanilla-kernel/Manifest |
19 |
+++ b/sys-kernel/vanilla-kernel/Manifest |
20 |
@@ -32,6 +32,8 @@ DIST linux-5.4.228.tar.sign 991 BLAKE2B 4edd63de96c2cceeedf8b20ab4696fb4c8b8e459 |
21 |
DIST linux-5.4.228.tar.xz 112978736 BLAKE2B ade9b21e3f434435230e31d67d39ea07d15d92cdf932b3b181fc532669f10ebd2f0eb7d5fb20ae9eae93c782f10db5ab3454bb13c01694f674f83146bcae8187 SHA512 f3fa33da1df3dd10ba9536d30b8aebf92796abe84872c402776c94b35bf3efb4256a6c3f0267bd97741db9853352d1b22bcb42d7d03f167960804bb9f7407601 |
22 |
DIST linux-6.0.15.tar.sign 989 BLAKE2B 214ba7092718635f5dd39f2374615854c276e450ee81b8811b2e5a9dcff300eb38c4acbda4ebc1dcc0d7a2866e4a6bea8c2e5280309428164df8294bc616f8b3 SHA512 f39bebbb1d60ab7457e861ac7005a5cb975cb53519d777ff66119d2ca087f9a654cf1f11ecb4f7b58af6da574c698dccc69c9daa99ded277da178593c5fdaf76 |
23 |
DIST linux-6.0.15.tar.xz 133929584 BLAKE2B 2d01f57c447ad7eecaa77a9b245ab1a79a35bdcede9d0b234dafd96d383a14a878868a6872d9c24cbc1a6a1332ccdeb15b492724063423ee833ccc56f9c5348d SHA512 1db7e086aaceabf12749728f100842c68886158202250cd9a582083488ee7073bc925f933f44b5c70a8f8c5bea48c73462da9ba979ef696005f16031d11312f6 |
24 |
+DIST linux-6.0.16.tar.sign 989 BLAKE2B 9c9d6f50affb9798b12b554f5368e2dac75582d5e17d34b37b26a4e3b4d3024c0b6d5576ee0945a97f5484b5553be486a8a4d7b5aa760ee022c2e8987a8eaf54 SHA512 7e0faa197b0444dddc58ed2b8d1bb822b7e06a05dff7c75fbddaba3773c69dc76b9984c3e6d812f44968c81309c43373d0293b6c602cf2a1b95e613a69662efe |
25 |
+DIST linux-6.0.16.tar.xz 133909080 BLAKE2B 9e7b042e1f8fefd5b84aa867a0dfc3d86da8e531fdbdf84aed81dfe987c01bf2b4d4df13fcad5ceca0fec206032268c5324ce1dfefc8611016e44c3ddb50584d SHA512 769d4a1a6042efdfb97fbb63c2e619e6ffdcf7808a26f380fd7a1b64d8788dd1c568b16315d0d371b69c1a23b817d6618c1c669824f9f09f5ac20850ad55d0f4 |
26 |
DIST linux-6.1.1.tar.sign 987 BLAKE2B a240a6428c456557362103620cb9d0d9eb0eb57d7e46ad7aa8183eee673b5578a811642222388cf99a9728bc47e35d7489dd05728b36c939227a109435a0e7ea SHA512 a089b3bfc255fcf10594ace137ca2553e717dd231434b08039252c23c2c7242fc3037b49a8a6fa8d55a92c99173f448bdcabd6116f185ed31078f7455aaa23ba |
27 |
DIST linux-6.1.1.tar.xz 134730676 BLAKE2B 8d25e501419dfe800b9cbbe219c39883be67a80e015c1c6034e83a9b142aa16bfc4db14a788a5331f6c44c03ca013f0c73e028b207e2e424dff1d3924d9a58fc SHA512 c303f53ace62cf5b860934130fa5c34d2a43e7719959bcc3f2b7f0e753ecca550da4d0dc52409b6b6dc1c9c515cbab75427a15e51b58e9f8b1ce12982d82d629 |
28 |
DIST linux-6.1.2.tar.sign 987 BLAKE2B 496c6817ca39458b0ef0853b84bcd89b5caa76b63739730056376713266d49298328342d1716980a244f00c57c74de03a6d36d6a80542590bb642ee2bb92e1e4 SHA512 c338bf4e330dab849c568a747209b8665e8cbb27ad7870eb26c41e66b828b2f8edeb03a3f02ac35523b1e2896f0156d5ba0f1f1900351dccaa1b4d5db6590317 |
29 |
|
30 |
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.0.16.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.0.16.ebuild |
31 |
new file mode 100644 |
32 |
index 000000000000..d2f94947b12d |
33 |
--- /dev/null |
34 |
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.0.16.ebuild |
35 |
@@ -0,0 +1,134 @@ |
36 |
+# Copyright 2020-2022 Gentoo Authors |
37 |
+# Distributed under the terms of the GNU General Public License v2 |
38 |
+ |
39 |
+EAPI=8 |
40 |
+ |
41 |
+inherit kernel-build toolchain-funcs verify-sig |
42 |
+ |
43 |
+MY_P=linux-${PV} |
44 |
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 |
45 |
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo |
46 |
+CONFIG_VER=6.0.8-gentoo |
47 |
+GENTOO_CONFIG_VER=g3 |
48 |
+ |
49 |
+DESCRIPTION="Linux kernel built from vanilla upstream sources" |
50 |
+HOMEPAGE="https://www.kernel.org/" |
51 |
+SRC_URI+=" |
52 |
+ https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz |
53 |
+ https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz |
54 |
+ -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz |
55 |
+ verify-sig? ( |
56 |
+ https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign |
57 |
+ ) |
58 |
+ amd64? ( |
59 |
+ https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config |
60 |
+ -> kernel-x86_64-fedora.config.${CONFIG_VER} |
61 |
+ ) |
62 |
+ arm64? ( |
63 |
+ https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config |
64 |
+ -> kernel-aarch64-fedora.config.${CONFIG_VER} |
65 |
+ ) |
66 |
+ ppc64? ( |
67 |
+ https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config |
68 |
+ -> kernel-ppc64le-fedora.config.${CONFIG_VER} |
69 |
+ ) |
70 |
+ x86? ( |
71 |
+ https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config |
72 |
+ -> kernel-i686-fedora.config.${CONFIG_VER} |
73 |
+ ) |
74 |
+" |
75 |
+S=${WORKDIR}/${MY_P} |
76 |
+ |
77 |
+LICENSE="GPL-2" |
78 |
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" |
79 |
+IUSE="debug hardened" |
80 |
+REQUIRED_USE="arm? ( savedconfig )" |
81 |
+ |
82 |
+BDEPEND=" |
83 |
+ debug? ( dev-util/pahole ) |
84 |
+ verify-sig? ( sec-keys/openpgp-keys-kernel ) |
85 |
+" |
86 |
+PDEPEND=" |
87 |
+ >=virtual/dist-kernel-${PV} |
88 |
+" |
89 |
+ |
90 |
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc |
91 |
+ |
92 |
+src_unpack() { |
93 |
+ if use verify-sig; then |
94 |
+ einfo "Unpacking linux-${PV}.tar.xz ..." |
95 |
+ verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \ |
96 |
+ < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x)) |
97 |
+ assert "Unpack failed" |
98 |
+ unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz" |
99 |
+ else |
100 |
+ default |
101 |
+ fi |
102 |
+} |
103 |
+ |
104 |
+src_prepare() { |
105 |
+ default |
106 |
+ |
107 |
+ local biendian=false |
108 |
+ |
109 |
+ # prepare the default config |
110 |
+ case ${ARCH} in |
111 |
+ amd64) |
112 |
+ cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die |
113 |
+ ;; |
114 |
+ arm) |
115 |
+ return |
116 |
+ ;; |
117 |
+ arm64) |
118 |
+ cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die |
119 |
+ biendian=true |
120 |
+ ;; |
121 |
+ hppa) |
122 |
+ return |
123 |
+ ;; |
124 |
+ ppc) |
125 |
+ # assume powermac/powerbook defconfig |
126 |
+ # we still package.use.force savedconfig |
127 |
+ cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die |
128 |
+ ;; |
129 |
+ ppc64) |
130 |
+ cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die |
131 |
+ biendian=true |
132 |
+ ;; |
133 |
+ x86) |
134 |
+ cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die |
135 |
+ ;; |
136 |
+ *) |
137 |
+ die "Unsupported arch ${ARCH}" |
138 |
+ ;; |
139 |
+ esac |
140 |
+ |
141 |
+ local myversion="-dist" |
142 |
+ use hardened && myversion+="-hardened" |
143 |
+ echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die |
144 |
+ local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}" |
145 |
+ |
146 |
+ local merge_configs=( |
147 |
+ "${T}"/version.config |
148 |
+ "${dist_conf_path}"/base.config |
149 |
+ ) |
150 |
+ use debug || merge_configs+=( |
151 |
+ "${dist_conf_path}"/no-debug.config |
152 |
+ ) |
153 |
+ if use hardened; then |
154 |
+ merge_configs+=( "${dist_conf_path}"/hardened-base.config ) |
155 |
+ |
156 |
+ tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config ) |
157 |
+ |
158 |
+ if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then |
159 |
+ merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" ) |
160 |
+ fi |
161 |
+ fi |
162 |
+ |
163 |
+ # this covers ppc64 and aarch64_be only for now |
164 |
+ if [[ ${biendian} == true && $(tc-endian) == big ]]; then |
165 |
+ merge_configs+=( "${dist_conf_path}/big-endian.config" ) |
166 |
+ fi |
167 |
+ |
168 |
+ kernel-build_merge_configs "${merge_configs[@]}" |
169 |
+} |