From 15b109bb3b6318c2bf2a9a4dcd9d5b21eb6e953e Mon Sep 17 00:00:00 2001 From: Fabiano Fidêncio Date: Jan 17 2020 13:47:15 +0000 Subject: Install images in /var/cache instead of /usr/libexec Instead of installing images on /usr/libexec, let's add them to /var/cache. Related: rhbz#1792216 Signed-off-by: Fabiano Fidêncio --- diff --git a/fedora-kata-osbuilder.sh b/fedora-kata-osbuilder.sh index 7701f0b..dbdbcb2 100755 --- a/fedora-kata-osbuilder.sh +++ b/fedora-kata-osbuilder.sh @@ -45,7 +45,7 @@ cat ${TARGET_INITRD} | \ 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 diff --git a/kata-osbuilder.spec b/kata-osbuilder.spec index 7444087..3fbbbbf 100644 --- a/kata-osbuilder.spec +++ b/kata-osbuilder.spec @@ -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 @@ -118,6 +119,7 @@ popd 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,14 +147,17 @@ fi %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 - 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 - 1.9.1-1 - Udpate to 1.9.1