From 226e2334bfb0bb964eb09b86aa288a25c9b8eb8fd8d888d8faf6cd89abaf2732 Mon Sep 17 00:00:00 2001 From: Marcus Schaefer Date: Sun, 7 Oct 2018 14:30:02 +0000 Subject: [PATCH 1/3] =?UTF-8?q?-=20Bump=20version:=209.16.18=20=E2=86=92?= =?UTF-8?q?=209.16.19?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Rename private method to be more expressive - Fixed URI handling with token query option So far only the query format ?credentials=... was supported. In case of ?random_token_data the returned uri was truncated and also the format check on the query caused a python trace. This Fixes #830 and Fixes #828 - Eliminate redundant code Create a helper method, _create_volume_no_zero, which calls the lvreate command with appropriate options and calls the vgscan command immeditately afterwards to create any missing /dev nodes. - Fixed broken link to ec2uploadimg tool - Update contact information OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Builder/python-kiwi?expand=0&rev=121 --- python-kiwi.changes | 78 ++++++++++++++++++++++++++++++++++++++++++++- python-kiwi.spec | 2 +- python-kiwi.tar.gz | 4 +-- 3 files changed, 80 insertions(+), 4 deletions(-) diff --git a/python-kiwi.changes b/python-kiwi.changes index 77255e3..cfbe83e 100644 --- a/python-kiwi.changes +++ b/python-kiwi.changes @@ -1,6 +1,82 @@ +------------------------------------------------------------------- +Fri Oct 5 17:12:14 CEST 2018 - ms@suse.de + +- Bump version: 9.16.18 → 9.16.19 + +------------------------------------------------------------------- +Fri Oct 5 16:37:14 CEST 2018 - ms@suse.de + +- Rename private method to be more expressive + +------------------------------------------------------------------- +Fri Oct 5 11:27:49 CEST 2018 - ms@suse.de + +- Fixed URI handling with token query option + + So far only the query format ?credentials=... was supported. + In case of ?random_token_data the returned uri was truncated + and also the format check on the query caused a python trace. + This Fixes #830 and Fixes #828 + +------------------------------------------------------------------- +Tue Oct 2 05:51:40 CEST 2018 - fergal.mc.carthy@suse.com + +- Eliminate redundant code + + Create a helper method, _create_volume_no_zero, which calls the + lvreate command with appropriate options and calls the vgscan + command immeditately afterwards to create any missing /dev nodes. + +------------------------------------------------------------------- +Sat Sep 29 21:37:46 CEST 2018 - ms@suse.de + +- Fixed broken link to ec2uploadimg tool + +------------------------------------------------------------------- +Sat Sep 29 21:14:38 CEST 2018 - ms@suse.de + +- Update contact information + + We moved from IRC to Matrix as chat platform. Thus the + documentation needs to be updated accordingly + +------------------------------------------------------------------- +Thu Sep 27 15:27:36 CEST 2018 - fergal.mc.carthy@suse.com + +- Fixes LVM based image creation in OBS + + While attempting to create LVM based images under the Open Build + Service I recently ran into some issues related to the fact that + there is no udev running in the chroot environment used to build + kiwi based images. + + Two workarounds have been implemented in this patch: + + (1) When calling lvcreate, include the `-Zn` option to disable + the automatic zeroing of the header of the newly created + LV device; doing so requires that the LV device's /dev + entry exists immediately after it has been created, but + in a chroot'd environment udev isn't going to be running + to automatically populate /dev// or + /dev/mapper/-. + This should be safe to do since the LV is being created + within a loopback device based partition, which is backed + by a zero filled file, created by qemu-img. + + (2) After creating an LV we need to run `vgscan --mknodes` + to create the required device nodes under /dev, which + won't be automatically created since udev isn't running + in the chroot'd environment. + + Unit tests updated to account for additional `-Zn` arguments that + are being passed to `lvcreate` and for additional call that is + being made to `vgscan --mknodes`. + + This fixes #824. + ------------------------------------------------------------------- Wed Sep 26 17:00:15 CEST 2018 - ms@suse.de - + - Bump version: 9.16.17 → 9.16.18 ------------------------------------------------------------------- diff --git a/python-kiwi.spec b/python-kiwi.spec index fa8192b..77b8660 100644 --- a/python-kiwi.spec +++ b/python-kiwi.spec @@ -38,7 +38,7 @@ %endif Name: python-kiwi -Version: 9.16.18 +Version: 9.16.19 Provides: kiwi-schema = 6.6 Release: 0 Url: https://github.com/SUSE/kiwi diff --git a/python-kiwi.tar.gz b/python-kiwi.tar.gz index 5f0e099..3310d24 100644 --- a/python-kiwi.tar.gz +++ b/python-kiwi.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cb29481480dc3c503a7b94e064852cc6e2adff182cc1ff802b19e0f3bc2e7935 -size 1256228 +oid sha256:138f3c3f2bea81ff082764635435750a7712d125b2bf5260055f6be0f3038b2a +size 1257098 From 4cff00908dea3b305a6c3963f0c543c82b93f0b9077b425bd6af88e62d537887 Mon Sep 17 00:00:00 2001 From: Marcus Schaefer Date: Tue, 9 Oct 2018 10:43:57 +0000 Subject: [PATCH 2/3] =?UTF-8?q?-=20Bump=20version:=209.16.19=20=E2=86=92?= =?UTF-8?q?=209.16.20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - rebuild auto generated code with stable generateDS For some reason the xml_parse code generated by generateDS v2.29.24 caused warnings on simple type XSD patterns. Therefore I rebuild the code with the stable build version v2.29.14 which fixed that issue - Fixup README travis and codacy status badges - Adding bugfix trace for bsc#1110869 bsc#1108508 ticket was fixed with request #831 from SUSE/fix_uri_handler - Include livenet module with dmsquash-live support The upstream dracut dmsquash-live module supports network mode with the livenet module. But that module must be explicitly included and is not fetched automatically. This Fixes #827 OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Builder/python-kiwi?expand=0&rev=122 --- python-kiwi.changes | 62 ++++++++++++++++++++++++++++++++++++++++++++- python-kiwi.spec | 2 +- python-kiwi.tar.gz | 4 +-- 3 files changed, 64 insertions(+), 4 deletions(-) diff --git a/python-kiwi.changes b/python-kiwi.changes index cfbe83e..5e89b3a 100644 --- a/python-kiwi.changes +++ b/python-kiwi.changes @@ -1,6 +1,44 @@ +------------------------------------------------------------------- +Tue Oct 9 09:17:25 CEST 2018 - ms@suse.de + +- Bump version: 9.16.19 → 9.16.20 + +------------------------------------------------------------------- +Mon Oct 8 15:47:53 CEST 2018 - ms@suse.de + +- rebuild auto generated code with stable generateDS + + For some reason the xml_parse code generated by generateDS v2.29.24 + caused warnings on simple type XSD patterns. Therefore I rebuild + the code with the stable build version v2.29.14 which fixed that + issue + +------------------------------------------------------------------- +Mon Oct 8 09:56:14 CEST 2018 - ms@suse.de + +- Fixup README travis and codacy status badges + +------------------------------------------------------------------- +Mon Oct 8 09:13:56 CEST 2018 - ms@suse.de + +- Adding bugfix trace for bsc#1110869 + + bsc#1108508 ticket was fixed with request #831 + from SUSE/fix_uri_handler + +------------------------------------------------------------------- +Sun Oct 7 20:49:44 CEST 2018 - ms@suse.de + +- Include livenet module with dmsquash-live support + + The upstream dracut dmsquash-live module supports network + mode with the livenet module. But that module must be + explicitly included and is not fetched automatically. + This Fixes #827 + ------------------------------------------------------------------- Fri Oct 5 17:12:14 CEST 2018 - ms@suse.de - + - Bump version: 9.16.18 → 9.16.19 ------------------------------------------------------------------- @@ -8,6 +46,18 @@ Fri Oct 5 16:37:14 CEST 2018 - ms@suse.de - Rename private method to be more expressive +------------------------------------------------------------------- +Fri Oct 5 11:39:41 CEST 2018 - dcassany@suse.de + +- Add Codec utils for bytes literals decoding + + In case of a literal decoding failure it tries to decode + the result in utf-8. This is handy in python2 environments where + python and the host might be using different charset configurations. + In python3 this issue seams to be solved. + + Fixes #829 and bsc#1110871 + ------------------------------------------------------------------- Fri Oct 5 11:27:49 CEST 2018 - ms@suse.de @@ -18,6 +68,16 @@ Fri Oct 5 11:27:49 CEST 2018 - ms@suse.de and also the format check on the query caused a python trace. This Fixes #830 and Fixes #828 +------------------------------------------------------------------- +Fri Oct 5 11:08:02 CEST 2018 - dcassany@suse.de + +- Make use of the quiet flag of mountpoint command + + This commit sets the use of -q flag of mountpoint. Kiwi only + checks the return code, thus any stdout is useless in this case. + + Fixes #829 + ------------------------------------------------------------------- Tue Oct 2 05:51:40 CEST 2018 - fergal.mc.carthy@suse.com diff --git a/python-kiwi.spec b/python-kiwi.spec index 77b8660..c457822 100644 --- a/python-kiwi.spec +++ b/python-kiwi.spec @@ -38,7 +38,7 @@ %endif Name: python-kiwi -Version: 9.16.19 +Version: 9.16.20 Provides: kiwi-schema = 6.6 Release: 0 Url: https://github.com/SUSE/kiwi diff --git a/python-kiwi.tar.gz b/python-kiwi.tar.gz index 3310d24..3ad4459 100644 --- a/python-kiwi.tar.gz +++ b/python-kiwi.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:138f3c3f2bea81ff082764635435750a7712d125b2bf5260055f6be0f3038b2a -size 1257098 +oid sha256:1e76e3d1a981aebba858192307c9d8553877e80e8fce51ef073b105e1eb24cbe +size 1256735 From cf8ef19c4e96332c6d629b84f135f4ea27fb2d4703dfcbd7bc9429b99bff38ce Mon Sep 17 00:00:00 2001 From: Marcus Schaefer Date: Fri, 19 Oct 2018 13:13:00 +0000 Subject: [PATCH 3/3] =?UTF-8?q?-=20Bump=20version:=209.16.26=20=E2=86=92?= =?UTF-8?q?=209.16.27?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Use %{ix86} rather than %ix86 in spec template Clear macro annotation prevents clarity issues - Fixed spec file for gfxboot requires Require gfxboot but only for the x86 architecture - Bump version: 9.16.25 → 9.16.26 - Move the default rpm database path into Defaults class - Handle default uri mime type in Defaults class - Add a hardcoded rpm database path to import trusted keys OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Builder/python-kiwi?expand=0&rev=123 --- python-kiwi.changes | 221 +++++++++++++++++++++++++++++++++++++++++++- python-kiwi.spec | 41 +++++--- python-kiwi.tar.gz | 4 +- 3 files changed, 249 insertions(+), 17 deletions(-) diff --git a/python-kiwi.changes b/python-kiwi.changes index 5e89b3a..49fd1e4 100644 --- a/python-kiwi.changes +++ b/python-kiwi.changes @@ -1,6 +1,225 @@ +------------------------------------------------------------------- +Fri Oct 19 14:26:39 CEST 2018 - ms@suse.de + +- Bump version: 9.16.26 → 9.16.27 + +------------------------------------------------------------------- +Fri Oct 19 08:51:47 CEST 2018 - ms@suse.de + +- Use %{ix86} rather than %ix86 in spec template + + Clear macro annotation prevents clarity issues + +------------------------------------------------------------------- +Thu Oct 18 17:55:53 CEST 2018 - ms@suse.de + +- Fixed spec file for gfxboot requires + + Require gfxboot but only for the x86 architecture + +------------------------------------------------------------------- +Thu Oct 18 16:33:26 CEST 2018 - ms@suse.de + +- Bump version: 9.16.25 → 9.16.26 + +------------------------------------------------------------------- +Thu Oct 18 16:30:15 CEST 2018 - dcassany@suse.de + +- Move the default rpm database path into Defaults class + +------------------------------------------------------------------- +Thu Oct 18 16:08:29 CEST 2018 - ms@suse.de + +- Handle default uri mime type in Defaults class + +------------------------------------------------------------------- +Thu Oct 18 15:27:07 CEST 2018 - dcassany@suse.de + +- Add a hardcoded rpm database path to import trusted keys + + This commits adds a hardcoded rpm database location to make + sure the imported keys are in the expected location for zypper. + + Fixes #855 + +------------------------------------------------------------------- +Thu Oct 18 13:57:11 CEST 2018 - ms@suse.de + +- Allow simple path source in Uri class + + This patch is needed as follow up fix for the setup of the + package cache in local repositories. The is_remote method + from the Uri class is used to identify if a repostory source + is remote or local. At that point the initial repository + source was already translated into its components. In case + of a local repository the Uri instance now receives a simple + path and the is_remote method raised with a style error. + This patch allows the Uri class to be more friendly and + initializes a local path as file:/ typed source. + Related to Issue #847 + +------------------------------------------------------------------- +Thu Oct 18 10:35:50 CEST 2018 - ms@suse.de + +- Bump version: 9.16.24 → 9.16.25 + +------------------------------------------------------------------- +Thu Oct 18 10:18:53 CEST 2018 - ms@suse.de + +- Add timestamp to logfile entries + + On the console output we use a log format with timestamps + This is useful for the logfile contents too + +------------------------------------------------------------------- +Wed Oct 17 16:15:22 CEST 2018 - seife@tuxbox-git.slipkontur.de + +- sort package list which accompanies the image + + This makes it much easier to diff the lists of two images to find out + the differences in package versions. + +------------------------------------------------------------------- +Wed Oct 17 14:34:24 CEST 2018 - ms@suse.de + +- Don't cache packages from local repos for zypper + + Access to packages from local repositories is as fast as reading + them from a cache location. The additional package copy and cache + update is superfluous and should be avoided. This Fixes #847 + +------------------------------------------------------------------- +Tue Oct 16 16:56:45 CEST 2018 - ms@suse.de + +- Bump version: 9.16.23 → 9.16.24 + +------------------------------------------------------------------- +Tue Oct 16 11:58:23 CEST 2018 - dcassany@suse.de + +- Update /etc/machine-id management docs + + Updates the information about how /etc/machine-id is treated in KIWI + and provides some hints for old systems where /var/lib/dbus/machine-id + is not a symlink to /etc/machine-id + + Related to #843 + +------------------------------------------------------------------- +Tue Oct 16 10:32:15 CEST 2018 - ms@suse.de + +- Unpack root.tar.gz file for LVM integration test + +------------------------------------------------------------------- +Tue Oct 16 10:28:44 CEST 2018 - ms@suse.de + +- Added LVM integration test build + +------------------------------------------------------------------- +Mon Oct 15 09:53:10 CEST 2018 - ms@suse.de + +- Bump version: 9.16.22 → 9.16.23 + +------------------------------------------------------------------- +Mon Oct 15 09:33:25 CEST 2018 - ms@suse.de + +- Added machine id setup in dracut preparation + + In case of a dracut booted image we empty out the systemd + machine-id configuration file to trigger the rebuild of that + information by the dracut boot code at boot time. This allows + for unique systemd identifiers if the same image gets deployed + on different machines. This also makes the script implementations + people put in in config.sh or images.sh to solve this problem + obsolete. This Fixes #843 + +------------------------------------------------------------------- +Fri Oct 12 21:42:28 CEST 2018 - ms@suse.de + +- Fix use of uri type in debootstrap call + + Referencing a file in a debootstrap call is done using + the file:/ source type. However when using file:// debootstrap + does something different and failed to find the file. The + additional / had a bad impact to the call. + +------------------------------------------------------------------- +Thu Oct 11 17:37:37 CEST 2018 - ms@suse.de + +- Bump version: 9.16.21 → 9.16.22 + +------------------------------------------------------------------- +Thu Oct 11 17:35:54 CEST 2018 - ms@suse.de + +- Delete obsolete rhel/fedora doc move + + With the fix to use the rpm macro consistently it + is no longer required to move around the docs + +------------------------------------------------------------------- +Thu Oct 11 17:13:34 CEST 2018 - ms@suse.de + +- Bump version: 9.16.20 → 9.16.21 + +------------------------------------------------------------------- +Thu Oct 11 16:02:01 CEST 2018 - ms@suse.de + +- Fixed package specs for dracut modules on fedora + + dracut-network is a separate package on Fedora/RHEL too + +------------------------------------------------------------------- +Thu Oct 11 15:48:34 CEST 2018 - ms@suse.de + +- Add alternative search path for syslinux binaries + + On debian/ubuntu systems /usr/lib/ISOLINUX is a valid + search path for syslinux binaries like isolinux.bin. + This Fixes #839 + +------------------------------------------------------------------- +Thu Oct 11 15:29:20 CEST 2018 - ms@suse.de + +- Fixed package doc install target + + The spec file uses the %{_defaultdocdir} macro but the + corresponding Makefile target used a hardcoded path which + lead to inconsistencies on debian/ubuntu based systems. + This Fixes #838 + +------------------------------------------------------------------- +Thu Oct 11 15:04:48 CEST 2018 - ms@suse.de + +- Fixed package specs for dracut modules on debian + + btrfs tools are provided by btrfs-tools package and not by + btrfs-progs. In addition dracut-network is a separate package + on debian/ubuntu based distributions. This Fixes #837 + +------------------------------------------------------------------- +Tue Oct 9 12:28:46 CEST 2018 - ms@suse.de + +- Don't require gfxboot on rhel/fedora + +------------------------------------------------------------------- +Tue Oct 9 10:44:03 CEST 2018 - ms@suse.de + +- Fixup zypper calls in documentation + + The way the documentation describes the zypper call to add + a repository was wrong in several places. + +------------------------------------------------------------------- +Tue Oct 9 10:32:26 CEST 2018 - ms@suse.de + +- Added gfxboot to required packages in spec + + kiwi calls gfxboot as tool when building live iso images. + Thus this tool provided by the gfxboot package should be + a requirement for kiwi + ------------------------------------------------------------------- Tue Oct 9 09:17:25 CEST 2018 - ms@suse.de - + - Bump version: 9.16.19 → 9.16.20 ------------------------------------------------------------------- diff --git a/python-kiwi.spec b/python-kiwi.spec index c457822..27dcede 100644 --- a/python-kiwi.spec +++ b/python-kiwi.spec @@ -38,7 +38,7 @@ %endif Name: python-kiwi -Version: 9.16.20 +Version: 9.16.27 Provides: kiwi-schema = 6.6 Release: 0 Url: https://github.com/SUSE/kiwi @@ -103,6 +103,9 @@ Requires(postun): update-alternatives %ifarch x86_64 Requires: grub2-x86_64-efi %endif +%ifarch %{ix86} x86_64 +Requires: gfxboot +%endif Requires: qemu-tools Requires: squashfs Requires: gptfdisk @@ -130,6 +133,9 @@ Requires: debootstrap Requires: qemu-utils Requires: squashfs-tools Requires: gdisk +%ifarch %{ix86} x86_64 +Requires: gfxboot +%endif %endif Requires: dosfstools Requires: e2fsprogs @@ -180,6 +186,9 @@ Requires(postun): update-alternatives %ifarch x86_64 Requires: grub2-x86_64-efi %endif +%ifarch %{ix86} x86_64 +Requires: gfxboot +%endif Requires: qemu-tools Requires: squashfs Requires: gptfdisk @@ -242,7 +251,7 @@ first boot of an appliance. The tools are not meant to be used outside of the scope of kiwi appliance building. %if %{_vendor} != "debbuild" -%ifarch %ix86 x86_64 +%ifarch %{ix86} x86_64 %package -n kiwi-pxeboot Summary: KIWI - PXE boot structure Requires: syslinux @@ -270,9 +279,10 @@ BuildRequires: dracut %endif Requires: bc Requires: cryptsetup -%if 0%{?fedora} || 0%{?rhel} || 0%{?debian} || 0%{?ubuntu} +%if 0%{?fedora} || 0%{?rhel} Requires: btrfs-progs Requires: gdisk +Requires: dracut-network %else Requires: btrfsprogs Requires: gptfdisk @@ -291,6 +301,9 @@ Requires: curl %if 0%{?debian} || 0%{?ubuntu} Requires: xz-utils Requires: dmsetup +Requires: btrfs-tools +Requires: gdisk +Requires: dracut-network %else Requires: xz Requires: device-mapper @@ -364,7 +377,13 @@ Requires: e2fsprogs Requires: util-linux %if 0%{?debian} || 0%{?ubuntu} Requires: dmsetup -%else +Requires: dracut-network +%endif +%if 0%{?fedora} || 0%{?rhel} +Requires: device-mapper +Requires: dracut-network +%endif +%if 0%{?suse_version} Requires: device-mapper %endif Requires: dracut @@ -431,7 +450,7 @@ python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} %{?is_deb:--ins make buildroot=%{buildroot}/ install_dracut # Install documentation in PDF format -make buildroot=%{buildroot}/ install_pdf_docs +make buildroot=%{buildroot}/ docdir=%{_defaultdocdir}/ install_package_docs %if %{_vendor} != "debbuild" # init alternatives setup @@ -453,19 +472,13 @@ ln -s %{_sysconfdir}/alternatives/kiwicompat \ %{buildroot}%_bindir/kiwicompat # kiwi pxeboot directory structure to be packed in kiwi-pxeboot -%ifarch %ix86 x86_64 +%ifarch %{ix86} x86_64 for i in KIWI pxelinux.cfg image upload boot; do \ mkdir -p %{buildroot}/srv/tftpboot/$i ;\ done %endif %endif -%if 0%{?fedora} || 0%{?rhel} -install -m 755 -d %{buildroot}/%{_defaultdocdir}/python-kiwi -mv %{buildroot}/%{_defaultdocdir}/packages/python-kiwi/* %{buildroot}/%{_defaultdocdir}/python-kiwi -rm -rf %{buildroot}/%{_defaultdocdir}/packages -%endif - %if 0%{?fedora} || 0%{?suse_version} %fdupes %{buildroot}/srv/tftpboot %endif @@ -507,7 +520,7 @@ rm -rf %{buildroot}/%{_defaultdocdir}/packages %endif %if %{_vendor} != "debbuild" -%ifarch %ix86 x86_64 +%ifarch %{ix86} x86_64 %pre -n kiwi-pxeboot #============================================================ # create user and group tftp if they does not exist @@ -585,7 +598,7 @@ fi %{_usr}/lib/dracut/modules.d/90kiwi-overlay %if %{_vendor} != "debbuild" -%ifarch %ix86 x86_64 +%ifarch %{ix86} x86_64 %files -n kiwi-pxeboot %defattr(-, root, root) %dir %attr(0755,tftp,tftp) /srv/tftpboot diff --git a/python-kiwi.tar.gz b/python-kiwi.tar.gz index 3ad4459..baa7582 100644 --- a/python-kiwi.tar.gz +++ b/python-kiwi.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e76e3d1a981aebba858192307c9d8553877e80e8fce51ef073b105e1eb24cbe -size 1256735 +oid sha256:ced4b9442a0e521c50a4825d471247e927e175d5ee6734ab7c813caa02bc25d6 +size 1259853