diff --git a/_service b/_service index d33e6a4..32a7f7e 100644 --- a/_service +++ b/_service @@ -2,7 +2,7 @@ https://github.com/warewulf/warewulf.git git - v4.5.8 + v4.6.0rc3 @PARENT_TAG@ v(.*) enable diff --git a/vendor.tar.xz b/vendor.tar.xz index 955eaba..308eabf 100644 --- a/vendor.tar.xz +++ b/vendor.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1bcb88969fa42ca31e86f10d23492b0a8ef4c01d906acdb2ea6fea5ca05f2011 -size 5458040 +oid sha256:e5ae6fb19f23b3f4ad3f1c347a812ebaf49a774cc394ba5d6b063576b9923178 +size 5306232 diff --git a/warewulf-4.5.8.obscpio b/warewulf-4.5.8.obscpio deleted file mode 100644 index 999d049..0000000 --- a/warewulf-4.5.8.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bc87304e69e168da9cdac808189058e7d57f3f21305b4d771a8f3986854829b3 -size 4151820 diff --git a/warewulf-4.6.0rc3.obscpio b/warewulf-4.6.0rc3.obscpio new file mode 100644 index 0000000..1257a5e --- /dev/null +++ b/warewulf-4.6.0rc3.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:44ff3be23c6fcf3e4e7ce3e5b238e116f30c678a5f4336de479e5c2518be9dfe +size 30093325 diff --git a/warewulf.obsinfo b/warewulf.obsinfo index a7b3723..0a8dd46 100644 --- a/warewulf.obsinfo +++ b/warewulf.obsinfo @@ -1,4 +1,4 @@ name: warewulf -version: 4.5.8 -mtime: 1727737516 -commit: f69dac7264522dda383ebb1584ddb6ddd82cb199 +version: 4.6.0rc3 +mtime: 1740311359 +commit: 52f555034fd931a622cabc029cf8f410ae4fdb84 diff --git a/warewulf4.changes b/warewulf4.changes index 5f10810..5172df6 100644 --- a/warewulf4.changes +++ b/warewulf4.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Tue Feb 25 14:13:23 UTC 2025 - Christian Goll + +- Update to version 4.6.0rc3 what is a major upgrade with following + highlights: + * renamed container to images + * "sprig" functions in overlays + * support for yaml and json formatted output + * completely re-designed kernel selection support + * nested profiles + * arbitrary node and profile data in new "resources" structure + * moved NFS mount options to resources / fstab overlay + * split overlays by function + * split overlays, site vs distribution + * replaced defaults.conf with settings on default profile + * improved tabular output + * parallel overlay build + * improved networking functionality (static route, vlans, and bonds) + * kernel arguments as a list + * non-zero exit codes on wwctl errors + * fixed argument parsing for wwctl image exec + * Defined menu for ipxe boot + * Re-order SSH key types to make ed25519 default. +- The configuation files nodes.conf and warewulf.conf will be updated + on upgrade and the unmodified configuration files will be saved + as nodes.conf.4.5.x and warewulf.conf.4.5.x + ------------------------------------------------------------------- Fri Feb 21 08:17:53 UTC 2025 - Egbert Eich diff --git a/warewulf4.spec b/warewulf4.spec index 45d359e..937428d 100644 --- a/warewulf4.spec +++ b/warewulf4.spec @@ -18,18 +18,24 @@ %global tftpdir /srv/tftpboot %global srvdir %{_sharedstatedir} -#%%global githash 5b0de8ea5397ca42584335517fd4959d7ffe3da5 +#%%global githash fd49254ac592d325056aa58a564933a008539607 +%if 0%{?githash} +%define srcdir warewulf-%{githash} +%else +%define srcdir warewulf-%{version} +%endif ExclusiveArch: x86_64 aarch64 Name: warewulf4 -Version: 4.5.8 +Version: 4.6.0rc3 Release: 0 Summary: A suite of tools for clustering License: BSD-3-Clause Group: Productivity/Clustering/Computing URL: https://warewulf.org Source0: warewulf-%{version}.tar +#Source0: https://github.com/mslacken/warewulf/archive/%{githash}.tar.gz#/warewulf-%{version}.tar.gz Source1: vendor.tar.xz Source5: warewulf4-rpmlintrc Source10: config-ww4.sh @@ -126,7 +132,7 @@ an initramfs that can fetch and boot a Warewulf container image from a Warewulf server. %prep -%autosetup -a1 -p1 -n warewulf-%{version} +%autosetup -a1 -p1 -n %{srcdir} echo %{version} > VERSION %build @@ -197,8 +203,9 @@ yq e ' .["container mounts"] += {"source": "/etc/zypp/credentials.d/SCCcredentials", "dest": "/etc/zypp/credentials.d/SCCcredentials", "readonly": true}' \ -i %{buildroot}%{_sysconfdir}/warewulf/warewulf.conf # SUSE starts user UIDs at 1000 -sed -i -e 's@\(.* \$_UID \(>\|-ge\) \)500\(.*\)@\11000\3@' %{buildroot}%{_localstatedir}/lib/warewulf/overlays/host/rootfs/etc/profile.d/ssh_setup.*sh.ww +#sed -i -e 's@\(.* \$_UID \(>\|-ge\) \)500\(.*\)@\11000\3@' %{buildroot}%{_localstatedir}/lib/warewulf/overlays/host/rootfs/etc/profile.d/ssh_setup.*sh.ww # fix dhcp for SUSE +mv %{buildroot}%{_prefix}/share/warewulf/overlays %{buildroot}%{_localstatedir}/lib/warewulf/ mv %{buildroot}%{_localstatedir}/lib/warewulf/overlays/host/rootfs/etc/dhcp/dhcpd.conf.ww %{buildroot}%{_localstatedir}/lib/warewulf/overlays/host/rootfs/etc/dhcpd.conf.ww rmdir %{buildroot}%{_localstatedir}/lib/warewulf/overlays/host/rootfs/etc/dhcp @@ -244,7 +251,14 @@ mv %{buildroot}/%{_sysconfdir}/logrotate.d/warewulfd.conf %{buildroot}/%{_syscon %post %service_add_post warewulfd.service +if [$1 -eq 1 ] ; then +cp %{_sysconfdir}/warewulf/nodes.conf %{_sysconfdir}/warewulf/nodes.conf.4.5.x +cp %{_sysconfdir}/warewulf/warewulf.conf %{_sysconfdir}/warewulf/warewulf.conf.4.5.x +%{_bindir}/wwctl upgrade nodes --replace-overlay --add-defaults +%{_bindir}/wwctl upgrade config +else %{_datadir}/warewulf/scripts/config-warewulf.sh +fi %preun %service_del_preun warewulfd.service