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

[Anthony G. Basile]

commit:     7b97cc398dc68ec6a8d07adf349f89a5b64a86a5
Author:     Michael Everitt <gentoo <AT> veremit <DOT> xyz>
AuthorDate: Thu Apr 23 04:42:58 2020 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Apr 23 14:56:07 2020 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=7b97cc39

kexec-tools: Upstream added patch in 2f6f6d6, subsequently reworked in f4ce070

In-tree version builds fine:
>>> Completed installing sys-apps/kexec-tools-2.0.19-r1 into /var/tmp/portage/sys-apps/kexec-tools-2.0.19-r1/image/
>>> sys-apps/kexec-tools-2.0.19-r1 merged.

Signed-off-by: Michael Everitt <gentoo <AT> veremit.xyz>
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 sys-apps/kexec-tools/Manifest                      |   1 -
 sys-apps/kexec-tools/files/90_kexec                |   9 -
 sys-apps/kexec-tools/files/README.Gentoo           |  33 ----
 .../kexec-tools-2.0.4-disable-kexec-test.patch     |  17 --
 .../files/kexec-tools-2.0.4-out-of-source.patch    |  24 ---
 .../files/kexec-tools-2.0.9-gnu-source.patch       |  10 --
 sys-apps/kexec-tools/files/kexec.conf              |  16 --
 sys-apps/kexec-tools/files/kexec.conf-2.0.4        |  34 ----
 sys-apps/kexec-tools/files/kexec.init-2.0.13-r1    | 186 ---------------------
 sys-apps/kexec-tools/files/kexec.service           |  16 --
 sys-apps/kexec-tools/kexec-tools-2.0.14.ebuild     |  77 ---------
 sys-apps/kexec-tools/metadata.xml                  |  13 --
 12 files changed, 436 deletions(-)

diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
deleted file mode 100644
index 8d4973f..0000000
--- a/sys-apps/kexec-tools/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kexec-tools-2.0.14.tar.xz 283640 SHA256 ffb2e7e99d9d08754c6bc1922aed3c000094f318665d82a72ecc76c4ff1c0dc6 SHA512 8c1f9d1f4bb69a621961d45091f9c8349535ae69b80168423663685b44d89e1b9324d5cd11c83e86d805a3371f4f1600b0def551c52efb3c6cf020e9c11c273f WHIRLPOOL 1f9cc414724bf2d710876b2fbf721543cbd973b272a66b86bf134774b946ec540579b698fa3bcb56a2041d226da2c4298f750180c671ece17633067370a9df8e

diff --git a/sys-apps/kexec-tools/files/90_kexec b/sys-apps/kexec-tools/files/90_kexec
deleted file mode 100644
index 40bad42..0000000
--- a/sys-apps/kexec-tools/files/90_kexec
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-version="$1" ; shift
-image="$1" ; shift
-
-exec sed \
-	-e "s:\"vmlinuz-.*\":\"vmlinuz-${version}\":" \
-	-e "s:/boot/initramfs-.*\.img:/boot/initramfs-${version}\.img:" \
-	-i /etc/kexec.conf

diff --git a/sys-apps/kexec-tools/files/README.Gentoo b/sys-apps/kexec-tools/files/README.Gentoo
deleted file mode 100644
index 7735e32..0000000
--- a/sys-apps/kexec-tools/files/README.Gentoo
+++ /dev/null
@@ -1,33 +0,0 @@
-Usage
-=====
-
-Do
- $ man 8 kexec
-for full understanding of the underlying kexec command.
-Gentoo offers a wrapper to the bare kexec command through
-/etc/init.d/kexec.
-
-Configuration
--------------
-
-Configuration is done in /etc/conf.d/kexec, which is self-documented.
-
-Usage
------
-
-In Gentoo, kexec is invoked, i.e., the new kernel will be booted when
-rebooting, by reboot (8) command or by pressing Ctrl+Alt+Del.
-
-If you want to use kexec once, just run
- $ /etc/init.d/kexec start
-
-It'll reserve kexec call at reboot. Later on, you can reboot anytime,
-letting kexec starts another (or the same) kernel. When all is done in
-the runlevel 6 - killing processes, unmounting volumes, etc - kexec
-starts the new kernel instead of doing the normal hardware reboot.
-
-If you want kexec to be run every time you reboot, add it to a runlevel:
- $ rc-update add kexec <runlevel>
-
-If you want to reboot in the normal way this time, do:
- $ touch /nokexec

diff --git a/sys-apps/kexec-tools/files/kexec-tools-2.0.4-disable-kexec-test.patch b/sys-apps/kexec-tools/files/kexec-tools-2.0.4-disable-kexec-test.patch
deleted file mode 100644
index 6fc73f2..0000000
--- a/sys-apps/kexec-tools/files/kexec-tools-2.0.4-disable-kexec-test.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git kexec-tools-2.0.3/kexec_test/Makefile kexec-tools-2.0.3/kexec_test/Makefile
-index fec6210..2ed4d51 100644
---- kexec-tools-2.0.3/kexec_test/Makefile
-+++ kexec-tools-2.0.3/kexec_test/Makefile
-@@ -8,12 +8,6 @@ dist += kexec_test/Makefile $(KEXEC_TEST_SRCS)				\
- 	kexec_test/x86-setup-legacy-pic.S
- 
- BUILD_KEXEC_TEST = no
--ifeq ($(ARCH),i386)
--BUILD_KEXEC_TEST = yes
--endif
--ifeq ($(ARCH),x86_64)
--BUILD_KEXEC_TEST = yes
--endif
- 
- ifeq ($(BUILD_KEXEC_TEST),yes)
- 

diff --git a/sys-apps/kexec-tools/files/kexec-tools-2.0.4-out-of-source.patch b/sys-apps/kexec-tools/files/kexec-tools-2.0.4-out-of-source.patch
deleted file mode 100644
index 64c6cd8..0000000
--- a/sys-apps/kexec-tools/files/kexec-tools-2.0.4-out-of-source.patch
+++ /dev/null
@@ -1,24 +0,0 @@
- Makefile.in | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index c1859d1..1aa8559 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -44,7 +44,7 @@ TARGET_CFLAGS	= @TARGET_CFLAGS@
- 
- # Base compiler flags. These are extended by the subcomponent-Makefiles
- # where necessary.
--CPPFLAGS	= @CPPFLAGS@ -I$(srcdir)/include -I$(srcdir)/util_lib/include \
-+CPPFLAGS	= @CPPFLAGS@ -I$(top_builddir)/include -I$(srcdir)/include -I$(srcdir)/util_lib/include \
- 			-Iinclude/ $($(ARCH)_CPPFLAGS)
- CFLAGS		= @CFLAGS@ -fno-strict-aliasing -Wall -Wstrict-prototypes
- PURGATORY_EXTRA_CFLAGS = @PURGATORY_EXTRA_CFLAGS@
-@@ -77,6 +77,7 @@ pkgincludedir = $(includedir)/$(PACKAGE_NAME)
- DESTDIR =
- 
- srcdir		= @srcdir@
-+top_builddir = @top_builddir@
- VPATH		= .:$(srcdir)
- 
- # install paths

diff --git a/sys-apps/kexec-tools/files/kexec-tools-2.0.9-gnu-source.patch b/sys-apps/kexec-tools/files/kexec-tools-2.0.9-gnu-source.patch
deleted file mode 100644
index cfe89c1..0000000
--- a/sys-apps/kexec-tools/files/kexec-tools-2.0.9-gnu-source.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -Naurw kexec-tools-2.0.9.orig/vmcore-dmesg/vmcore-dmesg.c kexec-tools-2.0.9/vmcore-dmesg/vmcore-dmesg.c
---- kexec-tools-2.0.9.orig/vmcore-dmesg/vmcore-dmesg.c	2014-10-13 21:58:06.000000000 -0700
-+++ kexec-tools-2.0.9/vmcore-dmesg/vmcore-dmesg.c	2015-12-30 11:51:20.594760356 -0800
-@@ -1,5 +1,6 @@
- #define _XOPEN_SOURCE 600
- #define _LARGEFILE_SOURCE 1
-+#define _GNU_SOURCE 1
- #define _FILE_OFFSET_BITS 64
- #include <endian.h>
- #include <byteswap.h>

diff --git a/sys-apps/kexec-tools/files/kexec.conf b/sys-apps/kexec-tools/files/kexec.conf
deleted file mode 100644
index aa829b9..0000000
--- a/sys-apps/kexec-tools/files/kexec.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# Kernel image pathname, relative from /boot.
-KNAME="bzimage"
-
-# 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
-#
-KEXEC_OPT_ARGS="--reuse-cmdline"

diff --git a/sys-apps/kexec-tools/files/kexec.conf-2.0.4 b/sys-apps/kexec-tools/files/kexec.conf-2.0.4
deleted file mode 100644
index b71ea2b..0000000
--- a/sys-apps/kexec-tools/files/kexec.conf-2.0.4
+++ /dev/null
@@ -1,34 +0,0 @@
-# Load kexec kernel image into memory during shutdown instead of bootup
-# (default: yes)
-#LOAD_DURING_SHUTDOWN="yes"
-
-# Additional arguments passed to kexec (8)
-#KEXEC_OPT_ARGS=""
-
-# Kernel image partition. Mounted automatically if not.
-# (default: /boot)
-#BOOTPART="/boot"
-
-# Root partition (should be autodetected)
-#ROOTPART="/dev/hda3"
-
-# Kernel image pathname, relative from BOOTPART.
-# 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"
-
-# Initrd
-# Same automatic detection restriction as for KNAME apply.
-# initramfs-genkernel-<currently running kernel version>,
-# initrd{,.img}-<currently running kernel version>{,.img}
-# will be detected.
-#INITRD="/boot/fbsplash-emergence-1024x768"
-
-# Kernel parameters (should be autodetected)
-#KPARAM="splash=silent,theme:emergence"
-
-# Do not try to mount /boot
-# DONT_MOUNT_BOOT="yes"

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 100755
index 5415b3b..0000000
--- a/sys-apps/kexec-tools/files/kexec.init-2.0.13-r1
+++ /dev/null
@@ -1,186 +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
-}
-
-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" \
-		"vmlinuz" \
-		"bzImage-${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/files/kexec.service b/sys-apps/kexec-tools/files/kexec.service
deleted file mode 100644
index 289aae0..0000000
--- a/sys-apps/kexec-tools/files/kexec.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Gracefully restart the box
-Documentation=man:kexec(8)
-After=boot.mount
-Before=shutdown.target umount.target final.target
-ConditionPathExists=!/nokexec
-
-[Service]
-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}
-
-[Install]
-WantedBy=multi-user.target

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 1780452..0000000
--- a/sys-apps/kexec-tools/kexec-tools-2.0.14.ebuild
+++ /dev/null
@@ -1,77 +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
-	"${FILESDIR}"/${PN}-2.0.9-gnu-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/metadata.xml b/sys-apps/kexec-tools/metadata.xml
deleted file mode 100644
index 2ea57db..0000000
--- a/sys-apps/kexec-tools/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>base-system@g.o</email>
-    <name>Gentoo Base System</name>
-  </maintainer>
-  <use>
-    <flag name="lzma">Enables support for LZMA compressed kernel images</flag>
-    <flag name="booke">Include support for Book-E memory management</flag>
-    <flag name="xen">Enable extended xen support</flag>
-  </use>
-</pkgmetadata>