Hello community, here is the log from the commit of package python-kiwi for openSUSE:Factory checked in at 2019-08-07 13:56:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-kiwi (Old) and /work/SRC/openSUSE:Factory/.python-kiwi.new.9556 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-kiwi" Wed Aug 7 13:56:51 2019 rev:45 rq:720209 version:9.18.9 Changes: -------- --- /work/SRC/openSUSE:Factory/python-kiwi/python-kiwi.changes 2019-07-17 14:23:08.344121041 +0200 +++ /work/SRC/openSUSE:Factory/.python-kiwi.new.9556/python-kiwi.changes 2019-08-07 13:57:05.060855722 +0200 @@ -1,0 +2,292 @@ +Fri Jul 26 16:23:49 CEST 2019 - Marcus Schäfer <m...@suse.de> + +- Bump version: 9.18.8 → 9.18.9 + +------------------------------------------------------------------- +Fri Jul 26 16:03:03 CEST 2019 - Marcus Schäfer <m...@suse.de> + +- Fixed left over import of six module + + The use of the six compat module was needed to support py2 + With the drop of py2 support all of six was no longer needed. + However this one was overlooked. + +------------------------------------------------------------------- +Fri Jul 26 16:02:32 CEST 2019 - Daniel Molkentin <daniel.molken...@suse.com> + +- 99-kiwi-lib requires rmdir, install it + + Fixes bsc#1143033 + +------------------------------------------------------------------- +Thu Jul 25 11:04:29 CEST 2019 - Marcus Schäfer <m...@suse.de> + +- Bump version: 9.18.7 → 9.18.8 + +------------------------------------------------------------------- +Wed Jul 24 09:51:02 CEST 2019 - Marcus Schäfer <m...@suse.de> + +- Added multiconsole setup to Fedora build test + +------------------------------------------------------------------- +Tue Jul 23 11:05:42 CEST 2019 - Marcus Schäfer <m...@suse.de> + +- Allow multiple values for grub terminal setup + + With regards to the grub documentation from + https://www.gnu.org/software/grub/manual/grub/grub.html#terminal_005finput + multiple terminal consoles can be active. This patch allows + to specify terminal collection between serial, console and gfxterm + This Fixes #1123 + +------------------------------------------------------------------- +Tue Jul 23 09:55:05 CEST 2019 - Marcus Schäfer <m...@suse.de> + +- Bump version: 9.18.6 → 9.18.7 + +------------------------------------------------------------------- +Mon Jul 22 18:12:30 CEST 2019 - Marcus Schäfer <m...@suse.de> + +- Fixed use of Command calls in destructors + + The Command class creates namedtuple to store the result + of the call. That tuple is created inside of the Command + namespace. If called inside of a __del__ destructor which + is often the case in kiwi classes I recently observed an + exception from python saying: + + File "/usr/lib64/python3.6/collections/__init__.py", line 429, in namedtuple + File "<string>", line 1, in <module> + ModuleNotFoundError: import of builtins halted; None in sys.modules + + I do not understand why this is a problem for python now + and only found the solution in making the command_type variable + a global namedtuple. + +------------------------------------------------------------------- +Mon Jul 22 09:00:43 CEST 2019 - Marcus Schäfer <m...@suse.de> + +- Bump version: 9.18.5 → 9.18.6 + +------------------------------------------------------------------- +Sat Jul 20 16:43:08 CEST 2019 - Neal Gompa <ngomp...@gmail.com> + +- Fix the pyxattr dependency to allow kiwi to function + + Most Linux distributions offer the pyxattr module, including + openSUSE Tumbleweed. Going forward, we will use the pyxattr + module by default as a dependency and only switch back to the + other xattr module when on older SUSE Linux distributions that + lack the pyxattr module. + + Note that because kiwi uses setuptools to create the CLI entry + points, kiwi checks the Python dependencies before executing, + so we change the dependency in the setup.py accordingly so that + it will not fail to start. + +------------------------------------------------------------------- +Fri Jul 19 16:47:23 CEST 2019 - Marcus Schäfer <m...@suse.de> + +- Bump version: 9.18.4 → 9.18.5 + +------------------------------------------------------------------- +Fri Jul 19 16:42:47 CEST 2019 - Marcus Schäfer <m...@suse.de> + +- Update spec file requirements for xattr + + On suse systems the python-xattr module is used. On any other + distribution the python-pyxattr module is used. This commit + modifies the spec file to reflect the Requires tag appropriately. + On CentOS there is currently no pyxattr build available. Thus we + provide that package for this target in the KIWI Staging area + at Virtualization:Appliances:Staging. There is an ongoing effort + to bring pyxattr to EPEL which would make it available on CentOS + and would obsolete the custom build we did. + +------------------------------------------------------------------- +Fri Jul 19 15:49:37 CEST 2019 - Marcus Schäfer <m...@suse.de> + +- Bump version: 9.18.3 → 9.18.4 + +------------------------------------------------------------------- +Fri Jul 19 15:47:49 CEST 2019 - Marcus Schäfer <m...@suse.de> + +- Update PXE integration test + + Move to multibuild, build one standard(uncompressed) filesystem + image and one compressed version. In any case we expect only + one compression process either on the filesystem file or on + the archive creation. This is related to Issue #1039 + +------------------------------------------------------------------- +Fri Jul 19 13:04:23 CEST 2019 - David Cassany <dcass...@suse.com> + +- Do not recompress PXE image if compressed flag is true + + This commit is two fold: + + * Refactor PXE builder to make use of the ArchiveTar instead of + directly calling tar command. + * Do not compress PXE tarball if the contained image is already + compressed according the type's compressed attribute. + + Related to #1039 + +------------------------------------------------------------------- +Fri Jul 19 11:15:07 CEST 2019 - Marcus Schäfer <m...@suse.de> + +- Fixed use of FileSystemBuilder class + + This was a broken coding for the construction of a + FileSystemBuilder instance in the PxeBuilder implementation. + The unit testing did not fail due to mocking code. + Integration testing however showed it immediately + +------------------------------------------------------------------- +Thu Jul 18 11:44:02 CEST 2019 - Marcus Schäfer <m...@suse.de> + +- Added support for fscreateoptions attribute + + Along with the fsmountoptions attribute there is now also the + fscreateoptions attribute which allows to control the options + used for creating the filesystem. Please note, it's not kiwi's + task to validate that the given option string is supported + by the selected filesystem. This means providing wrong values + here will cause the build to fail at the time the filesystem + gets created. This Fixes #1109 + +------------------------------------------------------------------- +Wed Jul 17 16:49:09 CEST 2019 - David Cassany <dcass...@suse.com> + +- Do not compress the install tarball archive + + Most of the components of the *.install.tar.xz file of a PXE install + image are already compressed, thus it doesn't make much sense to + recompress them again. + + Fixes #1032 + +------------------------------------------------------------------- +Tue Jul 16 18:24:47 CEST 2019 - Dan Čermák <dcer...@suse.com> + +- virtual_size must be an integer in metadata.json for libvirt vagrant boxes + + vagrant-libvirt expects that the parameter virtual_size from metadata.json is an + integer and not a string. + Supplying a string results in a backtrace when the user provides a different + value for libvirt.machine_virtual_size (as the integer is then compared to + string). + +------------------------------------------------------------------- +Tue Jul 16 11:58:50 CEST 2019 - Marcus Schäfer <m...@suse.de> + +- Bump version: 9.18.2 → 9.18.3 + +------------------------------------------------------------------- +Mon Jul 15 12:21:09 CEST 2019 - Marcus Schäfer <m...@suse.de> + +- Fixed ISO creation in EFI mode with cdrtools + + The changes introduced in #1113 will use the configured bootloader + e.g grub to boot the ISO image in BIOS and EFI mode. The creation + process works flawlessly if xorriso is used. However if cdrtools + are configured the options passed to e.g mkisofs were wrong. In + addition it's not possible to create a hybrid ISO based on + isohybrid if the loader is not isolinux. If cdrtools are in use + the process to make an ISO hybrid bootable is always based on + isohybrid and thus only works with isolinux. This patch also ++++ 105 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/python-kiwi/python-kiwi.changes ++++ and /work/SRC/openSUSE:Factory/.python-kiwi.new.9556/python-kiwi.changes ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-kiwi.spec ++++++ --- /var/tmp/diff_new_pack.rZyRKy/_old 2019-08-07 13:57:08.740855682 +0200 +++ /var/tmp/diff_new_pack.rZyRKy/_new 2019-08-07 13:57:08.740855682 +0200 @@ -19,34 +19,32 @@ # If they aren't provided by a system installed macro, define them %{!?_defaultdocdir: %global _defaultdocdir %{_datadir}/doc} -%{!?__python2: %global __python2 /usr/bin/python2} %{!?__python3: %global __python3 /usr/bin/python3} -# Expanded form required for debbuild's simpler engine -%if %{undefined python2_sitelib} -%global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") -%endif - %if %{undefined python3_sitelib} %global python3_sitelib %(%{__python3} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") %endif +%if 0%{?el7} +%global python3_pkgversion 36 +%else +%{!?python3_pkgversion:%global python3_pkgversion 3} +%endif + %if 0%{?debian} || 0%{?ubuntu} %global is_deb 1 %global pygroup python %global sysgroup admin %global develsuffix dev -%global update_alternatives %{_bindir}/update-alternatives %else %global pygroup Development/Languages/Python %global sysgroup System/Management %global develsuffix devel -%global update_alternatives %{_sbindir}/update-alternatives %endif Name: python-kiwi -Version: 9.17.42 -Provides: kiwi-schema = 6.6 +Version: 9.18.9 +Provides: kiwi-schema = 7.1 Release: 0 Url: https://github.com/SUSE/kiwi Summary: KIWI - Appliance Builder Next Generation @@ -59,19 +57,12 @@ Source: %{name}.tar.gz Source1: %{name}-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?fedora} || 0%{?suse_version} BuildRequires: gcc -BuildRequires: python3-devel -%endif -%if 0%{?fedora} || 0%{?suse_version} || 0%{?ubuntu} >= 1804 || 0%{?debian} >= 9 -BuildRequires: python3-setuptools +BuildRequires: python%{python3_pkgversion}-%{develsuffix} +BuildRequires: python%{python3_pkgversion}-setuptools BuildRequires: fdupes -%endif -BuildRequires: python-%{develsuffix} -BuildRequires: python-setuptools %if 0%{?suse_version} BuildRequires: shadow -BuildRequires: update-alternatives %endif %if 0%{?debian} || 0%{?ubuntu} BuildRequires: passwd @@ -85,121 +76,29 @@ for Linux supported hardware platforms as well as for virtualization and cloud systems like Xen, KVM, VMware, EC2 and more. -# python2-kiwi -%package -n python2-kiwi -Summary: KIWI - Appliance Builder Next Generation -Group: %{pygroup} -Provides: python-kiwi = %{version}-%{release} -%if 0%{?fedora} || 0%{?suse_version} -Recommends: jing -%endif -%if 0%{?debian} || 0%{?ubuntu} || 0%{?fedora} || 0%{?rhel} -Requires: python-yaml -%else -Requires: python-PyYAML -%endif -Requires: python-docopt -Requires: python-future -Requires: python-lxml -Requires: python-requests -Requires: python-setuptools -Requires: python-six -Requires: python-xattr -# tools used by kiwi -%if 0%{?suse_version} -Requires: update-alternatives -Requires(post): update-alternatives -Requires(postun): update-alternatives -%ifarch x86_64 -Requires: grub2-x86_64-efi -%endif -%ifarch %{ix86} x86_64 -Recommends: gfxboot -%endif -Requires: qemu-tools -Requires: squashfs -Requires: gptfdisk -%endif -%if 0%{?fedora} || 0%{?rhel} -Requires: chkconfig -Requires(post): chkconfig -Requires(postun): chkconfig -Requires: qemu-img -Requires: squashfs-tools -Requires: gdisk -Requires: dnf -Provides: kiwi-packagemanager:dnf -Provides: kiwi-packagemanager:yum -%endif -%if 0%{?suse_version} -# If it's available, let's pull it in -Recommends: dnf -%endif -%if 0%{?fedora} >= 26 || 0%{?suse_version} -Requires: zypper -Provides: kiwi-packagemanager:zypper -%endif -%if 0%{?debian} || 0%{?ubuntu} -Requires: debootstrap -Requires: qemu-utils -Requires: squashfs-tools -Requires: gdisk -%endif -Requires: dosfstools -Requires: e2fsprogs -Requires: xorriso -Requires: grub2 -Requires: kiwi-man-pages -Requires: kiwi-tools -Requires: lvm2 -Requires: mtools -Requires: parted -Requires: kpartx -Requires: rsync -Requires: tar >= 1.2.7 -%if %{_vendor} != "debbuild" -# Not supported with debbuild yet -%ifarch %arm aarch64 -%if 0%{?fedora} || 0%{?rhel} -Requires: uboot-tools -%endif -%if 0%{?suse_version} -Requires: u-boot-tools -%endif -%endif -%ifarch s390 s390x -Requires: s390-tools -%endif -%endif - -%description -n python2-kiwi -Python 2 library of the KIWI Image System. Provides an operating system -image builder for Linux supported hardware platforms as well as for -virtualization and cloud systems like Xen, KVM, VMware, EC2 and more. - -%if 0%{?fedora} || 0%{?suse_version} || 0%{?ubuntu} >= 1804 || 0%{?debian} >= 9 # python3-kiwi -%package -n python3-kiwi +%package -n python%{python3_pkgversion}-kiwi Summary: KIWI - Appliance Builder Next Generation Group: Development/Languages/Python +%if 0%{?fedora} || 0%{?rhel} >= 8 || 0%{?suse_version} || 0%{?debian} || 0%{?ubuntu} Recommends: jing +%endif %if 0%{?ubuntu} || 0%{?debian} -Requires: python3-yaml +Requires: python%{python3_pkgversion}-yaml +%else +Requires: python%{python3_pkgversion}-PyYAML +%endif +Requires: python%{python3_pkgversion}-docopt +Requires: python%{python3_pkgversion}-lxml +Requires: python%{python3_pkgversion}-requests +Requires: python%{python3_pkgversion}-setuptools +%if (0%{?suse_version} && 0%{?suse_version} < 1550) +Requires: python%{python3_pkgversion}-xattr %else -Requires: python3-PyYAML +Requires: python%{python3_pkgversion}-pyxattr %endif -Requires: python3-docopt -Requires: python3-future -Requires: python3-lxml -Requires: python3-requests -Requires: python3-setuptools -Requires: python3-six -Requires: python3-xattr # tools used by kiwi %if 0%{?suse_version} -Requires: update-alternatives -Requires(post): update-alternatives -Requires(postun): update-alternatives %ifarch x86_64 Requires: grub2-x86_64-efi %endif @@ -259,13 +158,11 @@ Requires: s390-tools %endif -%description -n python3-kiwi +%description -n python%{python3_pkgversion}-kiwi Python 3 library of the KIWI Image System. Provides an operating system image builder for Linux supported hardware platforms as well as for virtualization and cloud systems like Xen, KVM, VMware, EC2 and more. -%endif - %package -n kiwi-tools Summary: KIWI - Collection of Boot Helper Tools License: GPL-3.0-or-later @@ -458,23 +355,18 @@ # as an independent script sed -e "s|#!/usr/bin/env python||" -i kiwi/xml_parse.py -%build -# Build Python 2 version -python2 setup.py build --cflags="${RPM_OPT_FLAGS}" +%if 0%{?suse_version} && 0%{?suse_version} < 1550 +# For older SUSE distributions, use the other xattr Python module +sed -e "s|pyxattr|xattr|" -i setup.py +%endif -%if 0%{?fedora} || 0%{?suse_version} || 0%{?ubuntu} >= 1804 || 0%{?debian} >= 9 +%build # Build Python 3 version python3 setup.py build --cflags="${RPM_OPT_FLAGS}" -%endif %install -# Install Python 2 version -python2 setup.py install --prefix=%{_prefix} --root=%{buildroot} %{?is_deb:--install-layout=deb} - -%if 0%{?fedora} || 0%{?suse_version} || 0%{?ubuntu} >= 1804 || 0%{?debian} >= 9 # Install Python 3 version python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} %{?is_deb:--install-layout=deb} -%endif # Install dracut modules make buildroot=%{buildroot}/ install_dracut @@ -482,25 +374,12 @@ # Install documentation in PDF format make buildroot=%{buildroot}/ docdir=%{_defaultdocdir}/ install_package_docs -%if %{_vendor} != "debbuild" -# init alternatives setup -mkdir -p %{buildroot}%{_sysconfdir}/alternatives - -# alternatives setup for kiwi -> kiwi-ng-py_ver binary -touch %{buildroot}%{_sysconfdir}/alternatives/kiwi -ln -s %{_sysconfdir}/alternatives/kiwi \ - %{buildroot}%_bindir/kiwi - -# alternatives setup for kiwi-ng -> kiwi-ng-py_ver binary -touch %{buildroot}%{_sysconfdir}/alternatives/kiwi-ng -ln -s %{_sysconfdir}/alternatives/kiwi-ng \ - %{buildroot}%_bindir/kiwi-ng - -# alternatives setup for kiwicompat -> kiwicompat-py_ver binary -touch %{buildroot}%{_sysconfdir}/alternatives/kiwicompat -ln -s %{_sysconfdir}/alternatives/kiwicompat \ - %{buildroot}%_bindir/kiwicompat +# Create symlinks for correct binaries +ln -sr %{buildroot}%{_bindir}/kiwi-ng %{buildroot}%{_bindir}/kiwi +ln -sr %{buildroot}%{_bindir}/kiwi-ng-3 %{buildroot}%{_bindir}/kiwi-ng +ln -sr %{buildroot}%{_bindir}/kiwicompat-3 %{buildroot}%{_bindir}/kiwicompat +%if %{_vendor} != "debbuild" # kiwi pxeboot directory structure to be packed in kiwi-pxeboot %ifarch %{ix86} x86_64 for i in KIWI pxelinux.cfg image upload boot; do \ @@ -513,42 +392,6 @@ %fdupes %{buildroot}/srv/tftpboot %endif -%post -n python2-kiwi -%{update_alternatives} \ - --install %_bindir/kiwi kiwi %_bindir/kiwi-ng-2 10 -%{update_alternatives} \ - --install %_bindir/kiwi-ng kiwi-ng %_bindir/kiwi-ng-2 10 -%{update_alternatives} \ - --install %_bindir/kiwicompat kiwicompat %_bindir/kiwicompat-2 10 - -%if 0%{?fedora} || 0%{?suse_version} || 0%{?ubuntu} >= 1804 || 0%{?debian} >= 9 -%post -n python3-kiwi -%{update_alternatives} \ - --install %_bindir/kiwi kiwi %_bindir/kiwi-ng-3 10 -%{update_alternatives} \ - --install %_bindir/kiwi-ng kiwi-ng %_bindir/kiwi-ng-3 10 -%{update_alternatives} \ - --install %_bindir/kiwicompat kiwicompat %_bindir/kiwicompat-3 10 -%endif - -%preun -n python2-kiwi -%{update_alternatives} \ - --remove kiwi %_bindir/kiwi -%{update_alternatives} \ - --remove kiwi %_bindir/kiwi-ng -%{update_alternatives} \ - --remove kiwicompat %_bindir/kiwicompat - -%if 0%{?fedora} || 0%{?suse_version} || 0%{?ubuntu} >= 1804 || 0%{?debian} >= 9 -%preun -n python3-kiwi -%{update_alternatives} \ - --remove kiwi %_bindir/kiwi -%{update_alternatives} \ - --remove kiwi %_bindir/kiwi-ng -%{update_alternatives} \ - --remove kiwicompat %_bindir/kiwicompat -%endif - %if %{_vendor} != "debbuild" %ifarch %{ix86} x86_64 %pre -n kiwi-pxeboot @@ -564,34 +407,15 @@ %endif %endif -%files -n python2-kiwi -%defattr(-,root,root,-) -%{_bindir}/kiwi-ng-2* -%{_bindir}/kiwicompat-2* -%ghost %{_bindir}/kiwi -%ghost %{_bindir}/kiwi-ng -%ghost %{_bindir}/kiwicompat -%ghost %_sysconfdir/alternatives/kiwi -%ghost %_sysconfdir/alternatives/kiwi-ng -%ghost %_sysconfdir/alternatives/kiwicompat -%{python2_sitelib}/* - -%if 0%{?fedora} || 0%{?suse_version} || 0%{?ubuntu} >= 1804 || 0%{?debian} >= 9 -%files -n python3-kiwi -%defattr(-,root,root,-) +%files -n python%{python3_pkgversion}-kiwi +%{_bindir}/kiwi +%{_bindir}/kiwi-ng +%{_bindir}/kiwicompat %{_bindir}/kiwi-ng-3* %{_bindir}/kiwicompat-3* -%ghost %{_bindir}/kiwi -%ghost %{_bindir}/kiwi-ng -%ghost %{_bindir}/kiwicompat -%ghost %_sysconfdir/alternatives/kiwi -%ghost %_sysconfdir/alternatives/kiwi-ng -%ghost %_sysconfdir/alternatives/kiwicompat -%{python3_sitelib}/* -%endif +%{python3_sitelib}/kiwi* %files -n kiwi-man-pages -%defattr(-, root, root) %dir %{_defaultdocdir}/python-kiwi %{_defaultdocdir}/python-kiwi/kiwi.pdf %{_defaultdocdir}/python-kiwi/LICENSE @@ -600,36 +424,29 @@ %doc %{_mandir}/man8/* %files -n kiwi-tools -%defattr(-, root, root) %{_bindir}/dcounter %{_bindir}/isconsole %{_bindir}/kversion %{_bindir}/utimer %files -n dracut-kiwi-lib -%defattr(-, root, root) %{_usr}/lib/dracut/modules.d/99kiwi-lib %files -n dracut-kiwi-oem-repart -%defattr(-, root, root) %{_usr}/lib/dracut/modules.d/90kiwi-repart %files -n dracut-kiwi-oem-dump -%defattr(-, root, root) %{_usr}/lib/dracut/modules.d/90kiwi-dump %files -n dracut-kiwi-live -%defattr(-, root, root) %{_usr}/lib/dracut/modules.d/90kiwi-live %files -n dracut-kiwi-overlay -%defattr(-, root, root) %{_usr}/lib/dracut/modules.d/90kiwi-overlay %if %{_vendor} != "debbuild" %ifarch %{ix86} x86_64 %files -n kiwi-pxeboot -%defattr(-, root, root) %dir %attr(0755,tftp,tftp) /srv/tftpboot %dir /srv/tftpboot/KIWI %dir /srv/tftpboot/pxelinux.cfg ++++++ python-kiwi.tar.gz ++++++ ++++ 3297 lines of diff (skipped)
