[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: bf49d0a3cf8af625e0a0267ab206e55b7773594c
Author: Sam James gentoo org>
AuthorDate: Sat May 4 18:08:02 2024 +
Commit: Sam James gentoo org>
CommitDate: Sat May 4 18:08:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf49d0a3
sys-apps/kexec-tools: Stabilize 2.0.28 x86, #931204
Signed-off-by: Sam James gentoo.org>
sys-apps/kexec-tools/kexec-tools-2.0.28.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.28.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.28.ebuild
index 94c5e98e2054..e87b00d0d986 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.28.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.28.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "" ]] ; then
else
SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P/_/-}.tar.xz;
[[ "${PV}" == *_rc* ]] || \
- KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm64 ~ppc64 x86"
fi
DESCRIPTION="Load another kernel from the currently executing Linux kernel"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: a93770cc11a47c9d68d760efbb240630479893d6
Author: Sam James gentoo org>
AuthorDate: Sat May 4 18:08:01 2024 +
Commit: Sam James gentoo org>
CommitDate: Sat May 4 18:08:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a93770cc
sys-apps/kexec-tools: Stabilize 2.0.28 amd64, #931204
Signed-off-by: Sam James gentoo.org>
sys-apps/kexec-tools/kexec-tools-2.0.28.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.28.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.28.ebuild
index a19771a7837b..94c5e98e2054 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.28.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.28.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "" ]] ; then
else
SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P/_/-}.tar.xz;
[[ "${PV}" == *_rc* ]] || \
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
fi
DESCRIPTION="Load another kernel from the currently executing Linux kernel"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/, sys-apps/kexec-tools/files/
commit: a7a8cf1a580486ae3923fea714f1e6c09a032757
Author: Yuan Liao gmail com>
AuthorDate: Sat Mar 30 23:08:38 2024 +
Commit: Sam James gentoo org>
CommitDate: Mon Apr 1 06:49:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7a8cf1a
sys-apps/kexec-tools: Add patch for build error with binutils 2.42
The patch carries upstream commit
328de8e00e298f00d7ba6b25dc3950147e9642e6.
Bug: https://bugs.gentoo.org/925010
Signed-off-by: Yuan Liao gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36007
Signed-off-by: Sam James gentoo.org>
.../kexec-tools-2.0.28-binutils-2.42-x86_64.patch | 94 ++
sys-apps/kexec-tools/kexec-tools-2.0.28.ebuild | 1 +
2 files changed, 95 insertions(+)
diff --git
a/sys-apps/kexec-tools/files/kexec-tools-2.0.28-binutils-2.42-x86_64.patch
b/sys-apps/kexec-tools/files/kexec-tools-2.0.28-binutils-2.42-x86_64.patch
new file mode 100644
index ..31a18d0bf5e8
--- /dev/null
+++ b/sys-apps/kexec-tools/files/kexec-tools-2.0.28-binutils-2.42-x86_64.patch
@@ -0,0 +1,94 @@
+From 328de8e00e298f00d7ba6b25dc3950147e9642e6 Mon Sep 17 00:00:00 2001
+From: Michel Lind
+Date: Tue, 30 Jan 2024 04:14:31 -0600
+Subject: Fix building on x86_64 with binutils 2.41
+
+Bug: https://bugs.gentoo.org/925010
+
+Newer versions of the GNU assembler (observed with binutils 2.41) will
+complain about the ".arch i386" in files assembled with "as --64",
+with the message "Error: 64bit mode not supported on 'i386'".
+
+Fix by moving ".arch i386" below the relevant ".code32" directive, so
+that the assembler is no longer expecting 64-bit instructions to be used
+by the time that the ".arch i386" directive is encountered.
+
+Based on similar iPXE fix:
+https://github.com/ipxe/ipxe/commit/6ca597eee
+
+Signed-off-by: Michel Lind
+Signed-off-by: Simon Horman
+---
+ purgatory/arch/i386/entry32-16-debug.S | 2 +-
+ purgatory/arch/i386/entry32-16.S | 2 +-
+ purgatory/arch/i386/entry32.S | 2 +-
+ purgatory/arch/i386/setup-x86.S| 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/purgatory/arch/i386/entry32-16-debug.S
b/purgatory/arch/i386/entry32-16-debug.S
+index 5167944d..12e11649 100644
+--- a/purgatory/arch/i386/entry32-16-debug.S
b/purgatory/arch/i386/entry32-16-debug.S
+@@ -25,10 +25,10 @@
+ .globl entry16_debug_pre32
+ .globl entry16_debug_first32
+ .globl entry16_debug_old_first32
+- .arch i386
+ .balign 16
+ entry16_debug:
+ .code32
++ .arch i386
+ /* Compute where I am running at (assumes esp valid) */
+ call1f
+ 1:popl%ebx
+diff --git a/purgatory/arch/i386/entry32-16.S
b/purgatory/arch/i386/entry32-16.S
+index c051aab0..eace0958 100644
+--- a/purgatory/arch/i386/entry32-16.S
b/purgatory/arch/i386/entry32-16.S
+@@ -20,10 +20,10 @@
+ #undef i386
+ .text
+ .globl entry16, entry16_regs
+- .arch i386
+ .balign 16
+ entry16:
+ .code32
++ .arch i386
+ /* Compute where I am running at (assumes esp valid) */
+ call1f
+ 1:popl%ebx
+diff --git a/purgatory/arch/i386/entry32.S b/purgatory/arch/i386/entry32.S
+index f7a494f1..8ce9e316 100644
+--- a/purgatory/arch/i386/entry32.S
b/purgatory/arch/i386/entry32.S
+@@ -20,10 +20,10 @@
+ #undef i386
+
+ .text
+- .arch i386
+ .globl entry32, entry32_regs
+ entry32:
+ .code32
++ .arch i386
+
+ /* Setup a gdt that should that is generally usefully */
+ lgdt%cs:gdt
+diff --git a/purgatory/arch/i386/setup-x86.S b/purgatory/arch/i386/setup-x86.S
+index 201bb2cb..a212eed4 100644
+--- a/purgatory/arch/i386/setup-x86.S
b/purgatory/arch/i386/setup-x86.S
+@@ -21,10 +21,10 @@
+ #undef i386
+
+ .text
+- .arch i386
+ .globl purgatory_start
+ purgatory_start:
+ .code32
++ .arch i386
+
+ /* Load a gdt so I know what the segment registers are */
+ lgdt%cs:gdt
+--
+cgit 1.2.3-korg
+
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.28.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.28.ebuild
index c107633e4b71..a19771a7837b 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.28.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.28.ebuild
@@ -39,6 +39,7 @@ CONFIG_CHECK="~KEXEC"
PATCHES=(
"${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch
"${FILESDIR}"/${PN}-2.0.4-out-of-source.patch
+ "${FILESDIR}"/${PN}-2.0.28-binutils-2.42-x86_64.patch # Bug 925010
)
pkg_setup() {
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: b8f5c03d1e19e077e40cab82a35ce34b9b332aff Author: Yuan Liao gmail com> AuthorDate: Mon Feb 12 21:59:55 2024 + Commit: Sam James gentoo org> CommitDate: Sun Mar 10 13:50:28 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8f5c03d sys-apps/kexec-tools: Sync EAPI 7 -> 8 to live ebuild Signed-off-by: Yuan Liao gmail.com> Signed-off-by: Sam James gentoo.org> sys-apps/kexec-tools/kexec-tools-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kexec-tools/kexec-tools-.ebuild b/sys-apps/kexec-tools/kexec-tools-.ebuild index 156d90887fc7..c107633e4b71 100644 --- a/sys-apps/kexec-tools/kexec-tools-.ebuild +++ b/sys-apps/kexec-tools/kexec-tools-.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit libtool linux-info optfeature systemd
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: 69188850396bfd88bbf60cf288d4951ada99ff3b
Author: Yuan Liao gmail com>
AuthorDate: Mon Feb 12 22:00:38 2024 +
Commit: Sam James gentoo org>
CommitDate: Sun Mar 10 13:50:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69188850
sys-apps/kexec-tools: Add 2.0.28
Signed-off-by: Yuan Liao gmail.com>
Signed-off-by: Sam James gentoo.org>
sys-apps/kexec-tools/Manifest | 1 +
sys-apps/kexec-tools/kexec-tools-2.0.28.ebuild | 131 +
2 files changed, 132 insertions(+)
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index c9011dde6bd8..223a21a8405f 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -1,2 +1,3 @@
DIST kexec-tools-2.0.22.tar.xz 303564 BLAKE2B
977c741eabf9b6b882550713ba59b18289b4f997fb382e96338efce6d04a9390fea952fc46ca72fd0a0b782261841ab2002da84b1819f955e63996eac900b0f7
SHA512
7580860f272eee5af52139809f12961e5a5d3a65f4e191183ca9c845410425d25818945ac14ed04a60e6ce474dc2656fc6a14041177b0bf703f450820c7d6aba
DIST kexec-tools-2.0.24.tar.xz 303808 BLAKE2B
8188602f1b843c1dccc0307131f8c9ec0426c6cb3de898040352c1fed5f6d4bd7c58a0c2bf54290b91c8fe3401180df682959ee6c41693d07acc199c087c7db2
SHA512
ef7cf78246e2d729d81a3649791a5a23c385353cc75cbe8ef279616329fdaccc876d614c7f51e1456822a13a11520296070d9897467d24310399909e049c3822
+DIST kexec-tools-2.0.28.tar.xz 312524 BLAKE2B
b2ab25c632cd2bad21751940acee1816f9cd930e1bb5af1052f9f6c4979dcd62d82c487a88fa8015e3ce7c843de9f47a3f6ccf7efa9270b5f24c79ba30a82a91
SHA512
889a7bf1d26bb309e4ff7ce1c8dbcf48c01e47221ea3acf1c4ef2a98a652c496e31bddcdb627d3adebd85f7541d1fb9122c60e741e10b3726e31a9733cadc753
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.28.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.28.ebuild
new file mode 100644
index ..c107633e4b71
--- /dev/null
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.28.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit libtool linux-info optfeature systemd
+
+if [[ ${PV} == "" ]] ; then
+ inherit git-r3 autotools
+
EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git;
+else
+
SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P/_/-}.tar.xz;
+ [[ "${PV}" == *_rc* ]] || \
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Load another kernel from the currently executing Linux kernel"
+HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="booke lzma selinux xen zlib"
+
+REQUIRED_USE="lzma? ( zlib )"
+
+DEPEND="
+ lzma? ( app-arch/xz-utils )
+ zlib? ( sys-libs/zlib )
+"
+RDEPEND="
+ ${DEPEND}
+ selinux? ( sec-policy/selinux-kdump )
+"
+
+S="${WORKDIR}/${P/_/-}"
+
+CONFIG_CHECK="~KEXEC"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch
+ "${FILESDIR}"/${PN}-2.0.4-out-of-source.patch
+)
+
+pkg_setup() {
+ # GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC)
+ export ASFLAGS="${CCASFLAGS}"
+}
+
+src_prepare() {
+ default
+
+ # Append PURGATORY_EXTRA_CFLAGS flags set by configure, instead of
overriding them completely.
+ sed -e "/^PURGATORY_EXTRA_CFLAGS =/s/=/+=/" -i Makefile.in || die
+
+ if [[ "${PV}" == ]] ; then
+ eautoreconf
+ else
+ elibtoolize
+ fi
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_with booke)
+ $(use_with lzma)
+ $(use_with xen)
+ $(use_with zlib)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # Respect CFLAGS for purgatory.
+ # purgatory/Makefile uses PURGATORY_EXTRA_CFLAGS variable.
+ # -mfunction-return=thunk and -mindirect-branch=thunk conflict with
+ # -mcmodel=large which is added by build system.
+ # Replace them with -mfunction-return=thunk-inline and
-mindirect-branch=thunk-inline.
+ local flag flags=()
+ for flag in ${CFLAGS}; do
+ [[ ${flag} == -mfunction-return=thunk ]] &&
flag="-mfunction-return=thunk-inline"
+ [[ ${flag} == -mindirect-branch=thunk ]] &&
flag="-mindirect-branch=thunk-inline"
+ flags+=("${flag}")
+ done
+ local -x PURGATORY_EXTRA_CFLAGS="${flags[*]}"
+
+ default
+}
+
+src_install() {
+ default
+
+ dodoc "${FILESDIR}"/README.Gentoo
+
+ newinitd "${FILESDIR}"/kexec-r2.init kexec
+ newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec
+
+ insinto /etc
+ doins "${FILESDIR}"/kexec.conf
+
+ insinto /etc/kernel/postinst.d
+ doins "${FILESDIR}"/90_kexec
+
+ systemd_dounit "${FILESDIR}"/kexec.service
+}
+
+pkg_postinst() {
+ if systemd_is_booted || has_version sys-apps/systemd; then
+ elog "For systemd support the
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: 815e1282956363277eaf38dca04823931b03cdc3 Author: Yuan Liao gmail com> AuthorDate: Sat Feb 24 01:54:52 2024 + Commit: Sam James gentoo org> CommitDate: Sun Mar 10 13:50:29 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=815e1282 sys-apps/kexec-tools: Add myself as a co-maintainer Signed-off-by: Yuan Liao gmail.com> Closes: https://github.com/gentoo/gentoo/pull/35401 Signed-off-by: Sam James gentoo.org> sys-apps/kexec-tools/metadata.xml | 8 1 file changed, 8 insertions(+) diff --git a/sys-apps/kexec-tools/metadata.xml b/sys-apps/kexec-tools/metadata.xml index eef87b3eb99f..9f81955b6b17 100644 --- a/sys-apps/kexec-tools/metadata.xml +++ b/sys-apps/kexec-tools/metadata.xml @@ -5,6 +5,14 @@ base-sys...@gentoo.org Gentoo Base System + +liaoy...@gmail.com +Yuan Liao + + +proxy-ma...@gentoo.org +Proxy Maintainers + Enables support for LZMA compressed kernel images Include support for Book-E memory management
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: 97dd9dc654a71cc4ee30ee97c803af3313a50b97
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Wed Jan 31 08:49:09 2024 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Fri Feb 2 06:16:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97dd9dc6
sys-apps/kexec-tools: add installkernel as optfeature
package installs /etc/kernel/postinst.d/90_kexec which will be executed
by traditional installkernel (i.e. if the systemd-kernel-install flag is
disabled).
Signed-off-by: Andrew Ammerlaan gentoo.org>
sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild | 7 +--
sys-apps/kexec-tools/kexec-tools-2.0.24.ebuild | 7 +--
sys-apps/kexec-tools/kexec-tools-.ebuild | 7 +--
3 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild
index c92e41d36170..2f8eea8c0dee 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit libtool linux-info systemd
+inherit libtool linux-info optfeature systemd
if [[ ${PV} == "" ]] ; then
inherit git-r3 autotools
@@ -121,4 +121,7 @@ pkg_postinst() {
ewarn "in case running system and initramfs do not agree on
detected"
ewarn "root device name!"
fi
+
+ optfeature "automatically updating /etc/kexec.conf on each kernel
installation" \
+ "sys-kernel/installkernel[-systemd]"
}
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.24.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.24.ebuild
index bfdda831e42d..924cf21eef4a 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.24.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.24.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit libtool linux-info systemd
+inherit libtool linux-info optfeature systemd
if [[ ${PV} == "" ]] ; then
inherit git-r3 autotools
@@ -125,4 +125,7 @@ pkg_postinst() {
ewarn "in case running system and initramfs do not agree on
detected"
ewarn "root device name!"
fi
+
+ optfeature "automatically updating /etc/kexec.conf on each kernel
installation" \
+ "sys-kernel/installkernel[-systemd]"
}
diff --git a/sys-apps/kexec-tools/kexec-tools-.ebuild
b/sys-apps/kexec-tools/kexec-tools-.ebuild
index 76fed6da99d0..156d90887fc7 100644
--- a/sys-apps/kexec-tools/kexec-tools-.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit libtool linux-info systemd
+inherit libtool linux-info optfeature systemd
if [[ ${PV} == "" ]] ; then
inherit git-r3 autotools
@@ -125,4 +125,7 @@ pkg_postinst() {
ewarn "in case running system and initramfs do not agree on
detected"
ewarn "root device name!"
fi
+
+ optfeature "automatically updating /etc/kexec.conf on each kernel
installation" \
+ "sys-kernel/installkernel[-systemd]"
}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: ac7ecbff48a3d3978a495937017ee22c16edf620
Author: Sam James gentoo org>
AuthorDate: Wed Jun 28 07:43:09 2023 +
Commit: Sam James gentoo org>
CommitDate: Wed Jun 28 07:50:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac7ecbff
sys-apps/kexec-tools: add missing selinux policy dep
Signed-off-by: Sam James gentoo.org>
sys-apps/kexec-tools/kexec-tools-2.0.24.ebuild | 10 +++---
sys-apps/kexec-tools/kexec-tools-.ebuild | 12
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.24.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.24.ebuild
index 80eb92493ced..bfdda831e42d 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.24.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.24.ebuild
@@ -19,14 +19,18 @@ HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/;
LICENSE="GPL-2"
SLOT="0"
-IUSE="booke lzma xen zlib"
+IUSE="booke lzma selinux xen zlib"
REQUIRED_USE="lzma? ( zlib )"
DEPEND="
lzma? ( app-arch/xz-utils )
- zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
+ zlib? ( sys-libs/zlib )
+"
+RDEPEND="
+ ${DEPEND}
+ selinux? ( sec-policy/selinux-kdump )
+"
S="${WORKDIR}/${P/_/-}"
diff --git a/sys-apps/kexec-tools/kexec-tools-.ebuild
b/sys-apps/kexec-tools/kexec-tools-.ebuild
index b69a3c09e13d..76fed6da99d0 100644
--- a/sys-apps/kexec-tools/kexec-tools-.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -19,14 +19,18 @@ HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/;
LICENSE="GPL-2"
SLOT="0"
-IUSE="booke lzma xen zlib"
+IUSE="booke lzma selinux xen zlib"
REQUIRED_USE="lzma? ( zlib )"
DEPEND="
lzma? ( app-arch/xz-utils )
- zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
+ zlib? ( sys-libs/zlib )
+"
+RDEPEND="
+ ${DEPEND}
+ selinux? ( sec-policy/selinux-kdump )
+"
S="${WORKDIR}/${P/_/-}"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: d44bf53760ae949cae90cce30472559493645f64
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Mar 4 09:45:43 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Mar 4 09:45:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d44bf537
sys-apps/kexec-tools: Stabilize 2.0.24 x86, #899374
Signed-off-by: Arthur Zamarin gentoo.org>
sys-apps/kexec-tools/kexec-tools-2.0.24.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.24.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.24.ebuild
index 39eca916e697..80eb92493ced 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.24.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.24.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "" ]] ; then
else
SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P/_/-}.tar.xz;
[[ "${PV}" == *_rc* ]] || \
- KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm64 ~ppc64 x86"
fi
DESCRIPTION="Load another kernel from the currently executing Linux kernel"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: cfa70d5852e4a3e2aec08324ccfa570a870a5403
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Mar 4 07:51:46 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Mar 4 07:51:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfa70d58
sys-apps/kexec-tools: Stabilize 2.0.24 amd64, #899374
Signed-off-by: Arthur Zamarin gentoo.org>
sys-apps/kexec-tools/kexec-tools-2.0.24.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.24.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.24.ebuild
index 5723fa802401..39eca916e697 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.24.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,7 +11,7 @@ if [[ ${PV} == "" ]] ; then
else
SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P/_/-}.tar.xz;
[[ "${PV}" == *_rc* ]] || \
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
fi
DESCRIPTION="Load another kernel from the currently executing Linux kernel"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: ddf299533029bce6c271dd78e312a0ff9b11af94 Author: kochera google com> AuthorDate: Wed Oct 19 18:44:07 2022 + Commit: Sam James gentoo org> CommitDate: Wed Oct 19 19:21:52 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddf29953 sys-apps/kexec-tools: Add cpe_uri for kexec_tools package. Signed-off-by: Michael Kochera google.com> Signed-off-by: Sam James gentoo.org> sys-apps/kexec-tools/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys-apps/kexec-tools/metadata.xml b/sys-apps/kexec-tools/metadata.xml index d56b5de4df41..eef87b3eb99f 100644 --- a/sys-apps/kexec-tools/metadata.xml +++ b/sys-apps/kexec-tools/metadata.xml @@ -10,4 +10,7 @@ Include support for Book-E memory management Enable extended xen support + +cpe:/a:kernel:kexec-tools +
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: f5a51ebe55162d2cddcf40cb36204fde4ffa3d2b
Author: Sam James gentoo org>
AuthorDate: Fri Sep 23 02:10:57 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Sep 23 02:13:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5a51ebe
sys-apps/kexec-tools: drop 2.0.23
Signed-off-by: Sam James gentoo.org>
sys-apps/kexec-tools/Manifest | 1 -
sys-apps/kexec-tools/kexec-tools-2.0.23.ebuild | 124 -
2 files changed, 125 deletions(-)
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index 3f1cd08e7ece..c9011dde6bd8 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -1,3 +1,2 @@
DIST kexec-tools-2.0.22.tar.xz 303564 BLAKE2B
977c741eabf9b6b882550713ba59b18289b4f997fb382e96338efce6d04a9390fea952fc46ca72fd0a0b782261841ab2002da84b1819f955e63996eac900b0f7
SHA512
7580860f272eee5af52139809f12961e5a5d3a65f4e191183ca9c845410425d25818945ac14ed04a60e6ce474dc2656fc6a14041177b0bf703f450820c7d6aba
-DIST kexec-tools-2.0.23.tar.xz 304024 BLAKE2B
0150985093dc0012d3870c127ac5eab81d4cc839c0a79ff20224d1a409462a194d7e304f54ed8f0952e4d325dbff11bcbe1565b2c57c45c212302810dc06ed62
SHA512
b6e3b967cacc31c434b185d25da4d53c822ae4bbcec26ef9d6cb171f294fdcc80913d381e686a0a41e025187835f4dc088052ff88efe75a021d7624c8b1a1ed8
DIST kexec-tools-2.0.24.tar.xz 303808 BLAKE2B
8188602f1b843c1dccc0307131f8c9ec0426c6cb3de898040352c1fed5f6d4bd7c58a0c2bf54290b91c8fe3401180df682959ee6c41693d07acc199c087c7db2
SHA512
ef7cf78246e2d729d81a3649791a5a23c385353cc75cbe8ef279616329fdaccc876d614c7f51e1456822a13a11520296070d9897467d24310399909e049c3822
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.23.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.23.ebuild
deleted file mode 100644
index b69a3c09e13d..
--- a/sys-apps/kexec-tools/kexec-tools-2.0.23.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool linux-info systemd
-
-if [[ ${PV} == "" ]] ; then
- inherit git-r3 autotools
-
EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git;
-else
-
SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P/_/-}.tar.xz;
- [[ "${PV}" == *_rc* ]] || \
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Load another kernel from the currently executing Linux kernel"
-HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="booke lzma xen zlib"
-
-REQUIRED_USE="lzma? ( zlib )"
-
-DEPEND="
- lzma? ( app-arch/xz-utils )
- zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P/_/-}"
-
-CONFIG_CHECK="~KEXEC"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch
- "${FILESDIR}"/${PN}-2.0.4-out-of-source.patch
-)
-
-pkg_setup() {
- # GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC)
- export ASFLAGS="${CCASFLAGS}"
-}
-
-src_prepare() {
- default
-
- # Append PURGATORY_EXTRA_CFLAGS flags set by configure, instead of
overriding them completely.
- sed -e "/^PURGATORY_EXTRA_CFLAGS =/s/=/+=/" -i Makefile.in || die
-
- if [[ "${PV}" == ]] ; then
- eautoreconf
- else
- elibtoolize
- fi
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_with booke)
- $(use_with lzma)
- $(use_with xen)
- $(use_with zlib)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # Respect CFLAGS for purgatory.
- # purgatory/Makefile uses PURGATORY_EXTRA_CFLAGS variable.
- # -mfunction-return=thunk and -mindirect-branch=thunk conflict with
- # -mcmodel=large which is added by build system.
- # Replace them with -mfunction-return=thunk-inline and
-mindirect-branch=thunk-inline.
- local flag flags=()
- for flag in ${CFLAGS}; do
- [[ ${flag} == -mfunction-return=thunk ]] &&
flag="-mfunction-return=thunk-inline"
- [[ ${flag} == -mindirect-branch=thunk ]] &&
flag="-mindirect-branch=thunk-inline"
- flags+=("${flag}")
- done
- local -x PURGATORY_EXTRA_CFLAGS="${flags[*]}"
-
- default
-}
-
-src_install() {
- default
-
- dodoc "${FILESDIR}"/README.Gentoo
-
- newinitd "${FILESDIR}"/kexec-r2.init kexec
- newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec
-
- insinto /etc
- doins "${FILESDIR}"/kexec.conf
-
- insinto /etc/kernel/postinst.d
- doins "${FILESDIR}"/90_kexec
-
- systemd_dounit "${FILESDIR}"/kexec.service
-}
-
-pkg_postinst() {
- if systemd_is_booted || has_version sys-apps/systemd; then
- elog "For systemd support the new config file is"
- elog " /etc/kexec.conf"
- elog "Please adopt it to your
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: fd596919164d57a198e93ae4f94d098138f16ec7
Author: Matt Turner gentoo org>
AuthorDate: Tue Jun 21 17:24:42 2022 +
Commit: Matt Turner gentoo org>
CommitDate: Tue Jun 21 17:40:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd596919
sys-apps/kexec-tools: Version bump to 2.0.24
Signed-off-by: Matt Turner gentoo.org>
sys-apps/kexec-tools/Manifest | 1 +
sys-apps/kexec-tools/kexec-tools-2.0.24.ebuild | 124 +
2 files changed, 125 insertions(+)
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index b07611344429..3f1cd08e7ece 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -1,2 +1,3 @@
DIST kexec-tools-2.0.22.tar.xz 303564 BLAKE2B
977c741eabf9b6b882550713ba59b18289b4f997fb382e96338efce6d04a9390fea952fc46ca72fd0a0b782261841ab2002da84b1819f955e63996eac900b0f7
SHA512
7580860f272eee5af52139809f12961e5a5d3a65f4e191183ca9c845410425d25818945ac14ed04a60e6ce474dc2656fc6a14041177b0bf703f450820c7d6aba
DIST kexec-tools-2.0.23.tar.xz 304024 BLAKE2B
0150985093dc0012d3870c127ac5eab81d4cc839c0a79ff20224d1a409462a194d7e304f54ed8f0952e4d325dbff11bcbe1565b2c57c45c212302810dc06ed62
SHA512
b6e3b967cacc31c434b185d25da4d53c822ae4bbcec26ef9d6cb171f294fdcc80913d381e686a0a41e025187835f4dc088052ff88efe75a021d7624c8b1a1ed8
+DIST kexec-tools-2.0.24.tar.xz 303808 BLAKE2B
8188602f1b843c1dccc0307131f8c9ec0426c6cb3de898040352c1fed5f6d4bd7c58a0c2bf54290b91c8fe3401180df682959ee6c41693d07acc199c087c7db2
SHA512
ef7cf78246e2d729d81a3649791a5a23c385353cc75cbe8ef279616329fdaccc876d614c7f51e1456822a13a11520296070d9897467d24310399909e049c3822
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.24.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.24.ebuild
new file mode 100644
index ..5723fa802401
--- /dev/null
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.24.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit libtool linux-info systemd
+
+if [[ ${PV} == "" ]] ; then
+ inherit git-r3 autotools
+
EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git;
+else
+
SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P/_/-}.tar.xz;
+ [[ "${PV}" == *_rc* ]] || \
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Load another kernel from the currently executing Linux kernel"
+HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="booke lzma xen zlib"
+
+REQUIRED_USE="lzma? ( zlib )"
+
+DEPEND="
+ lzma? ( app-arch/xz-utils )
+ zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P/_/-}"
+
+CONFIG_CHECK="~KEXEC"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch
+ "${FILESDIR}"/${PN}-2.0.4-out-of-source.patch
+)
+
+pkg_setup() {
+ # GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC)
+ export ASFLAGS="${CCASFLAGS}"
+}
+
+src_prepare() {
+ default
+
+ # Append PURGATORY_EXTRA_CFLAGS flags set by configure, instead of
overriding them completely.
+ sed -e "/^PURGATORY_EXTRA_CFLAGS =/s/=/+=/" -i Makefile.in || die
+
+ if [[ "${PV}" == ]] ; then
+ eautoreconf
+ else
+ elibtoolize
+ fi
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_with booke)
+ $(use_with lzma)
+ $(use_with xen)
+ $(use_with zlib)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # Respect CFLAGS for purgatory.
+ # purgatory/Makefile uses PURGATORY_EXTRA_CFLAGS variable.
+ # -mfunction-return=thunk and -mindirect-branch=thunk conflict with
+ # -mcmodel=large which is added by build system.
+ # Replace them with -mfunction-return=thunk-inline and
-mindirect-branch=thunk-inline.
+ local flag flags=()
+ for flag in ${CFLAGS}; do
+ [[ ${flag} == -mfunction-return=thunk ]] &&
flag="-mfunction-return=thunk-inline"
+ [[ ${flag} == -mindirect-branch=thunk ]] &&
flag="-mindirect-branch=thunk-inline"
+ flags+=("${flag}")
+ done
+ local -x PURGATORY_EXTRA_CFLAGS="${flags[*]}"
+
+ default
+}
+
+src_install() {
+ default
+
+ dodoc "${FILESDIR}"/README.Gentoo
+
+ newinitd "${FILESDIR}"/kexec-r2.init kexec
+ newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec
+
+ insinto /etc
+ doins "${FILESDIR}"/kexec.conf
+
+ insinto /etc/kernel/postinst.d
+ doins "${FILESDIR}"/90_kexec
+
+ systemd_dounit "${FILESDIR}"/kexec.service
+}
+
+pkg_postinst() {
+ if systemd_is_booted || has_version sys-apps/systemd; then
+ elog "For systemd support the new config file is"
+ elog " /etc/kexec.conf"
+ elog "Please
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: 183cd801507244a3c1f75b33914cd7f96c3c5834
Author: Sam James gentoo org>
AuthorDate: Fri Apr 22 17:54:27 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Apr 22 17:54:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=183cd801
sys-apps/kexec-tools: fix shellcheck errors in comparison
Closes: https://bugs.gentoo.org/839177
Signed-off-by: Sam James gentoo.org>
sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild | 4 ++--
sys-apps/kexec-tools/kexec-tools-2.0.23.ebuild | 4 ++--
sys-apps/kexec-tools/kexec-tools-.ebuild | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild
index 897b98a24b69..c92e41d36170 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -114,7 +114,7 @@ pkg_postinst() {
fi
fi
- if [[ ${n_root_args} > 1 && "${has_rootpart_set}" == "no" ]]; then
+ if [[ ${n_root_args} -gt 1 && "${has_rootpart_set}" == "no" ]]; then
ewarn "WARNING: Multiple root arguments (root=) on kernel
command-line detected!"
ewarn "This was probably caused by a previous version of ${PN}."
ewarn "Please reboot system once *without* kexec to avoid boot
problems"
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.23.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.23.ebuild
index 0879b84e6744..b69a3c09e13d 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.23.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -114,7 +114,7 @@ pkg_postinst() {
fi
fi
- if [[ ${n_root_args} > 1 && "${has_rootpart_set}" == "no" ]]; then
+ if [[ ${n_root_args} -gt 1 && "${has_rootpart_set}" == "no" ]]; then
ewarn "WARNING: Multiple root arguments (root=) on kernel
command-line detected!"
ewarn "This was probably caused by a previous version of ${PN}."
ewarn "Please reboot system once *without* kexec to avoid boot
problems"
diff --git a/sys-apps/kexec-tools/kexec-tools-.ebuild
b/sys-apps/kexec-tools/kexec-tools-.ebuild
index 86b8d9fc9789..b69a3c09e13d 100644
--- a/sys-apps/kexec-tools/kexec-tools-.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -114,7 +114,7 @@ pkg_postinst() {
fi
fi
- if [[ ${n_root_args} > 1 && "${has_rootpart_set}" == "no" ]]; then
+ if [[ ${n_root_args} -gt 1 && "${has_rootpart_set}" == "no" ]]; then
ewarn "WARNING: Multiple root arguments (root=) on kernel
command-line detected!"
ewarn "This was probably caused by a previous version of ${PN}."
ewarn "Please reboot system once *without* kexec to avoid boot
problems"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: 3b5c03b1029b2a7284cc1f55e1d12df2077b88af
Author: Lars Wendler gentoo org>
AuthorDate: Tue Nov 9 17:16:31 2021 +
Commit: Lars Wendler gentoo org>
CommitDate: Tue Nov 9 17:16:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b5c03b1
sys-apps/kexec-tools: Bump to version 2.0.23
Signed-off-by: Lars Wendler gentoo.org>
sys-apps/kexec-tools/Manifest | 1 +
sys-apps/kexec-tools/kexec-tools-2.0.23.ebuild | 124 +
2 files changed, 125 insertions(+)
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index 37a0cacee22..b0761134442 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -1 +1,2 @@
DIST kexec-tools-2.0.22.tar.xz 303564 BLAKE2B
977c741eabf9b6b882550713ba59b18289b4f997fb382e96338efce6d04a9390fea952fc46ca72fd0a0b782261841ab2002da84b1819f955e63996eac900b0f7
SHA512
7580860f272eee5af52139809f12961e5a5d3a65f4e191183ca9c845410425d25818945ac14ed04a60e6ce474dc2656fc6a14041177b0bf703f450820c7d6aba
+DIST kexec-tools-2.0.23.tar.xz 304024 BLAKE2B
0150985093dc0012d3870c127ac5eab81d4cc839c0a79ff20224d1a409462a194d7e304f54ed8f0952e4d325dbff11bcbe1565b2c57c45c212302810dc06ed62
SHA512
b6e3b967cacc31c434b185d25da4d53c822ae4bbcec26ef9d6cb171f294fdcc80913d381e686a0a41e025187835f4dc088052ff88efe75a021d7624c8b1a1ed8
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.23.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.23.ebuild
new file mode 100644
index 000..0879b84e674
--- /dev/null
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.23.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool linux-info systemd
+
+if [[ ${PV} == "" ]] ; then
+ inherit git-r3 autotools
+
EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git;
+else
+
SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P/_/-}.tar.xz;
+ [[ "${PV}" == *_rc* ]] || \
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Load another kernel from the currently executing Linux kernel"
+HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="booke lzma xen zlib"
+
+REQUIRED_USE="lzma? ( zlib )"
+
+DEPEND="
+ lzma? ( app-arch/xz-utils )
+ zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P/_/-}"
+
+CONFIG_CHECK="~KEXEC"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch
+ "${FILESDIR}"/${PN}-2.0.4-out-of-source.patch
+)
+
+pkg_setup() {
+ # GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC)
+ export ASFLAGS="${CCASFLAGS}"
+}
+
+src_prepare() {
+ default
+
+ # Append PURGATORY_EXTRA_CFLAGS flags set by configure, instead of
overriding them completely.
+ sed -e "/^PURGATORY_EXTRA_CFLAGS =/s/=/+=/" -i Makefile.in || die
+
+ if [[ "${PV}" == ]] ; then
+ eautoreconf
+ else
+ elibtoolize
+ fi
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_with booke)
+ $(use_with lzma)
+ $(use_with xen)
+ $(use_with zlib)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # Respect CFLAGS for purgatory.
+ # purgatory/Makefile uses PURGATORY_EXTRA_CFLAGS variable.
+ # -mfunction-return=thunk and -mindirect-branch=thunk conflict with
+ # -mcmodel=large which is added by build system.
+ # Replace them with -mfunction-return=thunk-inline and
-mindirect-branch=thunk-inline.
+ local flag flags=()
+ for flag in ${CFLAGS}; do
+ [[ ${flag} == -mfunction-return=thunk ]] &&
flag="-mfunction-return=thunk-inline"
+ [[ ${flag} == -mindirect-branch=thunk ]] &&
flag="-mindirect-branch=thunk-inline"
+ flags+=("${flag}")
+ done
+ local -x PURGATORY_EXTRA_CFLAGS="${flags[*]}"
+
+ default
+}
+
+src_install() {
+ default
+
+ dodoc "${FILESDIR}"/README.Gentoo
+
+ newinitd "${FILESDIR}"/kexec-r2.init kexec
+ newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec
+
+ insinto /etc
+ doins "${FILESDIR}"/kexec.conf
+
+ insinto /etc/kernel/postinst.d
+ doins "${FILESDIR}"/90_kexec
+
+ systemd_dounit "${FILESDIR}"/kexec.service
+}
+
+pkg_postinst() {
+ if systemd_is_booted || has_version sys-apps/systemd; then
+ elog "For systemd support the new config file is"
+ elog " /etc/kexec.conf"
+ elog "Please adopt it to your needs as there is no autoconfig
anymore"
+ fi
+
+ local n_root_args=$(grep -o -- '\/dev/null | wc
-l)
+ local has_rootpart_set=no
+ if [[ -f "${EROOT}/etc/conf.d/kexec" ]]; then
+ if grep -q -E -- '^ROOTPART=' "${EROOT}/etc/conf.d/kexec"
2>/dev/null; then
+
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: db511bc85cc5bdde00114dac6898d4751298c1c6
Author: David Seifert gentoo org>
AuthorDate: Sat Sep 4 17:34:05 2021 +
Commit: David Seifert gentoo org>
CommitDate: Sat Sep 4 17:34:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db511bc8
sys-apps/kexec-tools: drop 2.0.21
Signed-off-by: David Seifert gentoo.org>
sys-apps/kexec-tools/Manifest | 1 -
sys-apps/kexec-tools/kexec-tools-2.0.21.ebuild | 124 -
2 files changed, 125 deletions(-)
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index cb80e9aa09d..37a0cacee22 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -1,2 +1 @@
-DIST kexec-tools-2.0.21.tar.xz 303300 BLAKE2B
d5b7bddeafdcbfd2b07dab6e4f167fcb61ccf2ec487f1835ac552a4596d22a94a7297d0eb769913f84eddc564ba4d9ae0c9d4c76994d0e3670fe168f377ebc77
SHA512
f487d2e243c2c4f29fbc9da7d06806f65210f717904655fc84d8d162b9c4614c3dd62e1bb47104a79f0dc2af04e462baf764fb309b5d7e6d287264cb48fd2a3e
DIST kexec-tools-2.0.22.tar.xz 303564 BLAKE2B
977c741eabf9b6b882550713ba59b18289b4f997fb382e96338efce6d04a9390fea952fc46ca72fd0a0b782261841ab2002da84b1819f955e63996eac900b0f7
SHA512
7580860f272eee5af52139809f12961e5a5d3a65f4e191183ca9c845410425d25818945ac14ed04a60e6ce474dc2656fc6a14041177b0bf703f450820c7d6aba
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.21.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.21.ebuild
deleted file mode 100644
index 897b98a24b6..000
--- a/sys-apps/kexec-tools/kexec-tools-2.0.21.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool linux-info systemd
-
-if [[ ${PV} == "" ]] ; then
- inherit git-r3 autotools
-
EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git;
-else
-
SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P/_/-}.tar.xz;
- [[ "${PV}" == *_rc* ]] || \
- KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-fi
-
-DESCRIPTION="Load another kernel from the currently executing Linux kernel"
-HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="booke lzma xen zlib"
-
-REQUIRED_USE="lzma? ( zlib )"
-
-DEPEND="
- lzma? ( app-arch/xz-utils )
- zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P/_/-}"
-
-CONFIG_CHECK="~KEXEC"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch
- "${FILESDIR}"/${PN}-2.0.4-out-of-source.patch
-)
-
-pkg_setup() {
- # GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC)
- export ASFLAGS="${CCASFLAGS}"
-}
-
-src_prepare() {
- default
-
- # Append PURGATORY_EXTRA_CFLAGS flags set by configure, instead of
overriding them completely.
- sed -e "/^PURGATORY_EXTRA_CFLAGS =/s/=/+=/" -i Makefile.in || die
-
- if [[ "${PV}" == ]] ; then
- eautoreconf
- else
- elibtoolize
- fi
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_with booke)
- $(use_with lzma)
- $(use_with xen)
- $(use_with zlib)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # Respect CFLAGS for purgatory.
- # purgatory/Makefile uses PURGATORY_EXTRA_CFLAGS variable.
- # -mfunction-return=thunk and -mindirect-branch=thunk conflict with
- # -mcmodel=large which is added by build system.
- # Replace them with -mfunction-return=thunk-inline and
-mindirect-branch=thunk-inline.
- local flag flags=()
- for flag in ${CFLAGS}; do
- [[ ${flag} == -mfunction-return=thunk ]] &&
flag="-mfunction-return=thunk-inline"
- [[ ${flag} == -mindirect-branch=thunk ]] &&
flag="-mindirect-branch=thunk-inline"
- flags+=("${flag}")
- done
- local -x PURGATORY_EXTRA_CFLAGS="${flags[*]}"
-
- default
-}
-
-src_install() {
- default
-
- dodoc "${FILESDIR}"/README.Gentoo
-
- newinitd "${FILESDIR}"/kexec-r2.init kexec
- newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec
-
- insinto /etc
- doins "${FILESDIR}"/kexec.conf
-
- insinto /etc/kernel/postinst.d
- doins "${FILESDIR}"/90_kexec
-
- systemd_dounit "${FILESDIR}"/kexec.service
-}
-
-pkg_postinst() {
- if systemd_is_booted || has_version sys-apps/systemd; then
- elog "For systemd support the new config file is"
- elog " /etc/kexec.conf"
- elog "Please adopt it to your needs as there is no autoconfig
anymore"
- fi
-
- local n_root_args=$(grep -o -- '\/dev/null | wc
-l)
- local has_rootpart_set=no
- if [[ -f "${EROOT}/etc/conf.d/kexec" ]]; then
- if grep -q -E -- '^ROOTPART=' "${EROOT}/etc/conf.d/kexec"
2>/dev/null; then
-
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: 044ec949e57cd6a31c0efb01f0680f1a49fb0873
Author: Sam James gentoo org>
AuthorDate: Tue Aug 10 23:59:46 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Aug 11 00:02:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=044ec949
sys-apps/kexec-tools: Stabilize 2.0.22 x86, #807490
Signed-off-by: Sam James gentoo.org>
sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild
index 32fca67a278..897b98a24b6 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "" ]] ; then
else
SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P/_/-}.tar.xz;
[[ "${PV}" == *_rc* ]] || \
- KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm64 ~ppc64 x86"
fi
DESCRIPTION="Load another kernel from the currently executing Linux kernel"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: 7a987ce593e53bd9e88ce5dcca7e2cd1dc3c3aeb
Author: Agostino Sarubbo gentoo org>
AuthorDate: Tue Aug 10 15:34:05 2021 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Tue Aug 10 15:34:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a987ce5
sys-apps/kexec-tools: amd64 stable wrt bug #807490
Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild
index 0879b84e674..32fca67a278 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "" ]] ; then
else
SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P/_/-}.tar.xz;
[[ "${PV}" == *_rc* ]] || \
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
fi
DESCRIPTION="Load another kernel from the currently executing Linux kernel"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/files/, sys-apps/kexec-tools/
commit: 8688bdf7c23696ebe3306470885d9ac187d12254
Author: David Seifert gentoo org>
AuthorDate: Thu May 13 20:24:12 2021 +
Commit: David Seifert gentoo org>
CommitDate: Thu May 13 20:24:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8688bdf7
sys-apps/kexec-tools: Remove old 2.0.20-r3
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert gentoo.org>
sys-apps/kexec-tools/Manifest | 1 -
...ec-tools-2.0.20-build-multiboot2-for-i386.patch | 68 ---
...0-remove-duplicated-variable-declarations.patch | 99
sys-apps/kexec-tools/kexec-tools-2.0.20-r3.ebuild | 126 -
4 files changed, 294 deletions(-)
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index 5f43db3899a..cb80e9aa09d 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -1,3 +1,2 @@
-DIST kexec-tools-2.0.20.tar.xz 297476 BLAKE2B
7e29e7f7d85296dd3e614c45f14c27eca74ce4426d5de2d20387d89f2f63afed318d6157cc4001849a04bb83505bbae87c43d34683ebaf9a70f5f29e3979ade3
SHA512
3112b6202c1030705c53e3f65a2b58aec14d65333a35aad681d48b9f2bd1c51a2e05c985a1e5e867ab02f8a9c97708483d9d225619db7c6993676f1a242e2d99
DIST kexec-tools-2.0.21.tar.xz 303300 BLAKE2B
d5b7bddeafdcbfd2b07dab6e4f167fcb61ccf2ec487f1835ac552a4596d22a94a7297d0eb769913f84eddc564ba4d9ae0c9d4c76994d0e3670fe168f377ebc77
SHA512
f487d2e243c2c4f29fbc9da7d06806f65210f717904655fc84d8d162b9c4614c3dd62e1bb47104a79f0dc2af04e462baf764fb309b5d7e6d287264cb48fd2a3e
DIST kexec-tools-2.0.22.tar.xz 303564 BLAKE2B
977c741eabf9b6b882550713ba59b18289b4f997fb382e96338efce6d04a9390fea952fc46ca72fd0a0b782261841ab2002da84b1819f955e63996eac900b0f7
SHA512
7580860f272eee5af52139809f12961e5a5d3a65f4e191183ca9c845410425d25818945ac14ed04a60e6ce474dc2656fc6a14041177b0bf703f450820c7d6aba
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
deleted file mode 100644
index 8f63ddbe3ba..000
---
a/sys-apps/kexec-tools/files/kexec-tools-2.0.20-build-multiboot2-for-i386.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 2c9f26ed20a791a7df0182ba82e93abb52f5a615 Mon Sep 17 00:00:00 2001
-From: Chris Packham
-Date: Mon, 18 Nov 2019 12:52:15 +1300
-Subject: kexec: build multiboot2 for i386
-
-This addresses the following compilation issues when building for i386.
-
- kexec/arch/i386/kexec-x86.c:39:22: error: 'multiboot2_x86_probe' undeclared
here (not in a function); did you mean 'multiboot_x86_probe'?
- { "multiboot2-x86", multiboot2_x86_probe, multiboot2_x86_load,
- ^~~~
- multiboot_x86_probe
- kexec/arch/i386/kexec-x86.c:39:44: error: 'multiboot2_x86_load' undeclared
here (not in a function); did you mean 'multiboot_x86_load'?
- { "multiboot2-x86", multiboot2_x86_probe, multiboot2_x86_load,
- ^~~
- multiboot_x86_load
- kexec/arch/i386/kexec-x86.c:40:4: error: 'multiboot2_x86_usage' undeclared
here (not in a function); did you mean 'multiboot_x86_usage'?
- multiboot2_x86_usage },
- ^~~~
- multiboot_x86_usage
- make: *** [Makefile:114: kexec/arch/i386/kexec-x86.o] Error 1
- make: *** Waiting for unfinished jobs
-
-Signed-off-by: Chris Packham
-Signed-off-by: Simon Horman
- kexec/arch/i386/Makefile| 2 +-
- kexec/arch/i386/kexec-x86.h | 5 +
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/kexec/arch/i386/Makefile b/kexec/arch/i386/Makefile
-index 105cefd..f486103 100644
a/kexec/arch/i386/Makefile
-+++ b/kexec/arch/i386/Makefile
-@@ -7,6 +7,7 @@ i386_KEXEC_SRCS += kexec/arch/i386/kexec-elf-x86.c
- i386_KEXEC_SRCS += kexec/arch/i386/kexec-elf-rel-x86.c
- i386_KEXEC_SRCS += kexec/arch/i386/kexec-bzImage.c
- i386_KEXEC_SRCS += kexec/arch/i386/kexec-multiboot-x86.c
-+i386_KEXEC_SRCS += kexec/arch/i386/kexec-mb2-x86.c
- i386_KEXEC_SRCS += kexec/arch/i386/kexec-beoboot-x86.c
- i386_KEXEC_SRCS += kexec/arch/i386/kexec-nbi.c
- i386_KEXEC_SRCS += kexec/arch/i386/x86-linux-setup.c
-@@ -14,7 +15,6 @@ i386_KEXEC_SRCS += kexec/arch/i386/crashdump-x86.c
-
- dist += kexec/arch/i386/Makefile $(i386_KEXEC_SRCS) \
- kexec/arch/i386/crashdump-x86.h \
-- kexec/arch/i386/kexec-mb2-x86.c \
- kexec/arch/i386/kexec-x86.h \
- kexec/arch/i386/x86-linux-setup.h \
- kexec/arch/i386/include/arch/options.h
-diff --git a/kexec/arch/i386/kexec-x86.h b/kexec/arch/i386/kexec-x86.h
-index 1b58c3b..0f941df 100644
a/kexec/arch/i386/kexec-x86.h
-+++ b/kexec/arch/i386/kexec-x86.h
-@@ -60,6 +60,11 @@ int multiboot_x86_load(int argc, char **argv,
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: 525ed0c462ba7048eb6bef7a028bdfa583961fa7
Author: Sam James gentoo org>
AuthorDate: Thu May 13 16:54:22 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu May 13 16:54:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=525ed0c4
sys-apps/kexec-tools: Stabilize 2.0.21 x86, #789843
Signed-off-by: Sam James gentoo.org>
sys-apps/kexec-tools/kexec-tools-2.0.21.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.21.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.21.ebuild
index 32fca67a278..897b98a24b6 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.21.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.21.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "" ]] ; then
else
SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P/_/-}.tar.xz;
[[ "${PV}" == *_rc* ]] || \
- KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm64 ~ppc64 x86"
fi
DESCRIPTION="Load another kernel from the currently executing Linux kernel"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: 0f80d5626636019253b8934fcb474cafae251057
Author: Sam James gentoo org>
AuthorDate: Thu May 13 16:16:57 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu May 13 16:16:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f80d562
sys-apps/kexec-tools: Stabilize 2.0.21 amd64, #789843
Signed-off-by: Sam James gentoo.org>
sys-apps/kexec-tools/kexec-tools-2.0.21.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.21.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.21.ebuild
index 86b8d9fc978..32fca67a278 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.21.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} == "" ]] ; then
else
SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P/_/-}.tar.xz;
[[ "${PV}" == *_rc* ]] || \
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
fi
DESCRIPTION="Load another kernel from the currently executing Linux kernel"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: 1c32db48384a223f4cc0432e20c1e96bbec77b17
Author: Lars Wendler gentoo org>
AuthorDate: Mon May 3 07:52:25 2021 +
Commit: Lars Wendler gentoo org>
CommitDate: Mon May 3 07:52:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c32db48
sys-apps/kexec-tools: Bump to version 2.0.22
Signed-off-by: Lars Wendler gentoo.org>
sys-apps/kexec-tools/Manifest | 1 +
sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild | 124 +
2 files changed, 125 insertions(+)
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index ba73c5ffdfd..5f43db3899a 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -1,2 +1,3 @@
DIST kexec-tools-2.0.20.tar.xz 297476 BLAKE2B
7e29e7f7d85296dd3e614c45f14c27eca74ce4426d5de2d20387d89f2f63afed318d6157cc4001849a04bb83505bbae87c43d34683ebaf9a70f5f29e3979ade3
SHA512
3112b6202c1030705c53e3f65a2b58aec14d65333a35aad681d48b9f2bd1c51a2e05c985a1e5e867ab02f8a9c97708483d9d225619db7c6993676f1a242e2d99
DIST kexec-tools-2.0.21.tar.xz 303300 BLAKE2B
d5b7bddeafdcbfd2b07dab6e4f167fcb61ccf2ec487f1835ac552a4596d22a94a7297d0eb769913f84eddc564ba4d9ae0c9d4c76994d0e3670fe168f377ebc77
SHA512
f487d2e243c2c4f29fbc9da7d06806f65210f717904655fc84d8d162b9c4614c3dd62e1bb47104a79f0dc2af04e462baf764fb309b5d7e6d287264cb48fd2a3e
+DIST kexec-tools-2.0.22.tar.xz 303564 BLAKE2B
977c741eabf9b6b882550713ba59b18289b4f997fb382e96338efce6d04a9390fea952fc46ca72fd0a0b782261841ab2002da84b1819f955e63996eac900b0f7
SHA512
7580860f272eee5af52139809f12961e5a5d3a65f4e191183ca9c845410425d25818945ac14ed04a60e6ce474dc2656fc6a14041177b0bf703f450820c7d6aba
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild
new file mode 100644
index 000..0879b84e674
--- /dev/null
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool linux-info systemd
+
+if [[ ${PV} == "" ]] ; then
+ inherit git-r3 autotools
+
EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git;
+else
+
SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P/_/-}.tar.xz;
+ [[ "${PV}" == *_rc* ]] || \
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Load another kernel from the currently executing Linux kernel"
+HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="booke lzma xen zlib"
+
+REQUIRED_USE="lzma? ( zlib )"
+
+DEPEND="
+ lzma? ( app-arch/xz-utils )
+ zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P/_/-}"
+
+CONFIG_CHECK="~KEXEC"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch
+ "${FILESDIR}"/${PN}-2.0.4-out-of-source.patch
+)
+
+pkg_setup() {
+ # GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC)
+ export ASFLAGS="${CCASFLAGS}"
+}
+
+src_prepare() {
+ default
+
+ # Append PURGATORY_EXTRA_CFLAGS flags set by configure, instead of
overriding them completely.
+ sed -e "/^PURGATORY_EXTRA_CFLAGS =/s/=/+=/" -i Makefile.in || die
+
+ if [[ "${PV}" == ]] ; then
+ eautoreconf
+ else
+ elibtoolize
+ fi
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_with booke)
+ $(use_with lzma)
+ $(use_with xen)
+ $(use_with zlib)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # Respect CFLAGS for purgatory.
+ # purgatory/Makefile uses PURGATORY_EXTRA_CFLAGS variable.
+ # -mfunction-return=thunk and -mindirect-branch=thunk conflict with
+ # -mcmodel=large which is added by build system.
+ # Replace them with -mfunction-return=thunk-inline and
-mindirect-branch=thunk-inline.
+ local flag flags=()
+ for flag in ${CFLAGS}; do
+ [[ ${flag} == -mfunction-return=thunk ]] &&
flag="-mfunction-return=thunk-inline"
+ [[ ${flag} == -mindirect-branch=thunk ]] &&
flag="-mindirect-branch=thunk-inline"
+ flags+=("${flag}")
+ done
+ local -x PURGATORY_EXTRA_CFLAGS="${flags[*]}"
+
+ default
+}
+
+src_install() {
+ default
+
+ dodoc "${FILESDIR}"/README.Gentoo
+
+ newinitd "${FILESDIR}"/kexec-r2.init kexec
+ newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec
+
+ insinto /etc
+ doins "${FILESDIR}"/kexec.conf
+
+ insinto /etc/kernel/postinst.d
+ doins "${FILESDIR}"/90_kexec
+
+ systemd_dounit "${FILESDIR}"/kexec.service
+}
+
+pkg_postinst() {
+ if systemd_is_booted || has_version sys-apps/systemd; then
+ elog "For systemd support the new config file is"
+ elog " /etc/kexec.conf"
+ elog "Please adopt
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: dcf62cfa32e2b010ad8244159cbc37f31f57ba60
Author: Lars Wendler gentoo org>
AuthorDate: Sat Dec 19 20:55:57 2020 +
Commit: Lars Wendler gentoo org>
CommitDate: Sat Dec 19 20:55:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcf62cfa
sys-apps/kexec-tools: Bump to version 2.0.21
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Lars Wendler gentoo.org>
sys-apps/kexec-tools/Manifest | 1 +
sys-apps/kexec-tools/kexec-tools-2.0.21.ebuild | 124 +
2 files changed, 125 insertions(+)
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index 7d82850e81a..ba73c5ffdfd 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -1 +1,2 @@
DIST kexec-tools-2.0.20.tar.xz 297476 BLAKE2B
7e29e7f7d85296dd3e614c45f14c27eca74ce4426d5de2d20387d89f2f63afed318d6157cc4001849a04bb83505bbae87c43d34683ebaf9a70f5f29e3979ade3
SHA512
3112b6202c1030705c53e3f65a2b58aec14d65333a35aad681d48b9f2bd1c51a2e05c985a1e5e867ab02f8a9c97708483d9d225619db7c6993676f1a242e2d99
+DIST kexec-tools-2.0.21.tar.xz 303300 BLAKE2B
d5b7bddeafdcbfd2b07dab6e4f167fcb61ccf2ec487f1835ac552a4596d22a94a7297d0eb769913f84eddc564ba4d9ae0c9d4c76994d0e3670fe168f377ebc77
SHA512
f487d2e243c2c4f29fbc9da7d06806f65210f717904655fc84d8d162b9c4614c3dd62e1bb47104a79f0dc2af04e462baf764fb309b5d7e6d287264cb48fd2a3e
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.21.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.21.ebuild
new file mode 100644
index 000..86b8d9fc978
--- /dev/null
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.21.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool linux-info systemd
+
+if [[ ${PV} == "" ]] ; then
+ inherit git-r3 autotools
+
EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git;
+else
+
SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P/_/-}.tar.xz;
+ [[ "${PV}" == *_rc* ]] || \
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Load another kernel from the currently executing Linux kernel"
+HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="booke lzma xen zlib"
+
+REQUIRED_USE="lzma? ( zlib )"
+
+DEPEND="
+ lzma? ( app-arch/xz-utils )
+ zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P/_/-}"
+
+CONFIG_CHECK="~KEXEC"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch
+ "${FILESDIR}"/${PN}-2.0.4-out-of-source.patch
+)
+
+pkg_setup() {
+ # GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC)
+ export ASFLAGS="${CCASFLAGS}"
+}
+
+src_prepare() {
+ default
+
+ # Append PURGATORY_EXTRA_CFLAGS flags set by configure, instead of
overriding them completely.
+ sed -e "/^PURGATORY_EXTRA_CFLAGS =/s/=/+=/" -i Makefile.in || die
+
+ if [[ "${PV}" == ]] ; then
+ eautoreconf
+ else
+ elibtoolize
+ fi
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_with booke)
+ $(use_with lzma)
+ $(use_with xen)
+ $(use_with zlib)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # Respect CFLAGS for purgatory.
+ # purgatory/Makefile uses PURGATORY_EXTRA_CFLAGS variable.
+ # -mfunction-return=thunk and -mindirect-branch=thunk conflict with
+ # -mcmodel=large which is added by build system.
+ # Replace them with -mfunction-return=thunk-inline and
-mindirect-branch=thunk-inline.
+ local flag flags=()
+ for flag in ${CFLAGS}; do
+ [[ ${flag} == -mfunction-return=thunk ]] &&
flag="-mfunction-return=thunk-inline"
+ [[ ${flag} == -mindirect-branch=thunk ]] &&
flag="-mindirect-branch=thunk-inline"
+ flags+=("${flag}")
+ done
+ local -x PURGATORY_EXTRA_CFLAGS="${flags[*]}"
+
+ default
+}
+
+src_install() {
+ default
+
+ dodoc "${FILESDIR}"/README.Gentoo
+
+ newinitd "${FILESDIR}"/kexec-r2.init kexec
+ newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec
+
+ insinto /etc
+ doins "${FILESDIR}"/kexec.conf
+
+ insinto /etc/kernel/postinst.d
+ doins "${FILESDIR}"/90_kexec
+
+ systemd_dounit "${FILESDIR}"/kexec.service
+}
+
+pkg_postinst() {
+ if systemd_is_booted || has_version sys-apps/systemd; then
+ elog "For systemd support the new config file is"
+ elog " /etc/kexec.conf"
+ elog "Please adopt it to your needs as there is no autoconfig
anymore"
+ fi
+
+ local n_root_args=$(grep -o -- '\/dev/null | wc
-l)
+ local has_rootpart_set=no
+ if [[ -f "${EROOT}/etc/conf.d/kexec" ]]; then
+ if grep -q -E -- '^ROOTPART='
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: 854540518ef4e1507c11e4a9db6d54ace55bd1d3
Author: Thomas Deutschmann gentoo org>
AuthorDate: Mon Aug 10 09:12:14 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Mon Aug 10 09:13:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85454051
sys-apps/kexec-tools: amd64 & x86 stable
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann gentoo.org>
sys-apps/kexec-tools/kexec-tools-2.0.20-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
index 4d758da9aad..89aebbb2917 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.20-r3.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.20-r3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "" ]] ; then
else
SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P/_/-}.tar.xz;
[[ "${PV}" == *_rc* ]] || \
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm64 ~ppc64 x86"
fi
DESCRIPTION="Load another kernel from the currently executing Linux kernel"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/files/, sys-apps/kexec-tools/
commit: 580d5de483ea67cd31407d8ae7cf64e95538b5a6
Author: Thomas Deutschmann gentoo org>
AuthorDate: Mon Aug 10 09:12:52 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Mon Aug 10 09:13:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=580d5de4
sys-apps/kexec-tools: drop old
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann gentoo.org>
sys-apps/kexec-tools/files/kexec.init-2.0.13-r1 | 188 --
sys-apps/kexec-tools/kexec-tools-2.0.20-r1.ebuild | 110 -
2 files changed, 298 deletions(-)
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
deleted file mode 100644
index 167b792de85..000
--- a/sys-apps/kexec-tools/files/kexec.init-2.0.13-r1
+++ /dev/null
@@ -1,188 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Set up some defaults.
-: "${LOAD_DURING_SHUTDOWN:=yes}"
-: "${BOOTPART:=/boot}"
-: "${DONT_MOUNT_BOOT:=no}"
-
-depend() {
- need localmount
-}
-
-auto_prefix_bootpath() {
- # Only auto-add prefix to relative paths.
- case $1 in
- */*) echo "$1";;
- *) echo "${BOOTPART}/$1" ;;
- esac
-}
-
-get_genkernel_arch() {
- case $1 in
- x86_64) echo "amd64" ;;
- i[3456]86) echo "x86" ;;
- *) echo "$1" ;;
- esac
-}
-
-image_path() {
- # Do no sanity checking if the user has set a value.
- if [ -n "${KNAME}" ]; then
- auto_prefix_bootpath "${KNAME}"
- return
- fi
-
- local x kver="$(uname -r)" karch="$(uname -m)"
- local gkarch="$(get_genkernel_arch $karch)"
- for x in \
- "bzImage" \
- "vmlinux" \
- "vmlinuz" \
- "bzImage-${kver}" \
- "vmlinux-${kver}" \
- "vmlinuz-${kver}" \
- "kernel-genkernel-${karch}-${kver}" \
- "kernel-genkernel-${gkarch}-${kver}" \
- "kernel-${kver}" \
- "kernel-${karch}"; do
- if [ -e "${BOOTPART}/${x}" ]; then
- echo "${BOOTPART}/${x}"
- return
- fi
- done
-
- return 1
-}
-
-initrd_path() {
- # Do no sanity checking if the user has set a value.
- if [ -n "${INITRD}" ]; then
- auto_prefix_bootpath "${INITRD}"
- return 0
- fi
-
- local x kver="$(uname -r)" karch="$(uname -m)"
- local gkarch="$(get_genkernel_arch $karch)"
- for x in \
- "initrd" \
- "initrd.img-${kver}" \
- "initrd-${kver}.img" \
- "initrd-${kver}" \
- "initramfs-${kver}.img" \
- "initramfs-genkernel-${karch}-${kver}" \
- "initramfs-genkernel-${gkarch}-${kver}"; do
- if [ -e "${BOOTPART}/${x}" ]; then
- echo "${BOOTPART}/${x}"
- return 0
- fi
- done
-
- return 1
-}
-
-mount_boot() {
- [ "${DONT_MOUNT_BOOT}" != "no" ] && return 1
- mountinfo -q "${BOOTPART}" && return 1
-
- ebegin "Mounting ${BOOTPART}"
- mount "${BOOTPART}"
- eend $?
-}
-
-load_image() {
- if [ "${KNAME}" = "-" ]; then
- ebegin "Disabling kexec"
- kexec -u
- eend $?
- return # eend preserved $? for us.
- fi
-
- local img initrd="$(initrd_path)" mounted=false kparamopt initrdopt
-
- if ! img="$(image_path)"; then
- if mount_boot; then
- if img="$(image_path)"; then
- mounted=true
- initrd="$(initrd_path)"
- else
- eerror "No kernel image found in ${BOOTPART}!"
- umount "${BOOTPART}"
- return 1
- fi
- else
- eerror "No kernel image found in ${BOOTPART}!"
- return 1
- fi
- fi
-
- if [ -z "${ROOTPART}" ]; then
- ROOTPART="$(readlink -f "$(sed -n '/^\/[^ ]* \/ / s,^\([^
]*\).*,\1,p' /proc/mounts)")"
- fi
-
- if [ -z "${KPARAM}" ]; then
- kparamopt="--reuse-cmdline"
- fi
-
- if [ -n "${initrd}" ]; then
- initrdopt="--initrd=${initrd}"
- fi
-
- local msg
- [ -n "${initrd}" ] && \
- msg=" (with ${initrd})"
- ebegin "Using kernel image ${img}${msg} for kexec"
-
- kexec ${KEXEC_OPT_ARGS} ${kparamopt} \
- -l "${img}" --append="root=${ROOTPART} ${KPARAM}" ${initrdopt}
- local ret=$?
-
- ${mounted} && umount "${BOOTPART}"
- eend ${ret}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: 61c03ffab76740c0420e3c8a3185d047d461f7a7
Author: Thomas Deutschmann gentoo org>
AuthorDate: Wed Aug 5 01:54:10 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Wed Aug 5 01:56:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61c03ffa
sys-apps/kexec-tools: rev bump to force ewarn
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann gentoo.org>
...ols-2.0.20-r2.ebuild => kexec-tools-2.0.20-r3.ebuild} | 16
sys-apps/kexec-tools/kexec-tools-.ebuild | 16
2 files changed, 32 insertions(+)
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.20-r2.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.20-r3.ebuild
similarity index 80%
rename from sys-apps/kexec-tools/kexec-tools-2.0.20-r2.ebuild
rename to sys-apps/kexec-tools/kexec-tools-2.0.20-r3.ebuild
index 3a25aced9f0..4d758da9aad 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.20-r2.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.20-r3.ebuild
@@ -107,4 +107,20 @@ pkg_postinst() {
elog " /etc/kexec.conf"
elog "Please adopt it to your needs as there is no autoconfig
anymore"
fi
+
+ local n_root_args=$(grep -o -- '\/dev/null | wc
-l)
+ local has_rootpart_set=no
+ if [[ -f "${EROOT}/etc/conf.d/kexec" ]]; then
+ if grep -q -E -- '^ROOTPART=' "${EROOT}/etc/conf.d/kexec"
2>/dev/null; then
+ has_rootpart_set=yes
+ fi
+ fi
+
+ if [[ ${n_root_args} > 1 && "${has_rootpart_set}" == "no" ]]; then
+ ewarn "WARNING: Multiple root arguments (root=) on kernel
command-line detected!"
+ ewarn "This was probably caused by a previous version of ${PN}."
+ ewarn "Please reboot system once *without* kexec to avoid boot
problems"
+ ewarn "in case running system and initramfs do not agree on
detected"
+ ewarn "root device name!"
+ fi
}
diff --git a/sys-apps/kexec-tools/kexec-tools-.ebuild
b/sys-apps/kexec-tools/kexec-tools-.ebuild
index cb3f3b6f1c4..86b8d9fc978 100644
--- a/sys-apps/kexec-tools/kexec-tools-.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-.ebuild
@@ -105,4 +105,20 @@ pkg_postinst() {
elog " /etc/kexec.conf"
elog "Please adopt it to your needs as there is no autoconfig
anymore"
fi
+
+ local n_root_args=$(grep -o -- '\/dev/null | wc
-l)
+ local has_rootpart_set=no
+ if [[ -f "${EROOT}/etc/conf.d/kexec" ]]; then
+ if grep -q -E -- '^ROOTPART=' "${EROOT}/etc/conf.d/kexec"
2>/dev/null; then
+ has_rootpart_set=yes
+ fi
+ fi
+
+ if [[ ${n_root_args} > 1 && "${has_rootpart_set}" == "no" ]]; then
+ ewarn "WARNING: Multiple root arguments (root=) on kernel
command-line detected!"
+ ewarn "This was probably caused by a previous version of ${PN}."
+ ewarn "Please reboot system once *without* kexec to avoid boot
problems"
+ ewarn "in case running system and initramfs do not agree on
detected"
+ ewarn "root device name!"
+ fi
}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/files/
commit: 1f1b89399e462f1798a5fa990c73fbaec5a4050e
Author: Thomas Deutschmann gentoo org>
AuthorDate: Tue Aug 4 22:03:31 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Tue Aug 4 23:02:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f1b8939
sys-apps/kexec-tools: runscript: add support for genkernel's default
kernel/initramfs symlink
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann gentoo.org>
sys-apps/kexec-tools/files/kexec-r2.init | 2 ++
1 file changed, 2 insertions(+)
diff --git a/sys-apps/kexec-tools/files/kexec-r2.init
b/sys-apps/kexec-tools/files/kexec-r2.init
index ea6b790d324..2a3b63ad526 100644
--- a/sys-apps/kexec-tools/files/kexec-r2.init
+++ b/sys-apps/kexec-tools/files/kexec-r2.init
@@ -40,6 +40,7 @@ image_path() {
"bzImage" \
"vmlinux" \
"vmlinuz" \
+ "kernel" \
"bzImage-${kver}" \
"vmlinux-${kver}" \
"vmlinuz-${kver}" \
@@ -67,6 +68,7 @@ initrd_path() {
local gkarch="$(get_genkernel_arch $karch)"
for x in \
"initrd" \
+ "initramfs" \
"initrd.img-${kver}" \
"initrd-${kver}.img" \
"initrd-${kver}" \
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/, sys-apps/kexec-tools/files/
commit: 7812874ed77c593bbbc912311d2483cb362f44dd
Author: Thomas Deutschmann gentoo org>
AuthorDate: Tue Aug 4 21:59:17 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Tue Aug 4 23:02:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7812874e
sys-apps/kexec-tools: runscript: fix style
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann gentoo.org>
sys-apps/kexec-tools/files/kexec-r2.init | 188 +
...ls-.ebuild => kexec-tools-2.0.20-r2.ebuild} | 4 +-
sys-apps/kexec-tools/kexec-tools-.ebuild | 2 +-
3 files changed, 192 insertions(+), 2 deletions(-)
diff --git a/sys-apps/kexec-tools/files/kexec-r2.init
b/sys-apps/kexec-tools/files/kexec-r2.init
new file mode 100644
index 000..ea6b790d324
--- /dev/null
+++ b/sys-apps/kexec-tools/files/kexec-r2.init
@@ -0,0 +1,188 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Set up some defaults.
+: "${LOAD_DURING_SHUTDOWN:=yes}"
+: "${BOOTPART:=/boot}"
+: "${DONT_MOUNT_BOOT:=no}"
+
+depend() {
+ need localmount
+}
+
+auto_prefix_bootpath() {
+ # Only auto-add prefix to relative paths.
+ case $1 in
+ */*) echo "$1";;
+ *) echo "${BOOTPART}/$1" ;;
+ esac
+}
+
+get_genkernel_arch() {
+ case $1 in
+ x86_64) echo "amd64" ;;
+ i[3456]86) echo "x86" ;;
+ *) echo "$1" ;;
+ esac
+}
+
+image_path() {
+ # Do no sanity checking if the user has set a value.
+ if [ -n "${KNAME}" ]; then
+ auto_prefix_bootpath "${KNAME}"
+ return
+ fi
+
+ local x kver="$(uname -r)" karch="$(uname -m)"
+ local gkarch="$(get_genkernel_arch $karch)"
+ for x in \
+ "bzImage" \
+ "vmlinux" \
+ "vmlinuz" \
+ "bzImage-${kver}" \
+ "vmlinux-${kver}" \
+ "vmlinuz-${kver}" \
+ "kernel-genkernel-${karch}-${kver}" \
+ "kernel-genkernel-${gkarch}-${kver}" \
+ "kernel-${kver}" \
+ "kernel-${karch}"; do
+ if [ -e "${BOOTPART}/${x}" ]; then
+ echo "${BOOTPART}/${x}"
+ return
+ fi
+ done
+
+ return 1
+}
+
+initrd_path() {
+ # Do no sanity checking if the user has set a value.
+ if [ -n "${INITRD}" ]; then
+ auto_prefix_bootpath "${INITRD}"
+ return 0
+ fi
+
+ local x kver="$(uname -r)" karch="$(uname -m)"
+ local gkarch="$(get_genkernel_arch $karch)"
+ for x in \
+ "initrd" \
+ "initrd.img-${kver}" \
+ "initrd-${kver}.img" \
+ "initrd-${kver}" \
+ "initramfs-${kver}.img" \
+ "initramfs-genkernel-${karch}-${kver}" \
+ "initramfs-genkernel-${gkarch}-${kver}"; do
+ if [ -e "${BOOTPART}/${x}" ]; then
+ echo "${BOOTPART}/${x}"
+ return 0
+ fi
+ done
+
+ return 1
+}
+
+mount_boot() {
+ [ "${DONT_MOUNT_BOOT}" != "no" ] && return 1
+ mountinfo -q "${BOOTPART}" && return 1
+
+ ebegin "Mounting ${BOOTPART}"
+ mount "${BOOTPART}"
+ eend $?
+}
+
+load_image() {
+ if [ "${KNAME}" = "-" ]; then
+ ebegin "Disabling kexec"
+ kexec -u
+ eend $?
+ return # eend preserved $? for us.
+ fi
+
+ local img initrd="$(initrd_path)" mounted=false kparamopt initrdopt
+
+ if ! img="$(image_path)"; then
+ if mount_boot; then
+ if img="$(image_path)"; then
+ mounted=true
+ initrd="$(initrd_path)"
+ else
+ eerror "No kernel image found in ${BOOTPART}!"
+ umount "${BOOTPART}"
+ return 1
+ fi
+ else
+ eerror "No kernel image found in ${BOOTPART}!"
+ return 1
+ fi
+ fi
+
+ if [ -z "${ROOTPART}" ]; then
+ ROOTPART="$(readlink -f "$(sed -n '/^\/[^ ]* \/ / s,^\([^
]*\).*,\1,p' /proc/mounts)")"
+ fi
+
+ if [ -z "${KPARAM}" ]; then
+ kparamopt="--reuse-cmdline"
+ fi
+
+ if [ -n "${initrd}" ]; then
+ initrdopt="--initrd=${initrd}"
+ fi
+
+ local msg
+ [ -n "${initrd}" ] && \
+ msg=" (with ${initrd})"
+ ebegin "Using kernel image ${img}${msg} for kexec"
+
+ kexec ${KEXEC_OPT_ARGS} ${kparamopt} \
+ -l "${img}" --append="root=${ROOTPART} ${KPARAM}"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/files/
commit: 4860fce5434f46d90e913ff10515a9a256fc6c6a
Author: Thomas Deutschmann gentoo org>
AuthorDate: Tue Aug 4 22:25:12 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Tue Aug 4 23:02:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4860fce5
sys-apps/kexec-tools: runscript: do not append root= if --reuse-cmdline is used
Always appending root= can cause problems when auto-detection is used
when real system and initramfs don't agree on naming (i.e. when
current system detects root as /dev/dm-4 but on next boot, initramfs
will detect root as /dev/dm-5).
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann gentoo.org>
sys-apps/kexec-tools/files/kexec-r2.init | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/sys-apps/kexec-tools/files/kexec-r2.init
b/sys-apps/kexec-tools/files/kexec-r2.init
index 2a3b63ad526..0578f51aea1 100644
--- a/sys-apps/kexec-tools/files/kexec-r2.init
+++ b/sys-apps/kexec-tools/files/kexec-r2.init
@@ -119,12 +119,22 @@ load_image() {
fi
fi
+ local is_rootpart_autodetected=no
if [ -z "${ROOTPART}" ]; then
ROOTPART="$(readlink -f "$(sed -n '/^\/[^ ]* \/ / s,^\([^
]*\).*,\1,p' /proc/mounts)")"
+ is_rootpart_autodetected=yes
fi
+ local is_reusing_cmdline=no
if [ -z "${KPARAM}" ]; then
kparamopt="--reuse-cmdline"
+ is_reusing_cmdline=yes
+ fi
+
+ if ! yesno "${is_rootpart_autodetected}" || ! yesno
"${is_reusing_cmdline}"; then
+ # Only append root when explicit set in config or
+ # if we aren't re-using kernel cmdline
+ KPARAM="${KPARAM:+"${KPARAM} "}root=${ROOTPART}"
fi
if [ -n "${initrd}" ]; then
@@ -137,7 +147,7 @@ load_image() {
ebegin "Using kernel image ${img}${msg} for kexec"
kexec ${KEXEC_OPT_ARGS} ${kparamopt} \
- -l "${img}" --append="root=${ROOTPART} ${KPARAM}" ${initrdopt}
+ -l "${img}" ${KPARAM:+--append="${KPARAM}"} ${initrdopt}
local ret=$?
${mounted} && umount "${BOOTPART}"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: b01a5ac59c74adb5853d4452683e6237bf47da99
Author: Thomas Deutschmann gentoo org>
AuthorDate: Mon May 4 15:31:33 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Mon May 4 16:00:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b01a5ac5
sys-apps/kexec-tools: drop old
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann gentoo.org>
sys-apps/kexec-tools/Manifest | 1 -
sys-apps/kexec-tools/kexec-tools-2.0.19-r1.ebuild | 85 --
sys-apps/kexec-tools/kexec-tools-2.0.20.ebuild| 88 ---
3 files changed, 174 deletions(-)
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index a318c88ab48..7d82850e81a 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -1,2 +1 @@
-DIST kexec-tools-2.0.19.tar.xz 292348 BLAKE2B
c9827d77c82f11351086f4cdf4bacd076a03c744969952706ffd6f17395f28fba2437dac976e12e8e5648ca09fac6ff241daf9b8d3fee215519ded9f18441ff0
SHA512
68b15fe46f9633d55c5ae51a6e7114b0c66bd8f4fe81197f581121939a7b21990a2eea89a0961ac6eb7af364ba0d3981ea504df81c7b4cc0b288ca6ac896730f
DIST kexec-tools-2.0.20.tar.xz 297476 BLAKE2B
7e29e7f7d85296dd3e614c45f14c27eca74ce4426d5de2d20387d89f2f63afed318d6157cc4001849a04bb83505bbae87c43d34683ebaf9a70f5f29e3979ade3
SHA512
3112b6202c1030705c53e3f65a2b58aec14d65333a35aad681d48b9f2bd1c51a2e05c985a1e5e867ab02f8a9c97708483d9d225619db7c6993676f1a242e2d99
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.19-r1.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.19-r1.ebuild
deleted file mode 100644
index ddde674c4c8..000
--- a/sys-apps/kexec-tools/kexec-tools-2.0.19-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic libtool linux-info systemd
-
-if [[ ${PV} == "" ]] ; then
- inherit git-r3 autotools
-
EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git;
-else
-
SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P}.tar.xz;
- KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-fi
-
-DESCRIPTION="Load another kernel from the currently executing Linux kernel"
-HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="booke lzma xen zlib"
-
-REQUIRED_USE="lzma? ( zlib )"
-
-DEPEND="
- lzma? ( app-arch/xz-utils )
- zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-CONFIG_CHECK="~KEXEC"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch
- "${FILESDIR}"/${PN}-2.0.4-out-of-source.patch
-)
-
-pkg_setup() {
- # GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC)
- export ASFLAGS="${CCASFLAGS}"
-}
-
-src_prepare() {
- default
- if [[ ${PV} == "" ]] ; then
- eautoreconf
- else
- elibtoolize
- fi
- filter-flags '-mindirect-branch=thunk*'
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_with booke)
- $(use_with lzma)
- $(use_with xen)
- $(use_with zlib)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- dodoc "${FILESDIR}"/README.Gentoo
-
- newinitd "${FILESDIR}"/kexec.init-2.0.13-r1 kexec
- newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec
-
- insinto /etc
- doins "${FILESDIR}"/kexec.conf
-
- insinto /etc/kernel/postinst.d
- doins "${FILESDIR}"/90_kexec
-
- systemd_dounit "${FILESDIR}"/kexec.service
-}
-
-pkg_postinst() {
- if systemd_is_booted || has_version sys-apps/systemd; then
- elog "For systemd support the new config file is"
- elog " /etc/kexec.conf"
- elog "Please adopt it to your needs as there is no autoconfig
anymore"
- fi
-}
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.20.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.20.ebuild
deleted file mode 100644
index 6f01ce71845..000
--- a/sys-apps/kexec-tools/kexec-tools-2.0.20.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic libtool linux-info systemd
-
-if [[ ${PV} == "" ]] ; then
- inherit git-r3 autotools
-
EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git;
-else
-
SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P/_/-}.tar.xz;
- [[ "${PV}" == *_rc* ]] || \
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Load another kernel from the currently executing Linux kernel"
-HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="booke lzma xen zlib"
-
-REQUIRED_USE="lzma? ( zlib )"
-
-DEPEND="
- lzma? (
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: 07deee9150408a27918663dec06f478141e0bc53
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon May 4 15:15:14 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon May 4 15:15:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07deee91
sys-apps/kexec-tools: x86 stable wrt bug #720854
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
sys-apps/kexec-tools/kexec-tools-2.0.20-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.20-r1.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.20-r1.ebuild
index 8726ab6111e..480260001a5 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.20-r1.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.20-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "" ]] ; then
else
SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P/_/-}.tar.xz;
[[ "${PV}" == *_rc* ]] || \
- KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm64 ~ppc64 x86"
fi
DESCRIPTION="Load another kernel from the currently executing Linux kernel"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: df06bb9e03d939e9edd555a987a45397c1c6119a
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon May 4 13:29:12 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon May 4 13:29:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df06bb9e
sys-apps/kexec-tools: amd64 stable wrt bug #720854
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
sys-apps/kexec-tools/kexec-tools-2.0.20-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.20-r1.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.20-r1.ebuild
index 3cfa2914c93..8726ab6111e 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.20-r1.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.20-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "" ]] ; then
else
SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P/_/-}.tar.xz;
[[ "${PV}" == *_rc* ]] || \
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
fi
DESCRIPTION="Load another kernel from the currently executing Linux kernel"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/, sys-apps/kexec-tools/files/
commit: a79ebc56e947c3561a98e56f1de792f491846cde
Author: Thomas Deutschmann gentoo org>
AuthorDate: Sun May 3 18:46:41 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sun May 3 19:01:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a79ebc56
sys-apps/kexec-tools: fix building against GCC 10
Closes: https://bugs.gentoo.org/707132
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann gentoo.org>
...0-remove-duplicated-variable-declarations.patch | 99 ++
sys-apps/kexec-tools/kexec-tools-2.0.20-r1.ebuild | 89 +++
2 files changed, 188 insertions(+)
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
new file mode 100644
index 000..d71e76b3d63
--- /dev/null
+++
b/sys-apps/kexec-tools/files/kexec-tools-2.0.20-remove-duplicated-variable-declarations.patch
@@ -0,0 +1,99 @@
+From cc087b11462af9f971a2c090d07e8d780a867b50 Mon Sep 17 00:00:00 2001
+From: Kairui Song
+Date: Wed, 29 Jan 2020 13:38:19 +0800
+Subject: kexec-tools: Remove duplicated variable declarations
+
+When building kexec-tools for Fedora 32, following error is observed:
+
+/usr/bin/ld: kexec/arch/x86_64/kexec-bzImage64.o:(.bss+0x0): multiple
definition of `bzImage_support_efi_boot';
+kexec/arch/i386/kexec-bzImage.o:(.bss+0x0): first defined here
+
+/builddir/build/BUILD/kexec-tools-2.0.20/kexec/arch/arm/../../fs2dt.h:33:
multiple definition of `my_debug';
+kexec/fs2dt.o:/builddir/build/BUILD/kexec-tools-2.0.20/kexec/fs2dt.h:33: first
defined here
+
+/builddir/build/BUILD/kexec-tools-2.0.20/kexec/arch/arm64/kexec-arm64.h:68:
multiple definition of `arm64_mem';
+kexec/fs2dt.o:/builddir/build/BUILD/kexec-tools-2.0.20/././kexec/arch/arm64/kexec-arm64.h:68:
first defined here
+
+/builddir/build/BUILD/kexec-tools-2.0.20/kexec/arch/arm64/kexec-arm64.h:54:
multiple definition of `initrd_size';
+kexec/fs2dt.o:/builddir/build/BUILD/kexec-tools-2.0.20/././kexec/arch/arm64/kexec-arm64.h:54:
first defined here
+
+/builddir/build/BUILD/kexec-tools-2.0.20/kexec/arch/arm64/kexec-arm64.h:53:
multiple definition of `initrd_base';
+kexec/fs2dt.o:/builddir/build/BUILD/kexec-tools-2.0.20/././kexec/arch/arm64/kexec-arm64.h:53:
first defined here
+
+And apparently, these variables are wrongly declared multiple times. So
+remove duplicated declaration.
+
+Signed-off-by: Kairui Song
+Signed-off-by: Simon Horman
+---
+ kexec/arch/arm64/kexec-arm64.h | 6 +++---
+ kexec/arch/ppc64/kexec-elf-ppc64.c | 2 --
+ kexec/arch/x86_64/kexec-bzImage64.c | 1 -
+ kexec/fs2dt.h | 2 +-
+ 4 files changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/kexec/arch/arm64/kexec-arm64.h b/kexec/arch/arm64/kexec-arm64.h
+index 628de79..ed447ac 100644
+--- a/kexec/arch/arm64/kexec-arm64.h
b/kexec/arch/arm64/kexec-arm64.h
+@@ -50,8 +50,8 @@ int zImage_arm64_load(int argc, char **argv, const char
*kernel_buf,
+ void zImage_arm64_usage(void);
+
+
+-off_t initrd_base;
+-off_t initrd_size;
++extern off_t initrd_base;
++extern off_t initrd_size;
+
+ /**
+ * struct arm64_mem - Memory layout info.
+@@ -65,7 +65,7 @@ struct arm64_mem {
+ };
+
+ #define arm64_mem_ngv UINT64_MAX
+-struct arm64_mem arm64_mem;
++extern struct arm64_mem arm64_mem;
+
+ uint64_t get_phys_offset(void);
+ uint64_t get_vp_offset(void);
+diff --git a/kexec/arch/ppc64/kexec-elf-ppc64.c
b/kexec/arch/ppc64/kexec-elf-ppc64.c
+index 3510b70..695b8b0 100644
+--- a/kexec/arch/ppc64/kexec-elf-ppc64.c
b/kexec/arch/ppc64/kexec-elf-ppc64.c
+@@ -44,8 +44,6 @@
+ uint64_t initrd_base, initrd_size;
+ unsigned char reuse_initrd = 0;
+ const char *ramdisk;
+-/* Used for enabling printing message from purgatory code */
+-int my_debug = 0;
+
+ int elf_ppc64_probe(const char *buf, off_t len)
+ {
+diff --git a/kexec/arch/x86_64/kexec-bzImage64.c
b/kexec/arch/x86_64/kexec-bzImage64.c
+index 8edb3e4..ba8dc48 100644
+--- a/kexec/arch/x86_64/kexec-bzImage64.c
b/kexec/arch/x86_64/kexec-bzImage64.c
+@@ -42,7 +42,6 @@
+ #include
+
+ static const int probe_debug = 0;
+-int bzImage_support_efi_boot;
+
+ int bzImage64_probe(const char *buf, off_t len)
+ {
+diff --git a/kexec/fs2dt.h b/kexec/fs2dt.h
+index 7633273..fe24931 100644
+--- a/kexec/fs2dt.h
b/kexec/fs2dt.h
+@@ -30,7 +30,7 @@ extern struct bootblock bb[1];
+
+ /* Used for enabling printing message from purgatory code
+ * Only has implemented for PPC64 */
+-int my_debug;
++extern int my_debug;
+ extern int dt_no_old_root;
+
+ void reserve(unsigned long long where, unsigned long long length);
+--
+cgit 1.2-0.3.lf.el7
+
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.20-r1.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.20-r1.ebuild
new file mode 100644
index 000..7fd2e6f2679
--- /dev/null
+++
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: b4aa565ce155f21bad4f3365268c7e7f3e370f23
Author: Arfrever Frehtes Taifersar Arahesis Apache Org>
AuthorDate: Sun May 3 19:00:08 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sun May 3 19:01:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4aa565c
sys-apps/kexec-tools: respect CFLAGS for purgatory
Only when building purgatory, replace -mfunction-return=thunk and
-mindirect-branch=thunk flags with similar -mfunction-return=thunk-inline
and -mindirect-branch=thunk-inline flags, which are not incompatible
with flags added by build system.
Closes: https://bugs.gentoo.org/646536
Closes: https://bugs.gentoo.org/692930
Signed-off-by: Arfrever Frehtes Taifersar Arahesis Apache.Org>
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann gentoo.org>
sys-apps/kexec-tools/kexec-tools-2.0.20-r1.ebuild | 24 +--
sys-apps/kexec-tools/kexec-tools-.ebuild | 28 +++
2 files changed, 46 insertions(+), 6 deletions(-)
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.20-r1.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.20-r1.ebuild
index 85f71ffaf47..3cfa2914c93 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.20-r1.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.20-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit flag-o-matic libtool linux-info systemd
+inherit libtool linux-info systemd
if [[ ${PV} == "" ]] ; then
inherit git-r3 autotools
@@ -46,12 +46,15 @@ pkg_setup() {
src_prepare() {
default
+
+ # Append PURGATORY_EXTRA_CFLAGS flags set by configure, instead of
overriding them completely.
+ sed -e "/^PURGATORY_EXTRA_CFLAGS =/s/=/+=/" -i Makefile.in || die
+
if [[ "${PV}" == ]] ; then
eautoreconf
else
elibtoolize
fi
- filter-flags '-mindirect-branch=thunk*'
}
src_configure() {
@@ -64,6 +67,23 @@ src_configure() {
econf "${myeconfargs[@]}"
}
+src_compile() {
+ # Respect CFLAGS for purgatory.
+ # purgatory/Makefile uses PURGATORY_EXTRA_CFLAGS variable.
+ # -mfunction-return=thunk and -mindirect-branch=thunk conflict with
+ # -mcmodel=large which is added by build system.
+ # Replace them with -mfunction-return=thunk-inline and
-mindirect-branch=thunk-inline.
+ local flag flags=()
+ for flag in ${CFLAGS}; do
+ [[ ${flag} == -mfunction-return=thunk ]] &&
flag="-mfunction-return=thunk-inline"
+ [[ ${flag} == -mindirect-branch=thunk ]] &&
flag="-mindirect-branch=thunk-inline"
+ flags+=("${flag}")
+ done
+ local -x PURGATORY_EXTRA_CFLAGS="${flags[*]}"
+
+ default
+}
+
src_install() {
default
diff --git a/sys-apps/kexec-tools/kexec-tools-.ebuild
b/sys-apps/kexec-tools/kexec-tools-.ebuild
index 99c3438156f..77c5d7c6e59 100644
--- a/sys-apps/kexec-tools/kexec-tools-.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit flag-o-matic libtool linux-info systemd
+inherit libtool linux-info systemd
if [[ ${PV} == "" ]] ; then
inherit git-r3 autotools
@@ -11,7 +11,7 @@ if [[ ${PV} == "" ]] ; then
else
SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P/_/-}.tar.xz;
[[ "${PV}" == *_rc* ]] || \
- KEYWORDS="~amd64 ~arm64 ~hppa ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
fi
DESCRIPTION="Load another kernel from the currently executing Linux kernel"
@@ -44,12 +44,15 @@ pkg_setup() {
src_prepare() {
default
+
+ # Append PURGATORY_EXTRA_CFLAGS flags set by configure, instead of
overriding them completely.
+ sed -e "/^PURGATORY_EXTRA_CFLAGS =/s/=/+=/" -i Makefile.in || die
+
if [[ "${PV}" == ]] ; then
eautoreconf
else
elibtoolize
fi
- filter-flags '-mindirect-branch=thunk*'
}
src_configure() {
@@ -62,6 +65,23 @@ src_configure() {
econf "${myeconfargs[@]}"
}
+src_compile() {
+ # Respect CFLAGS for purgatory.
+ # purgatory/Makefile uses PURGATORY_EXTRA_CFLAGS variable.
+ # -mfunction-return=thunk and -mindirect-branch=thunk conflict with
+ # -mcmodel=large which is added by build system.
+ # Replace them with -mfunction-return=thunk-inline and
-mindirect-branch=thunk-inline.
+ local flag flags=()
+ for flag in ${CFLAGS}; do
+ [[ ${flag} == -mfunction-return=thunk ]] &&
flag="-mfunction-return=thunk-inline"
+ [[ ${flag} == -mindirect-branch=thunk ]] &&
flag="-mindirect-branch=thunk-inline"
+ flags+=("${flag}")
+ done
+ local -x PURGATORY_EXTRA_CFLAGS="${flags[*]}"
+
+ default
+}
+
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/, sys-apps/kexec-tools/files/
commit: fdbdbf3786a1cf21010c4fc14b6aeb7b8c24a4c8
Author: Thomas Deutschmann gentoo org>
AuthorDate: Sun May 3 18:49:52 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sun May 3 19:01:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdbdbf37
sys-apps/kexec-tools: build multiboot2 for i386
Closes: https://bugs.gentoo.org/705314
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann gentoo.org>
...ec-tools-2.0.20-build-multiboot2-for-i386.patch | 68 ++
sys-apps/kexec-tools/kexec-tools-2.0.20-r1.ebuild | 1 +
2 files changed, 69 insertions(+)
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
new file mode 100644
index 000..8f63ddbe3ba
--- /dev/null
+++
b/sys-apps/kexec-tools/files/kexec-tools-2.0.20-build-multiboot2-for-i386.patch
@@ -0,0 +1,68 @@
+From 2c9f26ed20a791a7df0182ba82e93abb52f5a615 Mon Sep 17 00:00:00 2001
+From: Chris Packham
+Date: Mon, 18 Nov 2019 12:52:15 +1300
+Subject: kexec: build multiboot2 for i386
+
+This addresses the following compilation issues when building for i386.
+
+ kexec/arch/i386/kexec-x86.c:39:22: error: 'multiboot2_x86_probe' undeclared
here (not in a function); did you mean 'multiboot_x86_probe'?
+ { "multiboot2-x86", multiboot2_x86_probe, multiboot2_x86_load,
+ ^~~~
+ multiboot_x86_probe
+ kexec/arch/i386/kexec-x86.c:39:44: error: 'multiboot2_x86_load' undeclared
here (not in a function); did you mean 'multiboot_x86_load'?
+ { "multiboot2-x86", multiboot2_x86_probe, multiboot2_x86_load,
+ ^~~
+ multiboot_x86_load
+ kexec/arch/i386/kexec-x86.c:40:4: error: 'multiboot2_x86_usage' undeclared
here (not in a function); did you mean 'multiboot_x86_usage'?
+ multiboot2_x86_usage },
+ ^~~~
+ multiboot_x86_usage
+ make: *** [Makefile:114: kexec/arch/i386/kexec-x86.o] Error 1
+ make: *** Waiting for unfinished jobs
+
+Signed-off-by: Chris Packham
+Signed-off-by: Simon Horman
+---
+ kexec/arch/i386/Makefile| 2 +-
+ kexec/arch/i386/kexec-x86.h | 5 +
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/kexec/arch/i386/Makefile b/kexec/arch/i386/Makefile
+index 105cefd..f486103 100644
+--- a/kexec/arch/i386/Makefile
b/kexec/arch/i386/Makefile
+@@ -7,6 +7,7 @@ i386_KEXEC_SRCS += kexec/arch/i386/kexec-elf-x86.c
+ i386_KEXEC_SRCS += kexec/arch/i386/kexec-elf-rel-x86.c
+ i386_KEXEC_SRCS += kexec/arch/i386/kexec-bzImage.c
+ i386_KEXEC_SRCS += kexec/arch/i386/kexec-multiboot-x86.c
++i386_KEXEC_SRCS += kexec/arch/i386/kexec-mb2-x86.c
+ i386_KEXEC_SRCS += kexec/arch/i386/kexec-beoboot-x86.c
+ i386_KEXEC_SRCS += kexec/arch/i386/kexec-nbi.c
+ i386_KEXEC_SRCS += kexec/arch/i386/x86-linux-setup.c
+@@ -14,7 +15,6 @@ i386_KEXEC_SRCS += kexec/arch/i386/crashdump-x86.c
+
+ dist += kexec/arch/i386/Makefile $(i386_KEXEC_SRCS) \
+ kexec/arch/i386/crashdump-x86.h \
+- kexec/arch/i386/kexec-mb2-x86.c \
+ kexec/arch/i386/kexec-x86.h \
+ kexec/arch/i386/x86-linux-setup.h \
+ kexec/arch/i386/include/arch/options.h
+diff --git a/kexec/arch/i386/kexec-x86.h b/kexec/arch/i386/kexec-x86.h
+index 1b58c3b..0f941df 100644
+--- a/kexec/arch/i386/kexec-x86.h
b/kexec/arch/i386/kexec-x86.h
+@@ -60,6 +60,11 @@ int multiboot_x86_load(int argc, char **argv, const char
*buf, off_t len,
+ struct kexec_info *info);
+ void multiboot_x86_usage(void);
+
++int multiboot2_x86_load(int argc, char **argv, const char *buf, off_t len,
++ struct kexec_info *info);
++void multiboot2_x86_usage(void);
++int multiboot2_x86_probe(const char *buf, off_t buf_len);
++
+ int elf_x86_probe(const char *buf, off_t len);
+ int elf_x86_load(int argc, char **argv, const char *buf, off_t len,
+ struct kexec_info *info);
+--
+cgit 1.2-0.3.lf.el7
+
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.20-r1.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.20-r1.ebuild
index 7fd2e6f2679..85f71ffaf47 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.20-r1.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.20-r1.ebuild
@@ -36,6 +36,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch
"${FILESDIR}"/${PN}-2.0.4-out-of-source.patch
"${FILESDIR}"/${P}-remove-duplicated-variable-declarations.patch
+ "${FILESDIR}"/${P}-build-multiboot2-for-i386.patch
)
pkg_setup() {
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: 9407c8bded99eb34796c1488c650edc91cb4fbd5
Author: Jeroen Roovers gentoo org>
AuthorDate: Tue Oct 15 13:30:33 2019 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Tue Oct 15 13:31:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9407c8bd
sys-apps/kexec-tools: Mark ~hppa too
Package-Manager: Portage-2.3.77, Repoman-2.3.17
RepoMan-Options: --ignore-arches
Signed-off-by: Jeroen Roovers gentoo.org>
sys-apps/kexec-tools/kexec-tools-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/kexec-tools/kexec-tools-.ebuild
b/sys-apps/kexec-tools/kexec-tools-.ebuild
index 6f01ce71845..99c3438156f 100644
--- a/sys-apps/kexec-tools/kexec-tools-.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "" ]] ; then
else
SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P/_/-}.tar.xz;
[[ "${PV}" == *_rc* ]] || \
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~hppa ~ppc64 ~x86"
fi
DESCRIPTION="Load another kernel from the currently executing Linux kernel"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/files/, sys-apps/kexec-tools/
commit: 855e618441c0238164256e55e35814bbfa3691dc
Author: Lars Wendler gentoo org>
AuthorDate: Mon Jul 29 07:53:13 2019 +
Commit: Lars Wendler gentoo org>
CommitDate: Mon Jul 29 07:53:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=855e6184
sys-apps/kexec-tools: Removed old.
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Lars Wendler gentoo.org>
sys-apps/kexec-tools/Manifest | 1 -
...dled-rela-relocation-R_X86_64_PLT32-error.patch | 38 --
sys-apps/kexec-tools/kexec-tools-2.0.17-r1.ebuild | 86 --
3 files changed, 125 deletions(-)
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index 744431e4b9d..a318c88ab48 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -1,3 +1,2 @@
-DIST kexec-tools-2.0.17.tar.xz 290612 BLAKE2B
57ec5b5ed33a5c5bbe433099d6e80663717c8a086bdb8b95f4a1d81fd7e546619c0064698454dc79f489313f98696ee6dee4cafbc8b1b93db5c7909cdf7a6234
SHA512
e0f254ca2b26fa02cb61ba9a0735423b26bac2693fbd920eaf7cc2822c298de958bd65f7c37947ca1f6811a3752a58f7cf8aa903494f0109ea76b7159a037fa6
DIST kexec-tools-2.0.19.tar.xz 292348 BLAKE2B
c9827d77c82f11351086f4cdf4bacd076a03c744969952706ffd6f17395f28fba2437dac976e12e8e5648ca09fac6ff241daf9b8d3fee215519ded9f18441ff0
SHA512
68b15fe46f9633d55c5ae51a6e7114b0c66bd8f4fe81197f581121939a7b21990a2eea89a0961ac6eb7af364ba0d3981ea504df81c7b4cc0b288ca6ac896730f
DIST kexec-tools-2.0.20.tar.xz 297476 BLAKE2B
7e29e7f7d85296dd3e614c45f14c27eca74ce4426d5de2d20387d89f2f63afed318d6157cc4001849a04bb83505bbae87c43d34683ebaf9a70f5f29e3979ade3
SHA512
3112b6202c1030705c53e3f65a2b58aec14d65333a35aad681d48b9f2bd1c51a2e05c985a1e5e867ab02f8a9c97708483d9d225619db7c6993676f1a242e2d99
diff --git
a/sys-apps/kexec-tools/files/kexec-tools-2.0.17-fix-unhandled-rela-relocation-R_X86_64_PLT32-error.patch
b/sys-apps/kexec-tools/files/kexec-tools-2.0.17-fix-unhandled-rela-relocation-R_X86_64_PLT32-error.patch
deleted file mode 100644
index 5d691b34bec..000
---
a/sys-apps/kexec-tools/files/kexec-tools-2.0.17-fix-unhandled-rela-relocation-R_X86_64_PLT32-error.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From b9de21ef51a7ceab7122a707c188602eae22c4ee Mon Sep 17 00:00:00 2001
-From: Chris Clayton
-Date: Mon, 20 Aug 2018 12:00:31 +0100
-Subject: kexec: fix for "Unhandled rela relocation: R_X86_64_PLT32" error
-
-In response to a change in binutils, commit b21ebf2fb4c
-(x86: Treat R_X86_64_PLT32 as R_X86_64_PC32) was applied to
-the linux kernel during the 4.16 development cycle and has
-since been backported to earlier stable kernel series. The
-change results in the failure message in $SUBJECT when
-rebooting via kexec.
-
-Fix this by replicating the change in kexec.
-
-Signed-off-by: Chris Clayton
-Acked-by: Baoquan He
-Tested-by: Bhupesh Sharma
-Acked-by: Bhupesh Sharma
-Signed-off-by: Simon Horman
- kexec/arch/x86_64/kexec-elf-rel-x86_64.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c
b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c
-index 7fdde73..db85b44 100644
a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c
-+++ b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c
-@@ -79,6 +79,7 @@ void machine_apply_elf_rel(struct mem_ehdr *UNUSED(ehdr),
- goto overflow;
- break;
- case R_X86_64_PC32:
-+ case R_X86_64_PLT32:
- *(uint32_t *)location = value - address;
- break;
- default:
---
-cgit 1.2-0.3.lf.el7
-
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.17-r1.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.17-r1.ebuild
deleted file mode 100644
index b11b9c2a383..000
--- a/sys-apps/kexec-tools/kexec-tools-2.0.17-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == "" ]] ; then
- inherit git-r3 autotools
-
EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git;
-else
- SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz"
- KEYWORDS="amd64 ~arm64 x86"
-fi
-
-inherit flag-o-matic libtool linux-info systemd
-
-DESCRIPTION="Load another kernel from the currently executing Linux kernel"
-HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="booke lzma xen zlib"
-
-REQUIRED_USE="lzma? ( zlib )"
-
-DEPEND="
- lzma? ( app-arch/xz-utils )
- zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-CONFIG_CHECK="~KEXEC"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch
- "${FILESDIR}"/${PN}-2.0.4-out-of-source.patch
-
"${FILESDIR}"/${P}-fix-unhandled-rela-relocation-R_X86_64_PLT32-error.patch
-)
-
-pkg_setup() {
- # GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC)
- export ASFLAGS="${CCASFLAGS}"
-}
-
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: 908285da3dd316f4f6d7246b9c24cba6c03ab4d6
Author: Mikle Kolyada gentoo org>
AuthorDate: Sun Jul 28 11:23:34 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sun Jul 28 11:24:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=908285da
sys-apps/kexec-tools: amd64 stable wrt bug #690756
Package-Manager: Portage-2.3.66, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Mikle Kolyada gentoo.org>
sys-apps/kexec-tools/kexec-tools-2.0.19-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.19-r1.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.19-r1.ebuild
index d9c36c6dcf7..291b400a508 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.19-r1.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.19-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "" ]] ; then
EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git;
else
SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
fi
DESCRIPTION="Load another kernel from the currently executing Linux kernel"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: 4bbb6b26c22a096ddd251b44f8ef5266d750cbf3
Author: Mikle Kolyada gentoo org>
AuthorDate: Sun Jul 28 11:23:58 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sun Jul 28 11:24:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bbb6b26
sys-apps/kexec-tools: x86 stable wrt bug #690756
Package-Manager: Portage-2.3.66, Repoman-2.3.16
RepoMan-Options: --include-arches="x86"
Signed-off-by: Mikle Kolyada gentoo.org>
sys-apps/kexec-tools/kexec-tools-2.0.19-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.19-r1.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.19-r1.ebuild
index 291b400a508..144667478f9 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.19-r1.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.19-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "" ]] ; then
EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git;
else
SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz"
- KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm64 ~ppc64 x86"
fi
DESCRIPTION="Load another kernel from the currently executing Linux kernel"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: c3fd3f85d04568a74d1c02a4e89afefc3a5130b2
Author: Lars Wendler gentoo org>
AuthorDate: Fri Jul 26 10:01:01 2019 +
Commit: Lars Wendler gentoo org>
CommitDate: Fri Jul 26 10:01:39 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3fd3f85
sys-apps/kexec-tools: Removed old.
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Lars Wendler gentoo.org>
sys-apps/kexec-tools/Manifest | 1 -
sys-apps/kexec-tools/kexec-tools-2.0.18.ebuild | 85 --
2 files changed, 86 deletions(-)
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index 6e49456bdfd..744431e4b9d 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -1,4 +1,3 @@
DIST kexec-tools-2.0.17.tar.xz 290612 BLAKE2B
57ec5b5ed33a5c5bbe433099d6e80663717c8a086bdb8b95f4a1d81fd7e546619c0064698454dc79f489313f98696ee6dee4cafbc8b1b93db5c7909cdf7a6234
SHA512
e0f254ca2b26fa02cb61ba9a0735423b26bac2693fbd920eaf7cc2822c298de958bd65f7c37947ca1f6811a3752a58f7cf8aa903494f0109ea76b7159a037fa6
-DIST kexec-tools-2.0.18.tar.xz 289816 BLAKE2B
b894a5c563810b0a537a3837e902a8d1a3b903c2028393047d6e28d125582f82a4f7ad7c192857f7f58c2fb045deb39e6caf115434c8ba826c705d1363c6b683
SHA512
a4142e703a752eb270da29f02ea4fb213f3f4f965e73bb483c388a378821094317a4c63406ab0afe118f79eb168ff63b9d2d9530551c984592165430e269d697
DIST kexec-tools-2.0.19.tar.xz 292348 BLAKE2B
c9827d77c82f11351086f4cdf4bacd076a03c744969952706ffd6f17395f28fba2437dac976e12e8e5648ca09fac6ff241daf9b8d3fee215519ded9f18441ff0
SHA512
68b15fe46f9633d55c5ae51a6e7114b0c66bd8f4fe81197f581121939a7b21990a2eea89a0961ac6eb7af364ba0d3981ea504df81c7b4cc0b288ca6ac896730f
DIST kexec-tools-2.0.20.tar.xz 297476 BLAKE2B
7e29e7f7d85296dd3e614c45f14c27eca74ce4426d5de2d20387d89f2f63afed318d6157cc4001849a04bb83505bbae87c43d34683ebaf9a70f5f29e3979ade3
SHA512
3112b6202c1030705c53e3f65a2b58aec14d65333a35aad681d48b9f2bd1c51a2e05c985a1e5e867ab02f8a9c97708483d9d225619db7c6993676f1a242e2d99
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.18.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.18.ebuild
deleted file mode 100644
index 898acb87413..000
--- a/sys-apps/kexec-tools/kexec-tools-2.0.18.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == "" ]] ; then
- inherit git-r3 autotools
-
EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git;
-else
- SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-inherit flag-o-matic libtool linux-info systemd
-
-DESCRIPTION="Load another kernel from the currently executing Linux kernel"
-HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="booke lzma xen zlib"
-
-REQUIRED_USE="lzma? ( zlib )"
-
-DEPEND="
- lzma? ( app-arch/xz-utils )
- zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-CONFIG_CHECK="~KEXEC"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch
- "${FILESDIR}"/${PN}-2.0.4-out-of-source.patch
-)
-
-pkg_setup() {
- # GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC)
- export ASFLAGS="${CCASFLAGS}"
-}
-
-src_prepare() {
- default
- if [[ ${PV} == "" ]] ; then
- eautoreconf
- else
- elibtoolize
- fi
- filter-flags '-mindirect-branch=thunk*'
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_with booke)
- $(use_with lzma)
- $(use_with xen)
- $(use_with zlib)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- dodoc "${FILESDIR}"/README.Gentoo
-
- newinitd "${FILESDIR}"/kexec.init-2.0.13-r1 kexec
- newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec
-
- insinto /etc
- doins "${FILESDIR}"/kexec.conf
-
- insinto /etc/kernel/postinst.d
- doins "${FILESDIR}"/90_kexec
-
- systemd_dounit "${FILESDIR}"/kexec.service
-}
-
-pkg_postinst() {
- if systemd_is_booted || has_version sys-apps/systemd; then
- elog "For systemd support the new config file is"
- elog " /etc/kexec.conf"
- elog "Please adopt it to your needs as there is no autoconfig
anymore"
- fi
-}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: 214eac1613f11080a0cad511e31734e3de7c25b6
Author: Lars Wendler gentoo org>
AuthorDate: Fri Jul 26 09:57:39 2019 +
Commit: Lars Wendler gentoo org>
CommitDate: Fri Jul 26 10:01:38 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=214eac16
sys-apps/kexec-tools: Bump to version 2.0.20. Removed old.
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Lars Wendler gentoo.org>
sys-apps/kexec-tools/Manifest | 2 +-
.../{kexec-tools-2.0.20_rc1.ebuild => kexec-tools-2.0.20.ebuild}| 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index 9965b31e06f..6e49456bdfd 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -1,4 +1,4 @@
DIST kexec-tools-2.0.17.tar.xz 290612 BLAKE2B
57ec5b5ed33a5c5bbe433099d6e80663717c8a086bdb8b95f4a1d81fd7e546619c0064698454dc79f489313f98696ee6dee4cafbc8b1b93db5c7909cdf7a6234
SHA512
e0f254ca2b26fa02cb61ba9a0735423b26bac2693fbd920eaf7cc2822c298de958bd65f7c37947ca1f6811a3752a58f7cf8aa903494f0109ea76b7159a037fa6
DIST kexec-tools-2.0.18.tar.xz 289816 BLAKE2B
b894a5c563810b0a537a3837e902a8d1a3b903c2028393047d6e28d125582f82a4f7ad7c192857f7f58c2fb045deb39e6caf115434c8ba826c705d1363c6b683
SHA512
a4142e703a752eb270da29f02ea4fb213f3f4f965e73bb483c388a378821094317a4c63406ab0afe118f79eb168ff63b9d2d9530551c984592165430e269d697
DIST kexec-tools-2.0.19.tar.xz 292348 BLAKE2B
c9827d77c82f11351086f4cdf4bacd076a03c744969952706ffd6f17395f28fba2437dac976e12e8e5648ca09fac6ff241daf9b8d3fee215519ded9f18441ff0
SHA512
68b15fe46f9633d55c5ae51a6e7114b0c66bd8f4fe81197f581121939a7b21990a2eea89a0961ac6eb7af364ba0d3981ea504df81c7b4cc0b288ca6ac896730f
-DIST kexec-tools-2.0.20-rc1.tar.xz 296624 BLAKE2B
bb30a4179f1884848c5fc04a376dae570eb18a20a4e5fb87f339c2270c1ded13e7c73436ba9869c8bd93eff158560f9f5625d533819a243bda328ca916ec6cb8
SHA512
ffb518fd51cc7b38e72d45a7b14aaf8cf5b8743968c654c4f6fb6123f3d0b5643657f1ada565d69aacdc292e4deac2afeeb4513e91bde8fb81c96ae1f4365f02
+DIST kexec-tools-2.0.20.tar.xz 297476 BLAKE2B
7e29e7f7d85296dd3e614c45f14c27eca74ce4426d5de2d20387d89f2f63afed318d6157cc4001849a04bb83505bbae87c43d34683ebaf9a70f5f29e3979ade3
SHA512
3112b6202c1030705c53e3f65a2b58aec14d65333a35aad681d48b9f2bd1c51a2e05c985a1e5e867ab02f8a9c97708483d9d225619db7c6993676f1a242e2d99
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.20_rc1.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.20.ebuild
similarity index 100%
rename from sys-apps/kexec-tools/kexec-tools-2.0.20_rc1.ebuild
rename to sys-apps/kexec-tools/kexec-tools-2.0.20.ebuild
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: 60083908653a81473863e4e725ff59d5177de2f1
Author: Lars Wendler gentoo org>
AuthorDate: Fri Jul 12 11:03:25 2019 +
Commit: Lars Wendler gentoo org>
CommitDate: Fri Jul 12 15:26:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60083908
sys-apps/kexec-tools: Synced live ebuild
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Lars Wendler gentoo.org>
sys-apps/kexec-tools/kexec-tools-.ebuild | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/sys-apps/kexec-tools/kexec-tools-.ebuild
b/sys-apps/kexec-tools/kexec-tools-.ebuild
index d9c36c6dcf7..a96230eff79 100644
--- a/sys-apps/kexec-tools/kexec-tools-.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit flag-o-matic libtool linux-info systemd
@@ -9,7 +9,8 @@ if [[ ${PV} == "" ]] ; then
inherit git-r3 autotools
EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git;
else
- SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz"
+ SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P/_/-}.tar.xz"
+ [[ "${PV}" == *_rc* ]] || \
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
fi
@@ -27,6 +28,8 @@ DEPEND="
zlib? ( sys-libs/zlib )"
RDEPEND="${DEPEND}"
+S="${WORKDIR}/${P/_/-}"
+
CONFIG_CHECK="~KEXEC"
PATCHES=(
@@ -41,7 +44,7 @@ pkg_setup() {
src_prepare() {
default
- if [[ ${PV} == "" ]] ; then
+ if [[ "${PV}" == ]] ; then
eautoreconf
else
elibtoolize
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: 1923e0c3dbe18c667361c3ab6e5a188a02f8c006
Author: Lars Wendler gentoo org>
AuthorDate: Fri Jul 12 08:50:11 2019 +
Commit: Lars Wendler gentoo org>
CommitDate: Fri Jul 12 15:26:40 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1923e0c3
sys-apps/kexec-tools: Bump to version 2.0.20_rc1
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Lars Wendler gentoo.org>
sys-apps/kexec-tools/Manifest | 1 +
sys-apps/kexec-tools/kexec-tools-2.0.20_rc1.ebuild | 88 ++
2 files changed, 89 insertions(+)
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index 609f6985c68..9965b31e06f 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -1,3 +1,4 @@
DIST kexec-tools-2.0.17.tar.xz 290612 BLAKE2B
57ec5b5ed33a5c5bbe433099d6e80663717c8a086bdb8b95f4a1d81fd7e546619c0064698454dc79f489313f98696ee6dee4cafbc8b1b93db5c7909cdf7a6234
SHA512
e0f254ca2b26fa02cb61ba9a0735423b26bac2693fbd920eaf7cc2822c298de958bd65f7c37947ca1f6811a3752a58f7cf8aa903494f0109ea76b7159a037fa6
DIST kexec-tools-2.0.18.tar.xz 289816 BLAKE2B
b894a5c563810b0a537a3837e902a8d1a3b903c2028393047d6e28d125582f82a4f7ad7c192857f7f58c2fb045deb39e6caf115434c8ba826c705d1363c6b683
SHA512
a4142e703a752eb270da29f02ea4fb213f3f4f965e73bb483c388a378821094317a4c63406ab0afe118f79eb168ff63b9d2d9530551c984592165430e269d697
DIST kexec-tools-2.0.19.tar.xz 292348 BLAKE2B
c9827d77c82f11351086f4cdf4bacd076a03c744969952706ffd6f17395f28fba2437dac976e12e8e5648ca09fac6ff241daf9b8d3fee215519ded9f18441ff0
SHA512
68b15fe46f9633d55c5ae51a6e7114b0c66bd8f4fe81197f581121939a7b21990a2eea89a0961ac6eb7af364ba0d3981ea504df81c7b4cc0b288ca6ac896730f
+DIST kexec-tools-2.0.20-rc1.tar.xz 296624 BLAKE2B
bb30a4179f1884848c5fc04a376dae570eb18a20a4e5fb87f339c2270c1ded13e7c73436ba9869c8bd93eff158560f9f5625d533819a243bda328ca916ec6cb8
SHA512
ffb518fd51cc7b38e72d45a7b14aaf8cf5b8743968c654c4f6fb6123f3d0b5643657f1ada565d69aacdc292e4deac2afeeb4513e91bde8fb81c96ae1f4365f02
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.20_rc1.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.20_rc1.ebuild
new file mode 100644
index 000..a96230eff79
--- /dev/null
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.20_rc1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic libtool linux-info systemd
+
+if [[ ${PV} == "" ]] ; then
+ inherit git-r3 autotools
+
EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git;
+else
+ SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P/_/-}.tar.xz"
+ [[ "${PV}" == *_rc* ]] || \
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Load another kernel from the currently executing Linux kernel"
+HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="booke lzma xen zlib"
+
+REQUIRED_USE="lzma? ( zlib )"
+
+DEPEND="
+ lzma? ( app-arch/xz-utils )
+ zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P/_/-}"
+
+CONFIG_CHECK="~KEXEC"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch
+ "${FILESDIR}"/${PN}-2.0.4-out-of-source.patch
+)
+
+pkg_setup() {
+ # GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC)
+ export ASFLAGS="${CCASFLAGS}"
+}
+
+src_prepare() {
+ default
+ if [[ "${PV}" == ]] ; then
+ eautoreconf
+ else
+ elibtoolize
+ fi
+ filter-flags '-mindirect-branch=thunk*'
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_with booke)
+ $(use_with lzma)
+ $(use_with xen)
+ $(use_with zlib)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ dodoc "${FILESDIR}"/README.Gentoo
+
+ newinitd "${FILESDIR}"/kexec.init-2.0.13-r1 kexec
+ newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec
+
+ insinto /etc
+ doins "${FILESDIR}"/kexec.conf
+
+ insinto /etc/kernel/postinst.d
+ doins "${FILESDIR}"/90_kexec
+
+ systemd_dounit "${FILESDIR}"/kexec.service
+}
+
+pkg_postinst() {
+ if systemd_is_booted || has_version sys-apps/systemd; then
+ elog "For systemd support the new config file is"
+ elog " /etc/kexec.conf"
+ elog "Please adopt it to your needs as there is no autoconfig
anymore"
+ fi
+}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: a6ba451805f9b3bd5aa6e56d4b3fac34f410d0a2
Author: Lars Wendler gentoo org>
AuthorDate: Fri Jul 12 08:45:14 2019 +
Commit: Lars Wendler gentoo org>
CommitDate: Fri Jul 12 15:26:40 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6ba4518
sys-apps/kexec-tools: Removed old.
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Lars Wendler gentoo.org>
sys-apps/kexec-tools/kexec-tools-2.0.19.ebuild | 85 --
1 file changed, 85 deletions(-)
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.19.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.19.ebuild
deleted file mode 100644
index b2fcd90aca6..000
--- a/sys-apps/kexec-tools/kexec-tools-2.0.19.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic libtool linux-info systemd
-
-if [[ ${PV} == "" ]] ; then
- inherit git-r3 autotools
-
EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git;
-else
- SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-DESCRIPTION="Load another kernel from the currently executing Linux kernel"
-HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="booke lzma xen zlib"
-
-REQUIRED_USE="lzma? ( zlib )"
-
-DEPEND="
- lzma? ( app-arch/xz-utils )
- zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-CONFIG_CHECK="~KEXEC"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch
- "${FILESDIR}"/${PN}-2.0.4-out-of-source.patch
-)
-
-pkg_setup() {
- # GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC)
- export ASFLAGS="${CCASFLAGS}"
-}
-
-src_prepare() {
- default
- if [[ ${PV} == "" ]] ; then
- eautoreconf
- else
- elibtoolize
- fi
- filter-flags '-mindirect-branch=thunk*'
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_with booke)
- $(use_with lzma)
- $(use_with xen)
- $(use_with zlib)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- dodoc "${FILESDIR}"/README.Gentoo
-
- newinitd "${FILESDIR}"/kexec.init-2.0.13-r1 kexec
- newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec
-
- insinto /etc
- doins "${FILESDIR}"/kexec.conf
-
- insinto /etc/kernel/postinst.d
- doins "${FILESDIR}"/90_kexec
-
- systemd_dounit "${FILESDIR}"/kexec.service
-}
-
-pkg_postinst() {
- if systemd_is_booted || has_version sys-apps/systemd; then
- elog "For systemd support the new config file is"
- elog " /etc/kexec.conf"
- elog "Please adopt it to your needs as there is no autoconfig
anymore"
- fi
-}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/, sys-apps/kexec-tools/files/
commit: 3026ed88db0defe232b002d1ff9113fc437e8d87
Author: Marty E. Plummer startmail com>
AuthorDate: Fri Jun 28 01:48:47 2019 +
Commit: Mike Gilbert gentoo org>
CommitDate: Sat Jun 29 15:06:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3026ed88
sys-apps/kexec-tools: add ppc64 keyword
with package.accept_keywords =sys-apps/kexec-tools-2.0.19 ~amd64 and the
changes to the init file (by default make install installs vmlinux not
vmlinuz) this works on a Talos II.
Closes: https://github.com/gentoo/gentoo/pull/12346
Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Signed-off-by: Marty E. Plummer startmail.com>
Signed-off-by: Mike Gilbert gentoo.org>
sys-apps/kexec-tools/files/kexec.init-2.0.13-r1 | 4 +++-
.../{kexec-tools-.ebuild => kexec-tools-2.0.19-r1.ebuild} | 2 +-
sys-apps/kexec-tools/kexec-tools-.ebuild | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
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
index 5415b3bc85c..167b792de85 100644
--- a/sys-apps/kexec-tools/files/kexec.init-2.0.13-r1
+++ b/sys-apps/kexec-tools/files/kexec.init-2.0.13-r1
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Set up some defaults.
@@ -38,8 +38,10 @@ image_path() {
local gkarch="$(get_genkernel_arch $karch)"
for x in \
"bzImage" \
+ "vmlinux" \
"vmlinuz" \
"bzImage-${kver}" \
+ "vmlinux-${kver}" \
"vmlinuz-${kver}" \
"kernel-genkernel-${karch}-${kver}" \
"kernel-genkernel-${gkarch}-${kver}" \
diff --git a/sys-apps/kexec-tools/kexec-tools-.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.19-r1.ebuild
similarity index 97%
copy from sys-apps/kexec-tools/kexec-tools-.ebuild
copy to sys-apps/kexec-tools/kexec-tools-2.0.19-r1.ebuild
index b2fcd90aca6..d9c36c6dcf7 100644
--- a/sys-apps/kexec-tools/kexec-tools-.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.19-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "" ]] ; then
EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git;
else
SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
fi
DESCRIPTION="Load another kernel from the currently executing Linux kernel"
diff --git a/sys-apps/kexec-tools/kexec-tools-.ebuild
b/sys-apps/kexec-tools/kexec-tools-.ebuild
index b2fcd90aca6..d9c36c6dcf7 100644
--- a/sys-apps/kexec-tools/kexec-tools-.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "" ]] ; then
EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git;
else
SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
fi
DESCRIPTION="Load another kernel from the currently executing Linux kernel"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: ec62157570dd20e6675d610a79d146ba807b3029
Author: Lars Wendler gentoo org>
AuthorDate: Tue Mar 5 09:28:05 2019 +
Commit: Lars Wendler gentoo org>
CommitDate: Tue Mar 5 09:28:05 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec621575
sys-apps/kexec-tools: Bump to version 2.0.19
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler gentoo.org>
sys-apps/kexec-tools/Manifest | 1 +
sys-apps/kexec-tools/kexec-tools-2.0.19.ebuild | 85 ++
2 files changed, 86 insertions(+)
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index 25ee9fca195..609f6985c68 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -1,2 +1,3 @@
DIST kexec-tools-2.0.17.tar.xz 290612 BLAKE2B
57ec5b5ed33a5c5bbe433099d6e80663717c8a086bdb8b95f4a1d81fd7e546619c0064698454dc79f489313f98696ee6dee4cafbc8b1b93db5c7909cdf7a6234
SHA512
e0f254ca2b26fa02cb61ba9a0735423b26bac2693fbd920eaf7cc2822c298de958bd65f7c37947ca1f6811a3752a58f7cf8aa903494f0109ea76b7159a037fa6
DIST kexec-tools-2.0.18.tar.xz 289816 BLAKE2B
b894a5c563810b0a537a3837e902a8d1a3b903c2028393047d6e28d125582f82a4f7ad7c192857f7f58c2fb045deb39e6caf115434c8ba826c705d1363c6b683
SHA512
a4142e703a752eb270da29f02ea4fb213f3f4f965e73bb483c388a378821094317a4c63406ab0afe118f79eb168ff63b9d2d9530551c984592165430e269d697
+DIST kexec-tools-2.0.19.tar.xz 292348 BLAKE2B
c9827d77c82f11351086f4cdf4bacd076a03c744969952706ffd6f17395f28fba2437dac976e12e8e5648ca09fac6ff241daf9b8d3fee215519ded9f18441ff0
SHA512
68b15fe46f9633d55c5ae51a6e7114b0c66bd8f4fe81197f581121939a7b21990a2eea89a0961ac6eb7af364ba0d3981ea504df81c7b4cc0b288ca6ac896730f
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.19.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.19.ebuild
new file mode 100644
index 000..b2fcd90aca6
--- /dev/null
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.19.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic libtool linux-info systemd
+
+if [[ ${PV} == "" ]] ; then
+ inherit git-r3 autotools
+
EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git;
+else
+ SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Load another kernel from the currently executing Linux kernel"
+HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="booke lzma xen zlib"
+
+REQUIRED_USE="lzma? ( zlib )"
+
+DEPEND="
+ lzma? ( app-arch/xz-utils )
+ zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~KEXEC"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch
+ "${FILESDIR}"/${PN}-2.0.4-out-of-source.patch
+)
+
+pkg_setup() {
+ # GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC)
+ export ASFLAGS="${CCASFLAGS}"
+}
+
+src_prepare() {
+ default
+ if [[ ${PV} == "" ]] ; then
+ eautoreconf
+ else
+ elibtoolize
+ fi
+ filter-flags '-mindirect-branch=thunk*'
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_with booke)
+ $(use_with lzma)
+ $(use_with xen)
+ $(use_with zlib)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ dodoc "${FILESDIR}"/README.Gentoo
+
+ newinitd "${FILESDIR}"/kexec.init-2.0.13-r1 kexec
+ newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec
+
+ insinto /etc
+ doins "${FILESDIR}"/kexec.conf
+
+ insinto /etc/kernel/postinst.d
+ doins "${FILESDIR}"/90_kexec
+
+ systemd_dounit "${FILESDIR}"/kexec.service
+}
+
+pkg_postinst() {
+ if systemd_is_booted || has_version sys-apps/systemd; then
+ elog "For systemd support the new config file is"
+ elog " /etc/kexec.conf"
+ elog "Please adopt it to your needs as there is no autoconfig
anymore"
+ fi
+}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: 6264b226cb626f5ccf2cb38508f2315b9f19867a
Author: Lars Wendler gentoo org>
AuthorDate: Tue Mar 5 09:28:37 2019 +
Commit: Lars Wendler gentoo org>
CommitDate: Tue Mar 5 09:28:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6264b226
sys-apps/kexec-tools: Synced live ebuild.
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler gentoo.org>
sys-apps/kexec-tools/kexec-tools-.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys-apps/kexec-tools/kexec-tools-.ebuild
b/sys-apps/kexec-tools/kexec-tools-.ebuild
index 89ef61b3896..b2fcd90aca6 100644
--- a/sys-apps/kexec-tools/kexec-tools-.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
+inherit flag-o-matic libtool linux-info systemd
+
if [[ ${PV} == "" ]] ; then
inherit git-r3 autotools
EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git;
@@ -11,8 +13,6 @@ else
KEYWORDS="~amd64 ~arm64 ~x86"
fi
-inherit flag-o-matic libtool linux-info systemd
-
DESCRIPTION="Load another kernel from the currently executing Linux kernel"
HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/;
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: 365d834c0ee5011e5d2c8fab8aa58498c8bcd9b5
Author: Thomas Deutschmann gentoo org>
AuthorDate: Tue Nov 6 11:25:02 2018 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Tue Nov 6 11:28:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=365d834c
sys-apps/kexec-tools: bump to v2.0.18
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann gentoo.org>
sys-apps/kexec-tools/Manifest | 1 +
sys-apps/kexec-tools/kexec-tools-2.0.18.ebuild | 85 ++
2 files changed, 86 insertions(+)
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index 0327fc4ca1d..f82fdf6a8f4 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -1,3 +1,4 @@
DIST kexec-tools-2.0.14.tar.xz 283640 BLAKE2B
f84b5485904c0d4bbe5f7fdae391a4fb0b2a7436e078f23de649e79aaa7dfcdeff99139230a299bf2b9b0554ac13fa833e31211682c92f07cd6b8072907e35aa
SHA512
8c1f9d1f4bb69a621961d45091f9c8349535ae69b80168423663685b44d89e1b9324d5cd11c83e86d805a3371f4f1600b0def551c52efb3c6cf020e9c11c273f
DIST kexec-tools-2.0.16.tar.xz 287888 BLAKE2B
7e7bbe11dc2792be3cab6318c12b6866bf6b373fb7bf2d7601ef68a39dd5882aceab7c8905ce0d9b0af1da2072b3f3d2677bd9e006676c484e1d6506ac7036fa
SHA512
f2f06e7702fef20c8d7d6aabe1b264e2e2689e5c38cc00dbc2186dd7fa0479edb2dc9e307dd2ad7f03db47015e966e577f11576172604ef01c1bcca471fe2c24
DIST kexec-tools-2.0.17.tar.xz 290612 BLAKE2B
57ec5b5ed33a5c5bbe433099d6e80663717c8a086bdb8b95f4a1d81fd7e546619c0064698454dc79f489313f98696ee6dee4cafbc8b1b93db5c7909cdf7a6234
SHA512
e0f254ca2b26fa02cb61ba9a0735423b26bac2693fbd920eaf7cc2822c298de958bd65f7c37947ca1f6811a3752a58f7cf8aa903494f0109ea76b7159a037fa6
+DIST kexec-tools-2.0.18.tar.xz 289816 BLAKE2B
b894a5c563810b0a537a3837e902a8d1a3b903c2028393047d6e28d125582f82a4f7ad7c192857f7f58c2fb045deb39e6caf115434c8ba826c705d1363c6b683
SHA512
a4142e703a752eb270da29f02ea4fb213f3f4f965e73bb483c388a378821094317a4c63406ab0afe118f79eb168ff63b9d2d9530551c984592165430e269d697
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.18.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.18.ebuild
new file mode 100644
index 000..898acb87413
--- /dev/null
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.18.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "" ]] ; then
+ inherit git-r3 autotools
+
EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git;
+else
+ SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+inherit flag-o-matic libtool linux-info systemd
+
+DESCRIPTION="Load another kernel from the currently executing Linux kernel"
+HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="booke lzma xen zlib"
+
+REQUIRED_USE="lzma? ( zlib )"
+
+DEPEND="
+ lzma? ( app-arch/xz-utils )
+ zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~KEXEC"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch
+ "${FILESDIR}"/${PN}-2.0.4-out-of-source.patch
+)
+
+pkg_setup() {
+ # GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC)
+ export ASFLAGS="${CCASFLAGS}"
+}
+
+src_prepare() {
+ default
+ if [[ ${PV} == "" ]] ; then
+ eautoreconf
+ else
+ elibtoolize
+ fi
+ filter-flags '-mindirect-branch=thunk*'
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_with booke)
+ $(use_with lzma)
+ $(use_with xen)
+ $(use_with zlib)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ dodoc "${FILESDIR}"/README.Gentoo
+
+ newinitd "${FILESDIR}"/kexec.init-2.0.13-r1 kexec
+ newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec
+
+ insinto /etc
+ doins "${FILESDIR}"/kexec.conf
+
+ insinto /etc/kernel/postinst.d
+ doins "${FILESDIR}"/90_kexec
+
+ systemd_dounit "${FILESDIR}"/kexec.service
+}
+
+pkg_postinst() {
+ if systemd_is_booted || has_version sys-apps/systemd; then
+ elog "For systemd support the new config file is"
+ elog " /etc/kexec.conf"
+ elog "Please adopt it to your needs as there is no autoconfig
anymore"
+ fi
+}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: 027d3821d233e0e97cade2dfbcb1804754023b91
Author: Thomas Deutschmann gentoo org>
AuthorDate: Tue Nov 6 11:28:05 2018 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Tue Nov 6 11:28:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=027d3821
sys-apps/kexec-tools: drop old
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann gentoo.org>
sys-apps/kexec-tools/Manifest | 2 -
sys-apps/kexec-tools/kexec-tools-2.0.14.ebuild | 76 ---
sys-apps/kexec-tools/kexec-tools-2.0.16.ebuild | 82 -
sys-apps/kexec-tools/kexec-tools-2.0.17.ebuild | 85 --
4 files changed, 245 deletions(-)
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index f82fdf6a8f4..25ee9fca195 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -1,4 +1,2 @@
-DIST kexec-tools-2.0.14.tar.xz 283640 BLAKE2B
f84b5485904c0d4bbe5f7fdae391a4fb0b2a7436e078f23de649e79aaa7dfcdeff99139230a299bf2b9b0554ac13fa833e31211682c92f07cd6b8072907e35aa
SHA512
8c1f9d1f4bb69a621961d45091f9c8349535ae69b80168423663685b44d89e1b9324d5cd11c83e86d805a3371f4f1600b0def551c52efb3c6cf020e9c11c273f
-DIST kexec-tools-2.0.16.tar.xz 287888 BLAKE2B
7e7bbe11dc2792be3cab6318c12b6866bf6b373fb7bf2d7601ef68a39dd5882aceab7c8905ce0d9b0af1da2072b3f3d2677bd9e006676c484e1d6506ac7036fa
SHA512
f2f06e7702fef20c8d7d6aabe1b264e2e2689e5c38cc00dbc2186dd7fa0479edb2dc9e307dd2ad7f03db47015e966e577f11576172604ef01c1bcca471fe2c24
DIST kexec-tools-2.0.17.tar.xz 290612 BLAKE2B
57ec5b5ed33a5c5bbe433099d6e80663717c8a086bdb8b95f4a1d81fd7e546619c0064698454dc79f489313f98696ee6dee4cafbc8b1b93db5c7909cdf7a6234
SHA512
e0f254ca2b26fa02cb61ba9a0735423b26bac2693fbd920eaf7cc2822c298de958bd65f7c37947ca1f6811a3752a58f7cf8aa903494f0109ea76b7159a037fa6
DIST kexec-tools-2.0.18.tar.xz 289816 BLAKE2B
b894a5c563810b0a537a3837e902a8d1a3b903c2028393047d6e28d125582f82a4f7ad7c192857f7f58c2fb045deb39e6caf115434c8ba826c705d1363c6b683
SHA512
a4142e703a752eb270da29f02ea4fb213f3f4f965e73bb483c388a378821094317a4c63406ab0afe118f79eb168ff63b9d2d9530551c984592165430e269d697
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.14.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.14.ebuild
deleted file mode 100644
index df5c2d5b610..000
--- a/sys-apps/kexec-tools/kexec-tools-2.0.14.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-if [[ ${PV} == "" ]] ; then
- inherit git-r3
-
EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git"
- AUTOTOOLS_AUTORECONF=true
-else
- SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz"
- KEYWORDS="amd64 ~arm64 x86"
-fi
-
-inherit autotools-utils linux-info systemd
-
-DESCRIPTION="Load another kernel from the currently executing Linux kernel"
-HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="booke lzma xen zlib"
-
-REQUIRED_USE="lzma? ( zlib )"
-
-DEPEND="
- lzma? ( app-arch/xz-utils )
- zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-CONFIG_CHECK="~KEXEC"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch
- "${FILESDIR}"/${PN}-2.0.4-out-of-source.patch
-)
-
-pkg_setup() {
- # GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC)
- export ASFLAGS="${CCASFLAGS}"
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_with booke)
- $(use_with lzma)
- $(use_with xen)
- $(use_with zlib)
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
-
- dodoc "${FILESDIR}"/README.Gentoo
-
- newinitd "${FILESDIR}"/kexec.init-2.0.13-r1 kexec
- newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec
-
- insinto /etc
- doins "${FILESDIR}"/kexec.conf
-
- insinto /etc/kernel/postinst.d
- doins "${FILESDIR}"/90_kexec
-
- systemd_dounit "${FILESDIR}"/kexec.service
-}
-
-pkg_postinst() {
- if systemd_is_booted || has_version sys-apps/systemd; then
- elog "For systemd support the new config file is"
- elog " /etc/kexec.conf"
- elog "Please adopt it to your needs as there is no autoconfig
anymore"
- fi
-}
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.16.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.16.ebuild
deleted file mode 100644
index e691dd6cb12..000
--- a/sys-apps/kexec-tools/kexec-tools-2.0.16.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == "" ]] ; then
- inherit git-r3
-
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: 1381b6f86881214091993b4966dad9e6785a7c01
Author: Mikle Kolyada gentoo org>
AuthorDate: Thu Aug 30 08:46:49 2018 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Thu Aug 30 08:46:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1381b6f8
sys-apps/kexec-tools: amd64 stable wrt bug #664800
Package-Manager: Portage-2.3.40, Repoman-2.3.9
sys-apps/kexec-tools/kexec-tools-2.0.17-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.17-r1.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.17-r1.ebuild
index 849d5fd33b9..b11b9c2a383 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.17-r1.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.17-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "" ]] ; then
EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git;
else
SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm64 x86"
+ KEYWORDS="amd64 ~arm64 x86"
fi
inherit flag-o-matic libtool linux-info systemd
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: 2ec1eaf991ccdb9efcd9e70d4566e311a3a7a51e
Author: Thomas Deutschmann gentoo org>
AuthorDate: Wed Aug 29 00:56:19 2018 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Wed Aug 29 00:56:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ec1eaf9
sys-apps/kexec-tools: x86 stable (bug #664800)
Package-Manager: Portage-2.3.48, Repoman-2.3.10
sys-apps/kexec-tools/kexec-tools-2.0.17-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.17-r1.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.17-r1.ebuild
index fdf79664871..849d5fd33b9 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.17-r1.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.17-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "" ]] ; then
EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git;
else
SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm64 x86"
fi
inherit flag-o-matic libtool linux-info systemd
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/, sys-apps/kexec-tools/files/
commit: 07e7a6078533daa2ef86769c29c28966acd62470
Author: Thomas Deutschmann gentoo org>
AuthorDate: Tue Aug 28 22:44:38 2018 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Tue Aug 28 22:45:05 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07e7a607
sys-apps/kexec-tools: fix "Unhandled rela relocation: R_X86_64_PLT32" error
Package-Manager: Portage-2.3.48, Repoman-2.3.10
...dled-rela-relocation-R_X86_64_PLT32-error.patch | 38 ++
sys-apps/kexec-tools/kexec-tools-2.0.17-r1.ebuild | 86 ++
2 files changed, 124 insertions(+)
diff --git
a/sys-apps/kexec-tools/files/kexec-tools-2.0.17-fix-unhandled-rela-relocation-R_X86_64_PLT32-error.patch
b/sys-apps/kexec-tools/files/kexec-tools-2.0.17-fix-unhandled-rela-relocation-R_X86_64_PLT32-error.patch
new file mode 100644
index 000..5d691b34bec
--- /dev/null
+++
b/sys-apps/kexec-tools/files/kexec-tools-2.0.17-fix-unhandled-rela-relocation-R_X86_64_PLT32-error.patch
@@ -0,0 +1,38 @@
+From b9de21ef51a7ceab7122a707c188602eae22c4ee Mon Sep 17 00:00:00 2001
+From: Chris Clayton
+Date: Mon, 20 Aug 2018 12:00:31 +0100
+Subject: kexec: fix for "Unhandled rela relocation: R_X86_64_PLT32" error
+
+In response to a change in binutils, commit b21ebf2fb4c
+(x86: Treat R_X86_64_PLT32 as R_X86_64_PC32) was applied to
+the linux kernel during the 4.16 development cycle and has
+since been backported to earlier stable kernel series. The
+change results in the failure message in $SUBJECT when
+rebooting via kexec.
+
+Fix this by replicating the change in kexec.
+
+Signed-off-by: Chris Clayton
+Acked-by: Baoquan He
+Tested-by: Bhupesh Sharma
+Acked-by: Bhupesh Sharma
+Signed-off-by: Simon Horman
+---
+ kexec/arch/x86_64/kexec-elf-rel-x86_64.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c
b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c
+index 7fdde73..db85b44 100644
+--- a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c
b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c
+@@ -79,6 +79,7 @@ void machine_apply_elf_rel(struct mem_ehdr *UNUSED(ehdr),
+ goto overflow;
+ break;
+ case R_X86_64_PC32:
++ case R_X86_64_PLT32:
+ *(uint32_t *)location = value - address;
+ break;
+ default:
+--
+cgit 1.2-0.3.lf.el7
+
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.17-r1.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.17-r1.ebuild
new file mode 100644
index 000..fdf79664871
--- /dev/null
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.17-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "" ]] ; then
+ inherit git-r3 autotools
+
EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git;
+else
+ SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+inherit flag-o-matic libtool linux-info systemd
+
+DESCRIPTION="Load another kernel from the currently executing Linux kernel"
+HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="booke lzma xen zlib"
+
+REQUIRED_USE="lzma? ( zlib )"
+
+DEPEND="
+ lzma? ( app-arch/xz-utils )
+ zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~KEXEC"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch
+ "${FILESDIR}"/${PN}-2.0.4-out-of-source.patch
+
"${FILESDIR}"/${P}-fix-unhandled-rela-relocation-R_X86_64_PLT32-error.patch
+)
+
+pkg_setup() {
+ # GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC)
+ export ASFLAGS="${CCASFLAGS}"
+}
+
+src_prepare() {
+ default
+ if [[ ${PV} == "" ]] ; then
+ eautoreconf
+ else
+ elibtoolize
+ fi
+ filter-flags '-mindirect-branch=thunk*'
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_with booke)
+ $(use_with lzma)
+ $(use_with xen)
+ $(use_with zlib)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ dodoc "${FILESDIR}"/README.Gentoo
+
+ newinitd "${FILESDIR}"/kexec.init-2.0.13-r1 kexec
+ newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec
+
+ insinto /etc
+ doins "${FILESDIR}"/kexec.conf
+
+ insinto /etc/kernel/postinst.d
+ doins "${FILESDIR}"/90_kexec
+
+ systemd_dounit "${FILESDIR}"/kexec.service
+}
+
+pkg_postinst() {
+ if systemd_is_booted || has_version sys-apps/systemd; then
+ elog "For systemd support the new config file is"
+ elog " /etc/kexec.conf"
+ elog "Please adopt it to your needs as there is no autoconfig
anymore"
+ fi
+}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: e1fc08465cff44b4b8e5e379bbafa1074b399a8a
Author: Lars Wendler gentoo org>
AuthorDate: Tue May 1 20:08:56 2018 +
Commit: Lars Wendler gentoo org>
CommitDate: Tue May 1 20:10:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1fc0846
sys-apps/kexec-tools: Bump to version 2.0.17
Package-Manager: Portage-2.3.31, Repoman-2.3.9
sys-apps/kexec-tools/Manifest | 1 +
sys-apps/kexec-tools/kexec-tools-2.0.17.ebuild | 85 ++
2 files changed, 86 insertions(+)
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index 3e4f2577f5f..47b2cbcd431 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -1,4 +1,5 @@
DIST kexec-tools-2.0.14.tar.xz 283640 BLAKE2B
f84b5485904c0d4bbe5f7fdae391a4fb0b2a7436e078f23de649e79aaa7dfcdeff99139230a299bf2b9b0554ac13fa833e31211682c92f07cd6b8072907e35aa
SHA512
8c1f9d1f4bb69a621961d45091f9c8349535ae69b80168423663685b44d89e1b9324d5cd11c83e86d805a3371f4f1600b0def551c52efb3c6cf020e9c11c273f
DIST kexec-tools-2.0.15.tar.xz 286944 BLAKE2B
00344b607fbbca77398e74bf7f6506efa124ddb4ad0f2e55424a40b90ac0d1a6336dd43f4c8804323e12598f1647cd105880960abfda7df8215c787dae150bda
SHA512
0bddf31b9bb0e203b813d820e1e248974c2d62cb388dfaf4f2f4971f764cc71e54edbaeaeb663c15d6fa06574beceb87d9ffd7d822ac6699d86c54645096e7e9
DIST kexec-tools-2.0.16.tar.xz 287888 BLAKE2B
7e7bbe11dc2792be3cab6318c12b6866bf6b373fb7bf2d7601ef68a39dd5882aceab7c8905ce0d9b0af1da2072b3f3d2677bd9e006676c484e1d6506ac7036fa
SHA512
f2f06e7702fef20c8d7d6aabe1b264e2e2689e5c38cc00dbc2186dd7fa0479edb2dc9e307dd2ad7f03db47015e966e577f11576172604ef01c1bcca471fe2c24
+DIST kexec-tools-2.0.17.tar.xz 290612 BLAKE2B
57ec5b5ed33a5c5bbe433099d6e80663717c8a086bdb8b95f4a1d81fd7e546619c0064698454dc79f489313f98696ee6dee4cafbc8b1b93db5c7909cdf7a6234
SHA512
e0f254ca2b26fa02cb61ba9a0735423b26bac2693fbd920eaf7cc2822c298de958bd65f7c37947ca1f6811a3752a58f7cf8aa903494f0109ea76b7159a037fa6
DIST kexec-tools-2.0.4.tar.xz 271604 BLAKE2B
f3359e91295b1c37bd94d3ea7889e948e0716781375f3387077962313615986947b0ac134023876b88cf92b5f0b5e1d3d5d97099ac799d0ba182b58f1bb4674c
SHA512
2514f407d9150d2615dffc91a525fb28f159bef92b9543f9802e2618746b7d4c04137668ad8a8d8f0b75f68ed9057d09629ce736b6a061b5cf817b9d904f549e
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.17.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.17.ebuild
new file mode 100644
index 000..89ef61b3896
--- /dev/null
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.17.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "" ]] ; then
+ inherit git-r3 autotools
+
EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git;
+else
+ SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+inherit flag-o-matic libtool linux-info systemd
+
+DESCRIPTION="Load another kernel from the currently executing Linux kernel"
+HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="booke lzma xen zlib"
+
+REQUIRED_USE="lzma? ( zlib )"
+
+DEPEND="
+ lzma? ( app-arch/xz-utils )
+ zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~KEXEC"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch
+ "${FILESDIR}"/${PN}-2.0.4-out-of-source.patch
+)
+
+pkg_setup() {
+ # GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC)
+ export ASFLAGS="${CCASFLAGS}"
+}
+
+src_prepare() {
+ default
+ if [[ ${PV} == "" ]] ; then
+ eautoreconf
+ else
+ elibtoolize
+ fi
+ filter-flags '-mindirect-branch=thunk*'
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_with booke)
+ $(use_with lzma)
+ $(use_with xen)
+ $(use_with zlib)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ dodoc "${FILESDIR}"/README.Gentoo
+
+ newinitd "${FILESDIR}"/kexec.init-2.0.13-r1 kexec
+ newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec
+
+ insinto /etc
+ doins "${FILESDIR}"/kexec.conf
+
+ insinto /etc/kernel/postinst.d
+ doins "${FILESDIR}"/90_kexec
+
+ systemd_dounit "${FILESDIR}"/kexec.service
+}
+
+pkg_postinst() {
+ if systemd_is_booted || has_version sys-apps/systemd; then
+ elog "For systemd support the new config file is"
+ elog " /etc/kexec.conf"
+ elog "Please adopt it to your needs as there is no autoconfig
anymore"
+ fi
+}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/, sys-apps/kexec-tools/files/
commit: 0f9a75eef722e5959c9eb565d26c7e2798bc3fc1
Author: Lars Wendler gentoo org>
AuthorDate: Tue May 1 20:10:29 2018 +
Commit: Lars Wendler gentoo org>
CommitDate: Tue May 1 20:10:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f9a75ee
sys-apps/kexec-tools: Removed old.
Package-Manager: Portage-2.3.31, Repoman-2.3.9
sys-apps/kexec-tools/Manifest | 2 -
.../files/kexec-tools-2.0.0-respect-LDFLAGS.patch | 11 --
sys-apps/kexec-tools/files/kexec.init-2.0.4-r2 | 164 -
sys-apps/kexec-tools/kexec-tools-2.0.15.ebuild | 81 --
sys-apps/kexec-tools/kexec-tools-2.0.4-r2.ebuild | 72 -
5 files changed, 330 deletions(-)
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index 47b2cbcd431..0327fc4ca1d 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -1,5 +1,3 @@
DIST kexec-tools-2.0.14.tar.xz 283640 BLAKE2B
f84b5485904c0d4bbe5f7fdae391a4fb0b2a7436e078f23de649e79aaa7dfcdeff99139230a299bf2b9b0554ac13fa833e31211682c92f07cd6b8072907e35aa
SHA512
8c1f9d1f4bb69a621961d45091f9c8349535ae69b80168423663685b44d89e1b9324d5cd11c83e86d805a3371f4f1600b0def551c52efb3c6cf020e9c11c273f
-DIST kexec-tools-2.0.15.tar.xz 286944 BLAKE2B
00344b607fbbca77398e74bf7f6506efa124ddb4ad0f2e55424a40b90ac0d1a6336dd43f4c8804323e12598f1647cd105880960abfda7df8215c787dae150bda
SHA512
0bddf31b9bb0e203b813d820e1e248974c2d62cb388dfaf4f2f4971f764cc71e54edbaeaeb663c15d6fa06574beceb87d9ffd7d822ac6699d86c54645096e7e9
DIST kexec-tools-2.0.16.tar.xz 287888 BLAKE2B
7e7bbe11dc2792be3cab6318c12b6866bf6b373fb7bf2d7601ef68a39dd5882aceab7c8905ce0d9b0af1da2072b3f3d2677bd9e006676c484e1d6506ac7036fa
SHA512
f2f06e7702fef20c8d7d6aabe1b264e2e2689e5c38cc00dbc2186dd7fa0479edb2dc9e307dd2ad7f03db47015e966e577f11576172604ef01c1bcca471fe2c24
DIST kexec-tools-2.0.17.tar.xz 290612 BLAKE2B
57ec5b5ed33a5c5bbe433099d6e80663717c8a086bdb8b95f4a1d81fd7e546619c0064698454dc79f489313f98696ee6dee4cafbc8b1b93db5c7909cdf7a6234
SHA512
e0f254ca2b26fa02cb61ba9a0735423b26bac2693fbd920eaf7cc2822c298de958bd65f7c37947ca1f6811a3752a58f7cf8aa903494f0109ea76b7159a037fa6
-DIST kexec-tools-2.0.4.tar.xz 271604 BLAKE2B
f3359e91295b1c37bd94d3ea7889e948e0716781375f3387077962313615986947b0ac134023876b88cf92b5f0b5e1d3d5d97099ac799d0ba182b58f1bb4674c
SHA512
2514f407d9150d2615dffc91a525fb28f159bef92b9543f9802e2618746b7d4c04137668ad8a8d8f0b75f68ed9057d09629ce736b6a061b5cf817b9d904f549e
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
deleted file mode 100644
index 040d138ece0..000
--- a/sys-apps/kexec-tools/files/kexec-tools-2.0.0-respect-LDFLAGS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
kdump/Makefile
-+++ kdump/Makefile
-@@ -18,7 +18,7 @@
- $(KDUMP): CC=$(TARGET_CC)
- $(KDUMP): $(KDUMP_OBJS)
- @$(MKDIR) -p $(@D)
-- $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -o $@ $(KDUMP_OBJS)
-+ $(LINK.o) $(CFLAGS) -o $@ $(KDUMP_OBJS)
-
- $(KDUMP_MANPAGE): kdump/kdump.8
- $(MKDIR) -p $(MANDIR)/man8
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
deleted file mode 100644
index f60cb2a7caf..000
--- a/sys-apps/kexec-tools/files/kexec.init-2.0.4-r2
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- need localmount
-}
-
-image_path() {
- local x= kver=$(uname -r) karch=$(uname -m)
- BOOTPART="${BOOTPART:-/boot}"
- KNAME="${KNAME:-bzImage}"
- if [ -e "${KNAME}" ]; then
- echo "${KNAME}"
- return 0
- fi
- for x in "${KNAME#${BOOTPART}}" vmlinuz \
- bzImage-${kver} vmlinuz-${kver} \
- kernel-genkernel-${karch}-${kver} \
- kernel-${kver} kernel-${karch}; do
- if [ -e "${BOOTPART}/${x}" ]; then
- echo "${BOOTPART}/${x}"
- return 0
- fi
- done
-
- return 1
-}
-
-initrd_path() {
- local x= kver=$(uname -r) karch=$(uname -m)
- BOOTPART="${BOOTPART:-/boot}"
- INITRD="${INITRD:-initrd}"
- if [ -e "${INITRD}" ]; then
- echo "${INITRD}"
- return 0
- fi
- for x in "${INITRD#${BOOTPART}}" \
- initrd.img-${kver} initrd-${kver}.img \
- initrd-${kver} initramfs-${kver}.img \
- initramfs-genkernel-${karch}-${kver} ; do
- if [ -e "${BOOTPART}/${x}" ]; then
- echo "${BOOTPART}/${x}"
- return 0
- fi
- done
-
- return 1
-}
-
-mount_boot(){
- local ret
-
- [ -n "${DONT_MOUNT_BOOT}" ] && return 1
- grep -q " ${BOOTPART:-/boot} "
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: f59c667e9c206e59fea9f13f47eac488822ebba2
Author: Patrick McLean gentoo org>
AuthorDate: Fri Jan 26 00:27:55 2018 +
Commit: Patrick McLean gentoo org>
CommitDate: Fri Jan 26 00:28:15 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f59c667e
sys-apps/kexec-tools: Filter -mindirect-branch=thunk* for 1.0.16 and
Package-Manager: Portage-2.3.20, Repoman-2.3.6
sys-apps/kexec-tools/kexec-tools-2.0.16.ebuild | 5 +++--
sys-apps/kexec-tools/kexec-tools-.ebuild | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.16.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.16.ebuild
index f3f01574c05..e691dd6cb12 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.16.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ else
KEYWORDS="~amd64 ~arm64 ~x86"
fi
-inherit libtool linux-info systemd
+inherit flag-o-matic libtool linux-info systemd
DESCRIPTION="Load another kernel from the currently executing Linux kernel"
HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/;
@@ -43,6 +43,7 @@ pkg_setup() {
src_prepare() {
default
elibtoolize
+ filter-flags '-mindirect-branch=thunk*'
}
src_configure() {
diff --git a/sys-apps/kexec-tools/kexec-tools-.ebuild
b/sys-apps/kexec-tools/kexec-tools-.ebuild
index 784f7a48e98..89ef61b3896 100644
--- a/sys-apps/kexec-tools/kexec-tools-.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ else
KEYWORDS="~amd64 ~arm64 ~x86"
fi
-inherit libtool linux-info systemd
+inherit flag-o-matic libtool linux-info systemd
DESCRIPTION="Load another kernel from the currently executing Linux kernel"
HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/;
@@ -46,6 +46,7 @@ src_prepare() {
else
elibtoolize
fi
+ filter-flags '-mindirect-branch=thunk*'
}
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: c80c43db437068101e893143b3de253bd9976b1b
Author: Thomas Deutschmann gentoo org>
AuthorDate: Thu Nov 23 19:16:33 2017 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Nov 23 20:48:17 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c80c43db
sys-apps/kexec-tools: Bump to v2.0.16
Package-Manager: Portage-2.3.16, Repoman-2.3.6
sys-apps/kexec-tools/Manifest | 3 +-
sys-apps/kexec-tools/kexec-tools-2.0.16.ebuild | 81 ++
2 files changed, 83 insertions(+), 1 deletion(-)
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index 257e7124b8e..1fc594df788 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -1,3 +1,4 @@
DIST kexec-tools-2.0.14.tar.xz 283640 SHA256
ffb2e7e99d9d08754c6bc1922aed3c94f318665d82a72ecc76c4ff1c0dc6 SHA512
8c1f9d1f4bb69a621961d45091f9c8349535ae69b80168423663685b44d89e1b9324d5cd11c83e86d805a3371f4f1600b0def551c52efb3c6cf020e9c11c273f
WHIRLPOOL
1f9cc414724bf2d710876b2fbf721543cbd973b272a66b86bf134774b946ec540579b698fa3bcb56a2041d226da2c4298f750180c671ece17633067370a9df8e
-DIST kexec-tools-2.0.15.tar.xz 286944 SHA256
899b7b861431eb51886d0c12866e91b036228244d35a5fb04762dd1a3c0194e7 SHA512
0bddf31b9bb0e203b813d820e1e248974c2d62cb388dfaf4f2f4971f764cc71e54edbaeaeb663c15d6fa06574beceb87d9ffd7d822ac6699d86c54645096e7e9
WHIRLPOOL
8d40f03cc9cbaf90a9ab9bcb009dfd3c5b1130eec6ac515c3d3a2f7d7205d856fb43ff748a4ef51a1d3169f7ba068d998baafc155c7400a8e96245e326d62558
+DIST kexec-tools-2.0.15.tar.xz 286944 BLAKE2B
00344b607fbbca77398e74bf7f6506efa124ddb4ad0f2e55424a40b90ac0d1a6336dd43f4c8804323e12598f1647cd105880960abfda7df8215c787dae150bda
SHA512
0bddf31b9bb0e203b813d820e1e248974c2d62cb388dfaf4f2f4971f764cc71e54edbaeaeb663c15d6fa06574beceb87d9ffd7d822ac6699d86c54645096e7e9
+DIST kexec-tools-2.0.16.tar.xz 287888 BLAKE2B
7e7bbe11dc2792be3cab6318c12b6866bf6b373fb7bf2d7601ef68a39dd5882aceab7c8905ce0d9b0af1da2072b3f3d2677bd9e006676c484e1d6506ac7036fa
SHA512
f2f06e7702fef20c8d7d6aabe1b264e2e2689e5c38cc00dbc2186dd7fa0479edb2dc9e307dd2ad7f03db47015e966e577f11576172604ef01c1bcca471fe2c24
DIST kexec-tools-2.0.4.tar.xz 271604 SHA256
e5f5ab00d746eb15b4714eca6a8ec5a1a86a62ce2bbdad1b3000161138a978c6 SHA512
2514f407d9150d2615dffc91a525fb28f159bef92b9543f9802e2618746b7d4c04137668ad8a8d8f0b75f68ed9057d09629ce736b6a061b5cf817b9d904f549e
WHIRLPOOL
70ad298512e700cd1cdee7698e4fa68a769d91d3080d5d8387b8362ad49126ad68b0b6dbd1f13305958bdc988f805fa610e487682fd0eb5e4e9bcda0a9022627
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.16.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.16.ebuild
new file mode 100644
index 000..f3f01574c05
--- /dev/null
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.16.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "" ]] ; then
+ inherit git-r3
+
EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git"
+ AUTOTOOLS_AUTORECONF=true
+else
+ SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+inherit libtool linux-info systemd
+
+DESCRIPTION="Load another kernel from the currently executing Linux kernel"
+HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="booke lzma xen zlib"
+
+REQUIRED_USE="lzma? ( zlib )"
+
+DEPEND="
+ lzma? ( app-arch/xz-utils )
+ zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~KEXEC"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch
+ "${FILESDIR}"/${PN}-2.0.4-out-of-source.patch
+)
+
+pkg_setup() {
+ # GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC)
+ export ASFLAGS="${CCASFLAGS}"
+}
+
+src_prepare() {
+ default
+ elibtoolize
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_with booke)
+ $(use_with lzma)
+ $(use_with xen)
+ $(use_with zlib)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ dodoc "${FILESDIR}"/README.Gentoo
+
+ newinitd "${FILESDIR}"/kexec.init-2.0.13-r1 kexec
+ newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec
+
+ insinto /etc
+ doins "${FILESDIR}"/kexec.conf
+
+ insinto /etc/kernel/postinst.d
+ doins "${FILESDIR}"/90_kexec
+
+ systemd_dounit "${FILESDIR}"/kexec.service
+}
+
+pkg_postinst() {
+ if systemd_is_booted || has_version sys-apps/systemd; then
+ elog "For systemd support the new config file is"
+ elog " /etc/kexec.conf"
+ elog "Please adopt it to your needs as there is no autoconfig
anymore"
+ fi
+}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/files/
commit: 06bfeebcd9e444ee5383fbb69cf48af8c90031f0
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Tue Oct 10 13:40:19 2017 +
Commit: Patrice Clement gentoo org>
CommitDate: Fri Oct 20 07:45:13 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06bfeebc
sys-apps/kexec-tools: remove unused files.
sys-apps/kexec-tools/files/kexec.init-2.0.12 | 174 -
sys-apps/kexec-tools/files/kexec.init-2.0.4-r3 | 164 ---
2 files changed, 338 deletions(-)
diff --git a/sys-apps/kexec-tools/files/kexec.init-2.0.12
b/sys-apps/kexec-tools/files/kexec.init-2.0.12
deleted file mode 100644
index a7bd859f082..000
--- a/sys-apps/kexec-tools/files/kexec.init-2.0.12
+++ /dev/null
@@ -1,174 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Set up some defaults.
-: "${LOAD_DURING_SHUTDOWN:=yes}"
-: "${BOOTPART:=/boot}"
-: "${DONT_MOUNT_BOOT:=no}"
-
-depend() {
- need localmount
-}
-
-auto_prefix_bootpath() {
- # Only auto-add prefix to relative paths.
- case $1 in
- */*) echo "$1";;
- *) echo "${BOOTPART}/$1" ;;
- esac
-}
-
-image_path() {
- # Do no sanity checking if the user has set a value.
- if [ -n "${KNAME}" ]; then
- auto_prefix_bootpath "${KNAME}"
- return
- fi
-
- local x kver="$(uname -r)" karch="$(uname -m)"
- for x in \
- "bzImage" \
- "vmlinuz" \
- "bzImage-${kver}" \
- "vmlinuz-${kver}" \
- "kernel-genkernel-${karch}-${kver}" \
- "kernel-${kver}" \
- "kernel-${karch}"; do
- if [ -e "${BOOTPART}/${x}" ]; then
- echo "${BOOTPART}/${x}"
- return
- fi
- done
-
- return 1
-}
-
-initrd_path() {
- # Do no sanity checking if the user has set a value.
- if [ -n "${INITRD}" ]; then
- auto_prefix_bootpath "${INITRD}"
- return 0
- fi
-
- local x kver="$(uname -r)" karch="$(uname -m)"
- for x in \
- "initrd" \
- "initrd.img-${kver}" \
- "initrd-${kver}.img" \
- "initrd-${kver}" \
- "initramfs-${kver}.img" \
- "initramfs-genkernel-${karch}-${kver}"; do
- if [ -e "${BOOTPART}/${x}" ]; then
- echo "${BOOTPART}/${x}"
- return 0
- fi
- done
-
- return 1
-}
-
-mount_boot() {
- [ "${DONT_MOUNT_BOOT}" != "no" ] && return 1
- mountinfo -q "${BOOTPART}" && return 1
-
- ebegin "Mounting ${BOOTPART}"
- mount "${BOOTPART}"
- eend $?
-}
-
-load_image() {
- if [ "${KNAME}" = "-" ]; then
- ebegin "Disabling kexec"
- kexec -u
- eend $?
- return # eend preserved $? for us.
- fi
-
- local img initrd="$(initrd_path)" mounted=false kparamopt initrdopt
-
- if ! img="$(image_path)"; then
- if mount_boot; then
- if img="$(image_path)"; then
- mounted=true
- initrd="$(initrd_path)"
- else
- eerror "No kernel image found in ${BOOTPART}!"
- umount "${BOOTPART}"
- return 1
- fi
- else
- eerror "No kernel image found in ${BOOTPART}!"
- return 1
- fi
- fi
-
- if [ -z "${ROOTPART}" ]; then
- ROOTPART="$(readlink -f "$(sed -n '/^\/[^ ]* \/ / s,^\([^
]*\).*,\1,p' /proc/mounts)")"
- fi
-
- if [ -z "${KPARAM}" ]; then
- kparamopt="--reuse-cmdline"
- fi
-
- if [ -n "${initrd}" ]; then
- initrdopt="--initrd=${initrd}"
- fi
-
- local msg
- [ -n "${initrd}" ] && \
- msg=" (with ${initrd})"
- ebegin "Using kernel image ${img}${msg} for kexec"
-
- kexec ${KEXEC_OPT_ARGS} ${kparamopt} \
- -l "${img}" --append="root=${ROOTPART} ${KPARAM}" ${initrdopt}
- local ret=$?
-
- ${mounted} && umount "${BOOTPART}"
- eend ${ret}
- return ${ret}
-}
-
-start() {
- if [ "${LOAD_DURING_SHUTDOWN}" = "yes" ]; then
- local mounted
- if mount_boot; then
- mounted=true
- fi
- if ! image_path >/dev/null; then
- ewarn "Cannot find kernel image!"
- ewarn "Please make sure a valid kernel image is present
before reboot."
- return 0
- fi
- if [ -n "${mounted}" ]; then
-
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: a6ef526c60b1f809f9d008e5ecdba9cb28b795c1
Author: Sergey Alirzaev gmail com>
AuthorDate: Wed Oct 18 22:36:00 2017 +
Commit: Lars Wendler gentoo org>
CommitDate: Thu Oct 19 09:15:39 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6ef526c
sys-apps/kexec-tools: update the live ebuild
git -> https and make it build
Closes: https://github.com/gentoo/gentoo/pull/5979
sys-apps/kexec-tools/kexec-tools-.ebuild | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/sys-apps/kexec-tools/kexec-tools-.ebuild
b/sys-apps/kexec-tools/kexec-tools-.ebuild
index f3f01574c05..784f7a48e98 100644
--- a/sys-apps/kexec-tools/kexec-tools-.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-.ebuild
@@ -4,9 +4,8 @@
EAPI=6
if [[ ${PV} == "" ]] ; then
- inherit git-r3
-
EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git"
- AUTOTOOLS_AUTORECONF=true
+ inherit git-r3 autotools
+
EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git;
else
SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz"
KEYWORDS="~amd64 ~arm64 ~x86"
@@ -42,7 +41,11 @@ pkg_setup() {
src_prepare() {
default
- elibtoolize
+ if [[ ${PV} == "" ]] ; then
+ eautoreconf
+ else
+ elibtoolize
+ fi
}
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: dfed5f8cf1acf3dced17d82076303c290514b802
Author: Thomas Deutschmann gentoo org>
AuthorDate: Tue Aug 29 21:21:56 2017 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Tue Aug 29 21:38:42 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfed5f8c
sys-apps/kexec-tools: x86 stable (bug #626856)
Package-Manager: Portage-2.3.8, Repoman-2.3.3
sys-apps/kexec-tools/kexec-tools-2.0.14.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.14.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.14.ebuild
index 17f735f86b3..df5c2d5b610 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.14.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.14.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "" ]] ; then
AUTOTOOLS_AUTORECONF=true
else
SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz"
- KEYWORDS="amd64 ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm64 x86"
fi
inherit autotools-utils linux-info systemd
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: 0d40f0f2ff41178250145df0ec9e53ea98d924d1
Author: Mikle Kolyada gentoo org>
AuthorDate: Fri Aug 25 13:31:15 2017 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Fri Aug 25 13:31:36 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d40f0f2
sys-apps/kexec-tools: amd64 stable wrt bug #626856
Package-Manager: Portage-2.3.6, Repoman-2.3.1
sys-apps/kexec-tools/kexec-tools-2.0.14.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.14.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.14.ebuild
index a5566e9756f..17f735f86b3 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.14.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.14.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "" ]] ; then
AUTOTOOLS_AUTORECONF=true
else
SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm64 ~x86"
fi
inherit autotools-utils linux-info systemd
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: 5131b493538313bf348d72b03751289de77e0adb
Author: Lars Wendler gentoo org>
AuthorDate: Tue Aug 1 15:08:15 2017 +
Commit: Lars Wendler gentoo org>
CommitDate: Tue Aug 1 15:08:15 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5131b493
sys-apps/kexec-tools: Bump to version 2.0.15
Package-Manager: Portage-2.3.6, Repoman-2.3.3
Signed-off-by: Lars Wendler gentoo.org>
sys-apps/kexec-tools/Manifest | 1 +
sys-apps/kexec-tools/kexec-tools-2.0.15.ebuild | 81 ++
2 files changed, 82 insertions(+)
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index 172bd2db1e1..f209b88f512 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -1,5 +1,6 @@
DIST kexec-tools-2.0.12.tar.xz 274776 SHA256
14ce67b6242426a7ded10f58b7d29d3cfef5c1379850e8ba3816bb42053f920d SHA512
d192f841180daf534f7214b6c7c5dcd9de0e5616e8cb0da164c24e8b5903a2f65bb1fbe6ca29a3b9077fa6f6435cc33fda19a96584e1f393ee7a2fe56f374dab
WHIRLPOOL
9895716544987682f4ba9cc0622afa14c7dc844482fedce29ec9780b8ff74f87cf2bd79ef58febe651fa3bc5934b6d54aaae31d2593fb32ea9fffdca1e5f8c91
DIST kexec-tools-2.0.13.tar.xz 276824 SHA256
874baf421171dbfca0084af2da71ccf5a67749dd2a27c3023da5f72460bae5cc SHA512
19ff83eb25f492de5d87c0d5c3df9189ec5af225c3343ae61ae595fcb02638c0d7b8474edfa569c46e7203ae68e6c358db929a7dcfbf908518a00d6b5a597081
WHIRLPOOL
9281a2141892972657a02d6374dfa42474ce7c83955d9d54a1fd50456c34b8b2018aa3ab179a393e365c7ed2bfd43b2a94d3397e2bb09e25e9751eb19eace4e7
DIST kexec-tools-2.0.14.tar.xz 283640 SHA256
ffb2e7e99d9d08754c6bc1922aed3c94f318665d82a72ecc76c4ff1c0dc6 SHA512
8c1f9d1f4bb69a621961d45091f9c8349535ae69b80168423663685b44d89e1b9324d5cd11c83e86d805a3371f4f1600b0def551c52efb3c6cf020e9c11c273f
WHIRLPOOL
1f9cc414724bf2d710876b2fbf721543cbd973b272a66b86bf134774b946ec540579b698fa3bcb56a2041d226da2c4298f750180c671ece17633067370a9df8e
+DIST kexec-tools-2.0.15.tar.xz 286944 SHA256
899b7b861431eb51886d0c12866e91b036228244d35a5fb04762dd1a3c0194e7 SHA512
0bddf31b9bb0e203b813d820e1e248974c2d62cb388dfaf4f2f4971f764cc71e54edbaeaeb663c15d6fa06574beceb87d9ffd7d822ac6699d86c54645096e7e9
WHIRLPOOL
8d40f03cc9cbaf90a9ab9bcb009dfd3c5b1130eec6ac515c3d3a2f7d7205d856fb43ff748a4ef51a1d3169f7ba068d998baafc155c7400a8e96245e326d62558
DIST kexec-tools-2.0.4.tar.xz 271604 SHA256
e5f5ab00d746eb15b4714eca6a8ec5a1a86a62ce2bbdad1b3000161138a978c6 SHA512
2514f407d9150d2615dffc91a525fb28f159bef92b9543f9802e2618746b7d4c04137668ad8a8d8f0b75f68ed9057d09629ce736b6a061b5cf817b9d904f549e
WHIRLPOOL
70ad298512e700cd1cdee7698e4fa68a769d91d3080d5d8387b8362ad49126ad68b0b6dbd1f13305958bdc988f805fa610e487682fd0eb5e4e9bcda0a9022627
DIST kexec-tools-2.0.9.tar.xz 272728 SHA256
8ae34a9ceb76350954e1e1e3ca9ab51da15862bd5f2fd14392208e60fb454f71 SHA512
b58f8f0872f1a6a3a93bc67068d7035c4b39e985dafadc573585d92259ff289bf98d5a567293a5286668315ac2158b232919e0c6847fdefc68b7ecbcfab5109e
WHIRLPOOL
840d9d17ce9facc131736ef52acabb03bcc6d21f671896ff5603bd8d6bd629519e169ca878a127b863235b236dafd3b29f598424b272f599503bb3f1a5f70050
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.15.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.15.ebuild
new file mode 100644
index 000..f3f01574c05
--- /dev/null
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.15.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "" ]] ; then
+ inherit git-r3
+
EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git"
+ AUTOTOOLS_AUTORECONF=true
+else
+ SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+inherit libtool linux-info systemd
+
+DESCRIPTION="Load another kernel from the currently executing Linux kernel"
+HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="booke lzma xen zlib"
+
+REQUIRED_USE="lzma? ( zlib )"
+
+DEPEND="
+ lzma? ( app-arch/xz-utils )
+ zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~KEXEC"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch
+ "${FILESDIR}"/${PN}-2.0.4-out-of-source.patch
+)
+
+pkg_setup() {
+ # GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC)
+ export ASFLAGS="${CCASFLAGS}"
+}
+
+src_prepare() {
+ default
+ elibtoolize
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_with booke)
+ $(use_with lzma)
+ $(use_with xen)
+ $(use_with zlib)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ dodoc "${FILESDIR}"/README.Gentoo
+
+ newinitd "${FILESDIR}"/kexec.init-2.0.13-r1 kexec
+ newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec
+
+ insinto /etc
+ doins "${FILESDIR}"/kexec.conf
+
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/, sys-apps/kexec-tools/files/
commit: 2704730b9198b969d78f8c90e66adf57c777d985
Author: Lars Wendler gentoo org>
AuthorDate: Tue Aug 1 15:10:20 2017 +
Commit: Lars Wendler gentoo org>
CommitDate: Tue Aug 1 15:10:20 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2704730b
sys-apps/kexec-tools: Removed old.
Package-Manager: Portage-2.3.6, Repoman-2.3.3
Signed-off-by: Lars Wendler gentoo.org>
sys-apps/kexec-tools/Manifest | 3 -
.../files/kexec-tools-2.0.9-hardened.patch | 16 -
sys-apps/kexec-tools/kexec-tools-2.0.12.ebuild | 76 --
sys-apps/kexec-tools/kexec-tools-2.0.13-r1.ebuild | 76 --
sys-apps/kexec-tools/kexec-tools-2.0.13.ebuild | 76 --
sys-apps/kexec-tools/kexec-tools-2.0.9-r2.ebuild | 70
6 files changed, 317 deletions(-)
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index f209b88f512..257e7124b8e 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -1,6 +1,3 @@
-DIST kexec-tools-2.0.12.tar.xz 274776 SHA256
14ce67b6242426a7ded10f58b7d29d3cfef5c1379850e8ba3816bb42053f920d SHA512
d192f841180daf534f7214b6c7c5dcd9de0e5616e8cb0da164c24e8b5903a2f65bb1fbe6ca29a3b9077fa6f6435cc33fda19a96584e1f393ee7a2fe56f374dab
WHIRLPOOL
9895716544987682f4ba9cc0622afa14c7dc844482fedce29ec9780b8ff74f87cf2bd79ef58febe651fa3bc5934b6d54aaae31d2593fb32ea9fffdca1e5f8c91
-DIST kexec-tools-2.0.13.tar.xz 276824 SHA256
874baf421171dbfca0084af2da71ccf5a67749dd2a27c3023da5f72460bae5cc SHA512
19ff83eb25f492de5d87c0d5c3df9189ec5af225c3343ae61ae595fcb02638c0d7b8474edfa569c46e7203ae68e6c358db929a7dcfbf908518a00d6b5a597081
WHIRLPOOL
9281a2141892972657a02d6374dfa42474ce7c83955d9d54a1fd50456c34b8b2018aa3ab179a393e365c7ed2bfd43b2a94d3397e2bb09e25e9751eb19eace4e7
DIST kexec-tools-2.0.14.tar.xz 283640 SHA256
ffb2e7e99d9d08754c6bc1922aed3c94f318665d82a72ecc76c4ff1c0dc6 SHA512
8c1f9d1f4bb69a621961d45091f9c8349535ae69b80168423663685b44d89e1b9324d5cd11c83e86d805a3371f4f1600b0def551c52efb3c6cf020e9c11c273f
WHIRLPOOL
1f9cc414724bf2d710876b2fbf721543cbd973b272a66b86bf134774b946ec540579b698fa3bcb56a2041d226da2c4298f750180c671ece17633067370a9df8e
DIST kexec-tools-2.0.15.tar.xz 286944 SHA256
899b7b861431eb51886d0c12866e91b036228244d35a5fb04762dd1a3c0194e7 SHA512
0bddf31b9bb0e203b813d820e1e248974c2d62cb388dfaf4f2f4971f764cc71e54edbaeaeb663c15d6fa06574beceb87d9ffd7d822ac6699d86c54645096e7e9
WHIRLPOOL
8d40f03cc9cbaf90a9ab9bcb009dfd3c5b1130eec6ac515c3d3a2f7d7205d856fb43ff748a4ef51a1d3169f7ba068d998baafc155c7400a8e96245e326d62558
DIST kexec-tools-2.0.4.tar.xz 271604 SHA256
e5f5ab00d746eb15b4714eca6a8ec5a1a86a62ce2bbdad1b3000161138a978c6 SHA512
2514f407d9150d2615dffc91a525fb28f159bef92b9543f9802e2618746b7d4c04137668ad8a8d8f0b75f68ed9057d09629ce736b6a061b5cf817b9d904f549e
WHIRLPOOL
70ad298512e700cd1cdee7698e4fa68a769d91d3080d5d8387b8362ad49126ad68b0b6dbd1f13305958bdc988f805fa610e487682fd0eb5e4e9bcda0a9022627
-DIST kexec-tools-2.0.9.tar.xz 272728 SHA256
8ae34a9ceb76350954e1e1e3ca9ab51da15862bd5f2fd14392208e60fb454f71 SHA512
b58f8f0872f1a6a3a93bc67068d7035c4b39e985dafadc573585d92259ff289bf98d5a567293a5286668315ac2158b232919e0c6847fdefc68b7ecbcfab5109e
WHIRLPOOL
840d9d17ce9facc131736ef52acabb03bcc6d21f671896ff5603bd8d6bd629519e169ca878a127b863235b236dafd3b29f598424b272f599503bb3f1a5f70050
diff --git a/sys-apps/kexec-tools/files/kexec-tools-2.0.9-hardened.patch
b/sys-apps/kexec-tools/files/kexec-tools-2.0.9-hardened.patch
deleted file mode 100644
index 01a8b4be933..000
--- a/sys-apps/kexec-tools/files/kexec-tools-2.0.9-hardened.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-the purgatory subdir gets loaded into the kernel so we need to
-make sure it does not get built with compiler settings like the
-rest of the userland tools. that means no PIC/PIE/SSP/etc...
-
a/purgatory/Makefile
-+++ b/purgatory/Makefile
-@@ -47,7 +47,8 @@ purgatory/sha256.o: $(srcdir)/util_lib/sha256.c
- $(PURGATORY): CC=$(TARGET_CC)
- $(PURGATORY): CFLAGS+=$(PURGATORY_EXTRA_CFLAGS) \
- $($(ARCH)_PURGATORY_EXTRA_CFLAGS) \
---Os -fno-builtin -ffreestanding
-+-Os -fno-builtin -ffreestanding \
-+-fno-PIC -fno-PIE -fno-stack-protector
-
- $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \
- -I$(srcdir)/purgatory/include \
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.12.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.12.ebuild
deleted file mode 100644
index fb38edc70a0..000
--- a/sys-apps/kexec-tools/kexec-tools-2.0.12.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-if [[ ${PV} == "" ]] ; then
- inherit git-r3
-
EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git"
-
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: 2866f4373027f71ee945cbe06a13f23fc44ac846
Author: Lars Wendler gentoo org>
AuthorDate: Tue Aug 1 15:08:47 2017 +
Commit: Lars Wendler gentoo org>
CommitDate: Tue Aug 1 15:08:47 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2866f437
sys-apps/kexec-tools: Sync live ebuild.
Package-Manager: Portage-2.3.6, Repoman-2.3.3
Signed-off-by: Lars Wendler gentoo.org>
sys-apps/kexec-tools/kexec-tools-.ebuild | 19 ---
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/sys-apps/kexec-tools/kexec-tools-.ebuild
b/sys-apps/kexec-tools/kexec-tools-.ebuild
index fb38edc70a0..f3f01574c05 100644
--- a/sys-apps/kexec-tools/kexec-tools-.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=6
if [[ ${PV} == "" ]] ; then
inherit git-r3
@@ -9,10 +9,10 @@ if [[ ${PV} == "" ]] ; then
AUTOTOOLS_AUTORECONF=true
else
SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~x86"
fi
-inherit autotools-utils linux-info systemd
+inherit libtool linux-info systemd
DESCRIPTION="Load another kernel from the currently executing Linux kernel"
HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/;
@@ -40,6 +40,11 @@ pkg_setup() {
export ASFLAGS="${CCASFLAGS}"
}
+src_prepare() {
+ default
+ elibtoolize
+}
+
src_configure() {
local myeconfargs=(
$(use_with booke)
@@ -47,15 +52,15 @@ src_configure() {
$(use_with xen)
$(use_with zlib)
)
- autotools-utils_src_configure
+ econf "${myeconfargs[@]}"
}
src_install() {
- autotools-utils_src_install
+ default
dodoc "${FILESDIR}"/README.Gentoo
- newinitd "${FILESDIR}"/kexec.init-2.0.12 kexec
+ newinitd "${FILESDIR}"/kexec.init-2.0.13-r1 kexec
newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec
insinto /etc
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/files/
commit: 43983893090e88e6829a52e37a232456613683fd
Author: Thomas Deutschmann gentoo org>
AuthorDate: Sun Jan 8 02:59:18 2017 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sun Jan 8 02:59:18 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43983893
sys-apps/kexec-tools: Fix syntax error in runscript
sys-apps/kexec-tools/files/kexec.init-2.0.13-r1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
index 1f18f67..1d2494b 100644
--- a/sys-apps/kexec-tools/files/kexec.init-2.0.13-r1
+++ b/sys-apps/kexec-tools/files/kexec.init-2.0.13-r1
@@ -70,7 +70,7 @@ initrd_path() {
"initrd-${kver}.img" \
"initrd-${kver}" \
"initramfs-${kver}.img" \
- "initramfs-genkernel-${karch}-${kver}"; do
+ "initramfs-genkernel-${karch}-${kver}" \
"initramfs-genkernel-${gkarch}-${kver}"; do
if [ -e "${BOOTPART}/${x}" ]; then
echo "${BOOTPART}/${x}"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/, sys-apps/kexec-tools/files/
commit: 932b155bb612154a81654a5b23b9c59bf7768258
Author: Robin H. Johnson gentoo org>
AuthorDate: Sun Jan 8 00:31:46 2017 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Sun Jan 8 00:32:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=932b155b
sys-apps/kexec-tools: support more kernel names.
Package-Manager: portage-2.3.2
Gentoo-Bug: 489864
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=489864
Signed-off-by: Robin H. Johnson gentoo.org>
sys-apps/kexec-tools/files/kexec.init-2.0.12 | 2 +-
.../{kexec.init-2.0.12 => kexec.init-2.0.13-r1}| 16 -
sys-apps/kexec-tools/kexec-tools-2.0.13-r1.ebuild | 77 ++
3 files changed, 92 insertions(+), 3 deletions(-)
diff --git a/sys-apps/kexec-tools/files/kexec.init-2.0.12
b/sys-apps/kexec-tools/files/kexec.init-2.0.12
old mode 100755
new mode 100644
index 87863b3..93f8c04
--- a/sys-apps/kexec-tools/files/kexec.init-2.0.12
+++ b/sys-apps/kexec-tools/files/kexec.init-2.0.12
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/sys-apps/kexec-tools/files/kexec.init-2.0.12
b/sys-apps/kexec-tools/files/kexec.init-2.0.13-r1
old mode 100755
new mode 100644
similarity index 89%
copy from sys-apps/kexec-tools/files/kexec.init-2.0.12
copy to sys-apps/kexec-tools/files/kexec.init-2.0.13-r1
index 87863b3..1f18f67
--- a/sys-apps/kexec-tools/files/kexec.init-2.0.12
+++ b/sys-apps/kexec-tools/files/kexec.init-2.0.13-r1
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -20,6 +20,14 @@ auto_prefix_bootpath() {
esac
}
+get_genkernel_arch() {
+ case $1 in
+ x86_64) echo "amd64" ;;
+ i[3456]86) echo "x86" ;;
+ *) echo "$1" ;;
+ esac
+}
+
image_path() {
# Do no sanity checking if the user has set a value.
if [ -n "${KNAME}" ]; then
@@ -27,13 +35,15 @@ image_path() {
return
fi
- local x kver="$(uname -r)" karch="$(uname -m)"
+ local x kver="$(uname -r)" karch="$(uname -m)"
+ local gkarch="$(get_genkernel_arch $karch)"
for x in \
"bzImage" \
"vmlinuz" \
"bzImage-${kver}" \
"vmlinuz-${kver}" \
"kernel-genkernel-${karch}-${kver}" \
+ "kernel-genkernel-${gkarch}-${kver}" \
"kernel-${kver}" \
"kernel-${karch}"; do
if [ -e "${BOOTPART}/${x}" ]; then
@@ -53,6 +63,7 @@ initrd_path() {
fi
local x kver="$(uname -r)" karch="$(uname -m)"
+ local gkarch="$(get_genkernel_arch $karch)"
for x in \
"initrd" \
"initrd.img-${kver}" \
@@ -60,6 +71,7 @@ initrd_path() {
"initrd-${kver}" \
"initramfs-${kver}.img" \
"initramfs-genkernel-${karch}-${kver}"; do
+ "initramfs-genkernel-${gkarch}-${kver}"; do
if [ -e "${BOOTPART}/${x}" ]; then
echo "${BOOTPART}/${x}"
return 0
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.13-r1.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.13-r1.ebuild
new file mode 100644
index ..8bc203d
--- /dev/null
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.13-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+if [[ ${PV} == "" ]] ; then
+ inherit git-r3
+
EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git"
+ AUTOTOOLS_AUTORECONF=true
+else
+ SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+inherit autotools-utils linux-info systemd
+
+DESCRIPTION="Load another kernel from the currently executing Linux kernel"
+HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="booke lzma xen zlib"
+
+REQUIRED_USE="lzma? ( zlib )"
+
+DEPEND="
+ lzma? ( app-arch/xz-utils )
+ zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~KEXEC"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch
+ "${FILESDIR}"/${PN}-2.0.4-out-of-source.patch
+)
+
+pkg_setup() {
+ # GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC)
+ export ASFLAGS="${CCASFLAGS}"
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_with booke)
+ $(use_with lzma)
+ $(use_with xen)
+ $(use_with zlib)
+ )
+ autotools-utils_src_configure
+}
+
+src_install() {
+ autotools-utils_src_install
+
+ dodoc
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: b44f3eda36601f43ca4ae3d767e8064810305a85
Author: Lars Wendler gentoo org>
AuthorDate: Fri Dec 23 14:05:38 2016 +
Commit: Lars Wendler gentoo org>
CommitDate: Fri Dec 23 14:06:35 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b44f3eda
sys-apps/kexec-tools: Bump to version 2.0.13
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sys-apps/kexec-tools/Manifest | 1 +
sys-apps/kexec-tools/kexec-tools-2.0.13.ebuild | 77 ++
2 files changed, 78 insertions(+)
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index 99653fe..f97be56 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -1,3 +1,4 @@
DIST kexec-tools-2.0.12.tar.xz 274776 SHA256
14ce67b6242426a7ded10f58b7d29d3cfef5c1379850e8ba3816bb42053f920d SHA512
d192f841180daf534f7214b6c7c5dcd9de0e5616e8cb0da164c24e8b5903a2f65bb1fbe6ca29a3b9077fa6f6435cc33fda19a96584e1f393ee7a2fe56f374dab
WHIRLPOOL
9895716544987682f4ba9cc0622afa14c7dc844482fedce29ec9780b8ff74f87cf2bd79ef58febe651fa3bc5934b6d54aaae31d2593fb32ea9fffdca1e5f8c91
+DIST kexec-tools-2.0.13.tar.xz 276824 SHA256
874baf421171dbfca0084af2da71ccf5a67749dd2a27c3023da5f72460bae5cc SHA512
19ff83eb25f492de5d87c0d5c3df9189ec5af225c3343ae61ae595fcb02638c0d7b8474edfa569c46e7203ae68e6c358db929a7dcfbf908518a00d6b5a597081
WHIRLPOOL
9281a2141892972657a02d6374dfa42474ce7c83955d9d54a1fd50456c34b8b2018aa3ab179a393e365c7ed2bfd43b2a94d3397e2bb09e25e9751eb19eace4e7
DIST kexec-tools-2.0.4.tar.xz 271604 SHA256
e5f5ab00d746eb15b4714eca6a8ec5a1a86a62ce2bbdad1b3000161138a978c6 SHA512
2514f407d9150d2615dffc91a525fb28f159bef92b9543f9802e2618746b7d4c04137668ad8a8d8f0b75f68ed9057d09629ce736b6a061b5cf817b9d904f549e
WHIRLPOOL
70ad298512e700cd1cdee7698e4fa68a769d91d3080d5d8387b8362ad49126ad68b0b6dbd1f13305958bdc988f805fa610e487682fd0eb5e4e9bcda0a9022627
DIST kexec-tools-2.0.9.tar.xz 272728 SHA256
8ae34a9ceb76350954e1e1e3ca9ab51da15862bd5f2fd14392208e60fb454f71 SHA512
b58f8f0872f1a6a3a93bc67068d7035c4b39e985dafadc573585d92259ff289bf98d5a567293a5286668315ac2158b232919e0c6847fdefc68b7ecbcfab5109e
WHIRLPOOL
840d9d17ce9facc131736ef52acabb03bcc6d21f671896ff5603bd8d6bd629519e169ca878a127b863235b236dafd3b29f598424b272f599503bb3f1a5f70050
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.13.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.13.ebuild
new file mode 100644
index ..2a2d160
--- /dev/null
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.13.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+if [[ ${PV} == "" ]] ; then
+ inherit git-r3
+
EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git"
+ AUTOTOOLS_AUTORECONF=true
+else
+ SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+inherit autotools-utils linux-info systemd
+
+DESCRIPTION="Load another kernel from the currently executing Linux kernel"
+HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="booke lzma xen zlib"
+
+REQUIRED_USE="lzma? ( zlib )"
+
+DEPEND="
+ lzma? ( app-arch/xz-utils )
+ zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~KEXEC"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch
+ "${FILESDIR}"/${PN}-2.0.4-out-of-source.patch
+)
+
+pkg_setup() {
+ # GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC)
+ export ASFLAGS="${CCASFLAGS}"
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_with booke)
+ $(use_with lzma)
+ $(use_with xen)
+ $(use_with zlib)
+ )
+ autotools-utils_src_configure
+}
+
+src_install() {
+ autotools-utils_src_install
+
+ dodoc "${FILESDIR}"/README.Gentoo
+
+ newinitd "${FILESDIR}"/kexec.init-2.0.12 kexec
+ newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec
+
+ insinto /etc
+ doins "${FILESDIR}"/kexec.conf
+
+ insinto /etc/kernel/postinst.d
+ doins "${FILESDIR}"/90_kexec
+
+ systemd_dounit "${FILESDIR}"/kexec.service
+}
+
+pkg_postinst() {
+ if systemd_is_booted || has_version sys-apps/systemd; then
+ elog "For systemd support the new config file is"
+ elog " /etc/kexec.conf"
+ elog "Please adopt it to your needs as there is no autoconfig
anymore"
+ fi
+}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/, sys-apps/kexec-tools/files/
commit: 2ad6174bad17a8a426b977d82017d399111ab963
Author: Mike Frysinger gentoo org>
AuthorDate: Thu Mar 24 19:21:44 2016 +
Commit: Mike Frysinger gentoo org>
CommitDate: Thu Mar 24 21:39:33 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ad6174b
sys-apps/kexec-tools: merge git & release versions
sys-apps/kexec-tools/files/kexec.conf- | 18 ---
sys-apps/kexec-tools/files/kexec.init- | 165 ---
sys-apps/kexec-tools/kexec-tools-.ebuild | 23 ++--
3 files changed, 13 insertions(+), 193 deletions(-)
diff --git a/sys-apps/kexec-tools/files/kexec.conf-
b/sys-apps/kexec-tools/files/kexec.conf-
deleted file mode 100644
index 74f8b89..000
--- a/sys-apps/kexec-tools/files/kexec.conf-
+++ /dev/null
@@ -1,18 +0,0 @@
-# Boot partition
-#BOOTPART="/boot"
-
-# Kernel name
-#KNAME="vmlinuz-2.6.10"
-
-# Root partition (should be autodetected)
-#ROOTPART="/dev/hda3"
-
-# Kernel parameters (should be autodetected)
-#KPARAM="splash=silent,theme:emergence"
-
-# Initrd
-#INITRD="/boot/fbsplash-emergence-1024x768"
-
-# Load kexec kernel image into memory during shutdown instead of bootup
-# (default: yes)
-#LOAD_DURING_SHUTDOWN="yes"
diff --git a/sys-apps/kexec-tools/files/kexec.init-
b/sys-apps/kexec-tools/files/kexec.init-
deleted file mode 100644
index f130687..000
--- a/sys-apps/kexec-tools/files/kexec.init-
+++ /dev/null
@@ -1,165 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
- need localmount
-}
-
-image_path() {
- local x= kver=$(uname -r) karch=$(uname -m)
- BOOTPART="${BOOTPART:-/boot}"
- KNAME="${KNAME:-bzImage}"
- if [ -e "${KNAME}" ]; then
- echo "${KNAME}"
- return 0
- fi
- for x in "${KNAME#${BOOTPART}}" vmlinuz \
- bzImage-${kver} vmlinuz-${kver} \
- kernel-genkernel-${karch}-${kver} \
- kernel-${kver} kernel-${karch}; do
- if [ -e "${BOOTPART}/${x}" ]; then
- echo "${BOOTPART}/${x}"
- return 0
- fi
- done
-
- return 1
-}
-
-initrd_path() {
- local x= kver=$(uname -r) karch=$(uname -m)
- BOOTPART="${BOOTPART:-/boot}"
- INITRD="${INITRD:-initrd}"
- if [ -e "${INITRD}" ]; then
- echo "${INITRD}"
- return 0
- fi
- for x in "${INITRD#${BOOTPART}}" \
- initrd.img-${kver} initrd-${kver}.img \
- initrd-${kver} initramfs-${kver}.img \
- initramfs-genkernel-${karch}-${kver} ; do
- if [ -e "${BOOTPART}/${x}" ]; then
- echo "${BOOTPART}/${x}"
- return 0
- fi
- done
-
- return 1
-}
-
-mount_boot(){
- local ret
-
- [ -n "${DONT_MOUNT_BOOT}" ] && return 1
- grep -q " ${BOOTPART:-/boot} " /proc/mounts && return 1
-
- BOOTPART="${BOOTPART:-/boot}"
- ebegin "Mounting ${BOOTPART}"
- mount "${BOOTPART}"; ret=$?
- eend ${ret}
- return ${ret}
-}
-
-load_image() {
- local ret
- if [ "${KNAME}" = "-" ]; then
- ebegin "Disabling kexec"
- kexec -u; ret=$?
- eend ${ret}
- return ${ret}
- fi
-
- BOOTPART="${BOOTPART:-/boot}"
- local img= initrd="$(initrd_path)" mounted=false initrdopt=
-
- if ! img="$(image_path)"; then
- if mount_boot; then
- if img="$(image_path)"; then
- mounted=true
- initrd="$(initrd_path)"
- else
- eerror "No kernel image found in ${BOOTPART}!"
- umount "${BOOTPART}"
- return 1
- fi
- else
- eerror "No kernel image found in ${BOOTPART}!"
- return 1
- fi
- fi
-
- if [ -n "${INITRD}" ] && \
- ! [ "${BOOTPART}/${INITRD#${BOOTPART}}" = "${initrd}" ]; then
- eerror "Requested initrd: ${INITRD#${BOOTPART}}"
- eerror "could not be found"
- return 1
- fi
-
- [ -n "${ROOTPART}" ] || \
- ROOTPART="$(readlink -f "$(sed -n '/^\/[^ ]* \/ / s,^\([^
]*\).*,\1,p' /proc/mounts)")"
-
- [ -n "${KPARAM}" ] || KEXEC_OPT_ARGS="${KEXEC_OPT_ARGS} --reuse-cmdline"
-
- [ -n "${initrd}" ] && [ -e "${initrd}" ] &&
initrdopt="--initrd=${initrd}"
-
- local msg=
- [ -n "${initrd}" ] && \
- msg="with ${initrd}"
- einfo "Using kernel image ${img} ${msg} for kexec"
-
- ebegin "Setting kexec with ${KEXEC_OPT_ARGS} -l ${img} root=${ROOTPART}
${KPARAM}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/files/, sys-apps/kexec-tools/
commit: 292b70740c3eb4516bf99a2cc2d12657a031ab00
Author: Mike Frysinger gentoo org>
AuthorDate: Thu Mar 24 21:24:44 2016 +
Commit: Mike Frysinger gentoo org>
CommitDate: Thu Mar 24 21:39:33 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=292b7074
sys-apps/kexec-tools: version bump to 2.0.12 #578164
Rework the init script heavily in the process to make it a bit less
"smart" and respect user settings. #577496
sys-apps/kexec-tools/Manifest | 1 +
sys-apps/kexec-tools/files/kexec.init-2.0.12 | 175 +
...tools-.ebuild => kexec-tools-2.0.12.ebuild} | 2 +-
sys-apps/kexec-tools/kexec-tools-.ebuild | 2 +-
4 files changed, 178 insertions(+), 2 deletions(-)
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index 6a70245..99653fe 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -1,2 +1,3 @@
+DIST kexec-tools-2.0.12.tar.xz 274776 SHA256
14ce67b6242426a7ded10f58b7d29d3cfef5c1379850e8ba3816bb42053f920d SHA512
d192f841180daf534f7214b6c7c5dcd9de0e5616e8cb0da164c24e8b5903a2f65bb1fbe6ca29a3b9077fa6f6435cc33fda19a96584e1f393ee7a2fe56f374dab
WHIRLPOOL
9895716544987682f4ba9cc0622afa14c7dc844482fedce29ec9780b8ff74f87cf2bd79ef58febe651fa3bc5934b6d54aaae31d2593fb32ea9fffdca1e5f8c91
DIST kexec-tools-2.0.4.tar.xz 271604 SHA256
e5f5ab00d746eb15b4714eca6a8ec5a1a86a62ce2bbdad1b3000161138a978c6 SHA512
2514f407d9150d2615dffc91a525fb28f159bef92b9543f9802e2618746b7d4c04137668ad8a8d8f0b75f68ed9057d09629ce736b6a061b5cf817b9d904f549e
WHIRLPOOL
70ad298512e700cd1cdee7698e4fa68a769d91d3080d5d8387b8362ad49126ad68b0b6dbd1f13305958bdc988f805fa610e487682fd0eb5e4e9bcda0a9022627
DIST kexec-tools-2.0.9.tar.xz 272728 SHA256
8ae34a9ceb76350954e1e1e3ca9ab51da15862bd5f2fd14392208e60fb454f71 SHA512
b58f8f0872f1a6a3a93bc67068d7035c4b39e985dafadc573585d92259ff289bf98d5a567293a5286668315ac2158b232919e0c6847fdefc68b7ecbcfab5109e
WHIRLPOOL
840d9d17ce9facc131736ef52acabb03bcc6d21f671896ff5603bd8d6bd629519e169ca878a127b863235b236dafd3b29f598424b272f599503bb3f1a5f70050
diff --git a/sys-apps/kexec-tools/files/kexec.init-2.0.12
b/sys-apps/kexec-tools/files/kexec.init-2.0.12
new file mode 100755
index 000..7a202cc
--- /dev/null
+++ b/sys-apps/kexec-tools/files/kexec.init-2.0.12
@@ -0,0 +1,175 @@
+#!/sbin/runscript
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Set up some defaults.
+: "${LOAD_DURING_SHUTDOWN:=yes}"
+: "${BOOTPART:=/boot}"
+: "${DONT_MOUNT_BOOT:=no}"
+
+depend() {
+ need localmount
+}
+
+auto_prefix_bootpath() {
+ # Only auto-add prefix to relative paths.
+ case $1 in
+ */*) echo "$1";;
+ *) echo "${BOOTPART}/$1" ;;
+ esac
+}
+
+image_path() {
+ # Do no sanity checking if the user has set a value.
+ if [ -n "${KNAME}" ]; then
+ auto_prefix_bootpath "${KNAME}"
+ return
+ fi
+
+ local x kver="$(uname -r)" karch="$(uname -m)"
+ for x in \
+ "bzImage" \
+ "vmlinuz" \
+ "bzImage-${kver}" \
+ "vmlinuz-${kver}" \
+ "kernel-genkernel-${karch}-${kver}" \
+ "kernel-${kver}" \
+ "kernel-${karch}"; do
+ if [ -e "${BOOTPART}/${x}" ]; then
+ echo "${BOOTPART}/${x}"
+ return
+ fi
+ done
+
+ return 1
+}
+
+initrd_path() {
+ # Do no sanity checking if the user has set a value.
+ if [ -n "${INITRD}" ]; then
+ auto_prefix_bootpath "${INITRD}"
+ return 0
+ fi
+
+ local x kver="$(uname -r)" karch="$(uname -m)"
+ for x in \
+ "initrd" \
+ "initrd.img-${kver}" \
+ "initrd-${kver}.img" \
+ "initrd-${kver}" \
+ "initramfs-${kver}.img" \
+ "initramfs-genkernel-${karch}-${kver}"; do
+ if [ -e "${BOOTPART}/${x}" ]; then
+ echo "${BOOTPART}/${x}"
+ return 0
+ fi
+ done
+
+ return 1
+}
+
+mount_boot() {
+ [ "${DONT_MOUNT_BOOT}" != "no" ] && return 1
+ mountinfo -q "${BOOTPART}" && return 1
+
+ ebegin "Mounting ${BOOTPART}"
+ mount "${BOOTPART}"
+ eend $?
+}
+
+load_image() {
+ if [ "${KNAME}" = "-" ]; then
+ ebegin "Disabling kexec"
+ kexec -u
+ eend $?
+ return # eend preserved $? for us.
+ fi
+
+ local img initrd="$(initrd_path)" mounted=false kparamopt initrdopt
+
+ if ! img="$(image_path)"; then
+ if mount_boot; then
+ if img="$(image_path)"; then
+ mounted=true
+ initrd="$(initrd_path)"
+
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/, sys-apps/kexec-tools/files/
commit: 1cb39e43ada0dd1439c06acecfc749446551b493
Author: Mike Frysinger gentoo org>
AuthorDate: Thu Mar 24 19:23:13 2016 +
Commit: Mike Frysinger gentoo org>
CommitDate: Thu Mar 24 21:39:33 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cb39e43
sys-apps/kexec-tools: drop some old versions
sys-apps/kexec-tools/Manifest| 1 -
sys-apps/kexec-tools/files/kexec.init-2.0.4 | 144 ---
sys-apps/kexec-tools/kexec-tools-2.0.8.ebuild| 75
sys-apps/kexec-tools/kexec-tools-2.0.9-r1.ebuild | 71 ---
sys-apps/kexec-tools/kexec-tools-2.0.9.ebuild| 75
5 files changed, 366 deletions(-)
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index 2958a55..6a70245 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -1,3 +1,2 @@
DIST kexec-tools-2.0.4.tar.xz 271604 SHA256
e5f5ab00d746eb15b4714eca6a8ec5a1a86a62ce2bbdad1b3000161138a978c6 SHA512
2514f407d9150d2615dffc91a525fb28f159bef92b9543f9802e2618746b7d4c04137668ad8a8d8f0b75f68ed9057d09629ce736b6a061b5cf817b9d904f549e
WHIRLPOOL
70ad298512e700cd1cdee7698e4fa68a769d91d3080d5d8387b8362ad49126ad68b0b6dbd1f13305958bdc988f805fa610e487682fd0eb5e4e9bcda0a9022627
-DIST kexec-tools-2.0.8.tar.xz 272648 SHA256
f3abe96fa0793e63936725a4471429f070039a1e81e605deb378747194a50c47 SHA512
94d715cdf779802308f5f8a0bdfae55c1798cc515fd322a490e8b5414763ab4fa924930022baa0689cd001c2431aef4f28f18b3c7b0b7000cdfaa1a159ad5251
WHIRLPOOL
8d13239e153dded9a98f847101d5581fed8e5a51a17961d6156f0135642e589b7e766ecaeef439fca2b69d4a2bc8e8d3f681a78f28d35acf03bc8d6c06f8ab9e
DIST kexec-tools-2.0.9.tar.xz 272728 SHA256
8ae34a9ceb76350954e1e1e3ca9ab51da15862bd5f2fd14392208e60fb454f71 SHA512
b58f8f0872f1a6a3a93bc67068d7035c4b39e985dafadc573585d92259ff289bf98d5a567293a5286668315ac2158b232919e0c6847fdefc68b7ecbcfab5109e
WHIRLPOOL
840d9d17ce9facc131736ef52acabb03bcc6d21f671896ff5603bd8d6bd629519e169ca878a127b863235b236dafd3b29f598424b272f599503bb3f1a5f70050
diff --git a/sys-apps/kexec-tools/files/kexec.init-2.0.4
b/sys-apps/kexec-tools/files/kexec.init-2.0.4
deleted file mode 100644
index a7101ef..000
--- a/sys-apps/kexec-tools/files/kexec.init-2.0.4
+++ /dev/null
@@ -1,144 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
- need localmount
-}
-
-image_path() {
- local x= kver=$(uname -r) karch=$(uname -m)
- BOOTPART="${BOOTPART:-/boot}"
- for x in "${KNAME:-bzImage}" vmlinuz \
- bzImage-${kver} vmlinuz-${kver} \
- kernel-genkernel-${karch}-${kver} \
- kernel-${kver} kernel-${karch}; do
- if [ -e "${BOOTPART}/${x}" ]; then
- echo "${BOOTPART}/${x}"
- return 0
- fi
- done
-
- return 1
-}
-
-initrd_path() {
- local x= kver=$(uname -r) karch=$(uname -m)
- BOOTPART="${BOOTPART:-/boot}"
- for x in "${INITRD:-initrd}" \
- initrd.img-${kver} initrd-${kver}.img \
- initrd-${kver} initramfs-${kver}.img \
- initramfs-genkernel-${karch}-${kver} ; do
- if [ -e "${BOOTPART}/${x}" ]; then
- echo "${BOOTPART}/${x}"
- return 0
- fi
- done
-
- return 1
-}
-
-mount_boot(){
- local ret
-
- [ -n ${DONT_MOUNT_BOOT} ] && return 1
- grep -q " ${BOOTPART:-/boot} " /proc/mounts && return 1
-
- BOOTPART="${BOOTPART:-/boot}"
- ebegin "Mounting ${BOOTPART}"
- mount "${BOOTPART}"; ret=$?
- eend ${ret}
- return ${ret}
-}
-
-load_image() {
- local ret
- if [ "${KNAME}" = "-" ]; then
- ebegin "Disabling kexec"
- kexec -u; ret=$?
- eend ${ret}
- return ${ret}
- fi
-
- BOOTPART="${BOOTPART:-/boot}"
- local img= initrd="$(initrd_path)" mounted=false initrdopt=
-
- if ! img="$(image_path)"; then
- if mount_boot; then
- if img="$(image_path)"; then
- mounted=true
- initrd="$(initrd_path)"
- else
- eerror "No kernel image found in ${BOOTPART}!"
- umount "${BOOTPART}"
- return 1
- fi
- else
- eerror "No kernel image found in ${BOOTPART}!"
- return 1
- fi
- fi
-
- if [ -n "${INITRD}" ] && \
- ! [ "${INITRD}" = "${initrd}" ]; then
- eerror "Requested initrd: ${INITRD}"
- eerror "could not be found"
- return 1
- fi
-
- [ -n "${ROOTPART}" ] || \
-
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
commit: bf32c161c129b424b6f415b581af3cefd0e74b92 Author: Michael Palimaka gentoo org> AuthorDate: Fri Jan 22 08:42:19 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Fri Jan 22 08:55:48 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf32c161 sys-apps/kexec-tools: add base-system as a maintainer Package-Manager: portage-2.2.27 sys-apps/kexec-tools/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kexec-tools/metadata.xml b/sys-apps/kexec-tools/metadata.xml index dc210dc..6aa7d21 100644 --- a/sys-apps/kexec-tools/metadata.xml +++ b/sys-apps/kexec-tools/metadata.xml @@ -1,7 +1,7 @@ http://www.gentoo.org/dtd/metadata.dtd;> - kernel-misc + base-system Enables support for LZMA compressed kernel images Include support for Book-E memory management
