diff --git a/elemental-2.1.0.tar b/elemental-2.1.1.tar similarity index 81% rename from elemental-2.1.0.tar rename to elemental-2.1.1.tar index 069b857..c82e948 100644 Binary files a/elemental-2.1.0.tar and b/elemental-2.1.1.tar differ diff --git a/elemental-rpmlintrc b/elemental-rpmlintrc index 0847061..a6a110e 100644 --- a/elemental-rpmlintrc +++ b/elemental-rpmlintrc @@ -1,5 +1,5 @@ -# ignore rclink missing checks -addFilter("W: suse-missing-rclink"); +# ignore complaints due to not compressed source. Sources are really small anyway. +addFilter("W: source-not-compressed"); # ignore fhs complaints -addFilter("W: suse-filelist-forbidden-fhs23"); +addFilter("E: filelist-forbidden-fhs23"); diff --git a/elemental.changes b/elemental.changes index 105bc73..3267a16 100644 --- a/elemental.changes +++ b/elemental.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Apr 26 12:01:26 UTC 2024 - David Cassany + +- Update to version v2.1.1 + * Move bootargs to /etc/elemental + * Include boot assessment installation as part of elemental init + * Do not start elemental-register timer manually + * Add an elemental-register checker + * Adding an network-online checker for elemental + * Add wireless-regdb for aarch64 + ------------------------------------------------------------------- Wed Mar 13 20:24:13 UTC 2024 - David Cassany diff --git a/elemental.spec b/elemental.spec index 1c6e4d4..139a1b1 100644 --- a/elemental.spec +++ b/elemental.spec @@ -19,7 +19,7 @@ %define oemdir %{systemdir}/oem Name: elemental -Version: 2.1.0 +Version: 2.1.1 Release: 0 Summary: A Rancher and Kubernetes optimized immutable Linux distribution License: Apache-2.0 @@ -30,8 +30,8 @@ Source1: LICENSE Source2: README.md Source3: %{name}-rpmlintrc -Requires: elemental-toolkit >= 2.0.0 -Requires: elemental-toolkit < 2.1.0 +Requires: elemental-toolkit >= 2.1.0 +Requires: elemental-toolkit < 2.2.0 Requires: elemental-register Requires: elemental-system-agent Requires: elemental-support @@ -67,9 +67,6 @@ cp -a framework/files/* %{buildroot} rm -rf %{buildroot}/var/log/journal -# remove placeholders -rm -rf %{buildroot}/usr/libexec/.placeholder - %pre %if 0%{?suse_version} %service_add_pre elemental-populate-node-labels.service @@ -142,8 +139,10 @@ rm -rf %{buildroot}/usr/libexec/.placeholder %defattr(-,root,root,-) %doc README.md %license LICENSE -%dir %{_sysconfdir}/cos -%config %{_sysconfdir}/cos/bootargs.cfg +%dir %{_sysconfdir}/elemental +%config %{_sysconfdir}/elemental/bootargs.cfg +%dir %{_sysconfdir}/elemental/config.d +%config %{_sysconfdir}/elemental/config.d/* %dir %{_sysconfdir}/dracut.conf.d %config %{_sysconfdir}/dracut.conf.d/51-certificates-initrd.conf %config %{_sysconfdir}/dracut.conf.d/99-elemental-systemd.conf @@ -159,7 +158,8 @@ rm -rf %{buildroot}/usr/libexec/.placeholder %{_unitdir}/elemental-populate-node-labels.service %{_unitdir}/elemental-system-agent.service %{_sbindir}/elemental-populate-node-labels -%dir /usr/libexec +%dir %{_libexecdir}/elemental-checker +%{_libexecdir}/elemental-checker/elemental-register.sh %dir %{systemdir} %dir %{oemdir} %{oemdir}/*