resolving build break in openSUSE 15.x

This commit is contained in:
jason scott
2026-01-08 13:10:39 -07:00
committed by Jonathon Anderson
parent d46dcc2043
commit 4e3b1b6e56
4 changed files with 67 additions and 59 deletions

View File

@@ -79,7 +79,7 @@ jobs:
fail-fast: false
matrix:
arch: [x86_64, aarch64]
dist: [el10, el9, el8, suse.lp155]
dist: [el10, el9, el8, suse.lp156]
include:
- dist: el8
target: rocky+epel-8
@@ -87,8 +87,8 @@ jobs:
target: rocky+epel-9
- dist: el10
target: rocky+epel-10
- dist: suse.lp155
target: opensuse-leap-15.5
- dist: suse.lp156
target: opensuse-leap-15.6
- arch: x86_64
runs-on: ubuntu-24.04
- arch: aarch64

View File

@@ -49,10 +49,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Fix `wwctl image import --update` #2066
- Fix filesystem overwrite/force behavior in mkfs overlay. #2028
- Prevent ignition from running twice in a provision-to-disk configuration. #1981
- Fix `warewulf.spec.in` to resolve a build break for openSUSE 15.x
### Dependencies
- Updated github.com/ulikunitz/xz to 0.5.14 (CVE-2025-58058) #2007
- Updated github.com/opencontainers/selinux to v1.13.1 (CVE-2025-52881)
- Updated github.com/cyphar/filepath-securejoin to v0.5.1 (indirect via selinux version bump)
## v4.6.4, 2025-09-05
@@ -146,7 +149,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Removed
- Removed the gRPC API servers and client. #1876
- Removed ``wwctl node import --csv``. #1862
- Removed `wwctl node import --csv`. #1862
## v4.6.1, 2025-04-04
@@ -155,7 +158,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Added `wwctl overlay import --overwrite` to overwrite existing overlay file.
- wwclient uses `WW_IPADDR`, if set, to contact the Warewulf server. #1788
- Add `wwctl node import --yes` to assume yes to confirmations.
- Set an IPMI tag ``vlan`` to configure the vlan during ``ipmiwrite``. #1031
- Set an IPMI tag `vlan` to configure the vlan during `ipmiwrite`. #1031
- Added net.ifnames=1 to default kernel argument list. #1820
- Add a new OpenAPI v3 REST API to warewulfd at /api. #1588
- New sos plugin in `warewulf-sos` subpackage. #1822
@@ -518,7 +521,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Fix dhcpd.conf static template to include next-server and dhcp-range #1536
- Fix panic when adding tag with existing netdev #1546
## v4.5.7, 2024-09-11
### Added
@@ -549,6 +551,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- `wwctl conatiner list --kernel` shows the kernel detected for each container. #1283
- `wwctl container list --size` shows the uncompressed size of each container. `--compressed` shows the compressed size, and `--chroot` shows the size of the container source on the server. #954, #1117
- Add a logrotate config for `warewulfd.log`. #1311
### Changed
- Refactor URL handling in wwclient to consistently escape arguments.
@@ -643,7 +646,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Added
- Document warewulf.conf:paths. #635
- New "Overlay" template variable contains the name of the overlay being built. #1052
- New "Overlay" template variable contains the name of the overlay being built. #1052
- Documented HTTP proxy environment variables for `wwctl container import`. #1214
### Changed

View File

@@ -1,52 +1,53 @@
# Contributors
* Gregory Kurtzer <gmkurtzer@gmail.com> @gmk
* Christian Goll <cgoll@suse.de> @mslacken
* Jeremy Siadal <jeremy.c.siadal@intel.com> @jcsiadal
* Niko Kivel <niko.kivel@psi.ch> @kivel
* Shannon V. Davidson <svdavidson@charter.net>
* Brian Clemens <brian@ciq.com> @brianclemens
* Michael L. Young <myoung@ciq.com> @ajyounge
* Ian Kaneshiro <iankane@umich.edu> @ikaneshiro
* Carter Dodd <cdodd@nanohmics.com> @kcdodd
* MatthewHink <matthew_hink@yahoo.com> @MatthewHink
* WestleyR <westleyr@nym.hush.com> @WestleyK
* Michael L. Young <elgueromexicano@gmail.com>
* Yong Qin <yongq@nvidia.com>
* Yoshiaki Senda <yoshiaki@live.it>
* Cooper, Trevor <tcooper@sdsc.edu>
* Masahiko Ohkubo <masahiko.ohkubo+github@gmail.com>
* John Hanks <griznog@gmail.com> @griznog
* Rob Jansen <jansen@cs.umn.edu>
* svdavidson <svdavidson@charter.net>
* David McFarlane @Prepultrue
* Jean-Baptiste Denis <jbd@jbdenis.net>
* TerranWorks <tdunn3@uco.edu>
* Jonathon Anderson <janderson@ciq.com> @anderbubble
* Brian Phan <bphan@ciq.com>
* Jeffrey Frey @jtfrey
* Xu Yang(Jason Yang) <jasonyangshadow@gmail.com> @JasonYangShadow
* Matt Jolly <Kangie@footclan.ninja> @Kangie
* Arnaud LECOMTE <contact@arnaud-lcm.com>
* Ryan Novosielski <novosirj@rutgers.edu>
* Andreas Skau <andreas@scheen.no> @buzh
* Dietmar Rieder <dietmar.rieder@i-med.ac.at>
* Andreas Henkel <henkel@uni-mainz.de>
* Timothy Middelkoop <tmiddelkoop@internet2.edu>
* Shane Nehring <snehring@iastate.edu>
* Tobias Ribizel <mail@ribizel.de>
* Tobias Poschwatta <poschwatta@zib.de>
* Josh Burks <jeburks2@asu.edu>
* Elmar Pruesse <pruessee@njhealth.org> @epruesse
* Adam Michel <elfurbe@furbism.com> [@elfurbe](https://github.com/elfurbe)
* Brandon Biggs <brandonsbiggs@gmail.com>
* Howard Van Der Wal <howard.a.vanderwal@protonmail.com> [@metalllinux](https://github.com/metalllinux)
* Nicholas Porter <nap23@unm.edu>
* Ian Kaufman <ikaufman@ucsd.edu> [@iankgt40](https://github.com/iankgt40)
* Daniele Colombo [@dacolombo](https://github.com/dacolombo)
* Stephen Simpson [@ssimpson89](https://github.com/ssimpson89)
* Rafael Lopez <raflopez1@gmail.com> @rafalop
* Arian Cabrera [@acabrera86](https://github.com/acabrera86)
* Dacian Reece-Stremtan <dacianstremtan@gmail.com> [@dacianstremtan](https://github.com/dacianstremtan)
* Adrian Reber <areber@redhat.com>
* Karker Said <said.karker@gmail.com> [@kosmolito](https://github.com/kosmolito)
- Gregory Kurtzer <gmkurtzer@gmail.com> @gmk
- Christian Goll <cgoll@suse.de> @mslacken
- Jeremy Siadal <jeremy.c.siadal@intel.com> @jcsiadal
- Niko Kivel <niko.kivel@psi.ch> @kivel
- Shannon V. Davidson <svdavidson@charter.net>
- Brian Clemens <brian@ciq.com> @brianclemens
- Michael L. Young <myoung@ciq.com> @ajyounge
- Ian Kaneshiro <iankane@umich.edu> @ikaneshiro
- Carter Dodd <cdodd@nanohmics.com> @kcdodd
- MatthewHink <matthew_hink@yahoo.com> @MatthewHink
- WestleyR <westleyr@nym.hush.com> @WestleyK
- Michael L. Young <elgueromexicano@gmail.com>
- Yong Qin <yongq@nvidia.com>
- Yoshiaki Senda <yoshiaki@live.it>
- Cooper, Trevor <tcooper@sdsc.edu>
- Masahiko Ohkubo <masahiko.ohkubo+github@gmail.com>
- John Hanks <griznog@gmail.com> @griznog
- Rob Jansen <jansen@cs.umn.edu>
- svdavidson <svdavidson@charter.net>
- David McFarlane @Prepultrue
- Jean-Baptiste Denis <jbd@jbdenis.net>
- TerranWorks <tdunn3@uco.edu>
- Jonathon Anderson <janderson@ciq.com> @anderbubble
- Brian Phan <bphan@ciq.com>
- Jeffrey Frey @jtfrey
- Xu Yang(Jason Yang) <jasonyangshadow@gmail.com> @JasonYangShadow
- Matt Jolly <Kangie@footclan.ninja> @Kangie
- Arnaud LECOMTE <contact@arnaud-lcm.com>
- Ryan Novosielski <novosirj@rutgers.edu>
- Andreas Skau <andreas@scheen.no> @buzh
- Dietmar Rieder <dietmar.rieder@i-med.ac.at>
- Andreas Henkel <henkel@uni-mainz.de>
- Timothy Middelkoop <tmiddelkoop@internet2.edu>
- Shane Nehring <snehring@iastate.edu>
- Tobias Ribizel <mail@ribizel.de>
- Tobias Poschwatta <poschwatta@zib.de>
- Josh Burks <jeburks2@asu.edu>
- Elmar Pruesse <pruessee@njhealth.org> @epruesse
- Adam Michel <elfurbe@furbism.com> [@elfurbe](https://github.com/elfurbe)
- Brandon Biggs <brandonsbiggs@gmail.com>
- Howard Van Der Wal <howard.a.vanderwal@protonmail.com> [@metalllinux](https://github.com/metalllinux)
- Nicholas Porter <nap23@unm.edu>
- Ian Kaufman <ikaufman@ucsd.edu> [@iankgt40](https://github.com/iankgt40)
- Daniele Colombo [@dacolombo](https://github.com/dacolombo)
- Stephen Simpson [@ssimpson89](https://github.com/ssimpson89)
- Rafael Lopez <raflopez1@gmail.com> @rafalop
- Arian Cabrera [@acabrera86](https://github.com/acabrera86)
- Dacian Reece-Stremtan <dacianstremtan@gmail.com> [@dacianstremtan](https://github.com/dacianstremtan)
- Adrian Reber <areber@redhat.com>
- Karker Said <said.karker@gmail.com> [@kosmolito](https://github.com/kosmolito)
- Jason Scott <jsco2t@outlook.com> @jsco2t

View File

@@ -77,7 +77,8 @@ Requires: ipxe-bootimgs-aarch64
%if 0%{?is_suse}
BuildRequires: tftp
Requires: tftp
%elif 0%{?use_dnsmasq}
%else
%if 0%{?use_dnsmasq}
Requires: dnsmasq
%else
# Assume Red Hat/Fedora
@@ -88,6 +89,7 @@ Requires: dhcp-server
Requires: dhcp
%endif
%endif
%endif
BuildRequires: git
BuildRequires: make
@@ -140,9 +142,11 @@ make install \
%if 0%{?rhel} >= 10 || 0%{?openEuler}
cp -f etc/warewulf.conf-el10 %{buildroot}%{_sysconfdir}/warewulf/warewulf.conf
%elif 0%{?is_suse}
%else
%if 0%{?is_suse}
cp -f etc/warewulf.conf-suse %{buildroot}%{_sysconfdir}/warewulf/warewulf.conf
%endif
%endif
%if ! 0%{?is_suse}
make install-sos \