public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Yixun Lan" <dlan@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/
Date: Fri, 19 Jul 2024 13:06:43 +0000 (UTC)	[thread overview]
Message-ID: <1721394159.b5b7cc250a357dfaa5f1a41bd863d714bb2c14e3.dlan@gentoo> (raw)

commit:     b5b7cc250a357dfaa5f1a41bd863d714bb2c14e3
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Thu Jul 18 11:55:17 2024 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Fri Jul 19 13:02:39 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5b7cc25

sys-apps/kexec-tools: Add 2.0.29

Closes: https://github.com/gentoo/gentoo/pull/37603
Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 sys-apps/kexec-tools/Manifest                  |   1 +
 sys-apps/kexec-tools/kexec-tools-2.0.29.ebuild | 131 +++++++++++++++++++++++++
 2 files changed, 132 insertions(+)

diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index 5f0f14350525..a064ecc47229 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -1 +1,2 @@
 DIST kexec-tools-2.0.28.tar.xz 312524 BLAKE2B b2ab25c632cd2bad21751940acee1816f9cd930e1bb5af1052f9f6c4979dcd62d82c487a88fa8015e3ce7c843de9f47a3f6ccf7efa9270b5f24c79ba30a82a91 SHA512 889a7bf1d26bb309e4ff7ce1c8dbcf48c01e47221ea3acf1c4ef2a98a652c496e31bddcdb627d3adebd85f7541d1fb9122c60e741e10b3726e31a9733cadc753
+DIST kexec-tools-2.0.29.tar.xz 314576 BLAKE2B 3cb94015d0bcd8ab13f25e23835758fc305093c4d1a81c590830ced852e61da66321617f04bda847e26c95ec44bd101eb235fa1d34f397e22ed4e80426efa162 SHA512 4c9e0b3df47b240f0eac2c31e8b515465f626ce043f64daa32b0b032d7132e54dada5d70875dab256345f66cf94a25dc3c160a9009ba60addd8dcb1e5205f5ca

diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.29.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.29.ebuild
new file mode 100644
index 000000000000..bedde55d9615
--- /dev/null
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.29.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit libtool linux-info optfeature systemd
+
+if [[ ${PV} == "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/"
+
+S="${WORKDIR}/${P/_/-}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="booke lzma selinux xen zlib"
+
+REQUIRED_USE="lzma? ( zlib )"
+
+DEPEND="
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-kdump )
+"
+
+CONFIG_CHECK="~KEXEC"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch
+	"${FILESDIR}"/${PN}-2.0.4-out-of-source.patch
+)
+
+pkg_setup() {
+	# GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC)
+	export ASFLAGS="${CCASFLAGS}"
+}
+
+src_prepare() {
+	default
+
+	# Append PURGATORY_EXTRA_CFLAGS flags set by configure, instead of overriding them completely.
+	sed -e "/^PURGATORY_EXTRA_CFLAGS =/s/=/+=/" -i Makefile.in || die
+
+	if [[ "${PV}" == 9999 ]] ; then
+		eautoreconf
+	else
+		elibtoolize
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with booke)
+		$(use_with lzma)
+		$(use_with xen)
+		$(use_with zlib)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Respect CFLAGS for purgatory.
+	# purgatory/Makefile uses PURGATORY_EXTRA_CFLAGS variable.
+	# -mfunction-return=thunk and -mindirect-branch=thunk conflict with
+	# -mcmodel=large which is added by build system.
+	# Replace them with -mfunction-return=thunk-inline and -mindirect-branch=thunk-inline.
+	local flag flags=()
+	for flag in ${CFLAGS}; do
+		[[ ${flag} == -mfunction-return=thunk ]] && flag="-mfunction-return=thunk-inline"
+		[[ ${flag} == -mindirect-branch=thunk ]] && flag="-mindirect-branch=thunk-inline"
+		flags+=("${flag}")
+	done
+	local -x PURGATORY_EXTRA_CFLAGS="${flags[*]}"
+
+	default
+}
+
+src_install() {
+	default
+
+	dodoc "${FILESDIR}"/README.Gentoo
+
+	newinitd "${FILESDIR}"/kexec-r2.init kexec
+	newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec
+
+	insinto /etc
+	doins "${FILESDIR}"/kexec.conf
+
+	insinto /etc/kernel/postinst.d
+	doins "${FILESDIR}"/90_kexec
+
+	systemd_dounit "${FILESDIR}"/kexec.service
+}
+
+pkg_postinst() {
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		elog "For systemd support the new config file is"
+		elog "   /etc/kexec.conf"
+		elog "Please adopt it to your needs as there is no autoconfig anymore"
+	fi
+
+	local n_root_args=$(grep -o -- '\<root=' /proc/cmdline 2>/dev/null | wc -l)
+	local has_rootpart_set=no
+	if [[ -f "${EROOT}/etc/conf.d/kexec" ]]; then
+		if grep -q -E -- '^ROOTPART=' "${EROOT}/etc/conf.d/kexec" 2>/dev/null; then
+			has_rootpart_set=yes
+		fi
+	fi
+
+	if [[ ${n_root_args} -gt 1 && "${has_rootpart_set}" == "no"  ]]; then
+		ewarn "WARNING: Multiple root arguments (root=) on kernel command-line detected!"
+		ewarn "This was probably caused by a previous version of ${PN}."
+		ewarn "Please reboot system once *without* kexec to avoid boot problems"
+		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]"
+}


             reply	other threads:[~2024-07-19 13:06 UTC|newest]

Thread overview: 55+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-19 13:06 Yixun Lan [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-07-19 13:06 [gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/ Yixun Lan
2024-07-19 13:06 Yixun Lan
2024-05-04 18:08 Sam James
2024-05-04 18:08 Sam James
2024-03-10 13:50 Sam James
2024-03-10 13:50 Sam James
2024-03-10 13:50 Sam James
2024-02-02  6:28 Andrew Ammerlaan
2023-06-28  7:50 Sam James
2023-03-04  9:46 Arthur Zamarin
2023-03-04  7:51 Arthur Zamarin
2022-10-19 19:22 Sam James
2022-09-23  2:14 Sam James
2022-06-21 17:40 Matt Turner
2022-04-22 17:54 Sam James
2021-11-09 17:16 Lars Wendler
2021-09-04 17:35 David Seifert
2021-08-11  0:02 Sam James
2021-08-10 15:36 Agostino Sarubbo
2021-05-13 16:54 Sam James
2021-05-13 16:18 Sam James
2021-05-03  7:52 Lars Wendler
2020-12-19 20:56 Lars Wendler
2020-08-10  9:13 Thomas Deutschmann
2020-08-05  1:56 Thomas Deutschmann
2020-05-04 16:01 Thomas Deutschmann
2020-05-04 15:15 Agostino Sarubbo
2020-05-04 13:29 Agostino Sarubbo
2020-05-03 19:01 Thomas Deutschmann
2019-10-15 13:31 Jeroen Roovers
2019-07-28 11:24 Mikle Kolyada
2019-07-28 11:24 Mikle Kolyada
2019-07-26 10:01 Lars Wendler
2019-07-26 10:01 Lars Wendler
2019-07-12 15:26 Lars Wendler
2019-07-12 15:26 Lars Wendler
2019-07-12 15:26 Lars Wendler
2019-03-05  9:28 Lars Wendler
2019-03-05  9:28 Lars Wendler
2018-11-06 11:28 Thomas Deutschmann
2018-11-06 11:28 Thomas Deutschmann
2018-08-30  8:47 Mikle Kolyada
2018-08-29  1:07 Thomas Deutschmann
2018-05-01 20:10 Lars Wendler
2018-01-26  0:28 Patrick McLean
2017-11-23 20:48 Thomas Deutschmann
2017-10-19  9:15 Lars Wendler
2017-08-29 21:39 Thomas Deutschmann
2017-08-25 13:31 Mikle Kolyada
2017-08-01 15:10 Lars Wendler
2017-08-01 15:10 Lars Wendler
2017-02-21 21:05 Robin H. Johnson
2016-12-23 14:06 Lars Wendler
2016-01-22  8:56 Michael Palimaka

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1721394159.b5b7cc250a357dfaa5f1a41bd863d714bb2c14e3.dlan@gentoo \
    --to=dlan@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox