PR#1: Don't leave leftover files (rhbz#1792216) - rpms/kata-osbuilder

rpms / kata-osbuilder

#1 Don't leave leftover files (rhbz#1792216)

Merged 4 years ago by ddd. Opened 4 years ago by fidencio.

rpms/ fidencio/kata-osbuilder wip/dont_leave_leftovers into master

Install images in /var/cache instead of /usr/libexec

Fabiano Fidêncio • 4 years ago

15b109b

Remove nsdax binary after its usage

Fabiano Fidêncio • 4 years ago

dfcc16d

fedora-kata-osbuilder.sh

file modified

+5 -1

		`@@ -40,8 +40,12 @@`
		`# Build the FS image`
		`./image-builder/image_builder.sh -o ${TARGET_IMAGE} ${DRACUT_ROOTFS}`

		`+ # This is a workaround till issue[0] is fixed, released and packaged.`
		`+ # [0]: https://github.com/kata-containers/osbuilder/issues/394`
		`+ rm image-builder/nsdax`
		`+`
		`# Move images into place`
		`- cd /usr/share/kata-containers`
		`+ cd /var/cache/kata-containers`
		`# This is dangerous, but not sure what else to do...`
		`rm vmlinu* kata-.img fedora-kata.img fedora-kata*.initrd \|\| true`

kata-osbuilder.spec

file modified

+9 -1

		`@@ -11,6 +11,7 @@`
		`%global katalibexecdir %{_libexecdir}/kata-containers`
		`%global kataosbuilderdir %{katalibexecdir}/osbuilder`
		`%global kataagentdir %{kataosbuilderdir}/agent`
		`+ %global katalocalstatecachedir %{_localstatedir}/cache/kata-containers`

		`%global tag 1.9.1`
		`%global git0 https://github.com/kata-containers/osbuilder`
		`@@ -19,7 +20,7 @@`

		`Name: kata-osbuilder`
		`Version: %{tag}`
		`- Release: 1%{?dist}`
		`+ Release: 2%{?dist}`
		`License: ASL 2.0`
		`Summary: Kata guest initrd and image build scripts`
		`URL: %{git0}`
		`@@ -118,6 +119,7 @@`
		`mkdir -p %{buildroot}%{katadatadir}`
		`mkdir -p %{buildroot}%{kataosbuilderdir}`
		`mkdir -p %{buildroot}%{kataagentdir}`
		`+ mkdir -p %{buildroot}%{katalocalstatecachedir}`
		`rm rootfs-builder/.gitignore`
		`cp -aR rootfs-builder %{buildroot}/%{kataosbuilderdir}`
		`cp -aR image-builder %{buildroot}/%{kataosbuilderdir}`
		`@@ -145,12 +147,18 @@`
		`%license LICENSE`
		`%doc CODE_OF_CONDUCT.md CONTRIBUTING.md README.md`
		`%dir %{katadatadir}`
		`+ %dir %{katalibexecdir}`
		`%dir %{kataosbuilderdir}`
		`%{kataosbuilderdir}/*`
		`+ %dir %{katalocalstatecachedir}`



		`%changelog`
		`+ * Fri Jan 17 2020 Fabiano Fidêncio <fidencio@redhat.com> - 1.9.1-2`
		`+ - Remove unneeded nsdax binary file - rhbz#1792216`
		`+ - Install images in /var/cache instead of /usr/libexec - rhbz#1792216`
		`+`
		`* Fri Nov 29 2019 Christophe de Dinechin <dinechin@redhat.com> - 1.9.1-1`
		`- Udpate to 1.9.1`

fidencio commented 4 years ago

This series contains 2 fixes:
- Remove nsdax binary after its usage, which is basically a workaround for an upstream issue[0];
- Install images on /var/cache/kata-containers instead of /usr/libexec/kata-containers

Both patches should also be backported to f31, but I'll only open a PR once this one is reviewed.