Added sub-package for image minimizer (dhuff)

- image-minimizer: support drop-keep-drop
- image-minimizer: add droprpm/keeprpm

.gitignore

@@ -1,25 +1,2 @@
 appliance-tools-004.5.tar.bz2
 /appliance-tools-005.tar.bz2
-/appliance-tools-006.tar.bz2
-/appliance-tools-006.1.tar.bz2
-/appliance-tools-006.2.tar.bz2
-/appliance-tools-006.3.tar.bz2
-/appliance-tools-006.4.tar.bz2
-/appliance-tools-006.5.tar.bz2
-/appliance-tools-006.6.tar.bz2
-/appliance-tools-007.0.tar.bz2
-/appliance-tools-007.1.tar.bz2
-/appliance-tools-007.2.tar.bz2
-/appliance-tools-007.3.tar.bz2
-/appliance-tools-007.4.tar.bz2
-/appliance-tools-007.5.tar.bz2
-/appliance-tools-007.6.tar.bz2
-/appliance-tools-007.7.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
-/appliance-tools-010.1.tar.bz2
-/appliance-tools-010.2.tar.bz2
-/appliance-tools-011.0.tar.bz2
-/appliance-tools-011.1.tar.bz2

appliance-tools.spec

@@ -1,328 +1,83 @@
-%if (0%{?rhel} && 0%{?rhel} <= 7)
-# Since the Python 3 stack in EPEL is missing too many dependencies,
-# we're sticking with Python 2 there for now.
-%global __python %{__python2}
-%global python_pkgversion %{nil}
-%else
-# Default to Python 3 when not EL
-%global __python %{__python3}
-%global python_pkgversion %{python3_pkgversion}
-%endif
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "import distutils.sysconfig as d; print d.get_python_lib()")}
 
-# Minimum version of imgcreate (livecd-tools)
-%global min_imgcreate_ver 25.0-2
+%define debug_package %{nil}
 
-%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: 011.1
+Name: appliance-tools
+Version: 005
 Release: 1%{?dist}
 License: GPLv2
-URL: https://pagure.io/appliance-tools
-
-Source0: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2
-
-# Ensure system deps are installed (rhbz#1409536)
-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
+Group: System Environment/Base
+URL: http://thincrust.org/
+# The source for this package was pulled from upstream's vcs.  Use the
+# following commands to generate the tarball:
+#  git clone git://git.fedorahosted.org/appliance-tools
+#  cd appliance-tools
+#  git checkout appliance-tools-005
+#  make dist
+Source0: %{name}-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Requires: livecd-tools >= 020 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
-BuildRequires: /usr/bin/pod2man
-BuildRequires: /usr/bin/which
+BuildRequires: python
 BuildArch: noarch
+ExcludeArch: ppc64 s390 s390x
 
 
 %description
-Tools for generating appliance images on Fedora based systems, including
-derived distributions such as RHEL, CentOS, and others.
+Tools for generating appliance images on Fedora based systems including
+derived distributions such as RHEL, CentOS and others.
+See http://thincrust.net for more details.
+
+%package minimizer
+Summary: Tool to minimize a appliance image
+Group: System Environment/Base
+BuildArch: noarch
+
+%description minimizer
+Tool that helps remove unwanted files from the appliance image.
 
 %prep
-%autosetup -p1
+%setup -q
 
 %build
-# Nothing to do
+make
 
 %install
-%make_install PYTHON=%{__python}
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
-# Delete docs, we'll grab them later
-rm -rf %{buildroot}%{_datadir}/doc/%{name}
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 %files
-%doc README
+%defattr(-,root,root,-)
+%doc README COPYING
 %doc config/fedora-aos.ks
-%license COPYING
 %{_mandir}/man*/*
 %{_bindir}/appliance-creator
 %{_bindir}/ec2-converter
-%{python_sitelib}/appcreate/
-%{python_sitelib}/ec2convert/
+%dir %{python_sitelib}/appcreate
+%dir %{python_sitelib}/ec2convert
+%{python_sitelib}/appcreate/*.py
+%{python_sitelib}/appcreate/*.pyo
+%{python_sitelib}/appcreate/*.pyc
+%{python_sitelib}/ec2convert/*.py
+%{python_sitelib}/ec2convert/*.pyo
+%{python_sitelib}/ec2convert/*.pyc
+
+%files minimizer
+%defattr(-,root,root,-)
+%doc COPYING
+%{_bindir}/image-minimizer
 
 %changelog
-* Thu Aug 27 2020 Neal Gompa <ngompa13@gmail.com> - 011.1-1
-- Update to 011.1 release
-
-* Wed Aug 26 2020 Neal Gompa <ngompa13@gmail.com> - 011.0-1
-- Update to 011.0 release
-- Drop merged patches
-
-* Wed Aug 26 2020 Neal Gompa <ngompa13@gmail.com> - 010.2-3
-- Refresh patches for fixing bootloader config for btrfs
-
-* Wed Aug 26 2020 Neal Gompa <ngompa13@gmail.com> - 010.2-2
-- Add proposed patch to fix configuring fstab and grub for btrfs (#1855034)
-
-* Mon Aug 24 2020 Neal Gompa <ngompa13@gmail.com> - 010.2-1
-- Update to 010.2 release
-
-* Sun Aug 23 2020 Neal Gompa <ngompa13@gmail.com> - 010.1-1
-- Update to 010.1 release
-- Drop merged patches
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 010.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* 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)
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 009.0-8
-- Rebuilt for Python 3.8
-
-* 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
-
-* Thu Nov 22 2018 Neal Gompa <ngompa13@gmail.com> - 009.0-4
-- Backport fix to detect swap partition type correctly
-
-* Thu Nov 22 2018 Neal Gompa <ngompa13@gmail.com> - 009.0-3
-- Add missing dep for python-future
-
-* Thu Nov 15 2018 Neal Gompa <ngompa13@gmail.com> - 009.0-2
-- Fix package description grammar
-- Fix grabbing docs on EL7
-
-* Thu Nov 15 2018 Neal Gompa <ngompa13@gmail.com> - 009.0-1
-- Update to 009.0 relase
-- Dropped merged patches
-- Added compatibility for EL7 builds
-
-* Tue Nov 13 2018 Neal Gompa <ngompa13@gmail.com> - 008.0-11
-- Port to Python 3
-- Backport xz multi-threading support
-- Refresh nss libs hack patch
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 008.0-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Jul 05 2018 Kevin Fenzi <kevin@scrye.com> - 008.0-9
-- Add a patch to open nss libs in the chroot to avoid install_root keeping them open. 
-- See https://bugzilla.redhat.com/show_bug.cgi?id=1591804
-
-* Sat Feb 10 2018 Neal Gompa <ngompa13@gmail.com> - 008.0-8
-- Fix compatibility with pykickstart 3.9+ (#1544075)
-- Bump requires of livecd-tools to minimum version with pykickstart 3.9+ compatibility
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 008.0-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Fri Dec 15 2017 Iryna Shcherbina <ishcherb@redhat.com> - 008.0-6
-- Update Python 2 dependency declarations to new packaging standards
-  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 008.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Sun Mar 12 2017 Neal Gompa <ngompa13@gmail.com> - 008.0-4
-- Use 16 MiB block size for xz compression (#984704)
-
-* Tue Feb 28 2017 Neal Gompa <ngompa13@gmail.com> - 008.0-3
-- Backport patches to make more RPi friendly (#1270606)
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 008.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Sat Feb 04 2017 Neal Gompa <ngompa13@gmail.com> - 008.0-1
-- Dropped merged patches
-- Moved to pagure
-- Modernize spec and fix changelog entries
-
-* Mon Jan 02 2017 Neal Gompa <ngompa13@gmail.com> - 007.8-14
-- Add missing Epoch for python-imgcreate dependency (#1409650)
-
-* Mon Jan 02 2017 Neal Gompa <ngompa13@gmail.com> - 007.8-13
-- Bump python-imgcreate dependency to ensure system deps are installed (#1409536)
-
-* Mon Dec 19 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 007.8-12
-- Add missing python-urlgrabber dependency (RHBZ #1405942)
-
-* Tue Dec 06 2016 Neal Gompa <ngompa13@gmail.com> 007.8-11
-- Change dependency from livecd-tools to python-imgcreate
-- Fix for python-imgcreate v24 compatibility
-
-* Tue Sep 20 2016 Peter Robinson <pbrobinson@fedoraproject.org> 007.8-10
-- Fix swap partition type creation
-- Set boot partition as bootable
-
-* Sat Sep 17 2016 Peter Robinson <pbrobinson@fedoraproject.org> 007.8-9
-- Allow 4 primary partitions
-
-* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 007.8-8
-- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 007.8-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Sun Oct 11 2015 Lubomir Rintel <lkundrak@v3.sk> - 007.8-6
-- Add a dependency on sssd-client
-- Remove thincrust.org references
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 007.8-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Thu Aug 21 2014 Dennis Gilmore <dennis@ausil.us> - 007.8-4
-- add a hack to preload the sss nss library
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 007.8-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sat Apr 26 2014 Dennis Gilmore <dennis@ausil.us> - 007.8-1
-- drop image-minimiser
-- change partitioning alignment to be optimal rhbz#990469
-- change default timeout in extlinux config
-* Wed Mar 05 2014 Dennis Gilmore <dennis@ausil.us> - 007.7-2
-- Require xfsprogs
-
-* Tue Feb 11 2014 Dennis Gilmore <dennis@ausil.us> - 007.7-1
-- make sure the package list is available when we need it
-
-* Tue Feb 11 2014 Dennis Gilmore <dennis@ausil.us> - 007.6-1
-- use a slightly different path for extlinux-bootloader package
-
-* Mon Feb 10 2014 Dennis Gilmore <dennis@ausil.us> - 007.5-1
-- arm needs extlinux-bootloader to provide for extlinux support 
-- not syslinux-extlinux
-
-* Mon Aug 26 2013 Dennis Gilmore <dennis@ausil.us> - 007.4-1
-- refacter how re deal with each mount point old version did not handle swap
-
-* Mon Aug 26 2013 Dennis Gilmore <dennis@ausil.us> - 007.3-1
-- make sure that we only have a single instance of each mount point
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 007.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Fri Jun 21 2013 Dennis Gilmore <dennis@ausil.us> - 007.2-1
-- fix up call to xz
-
-* Fri Jun 21 2013 Dennis Gilmore <dennis@ausil.us> - 007.1-1
-- xz compress raw images
-
-* Fri Jun 07 2013 Dennis Gilmore <dennis@ausil.us> - 007.0-1
-- specify filesystem type when creating partitions
-- extlinux fixes from mattdm
-- dont use -F 32 when making vfat partition
-
-* Thu May 23 2013 Dennis Gilmore <dennis@ausil.us> - 006.6-1
-- really start at 1mb
-- compress qcow2 by default
-- make sure we dont destroy our newly created vfat partition
-
-* Wed May 22 2013 Dennis Gilmore <dennis@ausil.us> - 006.5-2
-- add patch to read vfat uuid earlier
-- leave first mb free
-
-* Sun May 19 2013 Dennis Gilmore <dennis@ausil.us> - 006.5-1
-- fix writing out kickstart file
-
-* Sat May 18 2013 Dennis Gilmore <dennis@ausil.us> - 006.4-1
-- write out kickstart file
-- correctly write out extlinux config
-- dont require --ondisk for partitions
-
-* Sun May 12 2013 Dennis Gilmore <dennis@ausil.us> - 006.3-2
-- add patch for typo fixes in extlinux config from mattdm
-
-* Fri May 10 2013 Dennis Gilmore <dennis@ausil.us> - 006.3-1.1
-- BuildRequires: /usr/bin/pod2man
-
-* Fri May 10 2013 Dennis Gilmore <dennis@ausil.us> - 006.3-1
-- update to 006.3
-- use UUID's for fstab and root lines
-- support making vfat partition for /boot/uboot
-- support extlinux as a bootloader
-
-* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 006.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Thu Aug 09 2012 Marek Goldmann <mgoldman@redhat.com> - 006.2-1
-- Upstream release 006.2
-
-* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 006.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Mon Feb 13 2012 Dennis Gilmore <dennis@ausil.us> - 006.1-3
-- add patch to always write out a legacy grub config file
-
-* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 006.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Fri Nov 11 2011 Marek Goldmann <mgoldman@redhat.com> - 006.1-1
-- Upstream release 006.1
-- Search for grub files also in ARCH-pc directories
-
-* Fri Nov 11 2011 Marek Goldmann <mgoldman@redhat.com> - 006-1
-- Support for GRUB2 rhbz#744390
-- Align partitions by default
-- Search for grub files also in ARCH-unknown directories
-- Allow to build appliances without GRUB installed at all
-
-* Sat Oct 29 2011 Dennis Gilmore <dennis@ausil.us> - 005-1.nogrubhack.2
-- update hack to work around no grub being installed so we can compose ec2 images
-
-* Sat Oct 29 2011 Dennis Gilmore <dennis@ausil.us> - 005-1.nogrubhack
-- add a hack to work around no grub being installed so we can compose ec2 images
-
 * Mon Apr 04 2011 Alan Pevec <apevec@redhat.com> 005-1
 - image-minimizer: support drop-keep-drop
 - image-minimizer: add droprpm/keeprpm
 - Added sub-package for image minimizer (dhuff)
 
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 004.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
 * Fri Aug 20 2010 Adam Tkac <atkac redhat com> - 004.5-1
 - rebuild to ensure NVR in F14 is bigger than in F13
 - merge following changes from F12 branch [David Huff]:
@@ -336,32 +91,32 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 004.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Tue Jul 07 2009 David Huff <dhuff@redhat.com> -004.4
+*Mon Jul 07 2009 David Huff <dhuff@redhat.com> -004.4
 - added functionality include additional modules in ramdisk 
 
-* Mon Dec 01 2008 David Huff <dhuff@redhat.com> -004.2
+*Mon Dec 01 2008 David Huff <dhuff@redhat.com> -004.2
 - changed form ExclusiveArch to EcludeArch to fix broken deps
 
-* Mon Dec 01 2008 David Huff <dhuff@redhat.com> - 004
+*Mon Dec 01 2008 David Huff <dhuff@redhat.com> - 004
 - bumped version for rebuild for Python 2.6
 - Allow the user to pass in --version and --release command line paramneters (bkearney)
 - Patches to integrate ec2 conversion into the adk (bkeareny)
 - Allow the appliance-creator to use remote urls with the new image tools (bkearney)
 
-* Fri Nov 14 2008 David Huff <dhuff@redhat.com> - 003.9
+*Fri Nov 14 2008 David Huff <dhuff@redhat.com> - 003.9
 - Fixed bug in globbing files under a directory (pmyers)
 
-* Fri Nov 14 2008 David Huff <dhuff@redhat.com> - 003.8
+*Fri Nov 14 2008 David Huff <dhuff@redhat.com> - 003.8
 - Fixed bug that causes appliance-creator to stacktrace when -i is omitted (pmyers)
 
-* Wed Nov 12 2008 David Huff <dhuff@redhat.com> - 003.7
+*Wed Nov 12 2008 David Huff <dhuff@redhat.com> - 003.7
 - Fixed problem with -i only taking one file, now can include a dir
 - Fixed versioning of source file, ie. 003.7
 
-* Mon Nov 10 2008 David Huff <dhuff@redhat.com> - 003-6
+*Mon Nov 10 2008 David Huff <dhuff@redhat.com> - 003-6
 - Fixed broken dependencies for specific archs where qemu is not available
 
-* Fri Nov 07 2008 David Huff <dhuff@redhat.com> - 003-5
+*Fri Nov 07 2008 David Huff <dhuff@redhat.com> - 003-5
 - Added error for Incomplete partition info (#465988)
 - Fixed problem with long move operations (#466278)
 - Fixed error converting disk formats (#464798)
@@ -372,7 +127,7 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 - Added option for -o outdir, no longer uses name
 - OutPut is now in a seprate dir under appliance name
 
-* Wed Sep 17 2008 David Huff <dhuff@redhat.com> - 003-4
+*Wed Sep 17 2008 David Huff <dhuff@redhat.com> - 003-4
 - Removed all the kickstart files in the config dir to mirror livecd-tools
 - Added the image minimization to the refactored code (BKearney)
 - multiple interface issue (#460922)
@@ -381,7 +136,7 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 - added --vmem and --vcpu options
 - Merged ec2-converter code (jboggs)
 
-* Tue Aug 26 2008 David Huff <dhuff@redhat.com> - 003-3
+*Tue Aug 26 2008 David Huff <dhuff@redhat.com> - 003-3
 - release 3 fixes minor build errors 
 
 * Wed Jul 09 2008 David Huff <dhuff@redhat.com> - 003-1

sources

@@ -1 +1 @@
-SHA512 (appliance-tools-011.1.tar.bz2) = 91f5248248fd877c34bf2389298cafd6e8fc406edb8daa32b98358b1fef96065d68a8ad18f08272b7632d96b7b983355eb01c87504c5810a6b0838d1a1395ff9
+a6e2a14d2fa474658a68845ce7ad06e9  appliance-tools-005.tar.bz2