Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/, sys-apps/kexec-tools/files/
Date: Sat, 29 Jun 2019 15:07:20
Message-Id: 1561820794.3026ed88db0defe232b002d1ff9113fc437e8d87.floppym@gentoo
1 commit: 3026ed88db0defe232b002d1ff9113fc437e8d87
2 Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
3 AuthorDate: Fri Jun 28 01:48:47 2019 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 29 15:06:34 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3026ed88
7
8 sys-apps/kexec-tools: add ppc64 keyword
9
10 with package.accept_keywords =sys-apps/kexec-tools-2.0.19 ~amd64 and the
11 changes to the init file (by default make install installs vmlinux not
12 vmlinuz) this works on a Talos II.
13
14 Closes: https://github.com/gentoo/gentoo/pull/12346
15 Package-Manager: Portage-2.3.67, Repoman-2.3.16
16 Signed-off-by: Signed-off-by: Marty E. Plummer <hanetzer <AT> startmail.com>
17 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
18
19 sys-apps/kexec-tools/files/kexec.init-2.0.13-r1 | 4 +++-
20 .../{kexec-tools-9999.ebuild => kexec-tools-2.0.19-r1.ebuild} | 2 +-
21 sys-apps/kexec-tools/kexec-tools-9999.ebuild | 2 +-
22 3 files changed, 5 insertions(+), 3 deletions(-)
23
24 diff --git a/sys-apps/kexec-tools/files/kexec.init-2.0.13-r1 b/sys-apps/kexec-tools/files/kexec.init-2.0.13-r1
25 index 5415b3bc85c..167b792de85 100644
26 --- a/sys-apps/kexec-tools/files/kexec.init-2.0.13-r1
27 +++ b/sys-apps/kexec-tools/files/kexec.init-2.0.13-r1
28 @@ -1,5 +1,5 @@
29 #!/sbin/openrc-run
30 -# Copyright 1999-2017 Gentoo Foundation
31 +# Copyright 1999-2019 Gentoo Authors
32 # Distributed under the terms of the GNU General Public License v2
33
34 # Set up some defaults.
35 @@ -38,8 +38,10 @@ image_path() {
36 local gkarch="$(get_genkernel_arch $karch)"
37 for x in \
38 "bzImage" \
39 + "vmlinux" \
40 "vmlinuz" \
41 "bzImage-${kver}" \
42 + "vmlinux-${kver}" \
43 "vmlinuz-${kver}" \
44 "kernel-genkernel-${karch}-${kver}" \
45 "kernel-genkernel-${gkarch}-${kver}" \
46
47 diff --git a/sys-apps/kexec-tools/kexec-tools-9999.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.19-r1.ebuild
48 similarity index 97%
49 copy from sys-apps/kexec-tools/kexec-tools-9999.ebuild
50 copy to sys-apps/kexec-tools/kexec-tools-2.0.19-r1.ebuild
51 index b2fcd90aca6..d9c36c6dcf7 100644
52 --- a/sys-apps/kexec-tools/kexec-tools-9999.ebuild
53 +++ b/sys-apps/kexec-tools/kexec-tools-2.0.19-r1.ebuild
54 @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
55 EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git"
56 else
57 SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz"
58 - KEYWORDS="~amd64 ~arm64 ~x86"
59 + KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
60 fi
61
62 DESCRIPTION="Load another kernel from the currently executing Linux kernel"
63
64 diff --git a/sys-apps/kexec-tools/kexec-tools-9999.ebuild b/sys-apps/kexec-tools/kexec-tools-9999.ebuild
65 index b2fcd90aca6..d9c36c6dcf7 100644
66 --- a/sys-apps/kexec-tools/kexec-tools-9999.ebuild
67 +++ b/sys-apps/kexec-tools/kexec-tools-9999.ebuild
68 @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
69 EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git"
70 else
71 SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz"
72 - KEYWORDS="~amd64 ~arm64 ~x86"
73 + KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
74 fi
75
76 DESCRIPTION="Load another kernel from the currently executing Linux kernel"