diff --git a/0001-image_builder-Force-mount_dir-to-be-created-in-TMPDI.patch b/0001-image_builder-Force-mount_dir-to-be-created-in-TMPDI.patch deleted file mode 100644 index 2cc187d..0000000 --- a/0001-image_builder-Force-mount_dir-to-be-created-in-TMPDI.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 4b9fbceaa3f6db76736489d9d00b74a3967112d2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= -Date: Mon, 23 Mar 2020 17:08:28 +0100 -Subject: [PATCH] image_builder: Force mount_dir to be created in $TMPDIR -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Immutable systems, as such Red Hat Core OS and Fedora Core OS, will not -allow mount_dir to be created in a location that's not read-write. - -Let's ensure we use $TMPDIR (with /tmp as fallback) as base for mount_dir, -as it's a safe writable choice for any distro supported by kata. - -Fixes: #437 - -Signed-off-by: Fabiano FidĂȘncio ---- - image-builder/image_builder.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/image-builder/image_builder.sh b/image-builder/image_builder.sh -index aa813d5..04c840c 100755 ---- a/image-builder/image_builder.sh -+++ b/image-builder/image_builder.sh -@@ -372,7 +372,7 @@ create_rootfs_image() { - fi - - info "Mounting root partition" -- readonly mount_dir=$(mktemp -d osbuilder-mount-dir.XXXX) -+ readonly mount_dir=$(mktemp -p ${TMPDIR:-/tmp} -d osbuilder-mount-dir.XXXX) - mount "${device}p1" "${mount_dir}" - OK "root partition mounted" - --- -2.26.0.rc2 - diff --git a/kata-osbuilder.spec b/kata-osbuilder.spec index 3dd5b16..86146f5 100644 --- a/kata-osbuilder.spec +++ b/kata-osbuilder.spec @@ -1,5 +1,5 @@ # Release candidate version tracking -%global rcver alpha1 +%global rcver rc0 %if 0%{?rcver:1} %global rcrel .%{rcver} %global rcstr -%{rcver} @@ -16,7 +16,7 @@ Version: 1.11.0 Name: kata-osbuilder -Release: 0.2%{?rcrel}%{?dist} +Release: 0.3%{?rcrel}%{?dist} License: ASL 2.0 Summary: Kata guest initrd and image build scripts URL: %{git0} @@ -34,10 +34,6 @@ Source5: 15-dracut-fedora.conf Source5: 15-dracut-rhel.conf %endif -# Force mount_dir to be created in $TMPDIR -# https://github.com/kata-containers/osbuilder/pull/436 -Patch01: 0001-image_builder-Force-mount_dir-to-be-created-in-TMPDI.patch - BuildRequires: gcc BuildRequires: git @@ -149,6 +145,9 @@ fi %changelog +* Mon Apr 20 2020 Cole Robinson - 1.11.0-0.3-rc0 +- Update to kata-osbuilder 1.11.0-rc0 + * Thu Apr 02 2020 Cole Robinson - 1.11.0-0.2.alpha - Disable FS image generation, the image is presently unused diff --git a/sources b/sources index 7c87fb7..8327b3c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuilder-1.11.0-alpha1.tar.gz) = 4d577f8eddc1b3465cd707a987e54af679d21c619b1358195db9ecda59158680bed08dc40cddc4fcd536bf4b7c0000baaa08501c16bd4a854cbed773cd2c5c99 +SHA512 (osbuilder-1.11.0-rc0.tar.gz) = 21d4adaab235a9eab17df600cae03697a805e595f90c0fe78f8cf17bf5f5aa3486b081544e2ef99bc59b04da9900f801b39e8e6fd5bd250a15506346320c81ad