[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/, sys-apps/kexec-tools/files/

[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/, sys-apps/kexec-tools/files/

[Mike Frysinger]

commit:     1cb39e43ada0dd1439c06acecfc749446551b493
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 24 19:23:13 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Mar 24 21:39:33 2016 +0000
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..0000000
--- 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}" ] || \
-		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} ${initrdopt}"
-	kexec ${KEXEC_OPT_ARGS} -l "${img}" --append="root=${ROOTPART} ${KPARAM}" ${initrdopt}
-	local res=$?
-
-	${mounted} && umount "${BOOTPART}"
-	eend ${res}
-	return ${res}
-}
-
-start() {
-	if [ "${LOAD_DURING_SHUTDOWN:-yes}" = "yes" ]; then
-		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
-	else
-		ebegin "Configuring kexec"
-		load_image
-		eend $?
-	fi
-}
-
-stop() {
-	[ "${LOAD_DURING_SHUTDOWN:-yes}" != "yes" ] && return 0
-
-	if ! yesno $RC_REBOOT; then
-		einfo "Not rebooting, so disabling"
-		kexec -u
-		return 0
-	fi
-
-	if [ -f /nokexec ]; then
-		einfo "Not using kexec during reboot"
-		rm -f /nokexec
-		kexec -u
-		return 0
-	fi
-
-	ebegin "Configuring kexec"
-	load_image
-	eend $?
-}

diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.8.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.8.ebuild
deleted file mode 100644
index f3d29ff..0000000
--- a/sys-apps/kexec-tools/kexec-tools-2.0.8.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools-utils flag-o-matic linux-info systemd
-
-DESCRIPTION="Load another kernel from the currently executing Linux kernel"
-HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/"
-SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-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}"
-	# to disable the -fPIE -pie in the hardened compiler
-	if gcc-specs-pie ; then
-		filter-flags -fPIE
-		append-ldflags -nopie
-	fi
-}
-
-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.4-r2 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.9-r1.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.9-r1.ebuild
deleted file mode 100644
index b8bd5e7..0000000
--- a/sys-apps/kexec-tools/kexec-tools-2.0.9-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-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/"
-SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-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}"/${PN}-2.0.9-hardened.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.4-r2 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.9.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.9.ebuild
deleted file mode 100644
index 3f19f71..0000000
--- a/sys-apps/kexec-tools/kexec-tools-2.0.9.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools-utils flag-o-matic linux-info systemd
-
-DESCRIPTION="Load another kernel from the currently executing Linux kernel"
-HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/"
-SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-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}"
-	# to disable the -fPIE -pie in the hardened compiler
-	if gcc-specs-pie ; then
-		filter-flags -fPIE
-		append-ldflags -nopie
-	fi
-}
-
-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.4-r2 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/

[Mike Frysinger]

commit:     2ad6174bad17a8a426b977d82017d399111ab963
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 24 19:21:44 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Mar 24 21:39:33 2016 +0000
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-9999   |  18 ---
 sys-apps/kexec-tools/files/kexec.init-9999   | 165 ---------------------------
 sys-apps/kexec-tools/kexec-tools-9999.ebuild |  23 ++--
 3 files changed, 13 insertions(+), 193 deletions(-)

diff --git a/sys-apps/kexec-tools/files/kexec.conf-9999 b/sys-apps/kexec-tools/files/kexec.conf-9999
deleted file mode 100644
index 74f8b89..0000000
--- a/sys-apps/kexec-tools/files/kexec.conf-9999
+++ /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-9999 b/sys-apps/kexec-tools/files/kexec.init-9999
deleted file mode 100644
index f130687..0000000
--- a/sys-apps/kexec-tools/files/kexec.init-9999
+++ /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} ${initrdopt}"
-	kexec ${KEXEC_OPT_ARGS} -l "${img}" --append="root=${ROOTPART} ${KPARAM}" ${initrdopt}
-	local res=$?
-
-	${mounted} && umount "${BOOTPART}"
-	eend ${res}
-	return ${res}
-}
-
-start() {
-	if [ "${LOAD_DURING_SHUTDOWN:-yes}" = "yes" ]; then
-		local ret=0
-		BOOTPART="${BOOTPART:-/boot}"
-		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
-			ebegin "Unmounting ${BOOTPART}"
-			umount "${BOOTPART}"; ret=$?
-			eend ${ret}
-		fi
-		return ${ret}
-	else
-		ebegin "Configuring kexec"
-		load_image
-		eend $?
-	fi
-}
-
-stop() {
-	[ "${LOAD_DURING_SHUTDOWN:-yes}" != "yes" ] && return 0
-
-	if ! yesno $RC_REBOOT; then
-		einfo "Not rebooting, so disabling"
-		kexec -u
-		return 0
-	fi
-
-	if [ -f /nokexec ]; then
-		einfo "Not using kexec during reboot"
-		rm -f /nokexec
-		kexec -u
-		return 0
-	fi
-
-	ebegin "Configuring kexec"
-	load_image
-	eend $?
-}

diff --git a/sys-apps/kexec-tools/kexec-tools-9999.ebuild b/sys-apps/kexec-tools/kexec-tools-9999.ebuild
index 008925c..8e66b4e 100644
--- a/sys-apps/kexec-tools/kexec-tools-9999.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-9999.ebuild
@@ -1,21 +1,25 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI="5"
 
-AUTOTOOLS_AUTORECONF=true
+if [[ ${PV} == "9999" ]] ; 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 git-r3
+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/"
-SRC_URI=""
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="booke lzma xen zlib"
 
 REQUIRED_USE="lzma? ( zlib )"
@@ -30,7 +34,6 @@ 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.9-hardened.patch
 )
 
 pkg_setup() {
@@ -53,8 +56,8 @@ src_install() {
 
 	dodoc "${FILESDIR}"/README.Gentoo
 
-	newinitd "${FILESDIR}"/kexec.init-${PV} kexec
-	newconfd "${FILESDIR}"/kexec.conf-${PV} kexec
+	newinitd "${FILESDIR}"/kexec.init-2.0.4-r3 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/

[Robin H. Johnson]

commit:     932b155bb612154a81654a5b23b9c59bf7768258
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  8 00:31:46 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Jan  8 00:32:50 2017 +0000
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 <robbat2 <AT> 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 00000000..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} == "9999" ]] ; 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.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/

[Lars Wendler]

commit:     2704730b9198b969d78f8c90e66adf57c777d985
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  1 15:10:20 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Aug  1 15:10:20 2017 +0000
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 <polynomial-c <AT> 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 ffb2e7e99d9d08754c6bc1922aed3c000094f318665d82a72ecc76c4ff1c0dc6 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..00000000000
--- 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..00000000000
--- 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} == "9999" ]] ; 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
-}

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
deleted file mode 100644
index d11a44e65b7..00000000000
--- a/sys-apps/kexec-tools/kexec-tools-2.0.13-r1.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} == "9999" ]] ; 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.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.13.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.13.ebuild
deleted file mode 100644
index fb38edc70a0..00000000000
--- a/sys-apps/kexec-tools/kexec-tools-2.0.13.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} == "9999" ]] ; 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
-}

diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.9-r2.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.9-r2.ebuild
deleted file mode 100644
index 59f7a84c068..00000000000
--- a/sys-apps/kexec-tools/kexec-tools-2.0.9-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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/"
-SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-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}"/${PN}-2.0.9-hardened.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.4-r3 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/

[Lars Wendler]

commit:     0f9a75eef722e5959c9eb565d26c7e2798bc3fc1
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue May  1 20:10:29 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue May  1 20:10:53 2018 +0000
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..00000000000
--- 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..00000000000
--- 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} " /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} ${initrdopt}"
-	kexec ${KEXEC_OPT_ARGS} -l "${img}" --append="root=${ROOTPART} ${KPARAM}" ${initrdopt}
-	local res=$?
-
-	${mounted} && umount "${BOOTPART}"
-	eend ${res}
-	return ${res}
-}
-
-start() {
-	if [ "${LOAD_DURING_SHUTDOWN:-yes}" = "yes" ]; then
-		local ret=0
-		BOOTPART="${BOOTPART:-/boot}"
-		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
-			ebegin "Unmounting ${BOOTPART}"
-			umount "${BOOTPART}"; ret=$?
-			eend ${ret}
-		fi
-		return ${ret}
-	else
-		ebegin "Configuring kexec"
-		load_image
-		eend $?
-	fi
-}
-
-stop() {
-	[ "${LOAD_DURING_SHUTDOWN:-yes}" != "yes" ] && return 0
-
-	if ! yesno $RC_REBOOT; then
-		einfo "Not rebooting, so disabling"
-		kexec -u
-		return 0
-	fi
-
-	if [ -f /nokexec ]; then
-		einfo "Not using kexec during reboot"
-		rm -f /nokexec
-		kexec -u
-		return 0
-	fi
-
-	ebegin "Configuring kexec"
-	load_image
-	eend $?
-}

diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.15.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.15.ebuild
deleted file mode 100644
index f3f01574c05..00000000000
--- a/sys-apps/kexec-tools/kexec-tools-2.0.15.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == "9999" ]] ; 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
-}

diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.4-r2.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.4-r2.ebuild
deleted file mode 100644
index 89c77e7586b..00000000000
--- a/sys-apps/kexec-tools/kexec-tools-2.0.4-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils flag-o-matic linux-info systemd
-
-DESCRIPTION="Load another kernel from the currently executing Linux kernel"
-HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/"
-SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-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.0-respect-LDFLAGS.patch
-		"${FILESDIR}"/${P}-disable-kexec-test.patch
-		"${FILESDIR}"/${P}-out-of-source.patch
-	)
-
-pkg_setup() {
-	# GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC)
-	export ASFLAGS="${CCASFLAGS}"
-	# to disable the -fPIE -pie in the hardened compiler
-	if gcc-specs-pie ; then
-		filter-flags -fPIE
-		append-ldflags -nopie
-	fi
-}
-
-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-${PVR} kexec
-	newconfd "${FILESDIR}"/kexec.conf-${PV} kexec
-
-	insinto /etc
-	doins "${FILESDIR}"/kexec.conf
-
-	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/

[Thomas Deutschmann]

commit:     07e7a6078533daa2ef86769c29c28966acd62470
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 28 22:44:38 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Aug 28 22:45:05 2018 +0000
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 00000000000..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 <chris2553@googlemail.com>
+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 <chris2553@googlemail.com>
+Acked-by: Baoquan He <bhe@redhat.com>
+Tested-by: Bhupesh Sharma <bhsharma@redhat.com>
+Acked-by: Bhupesh Sharma <bhsharma@redhat.com>
+Signed-off-by: Simon Horman <horms@verge.net.au>
+---
+ 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 00000000000..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} == "9999" ]] ; 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} == "9999" ]] ; 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/

[Mike Gilbert]

commit:     3026ed88db0defe232b002d1ff9113fc437e8d87
Author:     Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
AuthorDate: Fri Jun 28 01:48:47 2019 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Jun 29 15:06:34 2019 +0000
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 <hanetzer <AT> startmail.com>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-apps/kexec-tools/files/kexec.init-2.0.13-r1                       | 4 +++-
 .../{kexec-tools-9999.ebuild => kexec-tools-2.0.19-r1.ebuild}         | 2 +-
 sys-apps/kexec-tools/kexec-tools-9999.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-9999.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.19-r1.ebuild
similarity index 97%
copy from sys-apps/kexec-tools/kexec-tools-9999.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-9999.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.19-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; 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-9999.ebuild b/sys-apps/kexec-tools/kexec-tools-9999.ebuild
index b2fcd90aca6..d9c36c6dcf7 100644
--- a/sys-apps/kexec-tools/kexec-tools-9999.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; 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/, sys-apps/kexec-tools/files/

[Thomas Deutschmann]

commit:     fdbdbf3786a1cf21010c4fc14b6aeb7b8c24a4c8
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun May  3 18:49:52 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun May  3 19:01:10 2020 +0000
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 <whissi <AT> 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 00000000000..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 <chris.packham@alliedtelesis.co.nz>
+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 <chris.packham@alliedtelesis.co.nz>
+Signed-off-by: Simon Horman <horms@verge.net.au>
+---
+ 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/, sys-apps/kexec-tools/files/

[Thomas Deutschmann]

commit:     a79ebc56e947c3561a98e56f1de792f491846cde
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun May  3 18:46:41 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun May  3 19:01:09 2020 +0000
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 <whissi <AT> 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 00000000000..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 <kasong@redhat.com>
+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 <kasong@redhat.com>
+Signed-off-by: Simon Horman <horms@verge.net.au>
+---
+ 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 <arch/options.h>
+ 
+ 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 00000000000..7fd2e6f2679
--- /dev/null
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.20-r1.ebuild
@@ -0,0 +1,89 @@
+# 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
+
+if [[ ${PV} == "9999" ]] ; 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
+	"${FILESDIR}"/${P}-remove-duplicated-variable-declarations.patch
+)
+
+pkg_setup() {
+	# GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC)
+	export ASFLAGS="${CCASFLAGS}"
+}
+
+src_prepare() {
+	default
+	if [[ "${PV}" == 9999 ]] ; 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/

[Thomas Deutschmann]

commit:     7812874ed77c593bbbc912311d2483cb362f44dd
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  4 21:59:17 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Aug  4 23:02:39 2020 +0000
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 <whissi <AT> gentoo.org>

 sys-apps/kexec-tools/files/kexec-r2.init           | 188 +++++++++++++++++++++
 ...ls-9999.ebuild => kexec-tools-2.0.20-r2.ebuild} |   4 +-
 sys-apps/kexec-tools/kexec-tools-9999.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 00000000000..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}" ${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
+			ebegin "Unmounting ${BOOTPART}"
+			umount "${BOOTPART}"
+			eend $?
+		fi
+		# $? is already set to the previous calls.
+		return
+	else
+		load_image
+	fi
+}
+
+stop() {
+	if ! yesno ${RC_REBOOT}; then
+		ebegin "Not rebooting; disabling kexec"
+		kexec -u
+		eend $?
+		return
+	fi
+
+	if [ -f /nokexec ]; then
+		ebegin "Rebooting; disabling kexec due to /nokexec"
+		rm -f /nokexec
+		kexec -u
+		eend $?
+		return
+	fi
+
+	if [ "${LOAD_DURING_SHUTDOWN}" = "yes" ]; then
+		load_image
+	fi
+}

diff --git a/sys-apps/kexec-tools/kexec-tools-9999.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.20-r2.ebuild
similarity index 94%
copy from sys-apps/kexec-tools/kexec-tools-9999.ebuild
copy to sys-apps/kexec-tools/kexec-tools-2.0.20-r2.ebuild
index 77c5d7c6e59..3a25aced9f0 100644
--- a/sys-apps/kexec-tools/kexec-tools-9999.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.20-r2.ebuild
@@ -35,6 +35,8 @@ CONFIG_CHECK="~KEXEC"
 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() {
@@ -87,7 +89,7 @@ src_install() {
 
 	dodoc "${FILESDIR}"/README.Gentoo
 
-	newinitd "${FILESDIR}"/kexec.init-2.0.13-r1 kexec
+	newinitd "${FILESDIR}"/kexec-r2.init kexec
 	newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec
 
 	insinto /etc

diff --git a/sys-apps/kexec-tools/kexec-tools-9999.ebuild b/sys-apps/kexec-tools/kexec-tools-9999.ebuild
index 77c5d7c6e59..cb3f3b6f1c4 100644
--- a/sys-apps/kexec-tools/kexec-tools-9999.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-9999.ebuild
@@ -87,7 +87,7 @@ src_install() {
 
 	dodoc "${FILESDIR}"/README.Gentoo
 
-	newinitd "${FILESDIR}"/kexec.init-2.0.13-r1 kexec
+	newinitd "${FILESDIR}"/kexec-r2.init kexec
 	newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec
 
 	insinto /etc

[gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/, sys-apps/kexec-tools/files/

[Sam James]

commit:     a7a8cf1a580486ae3923fea714f1e6c09a032757
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Sat Mar 30 23:08:38 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr  1 06:49:44 2024 +0000
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 <liaoyuan <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36007
Signed-off-by: Sam James <sam <AT> 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 000000000000..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 <salimma@fedoraproject.org>
+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 <michel@michel-slm.name>
+Signed-off-by: Simon Horman <horms@kernel.org>
+---
+ 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) */
+ 	call	1f
+ 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) */
+ 	call	1f
+ 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/, sys-apps/kexec-tools/files/

[Andrew Ammerlaan]

commit:     8cb4582e9d05279ad58dd8282b7a927e53a2dbec
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 27 10:27:24 2024 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Aug  6 07:32:27 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cb4582e

sys-apps/kexec-tools: remove broken installkernel hooks

and replace with little wrapper script that reads the latest kernel from the
installkernel log file and uses the usual locations for the cmdline.

Merge /etc/kexec.conf and /etc/conf.d/kexec, both config files are now
basically the same, with the exception of some variables only being used by
the openrc script.

TODO (by someone on OpenRC): adapt the openrc init script so it also reads
the installkernel.log.

Closes: https://bugs.gentoo.org/585658
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/37742
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sys-apps/kexec-tools/files/kexec-auto-load         | 95 ++++++++++++++++++++++
 sys-apps/kexec-tools/files/kexec.conf              | 42 +++++++---
 sys-apps/kexec-tools/files/kexec.conf-2.0.4        |  6 +-
 sys-apps/kexec-tools/files/kexec.service           |  4 +-
 ...-2.0.29.ebuild => kexec-tools-2.0.29-r1.ebuild} | 17 +---
 sys-apps/kexec-tools/kexec-tools-9999.ebuild       | 17 +---
 6 files changed, 135 insertions(+), 46 deletions(-)

diff --git a/sys-apps/kexec-tools/files/kexec-auto-load b/sys-apps/kexec-tools/files/kexec-auto-load
new file mode 100755
index 000000000000..62c828fd1c3d
--- /dev/null
+++ b/sys-apps/kexec-tools/files/kexec-auto-load
@@ -0,0 +1,95 @@
+#!/usr/bin/env bash
+
+# Defaults
+LAYOUT=compat
+BOOTPART=/boot
+KNAME=kernel
+INITRD=initramfs.img
+
+instkern_state=/var/lib/misc/installkernel
+if [[ -s ${instkern_state} ]]; then
+	# If we have a log file, set defaults from there.
+	IFS=$'\t' read -r -a LastKernArray <<< "$(tail -n1 ${instkern_state})"
+	LAYOUT="${LastKernArray[4]}"
+	BOOTPART="${LastKernArray[7]}"
+	KNAME="${LastKernArray[8]}"
+	if [[ "${LastKernArray[9]}" != unknown && ${LAYOUT} != uki ]]; then
+		INITRD="${LastKernArray[9]}"
+	else
+		INITRD=
+	fi
+fi
+
+if [[ ${LAYOUT} == uki ]]; then
+	echo "WARNING: kexec currently does not support UKIs"
+	KPARAM=
+else
+	if [[ -f /etc/kernel/cmdline ]]; then
+		KPARAM="$(tr -s "${IFS}" ' ' </etc/kernel/cmdline)"
+	elif [[ -f /usr/lib/kernel/cmdline ]]; then
+		KPARAM="$(tr -s "${IFS}" ' ' </usr/lib/kernel/cmdline)"
+	else
+		KPARAM=
+	fi
+fi
+
+
+# /etc/kexec.conf overrides installkernel.log
+kexec_conf=/etc/kexec.conf
+if [[ -f ${kexec_conf} ]]; then
+	source ${kexec_conf}
+fi
+
+if [[ -z ${DONT_MOUNT_BOOT} ]]; then
+	# Borrowed from mount-boot-utils.eclass
+	# note that /dev/BOOT is in the Gentoo default /etc/fstab file
+	fstabstate=$(awk "!/^[[:blank:]]*#|^\/dev\/BOOT/ && \$2 == \"${BOOTPART}\" \
+		{ print 1; exit }" /etc/fstab || die "awk failed")
+
+	if [[ -z ${fstabstate} ]]; then
+		echo "Assuming you do not have a separate ${BOOTPART} partition."
+	else
+		procstate=$(awk "\$2 == \"${BOOTPART}\" { split(\$4, a, \",\"); \
+			for (i in a) if (a[i] ~ /^r[ow]\$/) { print a[i]; break }; exit }" \
+			/proc/mounts || die "awk failed")
+
+		if [[ -z ${procstate} ]]; then
+			echo "ERROR: Your ${BOOTPART} partition is not mounted"
+			exit 1
+		fi
+	fi
+fi
+
+if [[ ! -d ${BOOTPART} ]]; then
+	echo "ERROR: BOOTPART=${BOOTPART} not found"
+	exit 1
+fi
+
+KEXEC_ARGS=()
+
+if [[ -f ${BOOTPART}/${KNAME} ]]; then
+	KEXEC_ARGS+=( --load "${BOOTPART}/${KNAME}" )
+else
+	echo "ERROR: KNAME=${KNAME} not found"
+	exit 1
+fi
+
+if [[ -n ${INITRD} ]]; then
+	if [[ -f ${BOOTPART}/${INITRD} ]]; then
+		KEXEC_ARGS+=( --initrd "${BOOTPART}/${INITRD}" )
+	else
+		echo "WARNING: INITRD=${INITRD} not found"
+	fi
+fi
+
+if [[ -n ${KPARAM} ]]; then
+	KEXEC_ARGS+=(  --command-line "${KPARAM}" )
+elif [[ ! -f /etc/kernel/cmdline && ! -f /usr/lib/kernel/cmdline ]]; then
+	# If it is still empty and we did not intentionally set it empty then reuse.
+	KEXEC_OPT_ARGS+=" --reuse-cmdline "
+fi
+
+KEXEC_ARGS+=( ${KEXEC_OPT_ARGS} )
+
+echo "Calling kexec with arguments: ${KEXEC_ARGS[@]}"
+exec kexec "${KEXEC_ARGS[@]}"

diff --git a/sys-apps/kexec-tools/files/kexec.conf b/sys-apps/kexec-tools/files/kexec.conf
index aa829b9c2349..34161117ec8f 100644
--- a/sys-apps/kexec-tools/files/kexec.conf
+++ b/sys-apps/kexec-tools/files/kexec.conf
@@ -1,16 +1,32 @@
-# Kernel image pathname, relative from /boot.
-KNAME="bzimage"
+# Kernel image partition.
+# Default: partition that last kernel image was installed on
+#BOOTPART="/boot"
+
+# Path to (unified) kernel image, relative to BOOTPART.
+# Default: last installed kernel image
+#KNAME="kernel"
+
+# Path to the initramfs image, relative to BOOTPART
+# Default: initramfs belonging to last kernel image, if any
+#INITRD="initramfs.img"
+
+# Kernel cmdline to use,
+# Default: contents of {/etc,/usr/lib}/kernel/cmdline if exists, otherwise --reuse-cmdline is used
+#KPARAM="quiet"
+
+# Additional arguments passed to kexec
+#KEXEC_OPT_ARGS=""
+
+# Do not try to mount /boot
+#DONT_MOUNT_BOOT="yes"
 
-# Additional arguments passed to kexec (8)
-# Following arguments are support:
-#
-# --reuse-cmdline
-#   Use the current boot command line
-#
-# --command-line=string
-#   Use a different command line
 #
-# --initrd=file
-#   Specify an initrd to use
+# The below is currently used by the OpenRC script only
 #
-KEXEC_OPT_ARGS="--reuse-cmdline"
+
+# Load kexec kernel image into memory during shutdown instead of bootup
+# (default: yes)
+#LOAD_DURING_SHUTDOWN="yes"
+
+# Root partition (should be autodetected)
+#ROOTPART="/dev/hda3"

diff --git a/sys-apps/kexec-tools/files/kexec.conf-2.0.4 b/sys-apps/kexec-tools/files/kexec.conf-2.0.4
index b71ea2bae97f..215acca19d7a 100644
--- a/sys-apps/kexec-tools/files/kexec.conf-2.0.4
+++ b/sys-apps/kexec-tools/files/kexec.conf-2.0.4
@@ -13,12 +13,12 @@
 #ROOTPART="/dev/hda3"
 
 # Kernel image pathname, relative from BOOTPART.
-# If it's one of 
+# If it's one of
 # {kernel-genkernel,bzImage,vmlinuz,kernel}-<currently running kernel version>,
 # or bzImage, vmlinuz (without suffix),
 # then it's automaticaly detected.
 # Setting it to "-" will disable kexec.
-#KNAME="vmlinuz-3.9.0"
+#KNAME="kernel"
 
 # Initrd
 # Same automatic detection restriction as for KNAME apply.
@@ -31,4 +31,4 @@
 #KPARAM="splash=silent,theme:emergence"
 
 # Do not try to mount /boot
-# DONT_MOUNT_BOOT="yes"
+#DONT_MOUNT_BOOT="yes"

diff --git a/sys-apps/kexec-tools/files/kexec.service b/sys-apps/kexec-tools/files/kexec.service
index 289aae0df0b1..ce9adf0e5da2 100644
--- a/sys-apps/kexec-tools/files/kexec.service
+++ b/sys-apps/kexec-tools/files/kexec.service
@@ -9,8 +9,8 @@ ConditionPathExists=!/nokexec
 Type=oneshot
 RemainAfterExit=yes
 EnvironmentFile=/etc/kexec.conf
-ExecStart=/usr/sbin/kexec -l /boot/${KNAME} ${KEXEC_OPT_ARGS}
-ExecStop=/usr/sbin/kexec -l /boot/${KNAME} ${KEXEC_OPT_ARGS}
+ExecStart=/usr/sbin/kexec-auto-load
+ExecStop=/usr/sbin/kexec-auto-load
 
 [Install]
 WantedBy=multi-user.target

diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.29.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.29-r1.ebuild
similarity index 85%
rename from sys-apps/kexec-tools/kexec-tools-2.0.29.ebuild
rename to sys-apps/kexec-tools/kexec-tools-2.0.29-r1.ebuild
index bedde55d9615..761057097d28 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.29.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.29-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit libtool linux-info optfeature systemd
+inherit libtool linux-info systemd
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
@@ -92,24 +92,16 @@ src_install() {
 	dodoc "${FILESDIR}"/README.Gentoo
 
 	newinitd "${FILESDIR}"/kexec-r2.init kexec
-	newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec
 
 	insinto /etc
 	doins "${FILESDIR}"/kexec.conf
+	dosym ../kexec.conf /etc/conf.d/kexec
 
-	insinto /etc/kernel/postinst.d
-	doins "${FILESDIR}"/90_kexec
-
+	dosbin "${FILESDIR}"/kexec-auto-load
 	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 -- '\<root=' /proc/cmdline 2>/dev/null | wc -l)
 	local has_rootpart_set=no
 	if [[ -f "${EROOT}/etc/conf.d/kexec" ]]; then
@@ -125,7 +117,4 @@ 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-9999.ebuild b/sys-apps/kexec-tools/kexec-tools-9999.ebuild
index bedde55d9615..761057097d28 100644
--- a/sys-apps/kexec-tools/kexec-tools-9999.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit libtool linux-info optfeature systemd
+inherit libtool linux-info systemd
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
@@ -92,24 +92,16 @@ src_install() {
 	dodoc "${FILESDIR}"/README.Gentoo
 
 	newinitd "${FILESDIR}"/kexec-r2.init kexec
-	newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec
 
 	insinto /etc
 	doins "${FILESDIR}"/kexec.conf
+	dosym ../kexec.conf /etc/conf.d/kexec
 
-	insinto /etc/kernel/postinst.d
-	doins "${FILESDIR}"/90_kexec
-
+	dosbin "${FILESDIR}"/kexec-auto-load
 	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 -- '\<root=' /proc/cmdline 2>/dev/null | wc -l)
 	local has_rootpart_set=no
 	if [[ -f "${EROOT}/etc/conf.d/kexec" ]]; then
@@ -125,7 +117,4 @@ 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/, sys-apps/kexec-tools/files/

[Mike Gilbert]

commit:     7e4187530a2f735606b51db72363c24a6c85e146
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 12 17:48:24 2024 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Aug 12 17:48:24 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e418753

sys-apps/kexec-tools: revert systemd changes for 2.0.28

Closes: https://bugs.gentoo.org/937822
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-apps/kexec-tools/files/kexec.service                       | 4 ++--
 sys-apps/kexec-tools/files/{kexec.service => kexec.service-r1} | 0
 sys-apps/kexec-tools/kexec-tools-2.0.29-r1.ebuild              | 2 +-
 sys-apps/kexec-tools/kexec-tools-9999.ebuild                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-apps/kexec-tools/files/kexec.service b/sys-apps/kexec-tools/files/kexec.service
index ce9adf0e5da2..289aae0df0b1 100644
--- a/sys-apps/kexec-tools/files/kexec.service
+++ b/sys-apps/kexec-tools/files/kexec.service
@@ -9,8 +9,8 @@ ConditionPathExists=!/nokexec
 Type=oneshot
 RemainAfterExit=yes
 EnvironmentFile=/etc/kexec.conf
-ExecStart=/usr/sbin/kexec-auto-load
-ExecStop=/usr/sbin/kexec-auto-load
+ExecStart=/usr/sbin/kexec -l /boot/${KNAME} ${KEXEC_OPT_ARGS}
+ExecStop=/usr/sbin/kexec -l /boot/${KNAME} ${KEXEC_OPT_ARGS}
 
 [Install]
 WantedBy=multi-user.target

diff --git a/sys-apps/kexec-tools/files/kexec.service b/sys-apps/kexec-tools/files/kexec.service-r1
similarity index 100%
copy from sys-apps/kexec-tools/files/kexec.service
copy to sys-apps/kexec-tools/files/kexec.service-r1

diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.29-r1.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.29-r1.ebuild
index 761057097d28..c8af4693cfed 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.29-r1.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.29-r1.ebuild
@@ -98,7 +98,7 @@ src_install() {
 	dosym ../kexec.conf /etc/conf.d/kexec
 
 	dosbin "${FILESDIR}"/kexec-auto-load
-	systemd_dounit "${FILESDIR}"/kexec.service
+	systemd_newunit "${FILESDIR}"/kexec.service-r1 kexec.service
 }
 
 pkg_postinst() {

diff --git a/sys-apps/kexec-tools/kexec-tools-9999.ebuild b/sys-apps/kexec-tools/kexec-tools-9999.ebuild
index 761057097d28..c8af4693cfed 100644
--- a/sys-apps/kexec-tools/kexec-tools-9999.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-9999.ebuild
@@ -98,7 +98,7 @@ src_install() {
 	dosym ../kexec.conf /etc/conf.d/kexec
 
 	dosbin "${FILESDIR}"/kexec-auto-load
-	systemd_dounit "${FILESDIR}"/kexec.service
+	systemd_newunit "${FILESDIR}"/kexec.service-r1 kexec.service
 }
 
 pkg_postinst() {