forked from pool/diskimage-builder
Accepting request 623931 from home:markoschandras:sysinstall
- Version bump to 2.16.0 * Update pylint to 1.7.6, uncap networkx * Add expected semicolons for dhclient.conf * Add keyring if supplied * Add new modprobe element * Add iscsi-boot element for CentOS images * Fix /etc/network/interfaces file contents * Convert labels to upper case * Fix bootloader for efi on rhel systems * Don't run setfiles on /boot/efi * Add iscsi-boot element * Fix bootloader packages for rhel * Don't install zypper on bionic * Rename output log files * Save and close stdout on exit * Reduce path length in PS4 for debug * Use surrogateescape with outfilter.py * Fix encoding issue during processing output - Package improvements * convert to python3 * Improve description * spec-cleaner fixes OBS-URL: https://build.opensuse.org/request/show/623931 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/diskimage-builder?expand=0&rev=36
This commit is contained in:
Git OBS Bridge
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5e5e5081223ff77f36ed78fe004f117924e641b056dd442b2f3db0cea3bfaa07
|
||||
size 359802
|
||||
3
diskimage-builder-2.16.0.tar.gz
Normal file
3
diskimage-builder-2.16.0.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:42d6d5b69a3b01015a6c8c41036dbd41f53130d6c9d3634364aba6cc0bc97566
|
||||
size 357777
|
||||
@@ -1,6 +1,6 @@
|
||||
# /usr/local/bin/dib-python interpreter is only used inside
|
||||
# the generated image so it's not something that affects the
|
||||
# host or the package itself.
|
||||
addFilter(".*wrong-script-interpreter.*/usr/lib/python2.7/site-packages/diskimage_builder/elements/.*")
|
||||
addFilter(".*wrong-script-interpreter.*/usr/lib/python3.*/site-packages/diskimage_builder/elements/.*")
|
||||
# lib/* scripts are not meant to be used directly but rather be sourced by others.
|
||||
addFilter(".*non-executable-script.*/usr/lib/python2.7/site-packages/diskimage_builder/lib/.*")
|
||||
addFilter(".*non-executable-script.*/usr/lib/python3.*/site-packages/diskimage_builder/lib/.*")
|
||||
|
||||
@@ -1,3 +1,29 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 18 14:52:24 UTC 2018 - mchandras@suse.de
|
||||
|
||||
- Version bump to 2.16.0
|
||||
* Update pylint to 1.7.6, uncap networkx
|
||||
* Add expected semicolons for dhclient.conf
|
||||
* Add keyring if supplied
|
||||
* Add new modprobe element
|
||||
* Add iscsi-boot element for CentOS images
|
||||
* Fix /etc/network/interfaces file contents
|
||||
* Convert labels to upper case
|
||||
* Fix bootloader for efi on rhel systems
|
||||
* Don't run setfiles on /boot/efi
|
||||
* Add iscsi-boot element
|
||||
* Fix bootloader packages for rhel
|
||||
* Don't install zypper on bionic
|
||||
* Rename output log files
|
||||
* Save and close stdout on exit
|
||||
* Reduce path length in PS4 for debug
|
||||
* Use surrogateescape with outfilter.py
|
||||
* Fix encoding issue during processing output
|
||||
- Package improvements
|
||||
* convert to python3
|
||||
* Improve description
|
||||
* spec-cleaner fixes
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 7 13:13:28 UTC 2018 - mchandras@suse.de
|
||||
|
||||
|
||||
@@ -18,10 +18,9 @@
|
||||
|
||||
# Prevent shebangs of element scripts from being added as a requirement (they
|
||||
# are only ever run inside the disk image build chroot).
|
||||
|
||||
%global __requires_exclude_from ^%{python_sitelib}/diskimage_builder/elements/.*$
|
||||
%global __requires_exclude_from ^%{python3_sitelib}/diskimage_builder/elements/.*$
|
||||
Name: diskimage-builder
|
||||
Version: 2.15.1
|
||||
Version: 2.16.0
|
||||
Release: 0
|
||||
Summary: Image Building Tools for OpenStack
|
||||
License: Apache-2.0
|
||||
@@ -31,58 +30,59 @@ Source0: https://pypi.io/packages/source/d/%{name}/%{name}-%{version}.tar
|
||||
Source99: diskimage-builder-rpmlintrc
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: findutils
|
||||
BuildRequires: python-PyYAML >= 3.10.0
|
||||
BuildRequires: python-devel
|
||||
BuildRequires: python3-PyYAML >= 3.10.0
|
||||
BuildRequires: python3-networkx >= 1.10
|
||||
BuildRequires: python3-pbr >= 2.0.0
|
||||
BuildRequires: python3-setuptools
|
||||
# Test requirements (python2 only)
|
||||
BuildRequires: python2-PyYAML >= 3.10.0
|
||||
BuildRequires: python2-fixtures
|
||||
BuildRequires: python2-networkx >= 1.10
|
||||
# Test requirements:
|
||||
BuildRequires: python-fixtures
|
||||
BuildRequires: python-oslotest
|
||||
BuildRequires: python-pbr >= 2.0.0
|
||||
BuildRequires: python-setuptools
|
||||
BuildRequires: python-stevedore >= 1.20.0
|
||||
BuildRequires: python-testrepository
|
||||
BuildRequires: python-testtools
|
||||
BuildRequires: python2-oslotest
|
||||
BuildRequires: python2-stevedore >= 1.20.0
|
||||
BuildRequires: python2-testrepository
|
||||
BuildRequires: python2-testtools
|
||||
BuildRequires: sed
|
||||
# No stuff in python_sitelib, thus autoreqprov won't work:
|
||||
Requires: kpartx
|
||||
Requires: python-Babel >= 2.3.4
|
||||
Requires: python-PyYAML >= 3.10.0
|
||||
Requires: python-six >= 1.10.0
|
||||
Requires: python-stevedore >= 1.20.0
|
||||
Requires: python2-networkx >= 1.10
|
||||
Requires: python3-Babel >= 2.3.4
|
||||
Requires: python3-PyYAML >= 3.10.0
|
||||
Requires: python3-networkx >= 1.10
|
||||
Requires: python3-six >= 1.10.0
|
||||
Requires: python3-stevedore >= 1.20.0
|
||||
Requires: qemu-tools
|
||||
Requires: python(abi) = %{py_ver}
|
||||
# diskimage-builder-2.0.0 was merged with python-dib-utils
|
||||
Provides: python-dib-utils = %version
|
||||
Obsoletes: python-dib-utils < %version
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
These tools are the components of TripleO
|
||||
(https://wiki.openstack.org/wiki/TripleO) that are responsible for
|
||||
building disk images.
|
||||
diskimage-builder is a tool for automatically building customized
|
||||
operating-system images for use in clouds and other environments.
|
||||
|
||||
It includes support for building images based on many major
|
||||
distributions and can produce cloud-images in all common formats
|
||||
(qcow2, vhd, raw, etc), bare metal file-system images and ram-disk
|
||||
images. These images are composed from the many included elements;
|
||||
diskimage-builder acts as a framework to easily add your own elements
|
||||
for even further customization.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
# Fix env-script-interpreter rpmlint warning
|
||||
find diskimage_builder/elements -type f -perm /a+x \
|
||||
-exec sh -c "sed -E -i s@^#\!/usr/bin/env[[:space:]]+python@#\!/usr/bin/python@ {}" \;
|
||||
-exec sh -c "sed -E -i s@^#\!%{_bindir}/env[[:space:]]+python@#\!%{_bindir}/python@ {}" \;
|
||||
|
||||
%build
|
||||
%{__python2} setup.py build
|
||||
%python3_build
|
||||
|
||||
%install
|
||||
%{__python2} setup.py install --prefix=%{_prefix} --root=%{buildroot}
|
||||
%python3_install
|
||||
%py3_compile %{buildroot}
|
||||
%fdupes %{buildroot}
|
||||
%py_compile %{buildroot}
|
||||
|
||||
%check
|
||||
if [ ! -d ./.testrepository ] ; then testr init ; fi
|
||||
testr run %{?_smp_mflags:--parallel %{_smp_flags}} #; RET=$? echo "Slowest Tests" ; testr slowest && exit $RET
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc ChangeLog README.rst AUTHORS
|
||||
%license LICENSE
|
||||
%{_bindir}/dib-block-device
|
||||
@@ -90,7 +90,7 @@ testr run %{?_smp_mflags:--parallel %{_smp_flags}} #; RET=$? echo "Slowest Tests
|
||||
%{_bindir}/dib-lint
|
||||
%{_bindir}/element-info
|
||||
%{_bindir}/ramdisk-image-create
|
||||
%{python_sitelib}/diskimage_builder/
|
||||
%{python_sitelib}/diskimage_builder*.egg-info/
|
||||
%{python3_sitelib}/diskimage_builder/
|
||||
%{python3_sitelib}/diskimage_builder*.egg-info/
|
||||
|
||||
%changelog
|
||||
|
||||
Reference in New Issue
Block a user