1 |
commit: e6f94f5bb9f93714f2d1b56500b46eb357ba8fc5 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Apr 27 17:07:34 2022 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Apr 27 17:07:34 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6f94f5b |
7 |
|
8 |
sys-kernel/vanilla-kernel: Remove old |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
sys-kernel/vanilla-kernel/Manifest | 6 - |
13 |
.../vanilla-kernel/vanilla-kernel-5.10.112.ebuild | 134 --------------------- |
14 |
.../vanilla-kernel/vanilla-kernel-5.15.35.ebuild | 134 --------------------- |
15 |
.../vanilla-kernel/vanilla-kernel-5.17.4.ebuild | 134 --------------------- |
16 |
4 files changed, 408 deletions(-) |
17 |
|
18 |
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest |
19 |
index cd7a26812e02..0acd50df88dd 100644 |
20 |
--- a/sys-kernel/vanilla-kernel/Manifest |
21 |
+++ b/sys-kernel/vanilla-kernel/Manifest |
22 |
@@ -21,18 +21,12 @@ DIST kernel-x86_64-fedora.config.5.17.3-gentoo 219028 BLAKE2B a8a3e2f31315d6aaf1 |
23 |
DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f |
24 |
DIST linux-5.10.109.tar.sign 993 BLAKE2B e8676c541d825ce58f124da1279b1a2cc12fc5f4c29bfeb2bdfa35a35bca574a247c20905c58ee247b9efaa76abc1b24d80a3d0e9bbf36041adc26e47d111792 SHA512 45642e01921fff411714d6df90190161c5122f5810e136b55357ce3d9364321868e55b3b7c14445b16b1426e81321619aa636cfa501609f23bf9105c661bffdc |
25 |
DIST linux-5.10.109.tar.xz 120392556 BLAKE2B 3bd903b54977d942cb69d4eabaccaee3d8ce36bb68633715751752920ee87d80a6eb63779bf54809d8579145a769ebe7795881d266d2e22ae8c6c6a132f664b9 SHA512 0a035a72096c6076c47c93c885dbbf0f59315ea7acf1289305a98d6d585d9622115b38fb32634cc72929fd200eb7a4f5debb076c681afec999dbe49ef67438e2 |
26 |
-DIST linux-5.10.112.tar.sign 993 BLAKE2B b2cfb536a4533e0add641331d1403ad653bea5e68d9875e77a7314c322040e3fc8106b7ded6d0e5810dbb348a953f5aff0fafab5da8f8283cbeab50b6789a4dc SHA512 546626fb22f73eb9023a61556e30558888b83ca29c4656e78902746a7631d5c99de931a639d126b23cdede942a9f6a046e13afc4b625c34f8d121f63fc4e3f96 |
27 |
-DIST linux-5.10.112.tar.xz 120409860 BLAKE2B 380e1c4cf7b846e5fc95f9d773b561c020fd6bfba5e21e050e29d069a9a34c41b882bfe27d58e3acb0f2330718d08939e93e7078376fe49a72b3e05429a51402 SHA512 95c6146b5b7b51ce9ea586162b22237f88ba6a6008867e14f7975daf24056a3bcaa482e050837baf18efa4da5dd06b9159e591e2d70f7c55f6dfa23c607b1df0 |
28 |
DIST linux-5.10.113.tar.sign 993 BLAKE2B 076662f2ab09e172f5aef9817beda56753a35c0d48f12d3d096871dca8af6b85f635c1de6d562be0719b475ae66074b659f7a855825c09889bc18d5f9b659784 SHA512 c82e59dcb47cc8acf4d08e148ba91bebdf4e4c35a4ec5405ec5401165583d4c509fa287817cc343345da8f24a4cf7ec7e0b8277653f6d230c81beb32eca75fc3 |
29 |
DIST linux-5.10.113.tar.xz 120410360 BLAKE2B bfd4cac707bc8232767aafc0e666ed9fe23951802b87998aded0197a2141d2db20d33f8961e4e03159fd4c397466049ebaa9d47f1f7c512a42739b07e6c899a7 SHA512 7099c83243f707d66ac09bf7215aa3fbc63957c2636fa63f287e526de210952c4106de411201e2ac001aa46c73c05cd4892e633911cfa30b96db7613f832b81f |
30 |
DIST linux-5.15.32.tar.sign 991 BLAKE2B 3aecd518f4fe5e9135b802ac280fc2400f3912360dcfe0a5cbbc377a99bf77a55588de1974ae7d99bbbd67d50172b3a5a644b5376b1ba67ed97cf3bb414a856c SHA512 5c18849083f2bc17d1419282559f3fe445885ba412a60cd7c70336341f1b3511e6687ac420708748f0e4b1ef2632c19f4fee1333c0565826b851a7f1b4dfaa57 |
31 |
DIST linux-5.15.32.tar.xz 126254900 BLAKE2B 37db43d3fae8d56cfc9b4f9bd3a76f450b401cbe643c89191de4ab442cc0910fa2d67f2cddd2069d517fb426f6437ff7e05b43ff2a314da04f883d25e354dff2 SHA512 6d8955a6b71be155b153db0a43f75822f1f30f339445958828e1611648c8c6e0001cb118e9016a7119de80c28286b3e060da675aa73174a7a262fc8b537aacaf |
32 |
-DIST linux-5.15.35.tar.sign 991 BLAKE2B f457f0a24ac80d24ec0894dc3869a170e2c9f6264b3f491b0f84aac535cb0759a7f3df258a43f85875e523e62002c508f66f60555ef4efdd58c61f955e40a73a SHA512 6cb30052e392bf46bef6ff49a2c9e3f2fa6e6d68f7e6c492ac849b56816b68009418f0fd6662fa5f8e3ca5397a23b5ade96ed67ab6f5a62e3553278debff2048 |
33 |
-DIST linux-5.15.35.tar.xz 126293828 BLAKE2B 15f1af609ae4a233dc6bdae84c1231c2335be6320ddbb9a5d76c7983498a9ca72c13b55cc1408dac477f707fb84df99435994c1a7eeb91396481c2f7b11ecc2e SHA512 f75cc5615976ef58bf2e5a1ed12f433f2528c61151d59e0b95345782da1151eb94864e9a703973caad59b5bbe5a3667126e599107acdb3cd3b0f5576933ca3c1 |
34 |
DIST linux-5.15.36.tar.sign 991 BLAKE2B 7d7ac1237d1a06b4e55347c74089e1c05ef58ba6b7e06495fddb90a1ede896188a8d6ea87efb48aeb4c59f3e8dd18d86a91f3cfbfe2e5fbc3b8d7bd77b3f7eb8 SHA512 6f320635414855fe3e63e1e0966c29a8e0fb2321f91a94dcdee377f3369512a3c46dc495abcf55a44a0af5c7c25bd3e30562078689e698b2ecf3dcda2f7209c4 |
35 |
DIST linux-5.15.36.tar.xz 126289244 BLAKE2B fa9f4b4a4aa6f59155e5cbc3e355700ee4db4498053a6fca8e753b609f94a9c3ad947dd17a0bb6ba050b1dbafddb153096a79d07ee96e3fe3782166424045be2 SHA512 687f111226270080b7e8868972589755eb2f22bc396a56c23d663f2225c7aaab7e2c9bd0b66ea70364b35306ec43ac349ff9afcacbc1803b67734be0d752a973 |
36 |
-DIST linux-5.17.4.tar.sign 989 BLAKE2B d94187debf27aa4a8caf3010e2f61bfb8f7001285ef37cd81613385f6b82057dcbfb42c9b2187a0a9538cc8be9862d9ed7fbf78bcaf03b47326ac90b1e415be5 SHA512 ff50c91fe2359f4efc7515b859ef2816123da4b9f2d66274c07c1530d65b2378dbb58f757474905640cc6ad76143798875d5864c7a7ce6abb399fa2d13e0b7e4 |
37 |
-DIST linux-5.17.4.tar.xz 128419796 BLAKE2B a4ce00967f724753f5be39a3448ce6de18f46500d4dab8a4b93a4dfa4dfcb99cfcee6df3808ee355211cbb38819b2b9f7fea6e630db3e03e4a9f0bd952a32919 SHA512 a0f1945eb61527aac886875a83ad720bff3d6cd06ed0ee92ff7795e4f854d797f7688a102f1e8aa4425e96aab789f4b4c82104591de32fdf34ffd5c13622bbf3 |
38 |
DIST linux-5.17.5.tar.sign 989 BLAKE2B 72791ecee72367cb6eb883295dbe8dbb1d9d16b137fec43947df60e7a551415e74a93b7eaa1e568617e54e6fbabebb3f7582597c08eef9060d8a70d1d20f0a4d SHA512 d9bec5b8fafc3c33154498f5ff3d5bb432124d89c531cf650d4b0a8bf0c008fe2bed7a3228514a97225b43ebe641b3d5d8011ef01f2914d01a6ad2ef2fe0b861 |
39 |
DIST linux-5.17.5.tar.xz 128430464 BLAKE2B 253dff70d1f41a8d7483d98dfc374ef11367e7a07db0584787742b5a929458c3a52c81373622aa34f0421af3e4e270ba7f187e0421b3b124db43248f5ac04a36 SHA512 9a0b97b0179094fa4c3f91ad1f94ac274b4b7946b3c5112995fd5f60b263389772491f1a756186bb638ee868d42ccd7449cb9aa3227f1637949b6b54418c6bab |
40 |
DIST linux-5.4.188.tar.sign 991 BLAKE2B 544964d936af5ac8f877b2fd9fd3e858e1ea7bd82880ffed88493cc737a914285cfab6ec58019e42fbab3997b19148f4ec0925872179cecc1b7be62a02de6a04 SHA512 01fe913ef0da173dade0e0858f8032b01376223b1d99d381fc7118b38ed70cfba93435b97ce3e41f45159e952dd31db3a0bd67cdd32117379fd8847b236f05b2 |
41 |
|
42 |
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.112.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.112.ebuild |
43 |
deleted file mode 100644 |
44 |
index 96cb3e86fc4b..000000000000 |
45 |
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.112.ebuild |
46 |
+++ /dev/null |
47 |
@@ -1,134 +0,0 @@ |
48 |
-# Copyright 2020-2022 Gentoo Authors |
49 |
-# Distributed under the terms of the GNU General Public License v2 |
50 |
- |
51 |
-EAPI=7 |
52 |
- |
53 |
-inherit kernel-build toolchain-funcs verify-sig |
54 |
- |
55 |
-MY_P=linux-${PV} |
56 |
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 |
57 |
-CONFIG_VER=5.10.12 |
58 |
-CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530 |
59 |
-GENTOO_CONFIG_VER=g1 |
60 |
- |
61 |
-DESCRIPTION="Linux kernel built from vanilla upstream sources" |
62 |
-HOMEPAGE="https://www.kernel.org/" |
63 |
-SRC_URI+=" |
64 |
- https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz |
65 |
- https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz |
66 |
- -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz |
67 |
- verify-sig? ( |
68 |
- https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign |
69 |
- ) |
70 |
- amd64? ( |
71 |
- https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config |
72 |
- -> kernel-x86_64-fedora.config.${CONFIG_VER} |
73 |
- ) |
74 |
- arm64? ( |
75 |
- https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config |
76 |
- -> kernel-aarch64-fedora.config.${CONFIG_VER} |
77 |
- ) |
78 |
- ppc64? ( |
79 |
- https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config |
80 |
- -> kernel-ppc64le-fedora.config.${CONFIG_VER} |
81 |
- ) |
82 |
- x86? ( |
83 |
- https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config |
84 |
- -> kernel-i686-fedora.config.${CONFIG_VER} |
85 |
- ) |
86 |
-" |
87 |
-S=${WORKDIR}/${MY_P} |
88 |
- |
89 |
-LICENSE="GPL-2" |
90 |
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" |
91 |
-IUSE="debug hardened" |
92 |
-REQUIRED_USE="arm? ( savedconfig )" |
93 |
- |
94 |
-BDEPEND=" |
95 |
- debug? ( dev-util/pahole ) |
96 |
- verify-sig? ( sec-keys/openpgp-keys-kernel ) |
97 |
-" |
98 |
-PDEPEND=" |
99 |
- >=virtual/dist-kernel-${PV} |
100 |
-" |
101 |
- |
102 |
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc |
103 |
- |
104 |
-src_unpack() { |
105 |
- if use verify-sig; then |
106 |
- einfo "Unpacking linux-${PV}.tar.xz ..." |
107 |
- verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \ |
108 |
- < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x)) |
109 |
- assert "Unpack failed" |
110 |
- unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz" |
111 |
- else |
112 |
- default |
113 |
- fi |
114 |
-} |
115 |
- |
116 |
-src_prepare() { |
117 |
- default |
118 |
- |
119 |
- local biendian=false |
120 |
- |
121 |
- # prepare the default config |
122 |
- case ${ARCH} in |
123 |
- amd64) |
124 |
- cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die |
125 |
- ;; |
126 |
- arm) |
127 |
- return |
128 |
- ;; |
129 |
- arm64) |
130 |
- cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die |
131 |
- biendian=true |
132 |
- ;; |
133 |
- hppa) |
134 |
- return |
135 |
- ;; |
136 |
- ppc) |
137 |
- # assume powermac/powerbook defconfig |
138 |
- # we still package.use.force savedconfig |
139 |
- cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die |
140 |
- ;; |
141 |
- ppc64) |
142 |
- cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die |
143 |
- biendian=true |
144 |
- ;; |
145 |
- x86) |
146 |
- cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die |
147 |
- ;; |
148 |
- *) |
149 |
- die "Unsupported arch ${ARCH}" |
150 |
- ;; |
151 |
- esac |
152 |
- |
153 |
- local myversion="-dist" |
154 |
- use hardened && myversion+="-hardened" |
155 |
- echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die |
156 |
- local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}" |
157 |
- |
158 |
- local merge_configs=( |
159 |
- "${T}"/version.config |
160 |
- "${dist_conf_path}"/base.config |
161 |
- ) |
162 |
- use debug || merge_configs+=( |
163 |
- "${dist_conf_path}"/no-debug.config |
164 |
- ) |
165 |
- if use hardened; then |
166 |
- merge_configs+=( "${dist_conf_path}"/hardened-base.config ) |
167 |
- |
168 |
- tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config ) |
169 |
- |
170 |
- if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then |
171 |
- merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" ) |
172 |
- fi |
173 |
- fi |
174 |
- |
175 |
- # this covers ppc64 and aarch64_be only for now |
176 |
- if [[ ${biendian} == true && $(tc-endian) == big ]]; then |
177 |
- merge_configs+=( "${dist_conf_path}/big-endian.config" ) |
178 |
- fi |
179 |
- |
180 |
- kernel-build_merge_configs "${merge_configs[@]}" |
181 |
-} |
182 |
|
183 |
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.35.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.35.ebuild |
184 |
deleted file mode 100644 |
185 |
index 0ef902726d5d..000000000000 |
186 |
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.35.ebuild |
187 |
+++ /dev/null |
188 |
@@ -1,134 +0,0 @@ |
189 |
-# Copyright 2020-2022 Gentoo Authors |
190 |
-# Distributed under the terms of the GNU General Public License v2 |
191 |
- |
192 |
-EAPI=7 |
193 |
- |
194 |
-inherit kernel-build toolchain-funcs verify-sig |
195 |
- |
196 |
-MY_P=linux-${PV} |
197 |
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 |
198 |
-CONFIG_VER=5.15.19 |
199 |
-CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01 |
200 |
-GENTOO_CONFIG_VER=g1 |
201 |
- |
202 |
-DESCRIPTION="Linux kernel built from vanilla upstream sources" |
203 |
-HOMEPAGE="https://www.kernel.org/" |
204 |
-SRC_URI+=" |
205 |
- https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz |
206 |
- https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz |
207 |
- -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz |
208 |
- verify-sig? ( |
209 |
- https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign |
210 |
- ) |
211 |
- amd64? ( |
212 |
- https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config |
213 |
- -> kernel-x86_64-fedora.config.${CONFIG_VER} |
214 |
- ) |
215 |
- arm64? ( |
216 |
- https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config |
217 |
- -> kernel-aarch64-fedora.config.${CONFIG_VER} |
218 |
- ) |
219 |
- ppc64? ( |
220 |
- https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config |
221 |
- -> kernel-ppc64le-fedora.config.${CONFIG_VER} |
222 |
- ) |
223 |
- x86? ( |
224 |
- https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config |
225 |
- -> kernel-i686-fedora.config.${CONFIG_VER} |
226 |
- ) |
227 |
-" |
228 |
-S=${WORKDIR}/${MY_P} |
229 |
- |
230 |
-LICENSE="GPL-2" |
231 |
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" |
232 |
-IUSE="debug hardened" |
233 |
-REQUIRED_USE="arm? ( savedconfig )" |
234 |
- |
235 |
-BDEPEND=" |
236 |
- debug? ( dev-util/pahole ) |
237 |
- verify-sig? ( sec-keys/openpgp-keys-kernel ) |
238 |
-" |
239 |
-PDEPEND=" |
240 |
- >=virtual/dist-kernel-${PV} |
241 |
-" |
242 |
- |
243 |
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc |
244 |
- |
245 |
-src_unpack() { |
246 |
- if use verify-sig; then |
247 |
- einfo "Unpacking linux-${PV}.tar.xz ..." |
248 |
- verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \ |
249 |
- < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x)) |
250 |
- assert "Unpack failed" |
251 |
- unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz" |
252 |
- else |
253 |
- default |
254 |
- fi |
255 |
-} |
256 |
- |
257 |
-src_prepare() { |
258 |
- default |
259 |
- |
260 |
- local biendian=false |
261 |
- |
262 |
- # prepare the default config |
263 |
- case ${ARCH} in |
264 |
- amd64) |
265 |
- cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die |
266 |
- ;; |
267 |
- arm) |
268 |
- return |
269 |
- ;; |
270 |
- arm64) |
271 |
- cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die |
272 |
- biendian=true |
273 |
- ;; |
274 |
- hppa) |
275 |
- return |
276 |
- ;; |
277 |
- ppc) |
278 |
- # assume powermac/powerbook defconfig |
279 |
- # we still package.use.force savedconfig |
280 |
- cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die |
281 |
- ;; |
282 |
- ppc64) |
283 |
- cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die |
284 |
- biendian=true |
285 |
- ;; |
286 |
- x86) |
287 |
- cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die |
288 |
- ;; |
289 |
- *) |
290 |
- die "Unsupported arch ${ARCH}" |
291 |
- ;; |
292 |
- esac |
293 |
- |
294 |
- local myversion="-dist" |
295 |
- use hardened && myversion+="-hardened" |
296 |
- echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die |
297 |
- local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}" |
298 |
- |
299 |
- local merge_configs=( |
300 |
- "${T}"/version.config |
301 |
- "${dist_conf_path}"/base.config |
302 |
- ) |
303 |
- use debug || merge_configs+=( |
304 |
- "${dist_conf_path}"/no-debug.config |
305 |
- ) |
306 |
- if use hardened; then |
307 |
- merge_configs+=( "${dist_conf_path}"/hardened-base.config ) |
308 |
- |
309 |
- tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config ) |
310 |
- |
311 |
- if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then |
312 |
- merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" ) |
313 |
- fi |
314 |
- fi |
315 |
- |
316 |
- # this covers ppc64 and aarch64_be only for now |
317 |
- if [[ ${biendian} == true && $(tc-endian) == big ]]; then |
318 |
- merge_configs+=( "${dist_conf_path}/big-endian.config" ) |
319 |
- fi |
320 |
- |
321 |
- kernel-build_merge_configs "${merge_configs[@]}" |
322 |
-} |
323 |
|
324 |
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.17.4.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.17.4.ebuild |
325 |
deleted file mode 100644 |
326 |
index 87bf3c98dde9..000000000000 |
327 |
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.17.4.ebuild |
328 |
+++ /dev/null |
329 |
@@ -1,134 +0,0 @@ |
330 |
-# Copyright 2020-2022 Gentoo Authors |
331 |
-# Distributed under the terms of the GNU General Public License v2 |
332 |
- |
333 |
-EAPI=7 |
334 |
- |
335 |
-inherit kernel-build toolchain-funcs verify-sig |
336 |
- |
337 |
-MY_P=linux-${PV} |
338 |
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 |
339 |
-# forked to https://github.com/mgorny/fedora-kernel-config-for-gentoo |
340 |
-CONFIG_VER=5.17.3-gentoo |
341 |
-GENTOO_CONFIG_VER=g1 |
342 |
- |
343 |
-DESCRIPTION="Linux kernel built from vanilla upstream sources" |
344 |
-HOMEPAGE="https://www.kernel.org/" |
345 |
-SRC_URI+=" |
346 |
- https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz |
347 |
- https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz |
348 |
- -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz |
349 |
- verify-sig? ( |
350 |
- https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign |
351 |
- ) |
352 |
- amd64? ( |
353 |
- https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config |
354 |
- -> kernel-x86_64-fedora.config.${CONFIG_VER} |
355 |
- ) |
356 |
- arm64? ( |
357 |
- https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config |
358 |
- -> kernel-aarch64-fedora.config.${CONFIG_VER} |
359 |
- ) |
360 |
- ppc64? ( |
361 |
- https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config |
362 |
- -> kernel-ppc64le-fedora.config.${CONFIG_VER} |
363 |
- ) |
364 |
- x86? ( |
365 |
- https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config |
366 |
- -> kernel-i686-fedora.config.${CONFIG_VER} |
367 |
- ) |
368 |
-" |
369 |
-S=${WORKDIR}/${MY_P} |
370 |
- |
371 |
-LICENSE="GPL-2" |
372 |
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" |
373 |
-IUSE="debug hardened" |
374 |
-REQUIRED_USE="arm? ( savedconfig )" |
375 |
- |
376 |
-BDEPEND=" |
377 |
- debug? ( dev-util/pahole ) |
378 |
- verify-sig? ( sec-keys/openpgp-keys-kernel ) |
379 |
-" |
380 |
-PDEPEND=" |
381 |
- >=virtual/dist-kernel-${PV} |
382 |
-" |
383 |
- |
384 |
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc |
385 |
- |
386 |
-src_unpack() { |
387 |
- if use verify-sig; then |
388 |
- einfo "Unpacking linux-${PV}.tar.xz ..." |
389 |
- verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \ |
390 |
- < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x)) |
391 |
- assert "Unpack failed" |
392 |
- unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz" |
393 |
- else |
394 |
- default |
395 |
- fi |
396 |
-} |
397 |
- |
398 |
-src_prepare() { |
399 |
- default |
400 |
- |
401 |
- local biendian=false |
402 |
- |
403 |
- # prepare the default config |
404 |
- case ${ARCH} in |
405 |
- amd64) |
406 |
- cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die |
407 |
- ;; |
408 |
- arm) |
409 |
- return |
410 |
- ;; |
411 |
- arm64) |
412 |
- cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die |
413 |
- biendian=true |
414 |
- ;; |
415 |
- hppa) |
416 |
- return |
417 |
- ;; |
418 |
- ppc) |
419 |
- # assume powermac/powerbook defconfig |
420 |
- # we still package.use.force savedconfig |
421 |
- cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die |
422 |
- ;; |
423 |
- ppc64) |
424 |
- cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die |
425 |
- biendian=true |
426 |
- ;; |
427 |
- x86) |
428 |
- cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die |
429 |
- ;; |
430 |
- *) |
431 |
- die "Unsupported arch ${ARCH}" |
432 |
- ;; |
433 |
- esac |
434 |
- |
435 |
- local myversion="-dist" |
436 |
- use hardened && myversion+="-hardened" |
437 |
- echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die |
438 |
- local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}" |
439 |
- |
440 |
- local merge_configs=( |
441 |
- "${T}"/version.config |
442 |
- "${dist_conf_path}"/base.config |
443 |
- ) |
444 |
- use debug || merge_configs+=( |
445 |
- "${dist_conf_path}"/no-debug.config |
446 |
- ) |
447 |
- if use hardened; then |
448 |
- merge_configs+=( "${dist_conf_path}"/hardened-base.config ) |
449 |
- |
450 |
- tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config ) |
451 |
- |
452 |
- if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then |
453 |
- merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" ) |
454 |
- fi |
455 |
- fi |
456 |
- |
457 |
- # this covers ppc64 and aarch64_be only for now |
458 |
- if [[ ${biendian} == true && $(tc-endian) == big ]]; then |
459 |
- merge_configs+=( "${dist_conf_path}/big-endian.config" ) |
460 |
- fi |
461 |
- |
462 |
- kernel-build_merge_configs "${merge_configs[@]}" |
463 |
-} |