From 8171db1cefb67215326d846ccf0910a11256c690321385230c51af810d75e5b1 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 30 Mar 2018 19:48:41 +0000 Subject: [PATCH] Revert, trouble with iso as usb drive OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-kiwi?expand=0&rev=24 --- python-kiwi-rpmlintrc | 6 + python-kiwi.changes | 318 +----------------------------------------- python-kiwi.spec | 35 +++-- python-kiwi.tar.gz | 4 +- 4 files changed, 34 insertions(+), 329 deletions(-) diff --git a/python-kiwi-rpmlintrc b/python-kiwi-rpmlintrc index 2f0bc00..df80263 100644 --- a/python-kiwi-rpmlintrc +++ b/python-kiwi-rpmlintrc @@ -9,6 +9,12 @@ addFilter("no-manual-page-for-binary kiwi-ng") addFilter("suse-filelist-empty .*") addFilter("explicit-lib-dependency .*") +# don't blame on auto generated code +addFilter("non-executable-script .*/xml_parse.py.*") + +# don't blame on dracut scripts +addFilter("non-executable-script .*/dracut/modules.d.*") + # don't check uid for tftpboot addFilter("non-standard-uid .*") diff --git a/python-kiwi.changes b/python-kiwi.changes index a03db84..0659a24 100644 --- a/python-kiwi.changes +++ b/python-kiwi.changes @@ -1,322 +1,6 @@ -------------------------------------------------------------------- -Fri Mar 23 10:34:37 CET 2018 - ms@suse.de - -- Bump version: 9.13.9 → 9.14.0 - -------------------------------------------------------------------- -Fri Mar 23 10:33:08 CET 2018 - ms@suse.de - -- Rebuild online schema documentation - -------------------------------------------------------------------- -Fri Mar 23 09:29:43 CET 2018 - ms@suse.de - -- XSL Auto update descriptions due to schema change - -------------------------------------------------------------------- -Fri Mar 23 09:19:11 CET 2018 - ms@suse.de - -- Delete obsolete hybrid attribute from type - - Any iso image we create will be a hybrid image. That was - already the default for any install iso image and was a - configuration option for live images. The optional selection - only existed for systems which do not provide tools to - make an iso hybrid. All distributions kiwi supports provides - this capabilities and there is no good reason why a live - or install iso should not be hybrid and bootable as iso - and as disk. Also the boot in disk mode became the preferred - boot method for the majority of our users which requires - to provide a hybrid iso - -------------------------------------------------------------------- -Thu Mar 22 18:36:53 CET 2018 - dcassany@suse.com - -- Add efiparttable type attribute - - This commit allows to choose the partition table type for efi firmwares - using the efiparttable type attribute. - - Fixes #638 - -------------------------------------------------------------------- -Thu Mar 22 17:40:54 CET 2018 - ms@suse.de - -- Update spec file to require xorriso - -------------------------------------------------------------------- -Thu Mar 22 16:54:05 CET 2018 - ms@suse.de - -- Cleanup hybrid call and use of iso tool options - - The extra isohybrid call is only needed if the mkisofs - tool category is used. Thus it should be only visible - at the place where the isofs is created and not as an - extra step in the builder tasks. Additionally the handling - of extra options was mkisofs specific and should be - better done as a common meta_data record. The tool - specific options should only appear in the tool specific - class implementations - -------------------------------------------------------------------- -Thu Mar 22 10:33:01 CET 2018 - ms@suse.de - -- Allow to configure iso tool category - - Switch to xorriso by default but allow to setup cdrtools - in the runtime configuration file - -------------------------------------------------------------------- -Wed Mar 21 15:54:25 CET 2018 - dcassany@suse.com - -- Remove xml_parse.py shebang in spec - - It removes the shebang from the autogenerated file and also removes - the exception in rpmlint to ignore non-executable-script warning. - - Fixes #666 - -------------------------------------------------------------------- -Mon Mar 19 16:34:15 CET 2018 - dcassany@suse.com - -- Remove unneeded shebangs from dracut modules - - Fixes #668 - -------------------------------------------------------------------- -Mon Mar 19 14:22:40 CET 2018 - ms@suse.de - -- Added IsoToolsXorrIso class - - As an alternative to mkisofs/genisoimage there is now the - IsoToolsXorrIso class which implements the IsoTools interface - by using xorriso. This Fixes #635 - -------------------------------------------------------------------- -Mon Mar 19 10:07:19 CET 2018 - ms@suse.de - -- Update package MANIFEST.in - - Include new iso_tools directory - -------------------------------------------------------------------- -Fri Mar 16 21:03:30 CET 2018 - ms@suse.de - -- Added iso_tools api documentation - -------------------------------------------------------------------- -Fri Mar 16 20:55:57 CET 2018 - ms@suse.de - -- Add list_iso method to iso_tools api - -------------------------------------------------------------------- -Fri Mar 16 15:26:29 CET 2018 - dcassany@suse.com - -- Update FSF address - - The address has been taken from the header example published here - https://www.gnu.org/licenses/old-licenses/gpl-2.0.html - - Fixes #667 - -------------------------------------------------------------------- -Fri Mar 16 11:02:35 CET 2018 - ms@suse.de - -- Add create_iso method to iso_tools api - -------------------------------------------------------------------- -Thu Mar 15 17:27:51 CET 2018 - ms@suse.de - -- Seperate iso tool handling into its own namespace - - The Iso class only provides generic helper methods around the - creation of ISO filesystems. For the creation of the filesystem - itself we encapsulate the tool parameter handling into its own - class. For the option compatible mkisofs/genisoimage tools the - IsoToolsCdrTools class exists. This allows to create e.g - IsoToolsXorrIso class as a future implementation - -------------------------------------------------------------------- -Thu Mar 15 10:32:25 CET 2018 - ms@suse.de - -- Refactor iso helper tools - - There are several tools available to build iso images. - genisoimage, mkisofs and also xorriso. The history of - the tools shows them to be used in the range of available - Linux distributions. Thus kiwi contains an abstraction - layer to support them but assumed they are option - compatible. With the xorriso implementation this is no - longer correct and therefore a refactoring of the iso - tools api is required before support for xorriso can - be added. This references Issue #635 - -------------------------------------------------------------------- -Wed Mar 14 17:59:23 CET 2018 - dcassany@suse.com - -- Make build type mandatory in XMLState - -------------------------------------------------------------------- -Wed Mar 14 17:12:59 CET 2018 - dcassany@suse.com - -- kiwi_inode_size value is no longer hardcoded in more than one place - -------------------------------------------------------------------- -Wed Mar 14 16:34:39 CET 2018 - dcassany@suse.com - -- Add warning message for dasd - -------------------------------------------------------------------- -Wed Mar 14 15:13:09 CET 2018 - dcassany@suse.com - -- Rearrange defaults and some comments - -------------------------------------------------------------------- -Wed Mar 14 14:38:22 CET 2018 - dcassany@suse.com - -- Rearrange variable start_sector attribute to be a Partitioner attribute - -------------------------------------------------------------------- -Tue Mar 13 18:31:40 CET 2018 - dcassany@suse.com - -- Add disk_start_sector type attribute - - This commit adds the disk start sector attribute to configure the - first disk sector for the first partition of the disk. - - Fixes #575 - -------------------------------------------------------------------- -Tue Mar 13 15:36:29 CET 2018 - ms@suse.de - -- Rebuild online schema documentation - -------------------------------------------------------------------- -Tue Mar 13 10:27:30 CET 2018 - ms@suse.de - -- Bump version: 9.13.8 → 9.13.9 - -------------------------------------------------------------------- -Tue Mar 13 10:05:06 CET 2018 - ms@suse.de - -- Bump version: 9.13.7 → 9.13.8 - -------------------------------------------------------------------- -Tue Mar 13 10:02:16 CET 2018 - ms@suse.de - -- Fixed base package requires - - kpartx is used by kiwi but was not required in spec - -------------------------------------------------------------------- -Tue Mar 13 10:00:01 CET 2018 - ms@suse.de - -- Update gitignore - - Do not manage changes in .pytest_cache - -------------------------------------------------------------------- -Tue Mar 13 09:56:32 CET 2018 - ms@suse.de - -- Tell plymouth to quit only if a dialog is called - - In case of a dialog kiwi uses the dialog program which conflicts - with the plymouth splash system. Thus we tell plymouth to stop - This patch changes the request to be send to plymouth prior to - a dialog call and not in general - -------------------------------------------------------------------- -Mon Mar 12 15:41:07 CET 2018 - ms@suse.de - -- Bump version: 9.13.6 → 9.13.7 - -------------------------------------------------------------------- -Mon Mar 12 11:48:51 CET 2018 - ms@suse.de - -- Update bootloader console for oem test image - - Set bootloader_console="serial" for the oem test image to - allow testing in the Kanku CI - -------------------------------------------------------------------- -Mon Mar 12 09:13:51 CET 2018 - dcassany@suse.com - -- Add profile dependencies - - With this commit the profile can include other profiles as a dependency. - This way it is possible build an image defined by multiple profiles by just - calling a single composed profile from the command line. - - Fixes #658 - -------------------------------------------------------------------- -Mon Mar 12 08:28:52 CET 2018 - ms@suse.de - -- Bump version: 9.13.5 → 9.13.6 - -------------------------------------------------------------------- -Fri Mar 9 14:08:53 CET 2018 - ms@suse.de - -- Disable multipath from oem build test - -------------------------------------------------------------------- -Fri Mar 9 14:03:23 CET 2018 - ms@suse.de - -- Fixup setup of root_filesystem_is_multipath - - The variable is set to a boolean value or None. If set to - False due to a configuration of oem-multipath-scan this - will cause the dracut multipath module to be omitted. - In any other case the presence of the multipath module - decides whether it will be included into the dracut - generated initrd or not. - -------------------------------------------------------------------- -Fri Mar 9 11:26:38 CET 2018 - ms@suse.de - -- Fixup python-kiwi base package requires - - There is no need for the base package to require multipath. - Those tools are only needed for dracut modules - -------------------------------------------------------------------- -Thu Mar 8 15:58:38 CET 2018 - ms@suse.de - -- Use dracut modules based on feature use - - As the kiwi build dracut initrd is a generic one which - includes all installed dracut modules we missed a way to - exclude modules from beeing incorporated even if we know - it would not be needed. One example is the multipath module - which would only be useful if the oem multipath scan is - configured in the image description - -------------------------------------------------------------------- -Wed Mar 7 11:48:48 CET 2018 - ms@suse.de - -- Update test-image-oem build - - Create hostonly dracut initrd on first boot and replace - kiwi's grub config by the result of grub2-mkconfig - -------------------------------------------------------------------- -Wed Mar 7 11:36:34 CET 2018 - ms@suse.de - -- Delete invalid motd file from build tests - -------------------------------------------------------------------- -Wed Mar 7 10:28:28 CET 2018 - ms@suse.de - -- Prepare test-image-oem build test for Kanku - - Activate unattended mode and preselect the installation target - Also specify a fixed swapsize value to be independent of the - host main memory which is used to calculate swap if no size - is specified - ------------------------------------------------------------------- Tue Mar 6 17:01:58 CET 2018 - ms@suse.de - + - Bump version: 9.13.4 → 9.13.5 ------------------------------------------------------------------- diff --git a/python-kiwi.spec b/python-kiwi.spec index 37b775c..35ea6ae 100644 --- a/python-kiwi.spec +++ b/python-kiwi.spec @@ -38,7 +38,7 @@ %endif Name: python-kiwi -Version: 9.14.0 +Version: 9.13.5 Provides: kiwi-schema = 6.6 Release: 0 Url: https://github.com/SUSE/kiwi @@ -104,6 +104,7 @@ Requires(postun): update-alternatives Requires: grub2-x86_64-efi %endif Requires: qemu-tools +Requires: multipath-tools Requires: squashfs Requires: gptfdisk %endif @@ -113,6 +114,7 @@ Requires(post): chkconfig Requires(postun): chkconfig Requires: qemu-img Requires: squashfs-tools +Requires: device-mapper-multipath Requires: gdisk Requires: yum Provides: kiwi-packagemanager:yum @@ -129,18 +131,22 @@ Provides: kiwi-packagemanager:zypper Requires: debootstrap Requires: qemu-utils Requires: squashfs-tools +Requires: multipath-tools Requires: gdisk %endif Requires: dosfstools Requires: e2fsprogs -Requires: xorriso +%if 0%{?suse_version} >= 1500 +Requires: mkisofs +%else +Requires: genisoimage +%endif 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" @@ -181,6 +187,7 @@ Requires(postun): update-alternatives Requires: grub2-x86_64-efi %endif Requires: qemu-tools +Requires: multipath-tools Requires: squashfs Requires: gptfdisk %endif @@ -190,6 +197,7 @@ Requires(post): chkconfig Requires(postun): chkconfig Requires: qemu-img Requires: squashfs-tools +Requires: device-mapper-multipath Requires: gdisk %endif %if 0%{?rhel} && 0%{?rhel} < 8 @@ -206,14 +214,17 @@ Provides: kiwi-packagemanager:zypper %endif Requires: dosfstools Requires: e2fsprogs -Requires: xorriso +%if 0%{?suse_version} >= 1500 +Requires: mkisofs +%else +Requires: genisoimage +%endif Requires: grub2 Requires: kiwi-man-pages Requires: kiwi-tools Requires: lvm2 Requires: mtools Requires: parted -Requires: kpartx Requires: rsync Requires: tar >= 1.2.7 %ifarch %arm aarch64 @@ -369,7 +380,15 @@ Requires: dmsetup Requires: device-mapper %endif Requires: dracut -Requires: xorriso +%if 0%{?suse_version} >= 1500 +Requires: mkisofs +%else +%if 0%{?fedora} || 0%{?rhel} || 0%{?debian} || 0%{?ubuntu} +Requires: genisoimage +%else +Requires: cdrkit-cdrtools-compat +%endif +%endif License: GPL-3.0+ Group: %{sysgroup} @@ -406,10 +425,6 @@ Provides manual pages to describe the kiwi commands %prep %setup -q -n kiwi-%{version} -# Drop shebang for kiwi/xml_parse.py, as we don't intend to use it -# 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}" diff --git a/python-kiwi.tar.gz b/python-kiwi.tar.gz index 8749fea..68d939e 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:00f6b632e1e002cbabf4bb8d6cb2e4d04249a852b6d0bf7d71acb2adfd2e8aba -size 517132 +oid sha256:dd4740a20869dd0a38a14736c52a1575f8b4ba9634896e957e8ee761e4bcf662 +size 510977