1 |
commit: 8688bdf7c23696ebe3306470885d9ac187d12254 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu May 13 20:24:12 2021 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 13 20:24:12 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8688bdf7 |
7 |
|
8 |
sys-apps/kexec-tools: Remove old 2.0.20-r3 |
9 |
|
10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
12 |
|
13 |
sys-apps/kexec-tools/Manifest | 1 - |
14 |
...ec-tools-2.0.20-build-multiboot2-for-i386.patch | 68 ----------- |
15 |
...0-remove-duplicated-variable-declarations.patch | 99 ---------------- |
16 |
sys-apps/kexec-tools/kexec-tools-2.0.20-r3.ebuild | 126 --------------------- |
17 |
4 files changed, 294 deletions(-) |
18 |
|
19 |
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest |
20 |
index 5f43db3899a..cb80e9aa09d 100644 |
21 |
--- a/sys-apps/kexec-tools/Manifest |
22 |
+++ b/sys-apps/kexec-tools/Manifest |
23 |
@@ -1,3 +1,2 @@ |
24 |
-DIST kexec-tools-2.0.20.tar.xz 297476 BLAKE2B 7e29e7f7d85296dd3e614c45f14c27eca74ce4426d5de2d20387d89f2f63afed318d6157cc4001849a04bb83505bbae87c43d34683ebaf9a70f5f29e3979ade3 SHA512 3112b6202c1030705c53e3f65a2b58aec14d65333a35aad681d48b9f2bd1c51a2e05c985a1e5e867ab02f8a9c97708483d9d225619db7c6993676f1a242e2d99 |
25 |
DIST kexec-tools-2.0.21.tar.xz 303300 BLAKE2B d5b7bddeafdcbfd2b07dab6e4f167fcb61ccf2ec487f1835ac552a4596d22a94a7297d0eb769913f84eddc564ba4d9ae0c9d4c76994d0e3670fe168f377ebc77 SHA512 f487d2e243c2c4f29fbc9da7d06806f65210f717904655fc84d8d162b9c4614c3dd62e1bb47104a79f0dc2af04e462baf764fb309b5d7e6d287264cb48fd2a3e |
26 |
DIST kexec-tools-2.0.22.tar.xz 303564 BLAKE2B 977c741eabf9b6b882550713ba59b18289b4f997fb382e96338efce6d04a9390fea952fc46ca72fd0a0b782261841ab2002da84b1819f955e63996eac900b0f7 SHA512 7580860f272eee5af52139809f12961e5a5d3a65f4e191183ca9c845410425d25818945ac14ed04a60e6ce474dc2656fc6a14041177b0bf703f450820c7d6aba |
27 |
|
28 |
diff --git a/sys-apps/kexec-tools/files/kexec-tools-2.0.20-build-multiboot2-for-i386.patch b/sys-apps/kexec-tools/files/kexec-tools-2.0.20-build-multiboot2-for-i386.patch |
29 |
deleted file mode 100644 |
30 |
index 8f63ddbe3ba..00000000000 |
31 |
--- a/sys-apps/kexec-tools/files/kexec-tools-2.0.20-build-multiboot2-for-i386.patch |
32 |
+++ /dev/null |
33 |
@@ -1,68 +0,0 @@ |
34 |
-From 2c9f26ed20a791a7df0182ba82e93abb52f5a615 Mon Sep 17 00:00:00 2001 |
35 |
-From: Chris Packham <chris.packham@××××××××××××××××.nz> |
36 |
-Date: Mon, 18 Nov 2019 12:52:15 +1300 |
37 |
-Subject: kexec: build multiboot2 for i386 |
38 |
- |
39 |
-This addresses the following compilation issues when building for i386. |
40 |
- |
41 |
- kexec/arch/i386/kexec-x86.c:39:22: error: 'multiboot2_x86_probe' undeclared here (not in a function); did you mean 'multiboot_x86_probe'? |
42 |
- { "multiboot2-x86", multiboot2_x86_probe, multiboot2_x86_load, |
43 |
- ^~~~~~~~~~~~~~~~~~~~ |
44 |
- multiboot_x86_probe |
45 |
- kexec/arch/i386/kexec-x86.c:39:44: error: 'multiboot2_x86_load' undeclared here (not in a function); did you mean 'multiboot_x86_load'? |
46 |
- { "multiboot2-x86", multiboot2_x86_probe, multiboot2_x86_load, |
47 |
- ^~~~~~~~~~~~~~~~~~~ |
48 |
- multiboot_x86_load |
49 |
- kexec/arch/i386/kexec-x86.c:40:4: error: 'multiboot2_x86_usage' undeclared here (not in a function); did you mean 'multiboot_x86_usage'? |
50 |
- multiboot2_x86_usage }, |
51 |
- ^~~~~~~~~~~~~~~~~~~~ |
52 |
- multiboot_x86_usage |
53 |
- make: *** [Makefile:114: kexec/arch/i386/kexec-x86.o] Error 1 |
54 |
- make: *** Waiting for unfinished jobs.... |
55 |
- |
56 |
-Signed-off-by: Chris Packham <chris.packham@××××××××××××××××.nz> |
57 |
-Signed-off-by: Simon Horman <horms@×××××××××.au> |
58 |
---- |
59 |
- kexec/arch/i386/Makefile | 2 +- |
60 |
- kexec/arch/i386/kexec-x86.h | 5 +++++ |
61 |
- 2 files changed, 6 insertions(+), 1 deletion(-) |
62 |
- |
63 |
-diff --git a/kexec/arch/i386/Makefile b/kexec/arch/i386/Makefile |
64 |
-index 105cefd..f486103 100644 |
65 |
---- a/kexec/arch/i386/Makefile |
66 |
-+++ b/kexec/arch/i386/Makefile |
67 |
-@@ -7,6 +7,7 @@ i386_KEXEC_SRCS += kexec/arch/i386/kexec-elf-x86.c |
68 |
- i386_KEXEC_SRCS += kexec/arch/i386/kexec-elf-rel-x86.c |
69 |
- i386_KEXEC_SRCS += kexec/arch/i386/kexec-bzImage.c |
70 |
- i386_KEXEC_SRCS += kexec/arch/i386/kexec-multiboot-x86.c |
71 |
-+i386_KEXEC_SRCS += kexec/arch/i386/kexec-mb2-x86.c |
72 |
- i386_KEXEC_SRCS += kexec/arch/i386/kexec-beoboot-x86.c |
73 |
- i386_KEXEC_SRCS += kexec/arch/i386/kexec-nbi.c |
74 |
- i386_KEXEC_SRCS += kexec/arch/i386/x86-linux-setup.c |
75 |
-@@ -14,7 +15,6 @@ i386_KEXEC_SRCS += kexec/arch/i386/crashdump-x86.c |
76 |
- |
77 |
- dist += kexec/arch/i386/Makefile $(i386_KEXEC_SRCS) \ |
78 |
- kexec/arch/i386/crashdump-x86.h \ |
79 |
-- kexec/arch/i386/kexec-mb2-x86.c \ |
80 |
- kexec/arch/i386/kexec-x86.h \ |
81 |
- kexec/arch/i386/x86-linux-setup.h \ |
82 |
- kexec/arch/i386/include/arch/options.h |
83 |
-diff --git a/kexec/arch/i386/kexec-x86.h b/kexec/arch/i386/kexec-x86.h |
84 |
-index 1b58c3b..0f941df 100644 |
85 |
---- a/kexec/arch/i386/kexec-x86.h |
86 |
-+++ b/kexec/arch/i386/kexec-x86.h |
87 |
-@@ -60,6 +60,11 @@ int multiboot_x86_load(int argc, char **argv, const char *buf, off_t len, |
88 |
- struct kexec_info *info); |
89 |
- void multiboot_x86_usage(void); |
90 |
- |
91 |
-+int multiboot2_x86_load(int argc, char **argv, const char *buf, off_t len, |
92 |
-+ struct kexec_info *info); |
93 |
-+void multiboot2_x86_usage(void); |
94 |
-+int multiboot2_x86_probe(const char *buf, off_t buf_len); |
95 |
-+ |
96 |
- int elf_x86_probe(const char *buf, off_t len); |
97 |
- int elf_x86_load(int argc, char **argv, const char *buf, off_t len, |
98 |
- struct kexec_info *info); |
99 |
--- |
100 |
-cgit 1.2-0.3.lf.el7 |
101 |
- |
102 |
|
103 |
diff --git a/sys-apps/kexec-tools/files/kexec-tools-2.0.20-remove-duplicated-variable-declarations.patch b/sys-apps/kexec-tools/files/kexec-tools-2.0.20-remove-duplicated-variable-declarations.patch |
104 |
deleted file mode 100644 |
105 |
index d71e76b3d63..00000000000 |
106 |
--- a/sys-apps/kexec-tools/files/kexec-tools-2.0.20-remove-duplicated-variable-declarations.patch |
107 |
+++ /dev/null |
108 |
@@ -1,99 +0,0 @@ |
109 |
-From cc087b11462af9f971a2c090d07e8d780a867b50 Mon Sep 17 00:00:00 2001 |
110 |
-From: Kairui Song <kasong@××××××.com> |
111 |
-Date: Wed, 29 Jan 2020 13:38:19 +0800 |
112 |
-Subject: kexec-tools: Remove duplicated variable declarations |
113 |
- |
114 |
-When building kexec-tools for Fedora 32, following error is observed: |
115 |
- |
116 |
-/usr/bin/ld: kexec/arch/x86_64/kexec-bzImage64.o:(.bss+0x0): multiple definition of `bzImage_support_efi_boot'; |
117 |
-kexec/arch/i386/kexec-bzImage.o:(.bss+0x0): first defined here |
118 |
- |
119 |
-/builddir/build/BUILD/kexec-tools-2.0.20/kexec/arch/arm/../../fs2dt.h:33: multiple definition of `my_debug'; |
120 |
-kexec/fs2dt.o:/builddir/build/BUILD/kexec-tools-2.0.20/kexec/fs2dt.h:33: first defined here |
121 |
- |
122 |
-/builddir/build/BUILD/kexec-tools-2.0.20/kexec/arch/arm64/kexec-arm64.h:68: multiple definition of `arm64_mem'; |
123 |
-kexec/fs2dt.o:/builddir/build/BUILD/kexec-tools-2.0.20/././kexec/arch/arm64/kexec-arm64.h:68: first defined here |
124 |
- |
125 |
-/builddir/build/BUILD/kexec-tools-2.0.20/kexec/arch/arm64/kexec-arm64.h:54: multiple definition of `initrd_size'; |
126 |
-kexec/fs2dt.o:/builddir/build/BUILD/kexec-tools-2.0.20/././kexec/arch/arm64/kexec-arm64.h:54: first defined here |
127 |
- |
128 |
-/builddir/build/BUILD/kexec-tools-2.0.20/kexec/arch/arm64/kexec-arm64.h:53: multiple definition of `initrd_base'; |
129 |
-kexec/fs2dt.o:/builddir/build/BUILD/kexec-tools-2.0.20/././kexec/arch/arm64/kexec-arm64.h:53: first defined here |
130 |
- |
131 |
-And apparently, these variables are wrongly declared multiple times. So |
132 |
-remove duplicated declaration. |
133 |
- |
134 |
-Signed-off-by: Kairui Song <kasong@××××××.com> |
135 |
-Signed-off-by: Simon Horman <horms@×××××××××.au> |
136 |
---- |
137 |
- kexec/arch/arm64/kexec-arm64.h | 6 +++--- |
138 |
- kexec/arch/ppc64/kexec-elf-ppc64.c | 2 -- |
139 |
- kexec/arch/x86_64/kexec-bzImage64.c | 1 - |
140 |
- kexec/fs2dt.h | 2 +- |
141 |
- 4 files changed, 4 insertions(+), 7 deletions(-) |
142 |
- |
143 |
-diff --git a/kexec/arch/arm64/kexec-arm64.h b/kexec/arch/arm64/kexec-arm64.h |
144 |
-index 628de79..ed447ac 100644 |
145 |
---- a/kexec/arch/arm64/kexec-arm64.h |
146 |
-+++ b/kexec/arch/arm64/kexec-arm64.h |
147 |
-@@ -50,8 +50,8 @@ int zImage_arm64_load(int argc, char **argv, const char *kernel_buf, |
148 |
- void zImage_arm64_usage(void); |
149 |
- |
150 |
- |
151 |
--off_t initrd_base; |
152 |
--off_t initrd_size; |
153 |
-+extern off_t initrd_base; |
154 |
-+extern off_t initrd_size; |
155 |
- |
156 |
- /** |
157 |
- * struct arm64_mem - Memory layout info. |
158 |
-@@ -65,7 +65,7 @@ struct arm64_mem { |
159 |
- }; |
160 |
- |
161 |
- #define arm64_mem_ngv UINT64_MAX |
162 |
--struct arm64_mem arm64_mem; |
163 |
-+extern struct arm64_mem arm64_mem; |
164 |
- |
165 |
- uint64_t get_phys_offset(void); |
166 |
- uint64_t get_vp_offset(void); |
167 |
-diff --git a/kexec/arch/ppc64/kexec-elf-ppc64.c b/kexec/arch/ppc64/kexec-elf-ppc64.c |
168 |
-index 3510b70..695b8b0 100644 |
169 |
---- a/kexec/arch/ppc64/kexec-elf-ppc64.c |
170 |
-+++ b/kexec/arch/ppc64/kexec-elf-ppc64.c |
171 |
-@@ -44,8 +44,6 @@ |
172 |
- uint64_t initrd_base, initrd_size; |
173 |
- unsigned char reuse_initrd = 0; |
174 |
- const char *ramdisk; |
175 |
--/* Used for enabling printing message from purgatory code */ |
176 |
--int my_debug = 0; |
177 |
- |
178 |
- int elf_ppc64_probe(const char *buf, off_t len) |
179 |
- { |
180 |
-diff --git a/kexec/arch/x86_64/kexec-bzImage64.c b/kexec/arch/x86_64/kexec-bzImage64.c |
181 |
-index 8edb3e4..ba8dc48 100644 |
182 |
---- a/kexec/arch/x86_64/kexec-bzImage64.c |
183 |
-+++ b/kexec/arch/x86_64/kexec-bzImage64.c |
184 |
-@@ -42,7 +42,6 @@ |
185 |
- #include <arch/options.h> |
186 |
- |
187 |
- static const int probe_debug = 0; |
188 |
--int bzImage_support_efi_boot; |
189 |
- |
190 |
- int bzImage64_probe(const char *buf, off_t len) |
191 |
- { |
192 |
-diff --git a/kexec/fs2dt.h b/kexec/fs2dt.h |
193 |
-index 7633273..fe24931 100644 |
194 |
---- a/kexec/fs2dt.h |
195 |
-+++ b/kexec/fs2dt.h |
196 |
-@@ -30,7 +30,7 @@ extern struct bootblock bb[1]; |
197 |
- |
198 |
- /* Used for enabling printing message from purgatory code |
199 |
- * Only has implemented for PPC64 */ |
200 |
--int my_debug; |
201 |
-+extern int my_debug; |
202 |
- extern int dt_no_old_root; |
203 |
- |
204 |
- void reserve(unsigned long long where, unsigned long long length); |
205 |
--- |
206 |
-cgit 1.2-0.3.lf.el7 |
207 |
- |
208 |
|
209 |
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.20-r3.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.20-r3.ebuild |
210 |
deleted file mode 100644 |
211 |
index 89aebbb2917..00000000000 |
212 |
--- a/sys-apps/kexec-tools/kexec-tools-2.0.20-r3.ebuild |
213 |
+++ /dev/null |
214 |
@@ -1,126 +0,0 @@ |
215 |
-# Copyright 1999-2020 Gentoo Authors |
216 |
-# Distributed under the terms of the GNU General Public License v2 |
217 |
- |
218 |
-EAPI=7 |
219 |
- |
220 |
-inherit libtool linux-info systemd |
221 |
- |
222 |
-if [[ ${PV} == "9999" ]] ; then |
223 |
- inherit git-r3 autotools |
224 |
- EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git" |
225 |
-else |
226 |
- SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P/_/-}.tar.xz" |
227 |
- [[ "${PV}" == *_rc* ]] || \ |
228 |
- KEYWORDS="amd64 ~arm64 ~ppc64 x86" |
229 |
-fi |
230 |
- |
231 |
-DESCRIPTION="Load another kernel from the currently executing Linux kernel" |
232 |
-HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/" |
233 |
- |
234 |
-LICENSE="GPL-2" |
235 |
-SLOT="0" |
236 |
-IUSE="booke lzma xen zlib" |
237 |
- |
238 |
-REQUIRED_USE="lzma? ( zlib )" |
239 |
- |
240 |
-DEPEND=" |
241 |
- lzma? ( app-arch/xz-utils ) |
242 |
- zlib? ( sys-libs/zlib )" |
243 |
-RDEPEND="${DEPEND}" |
244 |
- |
245 |
-S="${WORKDIR}/${P/_/-}" |
246 |
- |
247 |
-CONFIG_CHECK="~KEXEC" |
248 |
- |
249 |
-PATCHES=( |
250 |
- "${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch |
251 |
- "${FILESDIR}"/${PN}-2.0.4-out-of-source.patch |
252 |
- "${FILESDIR}"/${P}-remove-duplicated-variable-declarations.patch |
253 |
- "${FILESDIR}"/${P}-build-multiboot2-for-i386.patch |
254 |
-) |
255 |
- |
256 |
-pkg_setup() { |
257 |
- # GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC) |
258 |
- export ASFLAGS="${CCASFLAGS}" |
259 |
-} |
260 |
- |
261 |
-src_prepare() { |
262 |
- default |
263 |
- |
264 |
- # Append PURGATORY_EXTRA_CFLAGS flags set by configure, instead of overriding them completely. |
265 |
- sed -e "/^PURGATORY_EXTRA_CFLAGS =/s/=/+=/" -i Makefile.in || die |
266 |
- |
267 |
- if [[ "${PV}" == 9999 ]] ; then |
268 |
- eautoreconf |
269 |
- else |
270 |
- elibtoolize |
271 |
- fi |
272 |
-} |
273 |
- |
274 |
-src_configure() { |
275 |
- local myeconfargs=( |
276 |
- $(use_with booke) |
277 |
- $(use_with lzma) |
278 |
- $(use_with xen) |
279 |
- $(use_with zlib) |
280 |
- ) |
281 |
- econf "${myeconfargs[@]}" |
282 |
-} |
283 |
- |
284 |
-src_compile() { |
285 |
- # Respect CFLAGS for purgatory. |
286 |
- # purgatory/Makefile uses PURGATORY_EXTRA_CFLAGS variable. |
287 |
- # -mfunction-return=thunk and -mindirect-branch=thunk conflict with |
288 |
- # -mcmodel=large which is added by build system. |
289 |
- # Replace them with -mfunction-return=thunk-inline and -mindirect-branch=thunk-inline. |
290 |
- local flag flags=() |
291 |
- for flag in ${CFLAGS}; do |
292 |
- [[ ${flag} == -mfunction-return=thunk ]] && flag="-mfunction-return=thunk-inline" |
293 |
- [[ ${flag} == -mindirect-branch=thunk ]] && flag="-mindirect-branch=thunk-inline" |
294 |
- flags+=("${flag}") |
295 |
- done |
296 |
- local -x PURGATORY_EXTRA_CFLAGS="${flags[*]}" |
297 |
- |
298 |
- default |
299 |
-} |
300 |
- |
301 |
-src_install() { |
302 |
- default |
303 |
- |
304 |
- dodoc "${FILESDIR}"/README.Gentoo |
305 |
- |
306 |
- newinitd "${FILESDIR}"/kexec-r2.init kexec |
307 |
- newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec |
308 |
- |
309 |
- insinto /etc |
310 |
- doins "${FILESDIR}"/kexec.conf |
311 |
- |
312 |
- insinto /etc/kernel/postinst.d |
313 |
- doins "${FILESDIR}"/90_kexec |
314 |
- |
315 |
- systemd_dounit "${FILESDIR}"/kexec.service |
316 |
-} |
317 |
- |
318 |
-pkg_postinst() { |
319 |
- if systemd_is_booted || has_version sys-apps/systemd; then |
320 |
- elog "For systemd support the new config file is" |
321 |
- elog " /etc/kexec.conf" |
322 |
- elog "Please adopt it to your needs as there is no autoconfig anymore" |
323 |
- fi |
324 |
- |
325 |
- local n_root_args=$(grep -o -- '\<root=' /proc/cmdline 2>/dev/null | wc -l) |
326 |
- local has_rootpart_set=no |
327 |
- if [[ -f "${EROOT}/etc/conf.d/kexec" ]]; then |
328 |
- if grep -q -E -- '^ROOTPART=' "${EROOT}/etc/conf.d/kexec" 2>/dev/null; then |
329 |
- has_rootpart_set=yes |
330 |
- fi |
331 |
- fi |
332 |
- |
333 |
- if [[ ${n_root_args} > 1 && "${has_rootpart_set}" == "no" ]]; then |
334 |
- ewarn "WARNING: Multiple root arguments (root=) on kernel command-line detected!" |
335 |
- ewarn "This was probably caused by a previous version of ${PN}." |
336 |
- ewarn "Please reboot system once *without* kexec to avoid boot problems" |
337 |
- ewarn "in case running system and initramfs do not agree on detected" |
338 |
- ewarn "root device name!" |
339 |
- fi |
340 |
-} |