1 |
commit: 0f9a75eef722e5959c9eb565d26c7e2798bc3fc1 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue May 1 20:10:29 2018 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 1 20:10:53 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f9a75ee |
7 |
|
8 |
sys-apps/kexec-tools: Removed old. |
9 |
|
10 |
Package-Manager: Portage-2.3.31, Repoman-2.3.9 |
11 |
|
12 |
sys-apps/kexec-tools/Manifest | 2 - |
13 |
.../files/kexec-tools-2.0.0-respect-LDFLAGS.patch | 11 -- |
14 |
sys-apps/kexec-tools/files/kexec.init-2.0.4-r2 | 164 --------------------- |
15 |
sys-apps/kexec-tools/kexec-tools-2.0.15.ebuild | 81 ---------- |
16 |
sys-apps/kexec-tools/kexec-tools-2.0.4-r2.ebuild | 72 --------- |
17 |
5 files changed, 330 deletions(-) |
18 |
|
19 |
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest |
20 |
index 47b2cbcd431..0327fc4ca1d 100644 |
21 |
--- a/sys-apps/kexec-tools/Manifest |
22 |
+++ b/sys-apps/kexec-tools/Manifest |
23 |
@@ -1,5 +1,3 @@ |
24 |
DIST kexec-tools-2.0.14.tar.xz 283640 BLAKE2B f84b5485904c0d4bbe5f7fdae391a4fb0b2a7436e078f23de649e79aaa7dfcdeff99139230a299bf2b9b0554ac13fa833e31211682c92f07cd6b8072907e35aa SHA512 8c1f9d1f4bb69a621961d45091f9c8349535ae69b80168423663685b44d89e1b9324d5cd11c83e86d805a3371f4f1600b0def551c52efb3c6cf020e9c11c273f |
25 |
-DIST kexec-tools-2.0.15.tar.xz 286944 BLAKE2B 00344b607fbbca77398e74bf7f6506efa124ddb4ad0f2e55424a40b90ac0d1a6336dd43f4c8804323e12598f1647cd105880960abfda7df8215c787dae150bda SHA512 0bddf31b9bb0e203b813d820e1e248974c2d62cb388dfaf4f2f4971f764cc71e54edbaeaeb663c15d6fa06574beceb87d9ffd7d822ac6699d86c54645096e7e9 |
26 |
DIST kexec-tools-2.0.16.tar.xz 287888 BLAKE2B 7e7bbe11dc2792be3cab6318c12b6866bf6b373fb7bf2d7601ef68a39dd5882aceab7c8905ce0d9b0af1da2072b3f3d2677bd9e006676c484e1d6506ac7036fa SHA512 f2f06e7702fef20c8d7d6aabe1b264e2e2689e5c38cc00dbc2186dd7fa0479edb2dc9e307dd2ad7f03db47015e966e577f11576172604ef01c1bcca471fe2c24 |
27 |
DIST kexec-tools-2.0.17.tar.xz 290612 BLAKE2B 57ec5b5ed33a5c5bbe433099d6e80663717c8a086bdb8b95f4a1d81fd7e546619c0064698454dc79f489313f98696ee6dee4cafbc8b1b93db5c7909cdf7a6234 SHA512 e0f254ca2b26fa02cb61ba9a0735423b26bac2693fbd920eaf7cc2822c298de958bd65f7c37947ca1f6811a3752a58f7cf8aa903494f0109ea76b7159a037fa6 |
28 |
-DIST kexec-tools-2.0.4.tar.xz 271604 BLAKE2B f3359e91295b1c37bd94d3ea7889e948e0716781375f3387077962313615986947b0ac134023876b88cf92b5f0b5e1d3d5d97099ac799d0ba182b58f1bb4674c SHA512 2514f407d9150d2615dffc91a525fb28f159bef92b9543f9802e2618746b7d4c04137668ad8a8d8f0b75f68ed9057d09629ce736b6a061b5cf817b9d904f549e |
29 |
|
30 |
diff --git a/sys-apps/kexec-tools/files/kexec-tools-2.0.0-respect-LDFLAGS.patch b/sys-apps/kexec-tools/files/kexec-tools-2.0.0-respect-LDFLAGS.patch |
31 |
deleted file mode 100644 |
32 |
index 040d138ece0..00000000000 |
33 |
--- a/sys-apps/kexec-tools/files/kexec-tools-2.0.0-respect-LDFLAGS.patch |
34 |
+++ /dev/null |
35 |
@@ -1,11 +0,0 @@ |
36 |
---- kdump/Makefile |
37 |
-+++ kdump/Makefile |
38 |
-@@ -18,7 +18,7 @@ |
39 |
- $(KDUMP): CC=$(TARGET_CC) |
40 |
- $(KDUMP): $(KDUMP_OBJS) |
41 |
- @$(MKDIR) -p $(@D) |
42 |
-- $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -o $@ $(KDUMP_OBJS) |
43 |
-+ $(LINK.o) $(CFLAGS) -o $@ $(KDUMP_OBJS) |
44 |
- |
45 |
- $(KDUMP_MANPAGE): kdump/kdump.8 |
46 |
- $(MKDIR) -p $(MANDIR)/man8 |
47 |
|
48 |
diff --git a/sys-apps/kexec-tools/files/kexec.init-2.0.4-r2 b/sys-apps/kexec-tools/files/kexec.init-2.0.4-r2 |
49 |
deleted file mode 100644 |
50 |
index f60cb2a7caf..00000000000 |
51 |
--- a/sys-apps/kexec-tools/files/kexec.init-2.0.4-r2 |
52 |
+++ /dev/null |
53 |
@@ -1,164 +0,0 @@ |
54 |
-#!/sbin/openrc-run |
55 |
-# Copyright 1999-2013 Gentoo Foundation |
56 |
-# Distributed under the terms of the GNU General Public License v2 |
57 |
- |
58 |
-depend() { |
59 |
- need localmount |
60 |
-} |
61 |
- |
62 |
-image_path() { |
63 |
- local x= kver=$(uname -r) karch=$(uname -m) |
64 |
- BOOTPART="${BOOTPART:-/boot}" |
65 |
- KNAME="${KNAME:-bzImage}" |
66 |
- if [ -e "${KNAME}" ]; then |
67 |
- echo "${KNAME}" |
68 |
- return 0 |
69 |
- fi |
70 |
- for x in "${KNAME#${BOOTPART}}" vmlinuz \ |
71 |
- bzImage-${kver} vmlinuz-${kver} \ |
72 |
- kernel-genkernel-${karch}-${kver} \ |
73 |
- kernel-${kver} kernel-${karch}; do |
74 |
- if [ -e "${BOOTPART}/${x}" ]; then |
75 |
- echo "${BOOTPART}/${x}" |
76 |
- return 0 |
77 |
- fi |
78 |
- done |
79 |
- |
80 |
- return 1 |
81 |
-} |
82 |
- |
83 |
-initrd_path() { |
84 |
- local x= kver=$(uname -r) karch=$(uname -m) |
85 |
- BOOTPART="${BOOTPART:-/boot}" |
86 |
- INITRD="${INITRD:-initrd}" |
87 |
- if [ -e "${INITRD}" ]; then |
88 |
- echo "${INITRD}" |
89 |
- return 0 |
90 |
- fi |
91 |
- for x in "${INITRD#${BOOTPART}}" \ |
92 |
- initrd.img-${kver} initrd-${kver}.img \ |
93 |
- initrd-${kver} initramfs-${kver}.img \ |
94 |
- initramfs-genkernel-${karch}-${kver} ; do |
95 |
- if [ -e "${BOOTPART}/${x}" ]; then |
96 |
- echo "${BOOTPART}/${x}" |
97 |
- return 0 |
98 |
- fi |
99 |
- done |
100 |
- |
101 |
- return 1 |
102 |
-} |
103 |
- |
104 |
-mount_boot(){ |
105 |
- local ret |
106 |
- |
107 |
- [ -n "${DONT_MOUNT_BOOT}" ] && return 1 |
108 |
- grep -q " ${BOOTPART:-/boot} " /proc/mounts && return 1 |
109 |
- |
110 |
- BOOTPART="${BOOTPART:-/boot}" |
111 |
- ebegin "Mounting ${BOOTPART}" |
112 |
- mount "${BOOTPART}"; ret=$? |
113 |
- eend ${ret} |
114 |
- return ${ret} |
115 |
-} |
116 |
- |
117 |
-load_image() { |
118 |
- local ret |
119 |
- if [ "${KNAME}" = "-" ]; then |
120 |
- ebegin "Disabling kexec" |
121 |
- kexec -u; ret=$? |
122 |
- eend ${ret} |
123 |
- return ${ret} |
124 |
- fi |
125 |
- |
126 |
- BOOTPART="${BOOTPART:-/boot}" |
127 |
- local img= initrd="$(initrd_path)" mounted=false initrdopt= |
128 |
- |
129 |
- if ! img="$(image_path)"; then |
130 |
- if mount_boot; then |
131 |
- if img="$(image_path)"; then |
132 |
- mounted=true |
133 |
- initrd="$(initrd_path)" |
134 |
- else |
135 |
- eerror "No kernel image found in ${BOOTPART}!" |
136 |
- umount "${BOOTPART}" |
137 |
- return 1 |
138 |
- fi |
139 |
- else |
140 |
- eerror "No kernel image found in ${BOOTPART}!" |
141 |
- return 1 |
142 |
- fi |
143 |
- fi |
144 |
- |
145 |
- if [ -n "${INITRD}" ] && \ |
146 |
- ! [ "${BOOTPART}/${INITRD#${BOOTPART}}" = "${initrd}" ]; then |
147 |
- eerror "Requested initrd: ${INITRD#${BOOTPART}}" |
148 |
- eerror "could not be found" |
149 |
- return 1 |
150 |
- fi |
151 |
- |
152 |
- [ -n "${ROOTPART}" ] || \ |
153 |
- ROOTPART="$(readlink -f "$(sed -n '/^\/[^ ]* \/ / s,^\([^ ]*\).*,\1,p' /proc/mounts)")" |
154 |
- |
155 |
- [ -n "${KPARAM}" ] || KEXEC_OPT_ARGS="${KEXEC_OPT_ARGS} --reuse-cmdline" |
156 |
- |
157 |
- [ -n "${initrd}" ] && [ -e "${initrd}" ] && initrdopt="--initrd=${initrd}" |
158 |
- |
159 |
- local msg= |
160 |
- [ -n "${initrd}" ] && \ |
161 |
- msg="with ${initrd}" |
162 |
- einfo "Using kernel image ${img} ${msg} for kexec" |
163 |
- |
164 |
- ebegin "Setting kexec with ${KEXEC_OPT_ARGS} -l ${img} root=${ROOTPART} ${KPARAM} ${initrdopt}" |
165 |
- kexec ${KEXEC_OPT_ARGS} -l "${img}" --append="root=${ROOTPART} ${KPARAM}" ${initrdopt} |
166 |
- local res=$? |
167 |
- |
168 |
- ${mounted} && umount "${BOOTPART}" |
169 |
- eend ${res} |
170 |
- return ${res} |
171 |
-} |
172 |
- |
173 |
-start() { |
174 |
- if [ "${LOAD_DURING_SHUTDOWN:-yes}" = "yes" ]; then |
175 |
- local ret=0 |
176 |
- BOOTPART="${BOOTPART:-/boot}" |
177 |
- if mount_boot; then |
178 |
- mounted=true |
179 |
- fi |
180 |
- if ! image_path > /dev/null; then |
181 |
- ewarn "Cannot find kernel image!" |
182 |
- ewarn "Please make sure a valid kernel image is present before reboot." |
183 |
- return 0 |
184 |
- fi |
185 |
- if [ -n "${mounted}" ]; then |
186 |
- ebegin "Unmounting ${BOOTPART}" |
187 |
- umount "${BOOTPART}"; ret=$? |
188 |
- eend ${ret} |
189 |
- fi |
190 |
- return ${ret} |
191 |
- else |
192 |
- ebegin "Configuring kexec" |
193 |
- load_image |
194 |
- eend $? |
195 |
- fi |
196 |
-} |
197 |
- |
198 |
-stop() { |
199 |
- [ "${LOAD_DURING_SHUTDOWN:-yes}" != "yes" ] && return 0 |
200 |
- |
201 |
- if ! yesno $RC_REBOOT; then |
202 |
- einfo "Not rebooting, so disabling" |
203 |
- kexec -u |
204 |
- return 0 |
205 |
- fi |
206 |
- |
207 |
- if [ -f /nokexec ]; then |
208 |
- einfo "Not using kexec during reboot" |
209 |
- rm -f /nokexec |
210 |
- kexec -u |
211 |
- return 0 |
212 |
- fi |
213 |
- |
214 |
- ebegin "Configuring kexec" |
215 |
- load_image |
216 |
- eend $? |
217 |
-} |
218 |
|
219 |
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.15.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.15.ebuild |
220 |
deleted file mode 100644 |
221 |
index f3f01574c05..00000000000 |
222 |
--- a/sys-apps/kexec-tools/kexec-tools-2.0.15.ebuild |
223 |
+++ /dev/null |
224 |
@@ -1,81 +0,0 @@ |
225 |
-# Copyright 1999-2017 Gentoo Foundation |
226 |
-# Distributed under the terms of the GNU General Public License v2 |
227 |
- |
228 |
-EAPI=6 |
229 |
- |
230 |
-if [[ ${PV} == "9999" ]] ; then |
231 |
- inherit git-r3 |
232 |
- EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git" |
233 |
- AUTOTOOLS_AUTORECONF=true |
234 |
-else |
235 |
- SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz" |
236 |
- KEYWORDS="~amd64 ~arm64 ~x86" |
237 |
-fi |
238 |
- |
239 |
-inherit libtool linux-info systemd |
240 |
- |
241 |
-DESCRIPTION="Load another kernel from the currently executing Linux kernel" |
242 |
-HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/" |
243 |
- |
244 |
-LICENSE="GPL-2" |
245 |
-SLOT="0" |
246 |
-IUSE="booke lzma xen zlib" |
247 |
- |
248 |
-REQUIRED_USE="lzma? ( zlib )" |
249 |
- |
250 |
-DEPEND=" |
251 |
- lzma? ( app-arch/xz-utils ) |
252 |
- zlib? ( sys-libs/zlib )" |
253 |
-RDEPEND="${DEPEND}" |
254 |
- |
255 |
-CONFIG_CHECK="~KEXEC" |
256 |
- |
257 |
-PATCHES=( |
258 |
- "${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch |
259 |
- "${FILESDIR}"/${PN}-2.0.4-out-of-source.patch |
260 |
-) |
261 |
- |
262 |
-pkg_setup() { |
263 |
- # GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC) |
264 |
- export ASFLAGS="${CCASFLAGS}" |
265 |
-} |
266 |
- |
267 |
-src_prepare() { |
268 |
- default |
269 |
- elibtoolize |
270 |
-} |
271 |
- |
272 |
-src_configure() { |
273 |
- local myeconfargs=( |
274 |
- $(use_with booke) |
275 |
- $(use_with lzma) |
276 |
- $(use_with xen) |
277 |
- $(use_with zlib) |
278 |
- ) |
279 |
- econf "${myeconfargs[@]}" |
280 |
-} |
281 |
- |
282 |
-src_install() { |
283 |
- default |
284 |
- |
285 |
- dodoc "${FILESDIR}"/README.Gentoo |
286 |
- |
287 |
- newinitd "${FILESDIR}"/kexec.init-2.0.13-r1 kexec |
288 |
- newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec |
289 |
- |
290 |
- insinto /etc |
291 |
- doins "${FILESDIR}"/kexec.conf |
292 |
- |
293 |
- insinto /etc/kernel/postinst.d |
294 |
- doins "${FILESDIR}"/90_kexec |
295 |
- |
296 |
- systemd_dounit "${FILESDIR}"/kexec.service |
297 |
-} |
298 |
- |
299 |
-pkg_postinst() { |
300 |
- if systemd_is_booted || has_version sys-apps/systemd; then |
301 |
- elog "For systemd support the new config file is" |
302 |
- elog " /etc/kexec.conf" |
303 |
- elog "Please adopt it to your needs as there is no autoconfig anymore" |
304 |
- fi |
305 |
-} |
306 |
|
307 |
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.4-r2.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.4-r2.ebuild |
308 |
deleted file mode 100644 |
309 |
index 89c77e7586b..00000000000 |
310 |
--- a/sys-apps/kexec-tools/kexec-tools-2.0.4-r2.ebuild |
311 |
+++ /dev/null |
312 |
@@ -1,72 +0,0 @@ |
313 |
-# Copyright 1999-2013 Gentoo Foundation |
314 |
-# Distributed under the terms of the GNU General Public License v2 |
315 |
- |
316 |
-EAPI=5 |
317 |
- |
318 |
-inherit autotools-utils flag-o-matic linux-info systemd |
319 |
- |
320 |
-DESCRIPTION="Load another kernel from the currently executing Linux kernel" |
321 |
-HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/" |
322 |
-SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz" |
323 |
- |
324 |
-LICENSE="GPL-2" |
325 |
-SLOT="0" |
326 |
-KEYWORDS="amd64 x86" |
327 |
-IUSE="booke lzma xen zlib" |
328 |
- |
329 |
-REQUIRED_USE="lzma? ( zlib )" |
330 |
- |
331 |
-DEPEND=" |
332 |
- lzma? ( app-arch/xz-utils ) |
333 |
- zlib? ( sys-libs/zlib )" |
334 |
-RDEPEND="${DEPEND}" |
335 |
- |
336 |
-CONFIG_CHECK="~KEXEC" |
337 |
- |
338 |
-PATCHES=( |
339 |
- "${FILESDIR}"/${PN}-2.0.0-respect-LDFLAGS.patch |
340 |
- "${FILESDIR}"/${P}-disable-kexec-test.patch |
341 |
- "${FILESDIR}"/${P}-out-of-source.patch |
342 |
- ) |
343 |
- |
344 |
-pkg_setup() { |
345 |
- # GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC) |
346 |
- export ASFLAGS="${CCASFLAGS}" |
347 |
- # to disable the -fPIE -pie in the hardened compiler |
348 |
- if gcc-specs-pie ; then |
349 |
- filter-flags -fPIE |
350 |
- append-ldflags -nopie |
351 |
- fi |
352 |
-} |
353 |
- |
354 |
-src_configure() { |
355 |
- local myeconfargs=( |
356 |
- $(use_with booke) |
357 |
- $(use_with lzma) |
358 |
- $(use_with xen) |
359 |
- $(use_with zlib) |
360 |
- ) |
361 |
- autotools-utils_src_configure |
362 |
-} |
363 |
- |
364 |
-src_install() { |
365 |
- autotools-utils_src_install |
366 |
- |
367 |
- dodoc "${FILESDIR}"/README.Gentoo |
368 |
- |
369 |
- newinitd "${FILESDIR}"/kexec.init-${PVR} kexec |
370 |
- newconfd "${FILESDIR}"/kexec.conf-${PV} kexec |
371 |
- |
372 |
- insinto /etc |
373 |
- doins "${FILESDIR}"/kexec.conf |
374 |
- |
375 |
- systemd_dounit "${FILESDIR}"/kexec.service |
376 |
-} |
377 |
- |
378 |
-pkg_postinst() { |
379 |
- if systemd_is_booted || has_version sys-apps/systemd; then |
380 |
- elog "For systemd support the new config file is" |
381 |
- elog " /etc/kexec.conf" |
382 |
- elog "Please adopt it to your needs as there is no autoconfig anymore" |
383 |
- fi |
384 |
-} |