From 34a69461c1d79ab43aebede49a515a8f622a868aded1e4fb74f5c10a93bc9be5 Mon Sep 17 00:00:00 2001 From: Marcus Schaefer Date: Fri, 22 May 2020 08:14:34 +0000 Subject: [PATCH 1/7] =?UTF-8?q?-=20Bump=20version:=209.20.12=20=C3=A2?= =?UTF-8?q?=E2=80=A0=E2=80=99=209.20.13?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Fix default repositories for APT This commit fixes the default repositories configuration for APT. Fixes #1439 - Include recommend for gpg tool - Fix signing keys management for APT This commit fixes the management of the trusted keyring for apt repositories. It creates a `trusted.gpg` keyring with the provided signing keys so APT can check against that the configured repositories. Fixes #1440 - Fixed spec file This patch is two fold. First the py2 version of kiwi was dropped since py2 is EOL. To indicate that correctly on the package level python3-kiwi has to obsolete python2-kiwi. The other part of the change is a file conflict of the files: etc/bash_completion.d/kiwi-ng.sh /usr/share/doc/packages/python-kiwi/README which were provided by the kiwi-man-pages sub-package but were moved to be provided by the main python3-kiwi package now. On update of the package with an older version of kiwi that maintains this files to belong to kiwi-man-pages a file conflict at install time appears. To solve this python3-kiwi now conflicts with kiwi-man-pages < %{version} This Fixes #1413 and Fixes bsc#1168973 and bsc#1156677 OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Builder/python-kiwi?expand=0&rev=170 --- PKGBUILD | 70 ++++++++ python-kiwi.changes | 404 ++++++++++++++++++++++++++++++++++++++++++++ python-kiwi.spec | 16 +- python-kiwi.tar.gz | 4 +- 4 files changed, 487 insertions(+), 7 deletions(-) create mode 100644 PKGBUILD diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 0000000..7efcc37 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,70 @@ +# Maintainer: Marcus Schaefer +# Maintainer: David Cassany + +pkgname=('python-kiwi' 'kiwi-man-pages' 'dracut-kiwi-lib' 'dracut-kiwi-oem-repart' 'dracut-kiwi-oem-dump' 'dracut-kiwi-live' 'dracut-kiwi-overlay') +arch=(x86_64) +pkgver=9.20.13 +pkgrel=0 +pkgdesc="KIWI - Appliance Builder Next Generation" +url="https://github.com/SUSE/kiwi/tarball/master" +license=('GPL3') +makedepends=(python-setuptools gcc shadow grep) +provides=(kiwi-ng kiwi) +source=("${pkgname}.tar.gz") +changelog="${pkgname}.changes" +md5sums=('742ccfcedbc651ba30dfa74cb306c7c9') + + +build() { + cd kiwi-${pkgver} + python setup.py build +} + +package_python-kiwi(){ + depends=(python-docopt python-future python-lxml python-requests python-setuptools python-six python-pyxattr python-yaml grub qemu squashfs-tools gptfdisk pacman e2fsprogs xfsprogs btrfs-progs libisoburn lvm2 mtools parted multipath-tools rsync tar shadow kiwi-man-pages) + optdepends=('gnupg: keyring creation for APT package manager') + cd kiwi-${pkgver} + python setup.py install --root="${pkgdir}/" --optimize=1 --skip-build + ln -sr "${pkgdir}/usr/bin/kiwi-ng" "${pkgdir}/usr/bin/kiwi" + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_kiwi-man-pages(){ + cd kiwi-${pkgver} + make buildroot="${pkgdir}/" docdir="/usr/share/doc/${pkgname}" install_package_docs +} + +package_dracut-kiwi-lib(){ + depends=(cryptsetup btrfs-progs gptfdisk coreutils e2fsprogs grep lvm2 mdadm parted util-linux xfsprogs dialog curl xz device-mapper dracut) + cd kiwi-${pkgver} + install -d -m 755 ${pkgdir}/usr/lib/dracut/modules.d/99kiwi-lib + cp -a dracut/modules.d/99kiwi-lib ${pkgdir}/usr/lib/dracut/modules.d/ +} + +package_dracut-kiwi-oem-repart(){ + depends=(dracut-kiwi-lib) + cd kiwi-${pkgver} + install -d -m 755 ${pkgdir}/usr/lib/dracut/modules.d/90kiwi-repart + cp -a dracut/modules.d/90kiwi-repart ${pkgdir}/usr/lib/dracut/modules.d/ +} + +package_dracut-kiwi-oem-dump(){ + depends=(dracut-kiwi-lib multipath-tools) + cd kiwi-${pkgver} + install -d -m 755 ${pkgdir}/usr/lib/dracut/modules.d/90kiwi-dump + cp -a dracut/modules.d/90kiwi-dump ${pkgdir}/usr/lib/dracut/modules.d/ +} + +package_dracut-kiwi-live(){ + depends=(dracut dialog xfsprogs e2fsprogs util-linux device-mapper libisoburn parted) + cd kiwi-${pkgver} + install -d -m 755 ${pkgdir}/usr/lib/dracut/modules.d/90kiwi-live + cp -a dracut/modules.d/90kiwi-live ${pkgdir}/usr/lib/dracut/modules.d/ +} + +package_dracut-kiwi-overlay(){ + depends=(dracut util-linux) + cd kiwi-${pkgver} + install -d -m 755 ${pkgdir}/usr/lib/dracut/modules.d/90kiwi-overlay + cp -a dracut/modules.d/90kiwi-overlay ${pkgdir}/usr/lib/dracut/modules.d/ +} diff --git a/python-kiwi.changes b/python-kiwi.changes index 2498792..199ccc7 100644 --- a/python-kiwi.changes +++ b/python-kiwi.changes @@ -1,3 +1,398 @@ +------------------------------------------------------------------- +Fri May 22 10:10:08 CEST 2020 - Marcus Schäfer + +- Bump version: 9.20.12 → 9.20.13 + +------------------------------------------------------------------- +Wed May 20 12:47:47 CEST 2020 - David Cassany + +- Fix default repositories for APT + + This commit fixes the default repositories configuration for APT. + + Fixes #1439 + +------------------------------------------------------------------- +Mon May 18 12:01:50 CEST 2020 - David Cassany + +- Include recommend for gpg tool + +------------------------------------------------------------------- +Fri May 15 11:40:59 CEST 2020 - David Cassany + +- Fix signing keys management for APT + + This commit fixes the management of the trusted keyring for apt + repositories. It creates a `trusted.gpg` keyring with the provided + signing keys so APT can check against that the configured repositories. + + Fixes #1440 + +------------------------------------------------------------------- +Thu May 14 13:30:57 CEST 2020 - Marcus Schäfer + +- Fixed spec file + + This patch is two fold. First the py2 version of kiwi was + dropped since py2 is EOL. To indicate that correctly on the + package level python3-kiwi has to obsolete python2-kiwi. + The other part of the change is a file conflict of the + files: + + etc/bash_completion.d/kiwi-ng.sh + /usr/share/doc/packages/python-kiwi/README + + which were provided by the kiwi-man-pages sub-package but + were moved to be provided by the main python3-kiwi package + now. On update of the package with an older version of + kiwi that maintains this files to belong to kiwi-man-pages + a file conflict at install time appears. To solve this + python3-kiwi now conflicts with kiwi-man-pages < %{version} + This Fixes #1413 and Fixes bsc#1168973 and bsc#1156677 + +------------------------------------------------------------------- +Wed May 13 12:45:30 CEST 2020 - Marcus Schäfer + +- Cleanup use of machine platform name + + in kiwi we handle 32bit x86 architecture names as ix86. This is + done by checking i586 and i686 32bit arch names. However those + checks are spread over the entire kiwi code base and should be + consolidated into one method. The cleanup of those arch name + usage fixes an inconsistency between the arch name used in the + disk builder and the arch name used in the subformat image + formats. This Fixes #1438 + +------------------------------------------------------------------- +Wed May 13 12:21:45 CEST 2020 - Marcus Schäfer + +- Fixed zypper error code validation + + The error code 127 - command not found, was not treated as + an error. This commit adds 127 to be an error condition + along with the other 1xx error codes from zypper that are + handled as errors. This Fixes #1430 + +------------------------------------------------------------------- +Wed May 13 11:34:29 CEST 2020 - Marcus Schäfer + +- Added archlinux to build_status helper + + Show the archlinux build results in the build_status + helper script + +------------------------------------------------------------------- +Wed May 13 11:30:59 CEST 2020 - Marcus Schäfer + +- Added sidebar link to ArchLinux build tests + +------------------------------------------------------------------- +Tue May 12 14:51:36 CEST 2020 - David Cassany + +- Fix string formatting + + After a flake8 upgrade to v3.8.0 these changes were required to pass + the `tox -e check` validation. + +------------------------------------------------------------------- +Tue May 12 13:02:16 CEST 2020 - David Cassany + +- Add Arch Linux integration tests for x86_64 + +------------------------------------------------------------------- +Mon May 11 18:19:25 CEST 2020 - Marcus Schäfer + +- Support multiple markup formats + + Allow to read multiple markup formats. Supported are XML + and YAML. The parsing and transformation is based on the + anymarkup module. The use of anymarkup is optional and + implemented as an on demand loading module. If a user + uses a yaml config file or a request to convert into + yaml is made without an installed anymarkup module an + exception is thrown + +------------------------------------------------------------------- +Mon May 11 16:15:16 CEST 2020 - Marcus Schäfer + +- Fixed boxbuild documentation + + The command doesn't have to be called as root. Therefore + the example should not be used with sudo prefix + +------------------------------------------------------------------- +Mon May 11 15:39:18 CEST 2020 - Marcus Schäfer + +- Allow setup of serial line in bootloader + + So far kiwi used a static serial line setup of the console + type was configured to use a serial console. However if + different parameters are needed there was no way to change + the static setup. This commit adds a new bootloader attribute + called serial_line which allows to specify the serial line + parameters for the grub bootloader e.g + + serial_line="serial --speed=9600 --unit=0 --word=8 --parity=no --stop=1" + + Please note serial_line takes the value as it is given and + adds this as a line to the grub configuration or as content + to the variable GRUB_SERIAL_COMMAND. No further validation + of the information takes place by kiwi. This Fixes #1401 + +------------------------------------------------------------------- +Mon May 11 12:32:36 CEST 2020 - Marcus Schäfer + +- Support grub timeout_style parameter + + Grub supports a style setting that influences the display of + the menu depending on the configured timeout value. With this + patch kiwi allows to specify the style via a new bootloader + parameter named timeout_style="hidden|countdown". If not set + the grub default applies which shows the menu in any case. + This Fixes bsc#1165730 and Fixes #1404 + +------------------------------------------------------------------- +Fri May 08 16:47:03 CEST 2020 - Marcus Schäfer + +- Bump version: 9.20.11 → 9.20.12 + +------------------------------------------------------------------- +Fri May 08 13:41:38 CEST 2020 - Marcus Schäfer + +- Update build tests to match new schema v7.2 + +------------------------------------------------------------------- +Thu May 07 12:17:10 CEST 2020 - Marcus Schäfer + +- Refactor setup of bootloader parameters + + The bootloader settings are handled through attributes in the + type element. Over the years some attributes were added and + there are requests for more settings. Therefore the bootloader + setup deservers its own section. With this commit the schema + changes from v7.1 to v7.2 and moves bootloader, bootloader_console + boottimeout and zipl_targettype into a new bootloader subsection + below type. The commit also adds an auto transformation template + such that customers don't have to change their image descriptions. + This is related to Issue #1401 + +------------------------------------------------------------------- +Tue May 05 10:43:52 CEST 2020 - Patrik Jakobsson + +- Fix support for multiple dracut modules + + Passing the dmsquash flag adds dmsquash-live and livenet modules to + dracut. This broke when adding a check to only add modules that dracut + reports as available. Use a list instead of a string to represent the + modules to add. + + Fixes: 07ea23a4 + +------------------------------------------------------------------- +Mon May 04 16:30:03 CEST 2020 - Marcus Schäfer + +- Rewrite chapter about self-contained builds + + Document the new boxed build plugin. The former solution + with dice will be deprecated in favor of the kiwi plugin. + This is related to Issue #1409 + +------------------------------------------------------------------- +Mon May 04 09:29:36 CEST 2020 - David Cassany + +- Clean AnonymousUniqueId + + This is a follow up commit for 469f71144. There is not need to remove + the `/var/lib/zypp/AnonymousUniqueId` file from the clean up method + since this has been already integrated inside the python code base + and this is not needed anymore as a helper function. + +------------------------------------------------------------------- +Fri May 01 17:40:12 CEST 2020 - Marcus Schäfer + +- Bump version: 9.20.10 → 9.20.11 + +------------------------------------------------------------------- +Fri May 01 17:39:33 CEST 2020 - Marcus Schäfer + +- Update Oxygen schema documentation + +------------------------------------------------------------------- +Fri May 01 17:38:09 CEST 2020 - Marcus Schäfer + +- Fixed headline for schema docs chapter + + Use the same headline for the schema chapter in the + schema_docs generator as in the default source file + +------------------------------------------------------------------- +Fri May 01 17:12:35 CEST 2020 - Marcus Schäfer + +- Bump version: 9.20.9 → 9.20.10 + +------------------------------------------------------------------- +Thu Apr 30 15:05:14 CEST 2020 - David Cassany + +- Clean AnonymousUniqueId from the image + + This commit is two fold. + + For one side does a small refactor to move the deletion of custom RPM + macros to package manager level inside a cleaning method. This way only + RPM based package managers run RPM specific code and each package manager + can apply its own specific logic. + + On the other hand for the zypper package manager the deletion of + /var/lib/zypp/AnonymousUniqueId file has been added as part of the + new cleaning method. + + Fixes #1396 + +------------------------------------------------------------------- +Thu Apr 30 13:55:20 CEST 2020 - Marcus Schäfer + +- Added kis type to image attribute + +------------------------------------------------------------------- +Wed Apr 29 11:14:53 CEST 2020 - Marcus Schäfer + +- Use auto video mode as default for grub + + An explicit video mode 800x600 was used for grub if no + video mode setup exists in the XML description. For grub + this should better result in the auto mode. Related to + bsc#1165730 + +------------------------------------------------------------------- +Tue Apr 28 17:49:20 CEST 2020 - Marcus Schäfer + +- Do not set GRUB_DISTRIBUTOR + + grub mkconfig creates a proper string based on /etc/os-release + if GRUB_DISTRIBUTOR is not set. We assume this to be true + for all distributions. This Fixes #1416 + +------------------------------------------------------------------- +Tue Apr 28 13:10:19 CEST 2020 - Marcus Schäfer + +- Fixed spec file header information + + Fixed copyright date/company and url path to project + +------------------------------------------------------------------- +Tue Apr 28 12:11:31 CEST 2020 - Marcus Schäfer + +- Fixed ovf Machine section setup for virtualbox + + Required attributes/sections name, ostype, uuid and StorageControllers + were missing according to IVirtualBox::createMachine documentation + from here: + + https://www.virtualbox.org/sdkref/interface_i_virtual_box.html + + This Fixes #1322 + +------------------------------------------------------------------- +Mon Apr 27 14:44:38 CEST 2020 - Marcus Schäfer + +- Added new build type kis + + KIS is an abbreviation for Kernel, Initrd, System and defines a + highly customizable image consisting out of these components. + This commit performs the changes documented in #1414 and + introduces the new kis type. From an image build perspective + kis is currently the same as pxe with restrictions for kis + on the schema level. A kis build uses dracut and does not allow + to use the legacy netboot initrd. The pxe type will therefore be + exclusively used to built for the legacy netboot infrastructure + and is on its way to deprecation in the future. + This Fixes #1262 + +------------------------------------------------------------------- +Thu Apr 23 22:41:35 CEST 2020 - Marcus Schäfer + +- Added KIS chapter + + A new chapter to document KIS images. KIS is an abbreviation + for Kernel, Initrd, System and defines a highly customizable + image consisting out of these components. This Fixes #1346 + +------------------------------------------------------------------- +Thu Apr 23 22:29:35 CEST 2020 - Marcus Schäfer + +- Move the self-contained chapter to the toplevel + + This chapter will be rewritten when the new kiwi box + plugin is available and deserves a space on the toplevel + page + +------------------------------------------------------------------- +Thu Apr 23 22:22:27 CEST 2020 - Marcus Schäfer + +- Moved chapters from building to working + + Chapters build_in_buildservice and build_with_profiles + belongs more to working with images + +------------------------------------------------------------------- +Thu Apr 23 22:15:32 CEST 2020 - Marcus Schäfer + +- Refactor netboot chapters + + All information about network boot that references the legacy + netboot code has been moved into one chapter at working_with_images + named legacy_netboot_root_filesystem.rst + +------------------------------------------------------------------- +Thu Apr 23 21:57:56 CEST 2020 - Marcus Schäfer + +- Update article about network live boot + + Added a note about the configured PXE loader + +------------------------------------------------------------------- +Thu Apr 23 21:42:30 CEST 2020 - Marcus Schäfer + +- Update boot server setup chapter + + Describe the general setup procedure to setup DHCP and TFTP + services using dnsmasq for clients to boot with either + pxelinux or grub loaders + +------------------------------------------------------------------- +Thu Apr 23 17:20:49 CEST 2020 - David Cassany + +- Add flags and argument separator for zypper + + This commits adds a `--` argument in zypper install calls right after + the flags and before the arguments (in this case packages) list. + + Fixes #1407 + +------------------------------------------------------------------- +Wed Apr 22 12:05:31 CEST 2020 - Marcus Schäfer + +- Disable AudioAdapter for vagrant + + The kiwi template for vagrant images assumes the box files to + be used in non graphics mode and for the purpose of automation + or server deployment. Thus by default we disable Audio. + For details see the API reference: + + https://www.virtualbox.org/sdkref/interface_i_audio_adapter.html + + This Fixes #1322 + +------------------------------------------------------------------- +Wed Apr 22 11:42:59 CEST 2020 - Marcus Schäfer + +- Added check_syslinux_installed_if_isolinux_is_used + + ISO images that are configured to use isolinux requires the host + to provide a set of syslinux binaries. The runtime check makes + sure to check for this condition early including a proper message. + This Fixes #1376 + ------------------------------------------------------------------- Fri Apr 17 11:06:19 CEST 2020 - Marcus Schäfer @@ -2912,6 +3307,15 @@ Mon Jul 01 10:51:19 CEST 2019 - Marcus Schäfer baseCreateCommonKernelFile is only used in the legacy custom kiwi boot images but not in the dracut case. +------------------------------------------------------------------- +Fri Jun 28 17:26:37 CEST 2019 - David Cassany + +- Adding support for Pacman package manager + + This commit adds support for pacman package manager and, in + consequence, support for Arch Linux images. It also adds + the package definition for Arch Linux. + ------------------------------------------------------------------- Fri Jun 28 09:24:18 CEST 2019 - Marcus Schäfer diff --git a/python-kiwi.spec b/python-kiwi.spec index a3a02de..d595cc6 100644 --- a/python-kiwi.spec +++ b/python-kiwi.spec @@ -1,7 +1,7 @@ # # spec file for package kiwi # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -14,7 +14,7 @@ # # Please submit bugfixes or comments via: # -# https://github.com/SUSE/kiwi/issues +# https://github.com/OSInside/kiwi/issues # # If they aren't provided by a system installed macro, define them @@ -43,10 +43,10 @@ %endif Name: python-kiwi -Version: 9.20.9 -Provides: kiwi-schema = 7.1 +Version: 9.20.13 +Provides: kiwi-schema = 7.2 Release: 0 -Url: https://github.com/SUSE/kiwi +Url: https://github.com/OSInside/kiwi Summary: KIWI - Appliance Builder Next Generation License: GPL-3.0-or-later %if %{_vendor} == "debbuild" @@ -80,6 +80,9 @@ and cloud systems like Xen, KVM, VMware, EC2 and more. %package -n python%{python3_pkgversion}-kiwi Summary: KIWI - Appliance Builder Next Generation Group: Development/Languages/Python +Obsoletes: python2-kiwi +Conflicts: python2-kiwi +Conflicts: kiwi-man-pages < %{version} %if 0%{?fedora} || 0%{?rhel} >= 8 || 0%{?suse_version} || 0%{?debian} || 0%{?ubuntu} Recommends: jing %endif @@ -122,10 +125,12 @@ Requires: gdisk Requires: dnf Provides: kiwi-packagemanager:dnf Provides: kiwi-packagemanager:yum +Recommends: gnupg2 %endif %if 0%{?suse_version} # If it's available, let's pull it in Recommends: dnf +Recommends: gpg2 %endif %if 0%{?fedora} >= 26 || 0%{?suse_version} Requires: zypper @@ -136,6 +141,7 @@ Requires: debootstrap Requires: qemu-utils Requires: squashfs-tools Requires: gdisk +Recommends: gnupg %endif Requires: dosfstools Requires: e2fsprogs diff --git a/python-kiwi.tar.gz b/python-kiwi.tar.gz index 2fa5946..8fb5dc4 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:3035d219b29af55f20847b0f27ffba149e7b279dd85d0230c0e00e6e0ee4e7d4 -size 1654683 +oid sha256:0bdbcb355c65ba1a578f84d64ef504b90d4484089f9eaeb5d0441c0ecd9b0e4c +size 1671829 From 54b0db90eead7db0c31632c2d228a6eddf40ac06982c88524f5f71b8008b072a Mon Sep 17 00:00:00 2001 From: David Cassany Date: Fri, 22 May 2020 10:05:43 +0000 Subject: [PATCH 2/7] osc copypac from project:Virtualization:Appliances:Staging package:python-kiwi revision:229 OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Builder/python-kiwi?expand=0&rev=171 --- PKGBUILD | 5 +- python-kiwi.changes | 173 -------------------------------------------- python-kiwi.spec | 10 +-- python-kiwi.tar.gz | 4 +- 4 files changed, 6 insertions(+), 186 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 7efcc37..2c698de 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ pkgname=('python-kiwi' 'kiwi-man-pages' 'dracut-kiwi-lib' 'dracut-kiwi-oem-repart' 'dracut-kiwi-oem-dump' 'dracut-kiwi-live' 'dracut-kiwi-overlay') arch=(x86_64) -pkgver=9.20.13 +pkgver=9.20.12 pkgrel=0 pkgdesc="KIWI - Appliance Builder Next Generation" url="https://github.com/SUSE/kiwi/tarball/master" @@ -12,7 +12,7 @@ makedepends=(python-setuptools gcc shadow grep) provides=(kiwi-ng kiwi) source=("${pkgname}.tar.gz") changelog="${pkgname}.changes" -md5sums=('742ccfcedbc651ba30dfa74cb306c7c9') +md5sums=('da0106601a0b35abd8d7f6b5a03752d4') build() { @@ -22,7 +22,6 @@ build() { package_python-kiwi(){ depends=(python-docopt python-future python-lxml python-requests python-setuptools python-six python-pyxattr python-yaml grub qemu squashfs-tools gptfdisk pacman e2fsprogs xfsprogs btrfs-progs libisoburn lvm2 mtools parted multipath-tools rsync tar shadow kiwi-man-pages) - optdepends=('gnupg: keyring creation for APT package manager') cd kiwi-${pkgver} python setup.py install --root="${pkgdir}/" --optimize=1 --skip-build ln -sr "${pkgdir}/usr/bin/kiwi-ng" "${pkgdir}/usr/bin/kiwi" diff --git a/python-kiwi.changes b/python-kiwi.changes index 199ccc7..796a9c2 100644 --- a/python-kiwi.changes +++ b/python-kiwi.changes @@ -1,181 +1,8 @@ -------------------------------------------------------------------- -Fri May 22 10:10:08 CEST 2020 - Marcus Schäfer - -- Bump version: 9.20.12 → 9.20.13 - -------------------------------------------------------------------- -Wed May 20 12:47:47 CEST 2020 - David Cassany - -- Fix default repositories for APT - - This commit fixes the default repositories configuration for APT. - - Fixes #1439 - -------------------------------------------------------------------- -Mon May 18 12:01:50 CEST 2020 - David Cassany - -- Include recommend for gpg tool - -------------------------------------------------------------------- -Fri May 15 11:40:59 CEST 2020 - David Cassany - -- Fix signing keys management for APT - - This commit fixes the management of the trusted keyring for apt - repositories. It creates a `trusted.gpg` keyring with the provided - signing keys so APT can check against that the configured repositories. - - Fixes #1440 - -------------------------------------------------------------------- -Thu May 14 13:30:57 CEST 2020 - Marcus Schäfer - -- Fixed spec file - - This patch is two fold. First the py2 version of kiwi was - dropped since py2 is EOL. To indicate that correctly on the - package level python3-kiwi has to obsolete python2-kiwi. - The other part of the change is a file conflict of the - files: - - etc/bash_completion.d/kiwi-ng.sh - /usr/share/doc/packages/python-kiwi/README - - which were provided by the kiwi-man-pages sub-package but - were moved to be provided by the main python3-kiwi package - now. On update of the package with an older version of - kiwi that maintains this files to belong to kiwi-man-pages - a file conflict at install time appears. To solve this - python3-kiwi now conflicts with kiwi-man-pages < %{version} - This Fixes #1413 and Fixes bsc#1168973 and bsc#1156677 - -------------------------------------------------------------------- -Wed May 13 12:45:30 CEST 2020 - Marcus Schäfer - -- Cleanup use of machine platform name - - in kiwi we handle 32bit x86 architecture names as ix86. This is - done by checking i586 and i686 32bit arch names. However those - checks are spread over the entire kiwi code base and should be - consolidated into one method. The cleanup of those arch name - usage fixes an inconsistency between the arch name used in the - disk builder and the arch name used in the subformat image - formats. This Fixes #1438 - -------------------------------------------------------------------- -Wed May 13 12:21:45 CEST 2020 - Marcus Schäfer - -- Fixed zypper error code validation - - The error code 127 - command not found, was not treated as - an error. This commit adds 127 to be an error condition - along with the other 1xx error codes from zypper that are - handled as errors. This Fixes #1430 - -------------------------------------------------------------------- -Wed May 13 11:34:29 CEST 2020 - Marcus Schäfer - -- Added archlinux to build_status helper - - Show the archlinux build results in the build_status - helper script - -------------------------------------------------------------------- -Wed May 13 11:30:59 CEST 2020 - Marcus Schäfer - -- Added sidebar link to ArchLinux build tests - -------------------------------------------------------------------- -Tue May 12 14:51:36 CEST 2020 - David Cassany - -- Fix string formatting - - After a flake8 upgrade to v3.8.0 these changes were required to pass - the `tox -e check` validation. - -------------------------------------------------------------------- -Tue May 12 13:02:16 CEST 2020 - David Cassany - -- Add Arch Linux integration tests for x86_64 - -------------------------------------------------------------------- -Mon May 11 18:19:25 CEST 2020 - Marcus Schäfer - -- Support multiple markup formats - - Allow to read multiple markup formats. Supported are XML - and YAML. The parsing and transformation is based on the - anymarkup module. The use of anymarkup is optional and - implemented as an on demand loading module. If a user - uses a yaml config file or a request to convert into - yaml is made without an installed anymarkup module an - exception is thrown - -------------------------------------------------------------------- -Mon May 11 16:15:16 CEST 2020 - Marcus Schäfer - -- Fixed boxbuild documentation - - The command doesn't have to be called as root. Therefore - the example should not be used with sudo prefix - -------------------------------------------------------------------- -Mon May 11 15:39:18 CEST 2020 - Marcus Schäfer - -- Allow setup of serial line in bootloader - - So far kiwi used a static serial line setup of the console - type was configured to use a serial console. However if - different parameters are needed there was no way to change - the static setup. This commit adds a new bootloader attribute - called serial_line which allows to specify the serial line - parameters for the grub bootloader e.g - - serial_line="serial --speed=9600 --unit=0 --word=8 --parity=no --stop=1" - - Please note serial_line takes the value as it is given and - adds this as a line to the grub configuration or as content - to the variable GRUB_SERIAL_COMMAND. No further validation - of the information takes place by kiwi. This Fixes #1401 - -------------------------------------------------------------------- -Mon May 11 12:32:36 CEST 2020 - Marcus Schäfer - -- Support grub timeout_style parameter - - Grub supports a style setting that influences the display of - the menu depending on the configured timeout value. With this - patch kiwi allows to specify the style via a new bootloader - parameter named timeout_style="hidden|countdown". If not set - the grub default applies which shows the menu in any case. - This Fixes bsc#1165730 and Fixes #1404 - ------------------------------------------------------------------- Fri May 08 16:47:03 CEST 2020 - Marcus Schäfer - Bump version: 9.20.11 → 9.20.12 -------------------------------------------------------------------- -Fri May 08 13:41:38 CEST 2020 - Marcus Schäfer - -- Update build tests to match new schema v7.2 - -------------------------------------------------------------------- -Thu May 07 12:17:10 CEST 2020 - Marcus Schäfer - -- Refactor setup of bootloader parameters - - The bootloader settings are handled through attributes in the - type element. Over the years some attributes were added and - there are requests for more settings. Therefore the bootloader - setup deservers its own section. With this commit the schema - changes from v7.1 to v7.2 and moves bootloader, bootloader_console - boottimeout and zipl_targettype into a new bootloader subsection - below type. The commit also adds an auto transformation template - such that customers don't have to change their image descriptions. - This is related to Issue #1401 - ------------------------------------------------------------------- Tue May 05 10:43:52 CEST 2020 - Patrik Jakobsson diff --git a/python-kiwi.spec b/python-kiwi.spec index d595cc6..424dac9 100644 --- a/python-kiwi.spec +++ b/python-kiwi.spec @@ -43,8 +43,8 @@ %endif Name: python-kiwi -Version: 9.20.13 -Provides: kiwi-schema = 7.2 +Version: 9.20.12 +Provides: kiwi-schema = 7.1 Release: 0 Url: https://github.com/OSInside/kiwi Summary: KIWI - Appliance Builder Next Generation @@ -80,9 +80,6 @@ and cloud systems like Xen, KVM, VMware, EC2 and more. %package -n python%{python3_pkgversion}-kiwi Summary: KIWI - Appliance Builder Next Generation Group: Development/Languages/Python -Obsoletes: python2-kiwi -Conflicts: python2-kiwi -Conflicts: kiwi-man-pages < %{version} %if 0%{?fedora} || 0%{?rhel} >= 8 || 0%{?suse_version} || 0%{?debian} || 0%{?ubuntu} Recommends: jing %endif @@ -125,12 +122,10 @@ Requires: gdisk Requires: dnf Provides: kiwi-packagemanager:dnf Provides: kiwi-packagemanager:yum -Recommends: gnupg2 %endif %if 0%{?suse_version} # If it's available, let's pull it in Recommends: dnf -Recommends: gpg2 %endif %if 0%{?fedora} >= 26 || 0%{?suse_version} Requires: zypper @@ -141,7 +136,6 @@ Requires: debootstrap Requires: qemu-utils Requires: squashfs-tools Requires: gdisk -Recommends: gnupg %endif Requires: dosfstools Requires: e2fsprogs diff --git a/python-kiwi.tar.gz b/python-kiwi.tar.gz index 8fb5dc4..81521c9 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:0bdbcb355c65ba1a578f84d64ef504b90d4484089f9eaeb5d0441c0ecd9b0e4c -size 1671829 +oid sha256:7f46024fdd46d436b9d6e13e880008ee882fa994ba090d1d0b6e462b7964601b +size 1665144 From 9d8a13eaf3b643d25652d654dcf68af4fe6a343d12e9e94dd4fc5a59c93e9492 Mon Sep 17 00:00:00 2001 From: Marcus Schaefer Date: Fri, 22 May 2020 11:24:13 +0000 Subject: [PATCH 3/7] =?UTF-8?q?-=20Bump=20version:=209.20.13=20=C3=A2?= =?UTF-8?q?=E2=80=A0=E2=80=99=209.20.14?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Remmove any Recommends for CentOS7 This commit fixes the package spec for CentOS 7. In CentOS 7 there is no support for weak dependencies. In 9792cea1 a recommended dependency on gpg tools was included for all builds and this caused a failure for CentOS 7. With this commit, the recommended dependency, is omitted for any pre CentOS 8 distro. OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Builder/python-kiwi?expand=0&rev=172 --- PKGBUILD | 5 +- python-kiwi.changes | 189 ++++++++++++++++++++++++++++++++++++++++++++ python-kiwi.spec | 12 ++- python-kiwi.tar.gz | 4 +- 4 files changed, 204 insertions(+), 6 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 2c698de..4b8b21c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ pkgname=('python-kiwi' 'kiwi-man-pages' 'dracut-kiwi-lib' 'dracut-kiwi-oem-repart' 'dracut-kiwi-oem-dump' 'dracut-kiwi-live' 'dracut-kiwi-overlay') arch=(x86_64) -pkgver=9.20.12 +pkgver=9.20.14 pkgrel=0 pkgdesc="KIWI - Appliance Builder Next Generation" url="https://github.com/SUSE/kiwi/tarball/master" @@ -12,7 +12,7 @@ makedepends=(python-setuptools gcc shadow grep) provides=(kiwi-ng kiwi) source=("${pkgname}.tar.gz") changelog="${pkgname}.changes" -md5sums=('da0106601a0b35abd8d7f6b5a03752d4') +md5sums=('c882393cd0db5cb8aa197fc3700604b5') build() { @@ -22,6 +22,7 @@ build() { package_python-kiwi(){ depends=(python-docopt python-future python-lxml python-requests python-setuptools python-six python-pyxattr python-yaml grub qemu squashfs-tools gptfdisk pacman e2fsprogs xfsprogs btrfs-progs libisoburn lvm2 mtools parted multipath-tools rsync tar shadow kiwi-man-pages) + optdepends=('gnupg: keyring creation for APT package manager') cd kiwi-${pkgver} python setup.py install --root="${pkgdir}/" --optimize=1 --skip-build ln -sr "${pkgdir}/usr/bin/kiwi-ng" "${pkgdir}/usr/bin/kiwi" diff --git a/python-kiwi.changes b/python-kiwi.changes index 796a9c2..bdaf9c9 100644 --- a/python-kiwi.changes +++ b/python-kiwi.changes @@ -1,8 +1,197 @@ +------------------------------------------------------------------- +Fri May 22 13:21:22 CEST 2020 - Marcus Schäfer + +- Bump version: 9.20.13 → 9.20.14 + +------------------------------------------------------------------- +Fri May 22 11:08:46 CEST 2020 - David Cassany + +- Remmove any Recommends for CentOS7 + + This commit fixes the package spec for CentOS 7. In CentOS 7 there is no + support for weak dependencies. In 9792cea1 a recommended dependency on + gpg tools was included for all builds and this caused a failure for + CentOS 7. With this commit, the recommended dependency, is omitted for + any pre CentOS 8 distro. + +------------------------------------------------------------------- +Fri May 22 10:10:08 CEST 2020 - Marcus Schäfer + +- Bump version: 9.20.12 → 9.20.13 + +------------------------------------------------------------------- +Wed May 20 12:47:47 CEST 2020 - David Cassany + +- Fix default repositories for APT + + This commit fixes the default repositories configuration for APT. + + Fixes #1439 + +------------------------------------------------------------------- +Mon May 18 12:01:50 CEST 2020 - David Cassany + +- Include recommend for gpg tool + +------------------------------------------------------------------- +Fri May 15 11:40:59 CEST 2020 - David Cassany + +- Fix signing keys management for APT + + This commit fixes the management of the trusted keyring for apt + repositories. It creates a `trusted.gpg` keyring with the provided + signing keys so APT can check against that the configured repositories. + + Fixes #1440 + +------------------------------------------------------------------- +Thu May 14 13:30:57 CEST 2020 - Marcus Schäfer + +- Fixed spec file + + This patch is two fold. First the py2 version of kiwi was + dropped since py2 is EOL. To indicate that correctly on the + package level python3-kiwi has to obsolete python2-kiwi. + The other part of the change is a file conflict of the + files: + + etc/bash_completion.d/kiwi-ng.sh + /usr/share/doc/packages/python-kiwi/README + + which were provided by the kiwi-man-pages sub-package but + were moved to be provided by the main python3-kiwi package + now. On update of the package with an older version of + kiwi that maintains this files to belong to kiwi-man-pages + a file conflict at install time appears. To solve this + python3-kiwi now conflicts with kiwi-man-pages < %{version} + This Fixes #1413 and Fixes bsc#1168973 and bsc#1156677 + +------------------------------------------------------------------- +Wed May 13 12:45:30 CEST 2020 - Marcus Schäfer + +- Cleanup use of machine platform name + + in kiwi we handle 32bit x86 architecture names as ix86. This is + done by checking i586 and i686 32bit arch names. However those + checks are spread over the entire kiwi code base and should be + consolidated into one method. The cleanup of those arch name + usage fixes an inconsistency between the arch name used in the + disk builder and the arch name used in the subformat image + formats. This Fixes #1438 + +------------------------------------------------------------------- +Wed May 13 12:21:45 CEST 2020 - Marcus Schäfer + +- Fixed zypper error code validation + + The error code 127 - command not found, was not treated as + an error. This commit adds 127 to be an error condition + along with the other 1xx error codes from zypper that are + handled as errors. This Fixes #1430 + +------------------------------------------------------------------- +Wed May 13 11:34:29 CEST 2020 - Marcus Schäfer + +- Added archlinux to build_status helper + + Show the archlinux build results in the build_status + helper script + +------------------------------------------------------------------- +Wed May 13 11:30:59 CEST 2020 - Marcus Schäfer + +- Added sidebar link to ArchLinux build tests + +------------------------------------------------------------------- +Tue May 12 14:51:36 CEST 2020 - David Cassany + +- Fix string formatting + + After a flake8 upgrade to v3.8.0 these changes were required to pass + the `tox -e check` validation. + +------------------------------------------------------------------- +Tue May 12 13:02:16 CEST 2020 - David Cassany + +- Add Arch Linux integration tests for x86_64 + +------------------------------------------------------------------- +Mon May 11 18:19:25 CEST 2020 - Marcus Schäfer + +- Support multiple markup formats + + Allow to read multiple markup formats. Supported are XML + and YAML. The parsing and transformation is based on the + anymarkup module. The use of anymarkup is optional and + implemented as an on demand loading module. If a user + uses a yaml config file or a request to convert into + yaml is made without an installed anymarkup module an + exception is thrown + +------------------------------------------------------------------- +Mon May 11 16:15:16 CEST 2020 - Marcus Schäfer + +- Fixed boxbuild documentation + + The command doesn't have to be called as root. Therefore + the example should not be used with sudo prefix + +------------------------------------------------------------------- +Mon May 11 15:39:18 CEST 2020 - Marcus Schäfer + +- Allow setup of serial line in bootloader + + So far kiwi used a static serial line setup of the console + type was configured to use a serial console. However if + different parameters are needed there was no way to change + the static setup. This commit adds a new bootloader attribute + called serial_line which allows to specify the serial line + parameters for the grub bootloader e.g + + serial_line="serial --speed=9600 --unit=0 --word=8 --parity=no --stop=1" + + Please note serial_line takes the value as it is given and + adds this as a line to the grub configuration or as content + to the variable GRUB_SERIAL_COMMAND. No further validation + of the information takes place by kiwi. This Fixes #1401 + +------------------------------------------------------------------- +Mon May 11 12:32:36 CEST 2020 - Marcus Schäfer + +- Support grub timeout_style parameter + + Grub supports a style setting that influences the display of + the menu depending on the configured timeout value. With this + patch kiwi allows to specify the style via a new bootloader + parameter named timeout_style="hidden|countdown". If not set + the grub default applies which shows the menu in any case. + This Fixes bsc#1165730 and Fixes #1404 + ------------------------------------------------------------------- Fri May 08 16:47:03 CEST 2020 - Marcus Schäfer - Bump version: 9.20.11 → 9.20.12 +------------------------------------------------------------------- +Fri May 08 13:41:38 CEST 2020 - Marcus Schäfer + +- Update build tests to match new schema v7.2 + +------------------------------------------------------------------- +Thu May 07 12:17:10 CEST 2020 - Marcus Schäfer + +- Refactor setup of bootloader parameters + + The bootloader settings are handled through attributes in the + type element. Over the years some attributes were added and + there are requests for more settings. Therefore the bootloader + setup deservers its own section. With this commit the schema + changes from v7.1 to v7.2 and moves bootloader, bootloader_console + boottimeout and zipl_targettype into a new bootloader subsection + below type. The commit also adds an auto transformation template + such that customers don't have to change their image descriptions. + This is related to Issue #1401 + ------------------------------------------------------------------- Tue May 05 10:43:52 CEST 2020 - Patrik Jakobsson diff --git a/python-kiwi.spec b/python-kiwi.spec index 424dac9..48c928b 100644 --- a/python-kiwi.spec +++ b/python-kiwi.spec @@ -43,8 +43,8 @@ %endif Name: python-kiwi -Version: 9.20.12 -Provides: kiwi-schema = 7.1 +Version: 9.20.14 +Provides: kiwi-schema = 7.2 Release: 0 Url: https://github.com/OSInside/kiwi Summary: KIWI - Appliance Builder Next Generation @@ -80,6 +80,9 @@ and cloud systems like Xen, KVM, VMware, EC2 and more. %package -n python%{python3_pkgversion}-kiwi Summary: KIWI - Appliance Builder Next Generation Group: Development/Languages/Python +Obsoletes: python2-kiwi +Conflicts: python2-kiwi +Conflicts: kiwi-man-pages < %{version} %if 0%{?fedora} || 0%{?rhel} >= 8 || 0%{?suse_version} || 0%{?debian} || 0%{?ubuntu} Recommends: jing %endif @@ -122,10 +125,14 @@ Requires: gdisk Requires: dnf Provides: kiwi-packagemanager:dnf Provides: kiwi-packagemanager:yum +%if 0%{?fedora} || 0%{?rhel} >= 8 +Recommends: gnupg2 +%endif %endif %if 0%{?suse_version} # If it's available, let's pull it in Recommends: dnf +Recommends: gpg2 %endif %if 0%{?fedora} >= 26 || 0%{?suse_version} Requires: zypper @@ -136,6 +143,7 @@ Requires: debootstrap Requires: qemu-utils Requires: squashfs-tools Requires: gdisk +Recommends: gnupg %endif Requires: dosfstools Requires: e2fsprogs diff --git a/python-kiwi.tar.gz b/python-kiwi.tar.gz index 81521c9..ecfe028 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:7f46024fdd46d436b9d6e13e880008ee882fa994ba090d1d0b6e462b7964601b -size 1665144 +oid sha256:0c9b62f141906c07e06593c582a0dace06020e78e51223227831491e85a9e570 +size 1671734 From 2a4005e0940e2558751af56d024c68c65ddb5c43f67c1deef953f3f24c0b626a Mon Sep 17 00:00:00 2001 From: Marcus Schaefer Date: Fri, 22 May 2020 11:30:26 +0000 Subject: [PATCH 4/7] - Fixed sdist MANIFEST kiwi.markup was not part of the source tarball OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Builder/python-kiwi?expand=0&rev=173 --- PKGBUILD | 2 +- python-kiwi.changes | 7 +++++++ python-kiwi.tar.gz | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 4b8b21c..a05aba9 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,7 +12,7 @@ makedepends=(python-setuptools gcc shadow grep) provides=(kiwi-ng kiwi) source=("${pkgname}.tar.gz") changelog="${pkgname}.changes" -md5sums=('c882393cd0db5cb8aa197fc3700604b5') +md5sums=('1869a702a3a6ea035f628b4ab86c15f3') build() { diff --git a/python-kiwi.changes b/python-kiwi.changes index bdaf9c9..1bc67bd 100644 --- a/python-kiwi.changes +++ b/python-kiwi.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri May 22 13:28:04 CEST 2020 - Marcus Schäfer + +- Fixed sdist MANIFEST + + kiwi.markup was not part of the source tarball + ------------------------------------------------------------------- Fri May 22 13:21:22 CEST 2020 - Marcus Schäfer diff --git a/python-kiwi.tar.gz b/python-kiwi.tar.gz index ecfe028..0e9c4a7 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:0c9b62f141906c07e06593c582a0dace06020e78e51223227831491e85a9e570 -size 1671734 +oid sha256:38946aa1c107fef6e386ff2e0e187226b0007570b465b3f70ef70c4338bfb974 +size 1673763 From e25a1cc47425c69e6fc36f9b75c1c7f28b8d0937b9d313b619d7c5effa251685 Mon Sep 17 00:00:00 2001 From: Marcus Schaefer Date: Fri, 22 May 2020 12:43:23 +0000 Subject: [PATCH 5/7] =?UTF-8?q?-=20Bump=20version:=209.20.14=20=C3=A2?= =?UTF-8?q?=E2=80=A0=E2=80=99=209.20.15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Fixed parse result description reference The object that holds the parse result also contains an information about description_dir and derived_description_dir. The change on the markup processing impacted the value for description_dir to be no longer the origin (user provided) directory. That broke any reference of files that belongs to the description directory like custom scripts config.sh, images.sh and so on. OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Builder/python-kiwi?expand=0&rev=174 --- PKGBUILD | 4 ++-- python-kiwi.changes | 18 ++++++++++++++++++ python-kiwi.spec | 2 +- python-kiwi.tar.gz | 4 ++-- 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index a05aba9..ab1788a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ pkgname=('python-kiwi' 'kiwi-man-pages' 'dracut-kiwi-lib' 'dracut-kiwi-oem-repart' 'dracut-kiwi-oem-dump' 'dracut-kiwi-live' 'dracut-kiwi-overlay') arch=(x86_64) -pkgver=9.20.14 +pkgver=9.20.15 pkgrel=0 pkgdesc="KIWI - Appliance Builder Next Generation" url="https://github.com/SUSE/kiwi/tarball/master" @@ -12,7 +12,7 @@ makedepends=(python-setuptools gcc shadow grep) provides=(kiwi-ng kiwi) source=("${pkgname}.tar.gz") changelog="${pkgname}.changes" -md5sums=('1869a702a3a6ea035f628b4ab86c15f3') +md5sums=('f8517b06fb6a1dc011a7dc03938a75cb') build() { diff --git a/python-kiwi.changes b/python-kiwi.changes index 1bc67bd..f46ca0f 100644 --- a/python-kiwi.changes +++ b/python-kiwi.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Fri May 22 14:35:46 CEST 2020 - Marcus Schäfer + +- Bump version: 9.20.14 → 9.20.15 + +------------------------------------------------------------------- +Fri May 22 14:31:43 CEST 2020 - Marcus Schäfer + +- Fixed parse result description reference + + The object that holds the parse result also contains an + information about description_dir and derived_description_dir. + The change on the markup processing impacted the value for + description_dir to be no longer the origin (user provided) + directory. That broke any reference of files that belongs + to the description directory like custom scripts config.sh, + images.sh and so on. + ------------------------------------------------------------------- Fri May 22 13:28:04 CEST 2020 - Marcus Schäfer diff --git a/python-kiwi.spec b/python-kiwi.spec index 48c928b..8d835b3 100644 --- a/python-kiwi.spec +++ b/python-kiwi.spec @@ -43,7 +43,7 @@ %endif Name: python-kiwi -Version: 9.20.14 +Version: 9.20.15 Provides: kiwi-schema = 7.2 Release: 0 Url: https://github.com/OSInside/kiwi diff --git a/python-kiwi.tar.gz b/python-kiwi.tar.gz index 0e9c4a7..87986b7 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:38946aa1c107fef6e386ff2e0e187226b0007570b465b3f70ef70c4338bfb974 -size 1673763 +oid sha256:d959386629a1620bdece2872f0da95cabdedf5ce1f29db1ebb08483a3f9c24cb +size 1673875 From 2a6aa3534751247b1f97fda90919b311a2a0ad627812f2054efba1de1a758658 Mon Sep 17 00:00:00 2001 From: Marcus Schaefer Date: Fri, 22 May 2020 13:13:18 +0000 Subject: [PATCH 6/7] =?UTF-8?q?-=20Bump=20version:=209.20.15=20=C3=A2?= =?UTF-8?q?=E2=80=A0=E2=80=99=209.20.16?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Fixed schematron rule for bootloader targettype The targettype attribute must be allowed for the grub2_s390x_emu bootloader name OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Builder/python-kiwi?expand=0&rev=175 --- PKGBUILD | 4 ++-- python-kiwi.changes | 13 +++++++++++++ python-kiwi.spec | 2 +- python-kiwi.tar.gz | 4 ++-- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index ab1788a..b49c0ec 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ pkgname=('python-kiwi' 'kiwi-man-pages' 'dracut-kiwi-lib' 'dracut-kiwi-oem-repart' 'dracut-kiwi-oem-dump' 'dracut-kiwi-live' 'dracut-kiwi-overlay') arch=(x86_64) -pkgver=9.20.15 +pkgver=9.20.16 pkgrel=0 pkgdesc="KIWI - Appliance Builder Next Generation" url="https://github.com/SUSE/kiwi/tarball/master" @@ -12,7 +12,7 @@ makedepends=(python-setuptools gcc shadow grep) provides=(kiwi-ng kiwi) source=("${pkgname}.tar.gz") changelog="${pkgname}.changes" -md5sums=('f8517b06fb6a1dc011a7dc03938a75cb') +md5sums=('95ab86b15f76aca08a0c44c0b456694c') build() { diff --git a/python-kiwi.changes b/python-kiwi.changes index f46ca0f..29e9fd0 100644 --- a/python-kiwi.changes +++ b/python-kiwi.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri May 22 15:00:19 CEST 2020 - Marcus Schäfer + +- Bump version: 9.20.15 → 9.20.16 + +------------------------------------------------------------------- +Fri May 22 14:57:29 CEST 2020 - Marcus Schäfer + +- Fixed schematron rule for bootloader targettype + + The targettype attribute must be allowed for the grub2_s390x_emu + bootloader name + ------------------------------------------------------------------- Fri May 22 14:35:46 CEST 2020 - Marcus Schäfer diff --git a/python-kiwi.spec b/python-kiwi.spec index 8d835b3..e3b3671 100644 --- a/python-kiwi.spec +++ b/python-kiwi.spec @@ -43,7 +43,7 @@ %endif Name: python-kiwi -Version: 9.20.15 +Version: 9.20.16 Provides: kiwi-schema = 7.2 Release: 0 Url: https://github.com/OSInside/kiwi diff --git a/python-kiwi.tar.gz b/python-kiwi.tar.gz index 87986b7..cc3a0b5 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:d959386629a1620bdece2872f0da95cabdedf5ce1f29db1ebb08483a3f9c24cb -size 1673875 +oid sha256:ad003dbebdb70a07c47ad148ead4a5db7fea4a4e841d94d78e062dad21bf5207 +size 1673880 From 8b0b900fdaa6021d7602f23a17b3a75ebcf596fc95f2dc622acbbbb29e249672 Mon Sep 17 00:00:00 2001 From: Marcus Schaefer Date: Tue, 26 May 2020 08:24:42 +0000 Subject: [PATCH 7/7] OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Builder/python-kiwi?expand=0&rev=176 --- python-kiwi.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/python-kiwi.spec b/python-kiwi.spec index e3b3671..ed86a7e 100644 --- a/python-kiwi.spec +++ b/python-kiwi.spec @@ -49,7 +49,7 @@ Release: 0 Url: https://github.com/OSInside/kiwi Summary: KIWI - Appliance Builder Next Generation License: GPL-3.0-or-later -%if %{_vendor} == "debbuild" +%if "%{_vendor}" == "debbuild" # Needed to set Maintainer in output debs Packager: Marcus Schaefer %endif @@ -187,7 +187,7 @@ kiwi created initial ramdisk which is used to control the very first boot of an appliance. The tools are not meant to be used outside of the scope of kiwi appliance building. -%if %{_vendor} != "debbuild" +%if "%{_vendor}" != "debbuild" %ifarch %{ix86} x86_64 %package -n kiwi-pxeboot Summary: KIWI - PXE boot structure @@ -394,7 +394,7 @@ ln -sr %{buildroot}%{_bindir}/kiwi-ng %{buildroot}%{_bindir}/kiwi ln -sr %{buildroot}%{_bindir}/kiwi-ng %{buildroot}%{_bindir}/kiwi-ng-3 ln -sr %{buildroot}%{_bindir}/kiwicompat %{buildroot}%{_bindir}/kiwicompat-3 -%if %{_vendor} != "debbuild" +%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 \ @@ -407,7 +407,7 @@ done %fdupes %{buildroot}/srv/tftpboot %endif -%if %{_vendor} != "debbuild" && 0%{?suse_version} < 1550 +%if "%{_vendor}" != "debbuild" && 0%{?suse_version} < 1550 %ifarch %{ix86} x86_64 %pre -n kiwi-pxeboot #============================================================ @@ -460,7 +460,7 @@ fi %files -n dracut-kiwi-overlay %{_usr}/lib/dracut/modules.d/90kiwi-overlay -%if %{_vendor} != "debbuild" +%if "%{_vendor}" != "debbuild" %ifarch %{ix86} x86_64 %files -n kiwi-pxeboot %if 0%{?suse_version} < 1550