diff --git a/containment-tik-img-to-rpm.changes b/containment-tik-img-to-rpm.changes index b818b49..b26315e 100644 --- a/containment-tik-img-to-rpm.changes +++ b/containment-tik-img-to-rpm.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Tue Jul 2 11:49:14 UTC 2024 - Richard Brown +Tue Jul 2 14:02:02 UTC 2024 - Richard Brown -- Support also creating systemd-repart bundles +- Package uncompressed images, to be used with systemd-repart ------------------------------------------------------------------- Thu Jun 20 15:13:08 UTC 2024 - Richard Brown diff --git a/containment-tik-img-to-rpm.spec b/containment-tik-img-to-rpm.spec index bc30757..0d43dcc 100644 --- a/containment-tik-img-to-rpm.spec +++ b/containment-tik-img-to-rpm.spec @@ -31,7 +31,6 @@ Requires: coreutils Requires: gawk Requires: jq Requires: perl-DateTime-Format-DateParse -Requires: udev Conflicts: containment-rpm %description diff --git a/image.spec.in b/image.spec.in index 99ba3ee..0f00599 100644 --- a/image.spec.in +++ b/image.spec.in @@ -14,40 +14,20 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This package contains the __OS_NAME__ image for tik. -%package repart-bundle -Summary: Package with __OS_NAME__ tik systemd-repart bundle -Requires: tik -BuildRequires: udev -BuildRequires: xz -BuildRequires: coreutils - -%description repart-bundle -This package containers the __OS_NAME__ systemd-repart bundle for tik - %prep %build -xz -d %{SOURCE0} -systemd-repart --split=1 %(basename ${SOURCE0} xz) +xz -k -d %{SOURCE0} %install install -d -m 644 $RPM_BUILD_ROOT%{_prefix}/lib/tik/img -install -p -D -m 644 %{SOURCE0} $RPM_BUILD_ROOT%{_prefix}/lib/tik/img/%{name}.%{version}.raw.xz - -install -d -m 644 $RPM_BUILD_ROOT%{_prefix}/lib/tik/img/%{name}.%{version} -install -p -D -m 644 %(basename ${SOURCE0} .raw.xz).root-%{_arch}.raw $RPM_BUILD_ROOT%{_prefix}/lib/tik/img/%{name}.%{version}/ -install -d -m 644 $RPM_BUILD_ROOT%{_prefix}/lib/tik/img/%{name}.%{version}/repart.d +install -p -D -m 644 %(basename %{SOURCE0} .xz) $RPM_BUILD_ROOT%{_prefix}/lib/tik/img/%{name}.%{version}.raw %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root) -%{_prefix}/lib/tik/img/%{name}.%{version}.raw.xz - -%files repart-bundle -%defattr(-, root, root) -%{_prefix}/lib/tik/img/%{name}.%{version} - +%{_prefix}/lib/tik/img/%{name}.%{version}.raw %changelog