diff --git a/.gitignore b/.gitignore index 1673fb6..0ff1a86 100644 --- a/.gitignore +++ b/.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 diff --git a/0001-Leave-more-space-4MB-for-uboot-before-the-first-part.patch b/0001-Leave-more-space-4MB-for-uboot-before-the-first-part.patch deleted file mode 100644 index 3feb014..0000000 --- a/0001-Leave-more-space-4MB-for-uboot-before-the-first-part.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 890341694c407fed77b817ccef1f1f70c3506378 Mon Sep 17 00:00:00 2001 -From: Pablo Greco -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 - diff --git a/0001-fstype-is-optional-for-swap-check-mountpoint-also.patch b/0001-fstype-is-optional-for-swap-check-mountpoint-also.patch deleted file mode 100644 index 301eaee..0000000 --- a/0001-fstype-is-optional-for-swap-check-mountpoint-also.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 52ca919e15e246324d084f2a9d03884aa9bfb81f Mon Sep 17 00:00:00 2001 -From: Pablo Greco -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 - diff --git a/appliance-tools.spec b/appliance-tools.spec index e0378c6..753beab 100644 --- a/appliance-tools.spec +++ b/appliance-tools.spec @@ -20,17 +20,13 @@ Name: appliance-tools Summary: Tools for building Appliances -Version: 009.0 -Release: 11%{?dist} +Version: 010.0 +Release: 1%{?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 - # Ensure system deps are installed (rhbz#1409536) Requires: python%{python_pkgversion}-imgcreate %{?min_imgcrate_evr:>= %{min_imgcreate_evr}} Requires: python%{python_pkgversion}-progress @@ -39,6 +35,9 @@ Requires: curl rsync kpartx Requires: zlib Requires: qemu-img Requires: xz +%if 0%{?fedora} +Requires: btrfs-progs +%endif Requires: xfsprogs Requires: sssd-client BuildRequires: python%{python_pkgversion}-devel @@ -74,6 +73,10 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name} %{python_sitelib}/ec2convert/ %changelog +* Fri Jul 10 2020 Neal Gompa - 010.0-1 +- Update to 010.0 release +- Drop merged patches + * Tue May 26 2020 Miro HronĨok - 009.0-11 - Rebuilt for Python 3.9 diff --git a/sources b/sources index 311c74e..4cdcdc2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (appliance-tools-009.0.tar.bz2) = 2c85ff875b346e0223691690ccbbdf81dd1ac3ac4faf738e6edac79ca4fad849fefcacd75e852b0f7f12ccbb402bf16288d70e2e4bd90bc0d2afe0c7dbc0e84f +SHA512 (appliance-tools-010.0.tar.bz2) = e6513211b43f8e2c8cf18194de0faaa58f45812eff3db404c2532b2c36c45a9bfd48b85e9f76ad6fc09135231f3aa6381ff38faa0bc5ef83b9e0842fbf6b248b