Merge remote-tracking branch 'up/master' into master-riscv64

Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>

.gitignore

@@ -18,3 +18,4 @@ appliance-tools-004.5.tar.bz2
 /appliance-tools-007.8.tar.bz2
 /appliance-tools-008.0.tar.bz2
 /appliance-tools-009.0.tar.bz2
+/appliance-tools-010.0.tar.bz2

0001-Leave-more-space-4MB-for-uboot-before-the-first-part.patch

@@ -1,28 +0,0 @@
-From 890341694c407fed77b817ccef1f1f70c3506378 Mon Sep 17 00:00:00 2001
-From: Pablo Greco <pablo@fliagreco.com.ar>
-Date: Fri, 12 Jul 2019 21:41:38 -0300
-Subject: [PATCH] Leave more space (4MB) for uboot before the first partition
-
-Uboot is getting bigger, and in some cases, it doesn't even fit in 1MB
-(like BeagleBoneBlack).
-Start the first partition at 4MB to leave more space.
----
- appcreate/partitionedfs.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/appcreate/partitionedfs.py b/appcreate/partitionedfs.py
-index b738b80..b2b0413 100644
---- a/appcreate/partitionedfs.py
-+++ b/appcreate/partitionedfs.py
-@@ -90,7 +90,7 @@ class PartitionedMount(Mount):
-                 p['type'] = 'primary'
-                 p['num'] = d['numpart']
-             if d['offset'] == 0:
--                d['offset'] = 1
-+                d['offset'] = 4
-             p['start'] = d['offset']
-             d['offset'] += p['size']
-             d['partitions'].append(n)
--- 
-2.21.0
-

0001-fix-subvolume-umount-path.patch

@@ -0,0 +1,25 @@
+From 8ec9b36ea829630b66a10ecbe4fe736648a65860 Mon Sep 17 00:00:00 2001
+From: Davide Cavalca <davide@cavalca.name>
+Date: Sat, 11 Jul 2020 15:24:39 -0700
+Subject: [PATCH] fix subvolume umount path
+
+---
+ appcreate/partitionedfs.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/appcreate/partitionedfs.py b/appcreate/partitionedfs.py
+index 86e709c..a1597ea 100644
+--- a/appcreate/partitionedfs.py
++++ b/appcreate/partitionedfs.py
+@@ -256,7 +256,7 @@ class PartitionedMount(Mount):
+             ordered += others
+              
+             for s in ordered:
+-                subprocess.call(['umount', s['mountpoint']])
++                subprocess.call(['umount', "%s%s" % (self.mountdir, s['mountpoint'])])
+     
+         for mp in self.unmountOrder:
+             if mp == 'swap':
+-- 
+2.26.2
+

0001-fstype-is-optional-for-swap-check-mountpoint-also.patch

@@ -1,25 +0,0 @@
-From 52ca919e15e246324d084f2a9d03884aa9bfb81f Mon Sep 17 00:00:00 2001
-From: Pablo Greco <psgreco@gmail.com>
-Date: Thu, 22 Nov 2018 13:35:04 -0300
-Subject: [PATCH] fstype is optional for swap, check mountpoint also
-
----
- appcreate/partitionedfs.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/appcreate/partitionedfs.py b/appcreate/partitionedfs.py
-index 3cc09c1..b738b80 100644
---- a/appcreate/partitionedfs.py
-+++ b/appcreate/partitionedfs.py
-@@ -110,7 +110,7 @@ class PartitionedMount(Mount):
-             logging.debug("Add %s part at %d of size %d" % (p['type'], p['start'], p['size']))
-             if p['fstype'].startswith('ext'):
-                 fstype = 'ext2'
--            if p['fstype'].startswith('swap'):
-+            if p['fstype'].startswith('swap') or p['mountpoint'].startswith('swap'):
-                 fstype = 'linux-swap'
-             if p['fstype'] == 'vfat':
-                 fstype = 'fat32'
--- 
-2.17.2
-

appliance-tools.spec

@@ -9,18 +9,26 @@
 %global python_pkgversion %{python3_pkgversion}
 %endif
 
+# Minimum version of imgcreate (livecd-tools)
+%global min_imgcreate_ver 25.0-2
+
+%if 0%{?fedora}
+%global min_imgcreate_evr 1:%{min_imgcreate_ver}
+%else
+%global min_imgcreate_evr %{min_imgcreate_ver}
+%endif
+
 Name: appliance-tools
 Summary: Tools for building Appliances
-Version: 009.0
-Release: 9.0.riscv64%{?dist}
+Version: 010.0
+Release: 2.0.riscv64%{?dist}
 License: GPLv2
 URL: https://pagure.io/appliance-tools
 
 Source0: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2
 
-# Patches backported from upstream
-Patch0001: 0001-fstype-is-optional-for-swap-check-mountpoint-also.patch
-Patch0002: 0001-Leave-more-space-4MB-for-uboot-before-the-first-part.patch
+# Backports from upstream
+Patch0001: 0001-fix-subvolume-umount-path.patch
 
 # NOT upstream
 # Add support for zstd compression instead of xz (optional)
@@ -31,7 +39,7 @@ Patch0010: appliance-tools-add-zstd.patch
 Patch0011: riscv-fix-extlinux-conf.patch
 
 # Ensure system deps are installed (rhbz#1409536)
-Requires: python%{python_pkgversion}-imgcreate >= 1:25.0-2
+Requires: python%{python_pkgversion}-imgcreate %{?min_imgcrate_evr:>= %{min_imgcreate_evr}}
 Requires: python%{python_pkgversion}-progress
 Requires: python%{python_pkgversion}-future
 Requires: curl rsync kpartx
@@ -39,6 +47,9 @@ Requires: zlib
 Requires: qemu-img
 Requires: xz
 Requires: zstd
+%if 0%{?fedora}
+Requires: btrfs-progs
+%endif
 Requires: xfsprogs
 Requires: sssd-client
 BuildRequires: python%{python_pkgversion}-devel
@@ -74,10 +85,23 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 %{python_sitelib}/ec2convert/
 
 %changelog
-* Mon Dec 23 2019 David Abdurachmanov <david.abdurachmanov@sifive.com> - 009.0-9.2.riscv64
+* Thu Jul 16 2020 David Abdurachmanov <david.abdurachmanov@sifive.com> - 010.0-2.0.riscv64
 - Fix extlinux configuration for RISC-V (riscv64)
 - Add support for zstd compression for images (optional)
 
+* Sat Jul 11 2020 Neal Gompa <ngompa13@gmail.com> - 010.0-2
+- Add patch to fix unmounting btrfs subvolumes
+
+* Fri Jul 10 2020 Neal Gompa <ngompa13@gmail.com> - 010.0-1
+- Update to 010.0 release
+- Drop merged patches
+
+* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 009.0-11
+- Rebuilt for Python 3.9
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 009.0-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 009.0-9
 - Rebuilt for Python 3.8.0rc1 (#1748018)
 

sources

@@ -1 +1 @@
-SHA512 (appliance-tools-009.0.tar.bz2) = 2c85ff875b346e0223691690ccbbdf81dd1ac3ac4faf738e6edac79ca4fad849fefcacd75e852b0f7f12ccbb402bf16288d70e2e4bd90bc0d2afe0c7dbc0e84f
+SHA512 (appliance-tools-010.0.tar.bz2) = e6513211b43f8e2c8cf18194de0faaa58f45812eff3db404c2532b2c36c45a9bfd48b85e9f76ad6fc09135231f3aa6381ff38faa0bc5ef83b9e0842fbf6b248b