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

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

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

@@ -0,0 +1,28 @@
+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
+

appliance-tools.spec

@@ -12,7 +12,7 @@
 Name: appliance-tools
 Summary: Tools for building Appliances
 Version: 009.0
-Release: 5.4.riscv64%{?dist}
+Release: 7.0.riscv64%{?dist}
 License: GPLv2
 URL: https://pagure.io/appliance-tools
 
@@ -20,6 +20,7 @@ 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
 
 # Patches for U-Boot RISC-V (riscv64) extlinux support
 Patch0020: uboot-riscv.patch
@@ -67,11 +68,17 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 %{python_sitelib}/ec2convert/
 
 %changelog
-* Sat Mar 30 2019 David Abdurachmanov <david.abdurachmanov@gmail.com> - 009.0-5.0.riscv64
+* Sun Aug 18 2019 David Abdurachmanov <david.abdurachmanov@sifive.com> - 009.0-7.0.riscv64
 - Allow user to override partition layout (clearpart kickstart command)
 - Detect if DTB is available in boot prefix (usually /boot) for extlinux.conf
 - Detect uImage / uInitrd for extlinux.conf
 
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 009.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sat Jul 13 2019 Neal Gompa <ngompa13@gmail.com> - 009.0-6
+- Backport fix to adjust offset from 1M to 4M for bigger uboot images
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 009.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild