#14 Make binutils a recommend as it's only needed for UKI support
Merged a year ago by coiby. Opened a year ago by siosm.
rpms/ siosm/kexec-tools rawhide-bintuils  into  rawhide

file modified
+26 -22
@@ -5,7 +5,7 @@ 

  

  Name: kexec-tools

  Version: 2.0.26

- Release: 5%{?dist}

+ Release: 6%{?dist}

  License: GPLv2

  Summary: The kexec/kdump userspace component

  
@@ -66,7 +66,8 @@ 

  Requires: dracut-squash >= 058

  Requires: ethtool

  Requires: util-linux

- Requires: binutils

+ # Needed for UKI support

+ Recommends: binutils

  Recommends: grubby

  Recommends: hostname

  BuildRequires: make
@@ -272,8 +273,8 @@ 

  %endif

  

  # This portion of the script is temporary.  Its only here

- # to fix up broken boxes that require special settings 

- # in /etc/sysconfig/kdump.  It will be removed when 

+ # to fix up broken boxes that require special settings

+ # in /etc/sysconfig/kdump.  It will be removed when

  # These systems are fixed.

  

  if [ -d /proc/bus/mckinley ]
@@ -286,7 +287,7 @@ 

  elif [ -d /proc/sgi_sn ]

  then

  	# This is for SGI SN boxes

- 	# They require the --noio option to kexec 

+ 	# They require the --noio option to kexec

  	# since they don't support legacy io

  	sed -e's/\(^KEXEC_ARGS.*\)\("$\)/\1 --noio"/' \

  	/etc/sysconfig/kdump > /etc/sysconfig/kdump.new
@@ -395,6 +396,9 @@ 

  %endif

  

  %changelog

+ * Fri Jun 02 2023 Timothée Ravier <tim@siosm.fr> - 2.0.26-6

+ - Make binutils a recommend as it's only needed for UKI support

+ 

  * Mon May 29 2023 Coiby <coxu@redhat.com> - 2.0.26-5

  - Simplify the management of the kernel parameter crashkernel

  - Let _update_kernel_cmdline return the correct return code
@@ -1127,7 +1131,7 @@ 

  - Revert "dracut-module-setup.sh: pass correct ip= param for ipv6"

  

  * Sat Apr 28 2018 Dave Young <dyoung@redhat.com> - 2.0.17-2

- - pull in makedumpfile 1.6.3 

+ - pull in makedumpfile 1.6.3

  

  * Sat Apr 28 2018 Dave Young <dyoung@redhat.com> - 2.0.17-1

  - pull in 2.0.17
@@ -1187,10 +1191,10 @@ 

  * Tue Aug 8 2017 Dave Young <dyoung@redhat.com> - 2.0.15-10

  - Improve 'cpu add' udev rules

  - module-setup: suppress the early iscsi error messages

- - mkdumprd: use 300s as the default systemd unit timeout for kdump mount 

+ - mkdumprd: use 300s as the default systemd unit timeout for kdump mount

  

  * Mon Aug 7 2017 Dave Young <dyoung@redhat.com> - 2.0.15-9

- - fix makedumpfile bug 1474706 

+ - fix makedumpfile bug 1474706

  

  * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.15-8

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
@@ -1346,9 +1350,9 @@ 

  - module-setup: Use get_ifcfg_filename() to get the proper ifcfg file

  

  * Mon May 30 2016 Dave Young <dyoung@redhat.com> - 2.0.12-4

- - update kdump anaconda addon to add mem range in tui 

+ - update kdump anaconda addon to add mem range in tui

  - .gitignore: Update to make it more generic

- - kdumpctl: check_rebuild improvement 

+ - kdumpctl: check_rebuild improvement

  - kdumpctl: Do not rebuild initramfs when $KDUMP_BOOTDIR is read only

  

  * Tue Mar 29 2016 Dave Young <dyoung@redhat.com> - 2.0.12-3
@@ -1359,7 +1363,7 @@ 

  - ppc64le: fix kexec hang due to ppc64 elf abi breakage

  

  * Tue Mar 22 2016 Dave Young <dyoung@redhat.com> - 2.0.12-1

- - Rebase kexec-tools to 2.0.12 

+ - Rebase kexec-tools to 2.0.12

  

  * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.11-4

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
@@ -1372,7 +1376,7 @@ 

  - fix bogus date in changelog

  

  * Thu Nov 19 2015 Dave Young <dyoung@redhat.com> - 2.0.11-2

- - Rebase to upstream makedumpfile 1.5.9 

+ - Rebase to upstream makedumpfile 1.5.9

  

  * Mon Nov 9 2015 Dave Young <dyoung@redhat.com> - 2.0.11-1

  - Rebase to upstream kexec-tools 2.0.11
@@ -1382,7 +1386,7 @@ 

  - Remove duplicate prefix path ${initdir}

  

  * Tue Sep 8 2015 Dave Young <dyoung@redhat.com> - 2.0.10-8

- - update kdump addon to fix a kickstart installationi issue 

+ - update kdump addon to fix a kickstart installationi issue

  

  * Wed Aug 19 2015 Dave Young <dyoung@redhat.com> - 2.0.10-7

  - add man page for kdumpctl
@@ -1724,7 +1728,7 @@ 

  

  * Thu Mar 14 2013 Baoquan He <bhe@redhat.com> - 2.0.3-69

  - Support for eppic language as a subpackage

-  

+ 

  * Thu Mar 14 2013 Baoquan He <bhe@redhat.com> - 2.0.3-68

  - tune sysconfig to save memory usage

  - Remove useless codes related to LOGGER in kdumpctl
@@ -1851,7 +1855,7 @@ 

  - do not add fstab-sys module in dracut cmdline

  - omit dash module

  - network dns config fix

- - shell exit value fix 

+ - shell exit value fix

  

  * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.3-52

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
@@ -2178,7 +2182,7 @@ 

  - Make makedumpfile a dynamic binary

  

  * Mon Jul 06 2009 Neil Horman <nhorman@redhat.com> 2.0.0-19

- - Fix build issue 

+ - Fix build issue

  

  * Mon Jul 06 2009 Neil Horman <nhorman@redhat.com> 2.0.0-18

  - Updated initscript to use mkdumprd2 if manifest is present
@@ -2390,7 +2394,7 @@ 

  - updating mkdumprd to use new kcp syntax

  

  * Wed Aug 23 2006 Neil Horman <nhorman@redhat.com> - 1.101-48

- - Bumping revision number 

+ - Bumping revision number

  

  * Tue Aug 22 2006 Jarod Wilson <jwilson@redhat.com> - 1.101-47

  - ppc64 no-more-platform fix
@@ -2410,7 +2414,7 @@ 

  

  * Tue Aug 15 2006 Neil Horman <nhorman@redhat.com> - 1.101-44

  - updated init script to implement status function/scrub err messages

-  

+ 

  * Wed Aug 09 2006 Jarod Wilson <jwilson@redhat.com> - 1.101-43

  - Misc spec cleanups and macro-ifications

  
@@ -2418,13 +2422,13 @@ 

  - Add %%dir /var/crash, so default kdump setup works

  

  * Thu Aug 03 2006 Neil Horman <nhorman@redhat.com> - 1.101-41

- - fix another silly makefile error for makedumpfile 

+ - fix another silly makefile error for makedumpfile

  

  * Thu Aug 03 2006 Neil Horman <nhorman@redhat.com> - 1.101-40

- - exclude makedumpfile from build on non-x86[_64] arches 

+ - exclude makedumpfile from build on non-x86[_64] arches

  

  * Thu Aug 03 2006 Neil Horman <nhorman@redhat.com> - 1.101-39

- - exclude makedumpfile from build on non-x86[_64] arches 

+ - exclude makedumpfile from build on non-x86[_64] arches

  

  * Thu Aug 03 2006 Neil Horman <nhorman@redhat.com> - 1.101-38

  - updating makedumpfile makefile to use pkg-config on glib-2.0
@@ -2521,7 +2525,7 @@ 

  

  * Wed Nov 16 2005 Thomas Graf <tgraf@redhat.com> - 1.101-5

  - Report missing kdump kernel image as warning

-  

+ 

  * Thu Nov  3 2005 Jeff Moyer <jmoyer@redhat.com> - 1.101-4

  - Build for x86_64 as well.  Kdump support doesn't work there, but users

    should be able to use kexec.

Make binutils a recommend as it's only needed for UKI support

UKI are not supported on rpm-ostree based Fedora variants so let's use
recommend for binutils for now to let those not include the package
until needed.

See: https://github.com/coreos/fedora-coreos-tracker/issues/1496
See: https://github.com/ostreedev/ostree/issues/2753
See: https://src.fedoraproject.org/rpms/kexec-tools/c/ea7be0608ed719cc1cb134ecf6ef51a4b7e9f104?branch=rawhide


Whitespace fixes

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/a6eb639e28ee4d6b8dd5dfdef3b4abe4

Hi,

I wonder if there is a package that is unique to rpm-ostree based Fedora variants so that we use "Requires: (RPM_OSTREE_ONLY_PACKAGE or binutils)" to skip adding this dependency rpm-ostree .

I wonder if there is a package that is unique to rpm-ostree based Fedora variants so that we use "Requires: (RPM_OSTREE_ONLY_PACKAGE or binutils)" to skip adding this dependency rpm-ostree.

I don't think there is such a package. I also don't think that this is something just for rpm-ostree variants. Other Fedora variants that may not be rpm-ostree based may want to exclude UKI support as well until it is supported for their use cases.

We will also want to include UKI support in the future but we're not ready for it yet.

I wonder if there is a package that is unique to rpm-ostree based Fedora variants so that we use "Requires: (RPM_OSTREE_ONLY_PACKAGE or binutils)" to skip adding this dependency rpm-ostree.

I don't think there is such a package. I also don't think that this is something just for rpm-ostree variants. Other Fedora variants that may not be rpm-ostree based may want to exclude UKI support as well until it is supported for their use cases.

We will also want to include UKI support in the future but we're not ready for it yet.

Thanks for the reply!

I also asked my team member to Philipp review this PR. As pointed out by him, "changing it to Recommend will conflict with this Bug https://bugzilla.redhat.com/show_bug.cgi?id=2162245". I wonder if there is a solution that could take care of bz2162245 as well.

Maybe utilizing a subpackage for the specific functionality?

Maybe we could pull this automatically if the uki package is installed (https://src.fedoraproject.org/rpms/kernel/blob/rawhide/f/kernel.spec#_1425), but that's not great as we would have to list all potential kernel build variants here.

I also don't think that this change is conflicting with the bug above. The bug is asking to justify with there are recommends and this is what we're doing here. Also not that most RHEL systems won't be using UKIs any time soon thus they don't need that dependency either.

Pull-Request has been merged by coiby

a year ago

The justification provided by siosm sounds convincing so I've merged this PR. Thanks!

Metadata