Compare commits

...

No commits in common. 'c9' and 'i10cs' have entirely different histories.
c9 ... i10cs

@ -1,34 +1,28 @@
# Disable the growpart subpackage in EPEL, as RHEL ships it on its own
%if 0%{?epel}
%bcond_with growpart
%else
%bcond_without growpart
%endif
Summary: Cloud image management utilities Summary: Cloud image management utilities
Name: cloud-utils Name: cloud-utils
Version: 0.33 Version: 0.33
Release: 1%{?dist} Release: 11%{?dist}
License: GPLv3 License: GPL-3.0-only
URL: https://github.com/canonical/cloud-utils/ URL: https://github.com/canonical/%{name}
Source0: cloud-utils-0.33.tar.gz Source: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
# Don't build the cloud-utils main package on EPEL architectures that don't
# have qemu-img. Which means we need to make it a no-noarch package for EPEL
# for this to work properly.
%define BuildMainPackage 1
%if 0%{?rhel}
# don't build debuginfo packages
%global debug_package %{nil}
%ifarch i686 ppc64
%define BuildMainPackage 0
%endif
%else
BuildArch: noarch BuildArch: noarch
%endif
Requires: cloud-utils-growpart Requires: %{name}-growpart
Requires: gawk Requires: %{name}-cloud-localds
Requires: e2fsprogs Requires: %{name}-write-mime-multipart
Requires: file Requires: %{name}-ec2metadata
Requires: python3 Requires: %{name}-resize-part-image
Requires: qemu-img Requires: %{name}-mount-image-callback
Requires: util-linux Requires: %{name}-vcs-run
%description %description
This package provides a useful set of utilities for managing cloud images. This package provides a useful set of utilities for managing cloud images.
@ -38,218 +32,197 @@ cloud-utils package provides several scripts that wrap the complicated tasks
with a much simpler interface. with a much simpler interface.
%if %{with growpart}
%package growpart %package growpart
Summary: Script for growing a partition Summary: A script for growing a partition
Requires: gawk Requires: gawk
# gdisk is only required for resizing GPT partitions and depends on libicu
# (25MB). We don't make this a hard requirement to save some space in non-GPT
# systems.
#Requires: gdisk
Requires: util-linux Requires: util-linux
Recommends: lvm2
%description growpart %description growpart
This package provides the growpart script for growing a partition. It is This package provides the growpart script for growing a partition. It is
primarily used in cloud images in conjunction with the dracut-modules-growroot primarily used in cloud images in conjunction with the dracut-modules-growroot
package to grow the root partition on first boot. package to grow the root partition on first boot.
%endif
%prep %package cloud-localds
%setup -q Summary: A script for creating a nocloud configuration disk for cloud-init
Recommends: tar
Recommends: dosfstools
Recommends: mtools
Recommends: genisoimage
Recommends: qemu-img
%build
%install %description cloud-localds
This package provides the cloud-localds script, which creates a disk-image
with user-data and/or meta-data for cloud-init.
# Create the target directories
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
%if %{BuildMainPackage} %package write-mime-multipart
# Install binaries and manpages Summary: A utilty for creating mime-multipart files
cp bin/* $RPM_BUILD_ROOT/%{_bindir}/
cp man/* $RPM_BUILD_ROOT/%{_mandir}/man1/
# Exclude Ubuntu-specific tools
rm $RPM_BUILD_ROOT/%{_bindir}/*ubuntu*
# Exclude the cloud-run-instances manpage %description write-mime-multipart
rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/cloud-run-instances.* This package provides the write-mime-multipart script, which creates
mime multipart files that can be consumed by cloud-init as user-data.
# Exclude euca2ools wrappers and manpages
rm -f $RPM_BUILD_ROOT/%{_bindir}/cloud-publish-*
rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/cloud-publish-*
%endif
# Install the growpart binary and man page %package ec2metadata
cp bin/growpart $RPM_BUILD_ROOT/%{_bindir}/ Summary: A script to query and display EC2 AMI instance metadata
cp man/growpart.* $RPM_BUILD_ROOT/%{_mandir}/man1/
# Files for the main package %description ec2metadata
%if %{BuildMainPackage} This package provides the ec2metadata script, which can be used to query and
%files display EC2 instance metadata rekated to an AMI instance.
%doc ChangeLog
%{!?_licensedir:%global license %%doc}
%license LICENSE
%{_bindir}/cloud-localds
%{_bindir}/write-mime-multipart
%{_bindir}/ec2metadata
%{_bindir}/resize-part-image
%{_bindir}/mount-image-callback
%{_bindir}/vcs-run
%doc %{_mandir}/man1/resize-part-image.*
%doc %{_mandir}/man1/write-mime-multipart.*
%doc %{_mandir}/man1/cloud-localds.*
%endif
# Files for the growpart subpackage %package resize-part-image
%files growpart Summary: A script for resizing cloud images
%doc ChangeLog
%{!?_licensedir:%global license %%doc} Requires: file
%license LICENSE Requires: gzip
%{_bindir}/growpart Requires: e2fsprogs
%doc %{_mandir}/man1/growpart.* Requires: gawk
Requires: tar
%changelog %description resize-part-image
* Wed Oct 19 2022 Camilla Conte <cconte@redhat.com> - 0.33-1 This package provides the resize-part-image script, which can be used to
- Rebase to 0.33 resize a partition image and the contained filesystem to a new size.
Resolves: bz#2133248
%package mount-image-callback
Summary: A script to run commands over cloud image contents
Requires: gawk
Requires: util-linux
Recommends: qemu-img
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.31-10
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 0.31-9 %description mount-image-callback
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 This package provides the mount-image-callback script, which mounts a cloud
image to a temporary mountpoint and runs a specified command on the contents.
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.31-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.31-7 %package vcs-run
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Summary: Script to run commands over a VCS repository contents
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.31-6 Recommends: breezy
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Recommends: git-core
Recommends: mercurial
Recommends: wget
* Thu Oct 24 2019 Juerg Haefliger <juergh@gmail.com> - 0.31-5
- Bump the release number to differentiate from the previous version which didn't build.
* Thu Oct 24 2019 Juerg Haefliger <juergh@gmail.com> - 0.31-4 %description vcs-run
- Drop euca2ools dependency (retired package) and wrapper scripts [bz#1762325]. This package provides the vcs-run script, which fetches a code repository
into a temporary directory and runs a user-specified command in it.
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.31-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Mon Mar 18 2019 Juerg Haefliger <juergh@gmail.com> - 0.31-2 %prep
- Add new cloud-utils-0.31.tar.gz sources. %setup -q
* Mon Mar 18 2019 Juerg Haefliger <juergh@gmail.com> - 0.31-1 %build
- Requires python3 instead of python2 [bz#1530224].
- Drop python2-paramiko dependency (no longer required).
- Drop cloud-run-instances manpage (script no longer included).
- Rebase to upstream release 0.31
- mount-image-callback: mount with -o 'rw' or -o 'ro' (LP: #1663722)
- mount-image-callback: run blockdev and udevadm settle on nbd devices. (LP: #1741096, 1741300)
- mount-image-callback: Drop support for mounting lxd containers. (LP: #1715994)
- growpart: fix bug that stopped GPT disks from being grown past 2TB. (LP: #1762748)
- mount-image-callback: mention --help and -C/--cd-mountpoint in Usage
- growpart: fix bug when resizing a middle partition with sgdisk (LP: #1706751) [Fred De Backer]
- growpart: Resolve symbolic links before operating. [Kevin Locke] (LP: #1744406)
- growpart: fix bug occurring if start sector and size were the same. [Lars Kellogg-Stedman] (LP: #1807171)
- debian/control: drop Suggests on lxc1
- debian/tests/control: add test growpart-start-matches-size.
- White space cleanup. Remove trailing space and tabs.
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-5 %install
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-4 # Create the target directories
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild install -d %{buildroot}%{_bindir}
install -d %{buildroot}%{_mandir}/man1
* Wed Feb 07 2018 Iryna Shcherbina <ishcherb@redhat.com> - 0.30-3 # Install binaries and manpages
- Update Python 2 dependency declarations to new packaging standards install -pm 0755 bin/* %{buildroot}%{_bindir}/
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) install -pm 0644 man/* %{buildroot}%{_mandir}/man1/
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-2 # Exclude Ubuntu-specific tools
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild rm %{buildroot}%{_bindir}/*ubuntu*
* Tue Dec 12 2017 Sinny Kumari <sinnykumari@fedoraproject.org> - 0.30-1 # Exclude the cloud-run-instances manpage
- Rebase to upstream release 0.30 rm -f %{buildroot}%{_mandir}/man1/cloud-run-instances.*
- Resolves RHBZ#1515835 - growpart fails to resize partition on aarch64
- Remove patches in spec file because they are already available in 0.30
- Fix rpmlint issues on spec file
- Remove LICENSE file, already shipped with 0.30 source tar
- cloud-run-instances binary has been dropped in 0.28
- mount-image-callback and vcs-run binaries has been introduced in 0.28
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.27-18 # Exclude euca2ools wrappers and manpages
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild rm -f %{buildroot}%{_bindir}/cloud-publish-*
rm -f %{buildroot}%{_mandir}/man1/cloud-publish-*
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.27-17 %if %{without growpart}
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild rm -f %{buildroot}%{_bindir}/growpart
rm -f %{buildroot}%{_mandir}/man1/growpart.*
%endif
* Fri Jun 03 2016 Adam Williamson <awilliam@redhat.com> - 0.27-16
- backport fix for RHBZ #1327337 (growpart fail with newer util-linux-ng)
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.27-15 %files
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild %doc ChangeLog
%license LICENSE
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.27-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Wed Mar 25 2015 Juerg Haefliger <juergh@gmail.com> - 0.27-13 %if %{with growpart}
- [1197894] sfdisk dropped --show-pt-geometry option %files growpart
%doc ChangeLog
%license LICENSE
%{_bindir}/growpart
%doc %{_mandir}/man1/growpart.*
%endif
* Fri Jul 11 2014 Tom Callaway <spot@fedoraproject.org> - 0.27-12
- fix license handling
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.27-11 %files cloud-localds
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild %doc ChangeLog
%license LICENSE
%{_bindir}/cloud-localds
%doc %{_mandir}/man1/cloud-localds.*
* Fri Nov 22 2013 Juerg Haefliger <juergh@gmail.com> - 0.27-10
- [966574] growpart spits out a non-fatal error
* Fri Aug 16 2013 Juerg Haefliger <juergh@gmail.com> - 0.27-9 %files write-mime-multipart
- Prevent building of debuginfo packages. %doc ChangeLog
- Fix 32-bit arch type. %license LICENSE
%{_bindir}/write-mime-multipart
%doc %{_mandir}/man1/write-mime-multipart.*
%files ec2metadata
%doc ChangeLog
%license LICENSE
%{_bindir}/ec2metadata
%files resize-part-image
%doc ChangeLog
%license LICENSE
%{_bindir}/resize-part-image
%doc %{_mandir}/man1/resize-part-image.*
%files mount-image-callback
%doc ChangeLog
%license LICENSE
%{_bindir}/mount-image-callback
* Fri Aug 16 2013 Juerg Haefliger <juergh@gmail.com> - 0.27-8
- Make the package a no-noarch package on EPEL so that the build of the main
package can be prevented for the arches that don't support it [bz#986809].
* Tue Aug 06 2013 Juerg Haefliger <juergh@gmail.com> - 0.27-7 %files vcs-run
- Build the growpart subpackage on all EPEL architectures [bz#986809]. %doc ChangeLog
%license LICENSE
%{_bindir}/vcs-run
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.27-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Mon Jun 17 2013 Juerg Haefliger <juergh@gmail.com> - 0.27-5 %changelog
- Don't make gdisk a hard requirement for cloud-utils-growpart to save some * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 0.33-11
space on systems that don't use GPT partitions. - Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Mon Jun 17 2013 Juerg Haefliger <juergh@gmail.com> - 0.27-4 * Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 0.33-10
- Break out the growpart script into its own subpackage to prevent pulling a - Rebuilt for MSVSphere 10
boatload of unnecessary dependencies into a cloud image.
* Mon Apr 8 2013 Juerg Haefliger <juergh@gmail.com> - 0.27-3 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 0.33-10
- 3rd attempt to fix the spec file to only build on x86_64 for EPEL. - Bump release for June 2024 mass rebuild
* Fri Apr 5 2013 Juerg Haefliger <juergh@gmail.com> - 0.27-2 * Wed Jun 12 2024 Miroslav Rezanina <mrezanin@redhat.com> - 0.33-9
- Yet another spec file fix to only build on x86_64 for EPEL. - cu-Drop-obsolete-gdisk-soft-dependency.patch [RHEL-36095]
- Resolves: RHEL-36095
(Remove cloud-utils-growpart dependency on obsolete gdisk)
* Tue Apr 2 2013 Juerg Haefliger <juergh@gmail.com> - 0.27-1 * Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.33-7
- Update to upstream release 0.27. - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
- Fix spec file to only build on x86_64 for EPEL.
* Tue Feb 12 2013 Juerg Haefliger <juergh@gmail.com> - 0.27-0.2.bzr216
- Add GPL-3 license.
- Exclude Ubuntu-specific tools.
- Fix some spec file issues per reviewers comments.
* Tue Feb 5 2013 Juerg Haefliger <juergh@gmail.com> - 0.27-0.1.bzr216
- Initial build based on upstream revision bzr216.

Loading…
Cancel
Save