Hello community, here is the log from the commit of package python-kiwi for openSUSE:Factory checked in at 2017-11-16 13:58:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-kiwi (Old) and /work/SRC/openSUSE:Factory/.python-kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-kiwi" Thu Nov 16 13:58:10 2017 rev:13 rq:541767 version:9.11.17 Changes: -------- --- /work/SRC/openSUSE:Factory/python-kiwi/python-kiwi.changes 2017-11-04 10:24:51.464560893 +0100 +++ /work/SRC/openSUSE:Factory/.python-kiwi.new/python-kiwi.changes 2017-11-16 13:58:16.979563806 +0100 @@ -1,0 +2,126 @@ +Wed Nov 8 10:16:00 CET 2017 - [email protected] + +- Bump version: 9.11.16 → 9.11.17 + +------------------------------------------------------------------- +Wed Nov 8 10:12:45 CET 2017 - [email protected] + +- Delete atftp from SLE15 boot descriptions + + atftp will not be part of SLE15 per fate#323633. + This Fixes #543 + +------------------------------------------------------------------- +Tue Nov 7 17:31:11 CET 2017 - [email protected] + +- Fixed blocksize setup in losetup + + The -L option was used to set the blocksize value for losetup + However there is an option name clash between suse util-linux + and upstream which now leads to the problem that option -L + has changed its meaning and actually means --nooverlap which + completely breaks the call in kiwi. This patch changes the + call to use the long form --logical-blocksize. + This Fixes bsc#1066873 + +------------------------------------------------------------------- +Tue Nov 7 17:18:30 CET 2017 - [email protected] + +- Code cleaning and enhancing variables names + +------------------------------------------------------------------- +Tue Nov 7 16:53:28 CET 2017 - [email protected] + +- Use usr/lib/rpm if present instead of var/lib/rpm + + With this commit OEM recovery tries to backup usr/lib/rpm if present, + if the directory is not present it tries to backup the old default + configuration, var/lib/rpm. + +------------------------------------------------------------------- +Mon Nov 6 16:32:28 CET 2017 - [email protected] + +- Extend checkmedia runtime check + + In addition to the correct architecture the check also includes + the lookup of the required tagmedia tool to be present on the + building host. This Fixes #538 + +------------------------------------------------------------------- +Mon Nov 6 16:31:23 CET 2017 - [email protected] + +- Remove hardcoded any /var/lib/rpm path + + This commit changes any /var/lib/rpm reference to the call + 'rpm -E %_dbpath' which returns the path of the rpmdb which + has been recently updated to a different location in recent rpm + versions. Now the rpmdb path is determined dynamically. + + Fixes #537 + +------------------------------------------------------------------- +Fri Nov 3 18:15:02 CET 2017 - [email protected] + +- Adding a s390 oem test image + +------------------------------------------------------------------- +Fri Nov 3 17:48:56 CET 2017 - [email protected] + +- kiwi-hooks should be packed in tar + + Remote OBS source service is no capable of packaing a folder into a tar. + +------------------------------------------------------------------- +Fri Nov 3 17:10:39 CET 2017 - [email protected] + +- Include arm build test + +------------------------------------------------------------------- +Fri Nov 3 14:54:29 CET 2017 - [email protected] + +- Adding test image descriptions + + This commit adds the image descriptions used to test KIWI within + the Open Build Service. + +------------------------------------------------------------------- +Thu Nov 2 12:18:18 CET 2017 - [email protected] + +- Add support for apt repository priorities + + Apt handles repository priorities in a preferences + file per repository and calls that pin-priorities. + The implementation here sets the configured priority + for all packages of the given repository + +------------------------------------------------------------------- +Tue Oct 31 16:37:27 CET 2017 - [email protected] + +- Add missing hooks to the other architectures + +------------------------------------------------------------------- +Tue Oct 31 16:37:09 CET 2017 - [email protected] + +- Add pre/post mount hook for oem + +------------------------------------------------------------------- +Tue Oct 31 13:24:15 CET 2017 - [email protected] + +- Clarify how strip works + +------------------------------------------------------------------- +Mon Oct 30 11:12:04 CET 2017 - [email protected] + +- Add more OEM hooks + +------------------------------------------------------------------- +Wed Oct 25 22:56:48 CEST 2017 - [email protected] + +- updated contributing link + +------------------------------------------------------------------- +Wed Oct 25 22:03:12 CEST 2017 - [email protected] + +- s/42.1/42.3/ + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-kiwi.spec ++++++ --- /var/tmp/diff_new_pack.eGyAEX/_old 2017-11-16 13:58:19.819460909 +0100 +++ /var/tmp/diff_new_pack.eGyAEX/_new 2017-11-16 13:58:19.823460764 +0100 @@ -93,7 +93,7 @@ %endif Name: python-kiwi -Version: 9.11.16 +Version: 9.11.17 Release: 0 Provides: kiwi-schema = 6.6 Url: https://github.com/SUSE/kiwi ++++++ python-kiwi-boot-packages ++++++ --- /var/tmp/diff_new_pack.eGyAEX/_old 2017-11-16 13:58:19.871459025 +0100 +++ /var/tmp/diff_new_pack.eGyAEX/_new 2017-11-16 13:58:19.871459025 +0100 @@ -38,14 +38,14 @@ armv6l:suse-SLES15:bc bind-libs bind-utils bootsplash btrfsprogs busybox bzip2 cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime glibc glibc-locale gptfdisk hwinfo ifplugd iproute2 iputils kbd kernel-default kernel-firmware kiwi-tools kmod-compat kpartx lvm2 make mdadm net-tools netcfg parted pciutils procps psmisc rsync squashfs sysconfig sysfsutils sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz armv7hl:suse-SLES15:bc bind-libs bind-utils bootsplash btrfsprogs busybox bzip2 cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime glibc glibc-locale gptfdisk hwinfo ifplugd iproute2 iputils kbd kernel-default kernel-firmware kiwi-tools kmod-compat kpartx lvm2 make mdadm net-tools netcfg parted pciutils procps psmisc rsync squashfs sysconfig sysfsutils sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz armv7l:suse-SLES15:bc bind-libs bind-utils bootsplash btrfsprogs busybox bzip2 cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime glibc glibc-locale gptfdisk hwinfo ifplugd iproute2 iputils kbd kernel-default kernel-firmware kiwi-tools kmod-compat kpartx lvm2 make mdadm net-tools netcfg parted pciutils procps psmisc rsync squashfs sysconfig sysfsutils sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz -i586:suse-SLES15:adaptec-firmware atftp bc bind-libs bind-utils btrfsprogs busybox bzip2 ca-certificates cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime glibc glibc-locale gptfdisk grub2 grub2-i386-efi grub2-i386-pc hwinfo iproute2 iputils kbd kernel-default kernel-firmware kexec-tools kiwi-tools kmod-compat kpartx lvm2 make mdadm nbd net-tools netcfg nfs-client parted pciutils plymouth plymouth-scripts procps psmisc rsync squashfs sysconfig sysfsutils syslinux sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz -i686:suse-SLES15:adaptec-firmware atftp bc bind-libs bind-utils btrfsprogs busybox bzip2 ca-certificates cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime glibc glibc-locale gptfdisk grub2 grub2-i386-efi grub2-i386-pc hwinfo iproute2 iputils kbd kernel-default kernel-firmware kexec-tools kiwi-tools kmod-compat kpartx lvm2 make mdadm nbd net-tools netcfg nfs-client parted pciutils plymouth plymouth-scripts procps psmisc rsync squashfs sysconfig sysfsutils syslinux sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz +i586:suse-SLES15:adaptec-firmware bc bind-libs bind-utils btrfsprogs busybox bzip2 ca-certificates cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime glibc glibc-locale gptfdisk grub2 grub2-i386-efi grub2-i386-pc hwinfo iproute2 iputils kbd kernel-default kernel-firmware kexec-tools kiwi-tools kmod-compat kpartx lvm2 make mdadm nbd net-tools netcfg nfs-client parted pciutils plymouth plymouth-scripts procps psmisc rsync squashfs sysconfig sysfsutils syslinux sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz +i686:suse-SLES15:adaptec-firmware bc bind-libs bind-utils btrfsprogs busybox bzip2 ca-certificates cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime glibc glibc-locale gptfdisk grub2 grub2-i386-efi grub2-i386-pc hwinfo iproute2 iputils kbd kernel-default kernel-firmware kexec-tools kiwi-tools kmod-compat kpartx lvm2 make mdadm nbd net-tools netcfg nfs-client parted pciutils plymouth plymouth-scripts procps psmisc rsync squashfs sysconfig sysfsutils syslinux sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz ppc:suse-SLES15:bc bind-libs bind-utils btrfsprogs busybox bzip2 cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime glibc glibc-locale gptfdisk grub2 hwinfo ifplugd iproute2 iputils kbd kernel-default kernel-firmware kexec-tools kiwi-tools kmod-compat kpartx lvm2 make mdadm nbd net-tools netcfg nfs-client parted pciutils plymouth plymouth-scripts procps psmisc rsync squashfs sysconfig sysfsutils syslinux sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz ppc64:suse-SLES15:bc bind-libs bind-utils btrfsprogs busybox bzip2 cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime glibc glibc-locale gptfdisk grub2 hwinfo ifplugd iproute2 iputils kbd kernel-default kernel-firmware kexec-tools kiwi-tools kmod-compat kpartx lvm2 make mdadm nbd net-tools netcfg nfs-client parted pciutils plymouth plymouth-scripts procps psmisc rsync squashfs sysconfig sysfsutils syslinux sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz ppc64le:suse-SLES15:bc bind-libs bind-utils btrfsprogs busybox bzip2 cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime glibc glibc-locale gptfdisk grub2 hwinfo ifplugd iproute2 iputils kbd kernel-default kernel-firmware kexec-tools kiwi-tools kmod-compat kpartx lvm2 make mdadm nbd net-tools netcfg nfs-client parted pciutils plymouth plymouth-scripts procps psmisc rsync squashfs sysconfig sysfsutils syslinux sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz s390:suse-SLES15:bc bind-libs bind-utils btrfsprogs busybox bzip2 cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime glibc glibc-locale grub2 grub2-s390x-emu hwinfo iproute2 iputils kbd kernel-default kexec-tools kiwi-tools kpartx lvm2 make mdadm module-init-tools multipath-tools net-tools netcfg nfs-client parted pciutils plymouth plymouth-scripts procps psmisc rsync s390-tools squashfs sysconfig sysfsutils sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz s390x:suse-SLES15:bc bind-libs bind-utils btrfsprogs busybox bzip2 cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime glibc glibc-locale grub2 grub2-s390x-emu hwinfo iproute2 iputils kbd kernel-default kexec-tools kiwi-tools kpartx lvm2 make mdadm module-init-tools multipath-tools net-tools netcfg nfs-client parted pciutils plymouth plymouth-scripts procps psmisc rsync s390-tools squashfs sysconfig sysfsutils sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz -x86_64:suse-SLES15:adaptec-firmware atftp bc bind-libs bind-utils btrfsprogs busybox bzip2 ca-certificates cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime glibc glibc-locale gptfdisk grub2 grub2-i386-pc grub2-x86_64-efi grub2-x86_64-xen hwinfo iproute2 iputils kbd kernel-default kernel-firmware kexec-tools kiwi-tools kmod-compat kpartx lvm2 make mdadm nbd net-tools netcfg nfs-client parted pciutils plymouth plymouth-scripts procps psmisc rsync shim squashfs sysconfig sysfsutils syslinux sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz +x86_64:suse-SLES15:adaptec-firmware bc bind-libs bind-utils btrfsprogs busybox bzip2 ca-certificates cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime glibc glibc-locale gptfdisk grub2 grub2-i386-pc grub2-x86_64-efi grub2-x86_64-xen hwinfo iproute2 iputils kbd kernel-default kernel-firmware kexec-tools kiwi-tools kmod-compat kpartx lvm2 make mdadm nbd net-tools netcfg nfs-client parted pciutils plymouth plymouth-scripts procps psmisc rsync shim squashfs sysconfig sysfsutils syslinux sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz aarch64:suse-leap15.0:bc bind-libs bind-utils bootsplash btrfsprogs busybox bzip2 cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime glibc glibc-locale gptfdisk grub2-arm64-efi hwinfo ifplugd iproute2 iputils kbd kernel-default kernel-firmware kiwi-tools kmod-compat kpartx lvm2 make mdadm net-tools netcfg parted pciutils procps psmisc rsync squashfs sysconfig sysfsutils sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz arm:suse-leap15.0:bc bind-libs bind-utils bootsplash btrfsprogs busybox bzip2 cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime glibc glibc-locale gptfdisk hwinfo ifplugd iproute2 iputils kbd kernel-default kernel-firmware kiwi-tools kmod-compat kpartx lvm2 make mdadm net-tools netcfg parted pciutils procps psmisc rsync squashfs sysconfig sysfsutils sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz armv5el:suse-leap15.0:bc bind-libs bind-utils bootsplash btrfsprogs busybox bzip2 cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime glibc glibc-locale gptfdisk hwinfo ifplugd iproute2 iputils kbd kernel-default kernel-firmware kiwi-tools kmod-compat kpartx lvm2 make mdadm net-tools netcfg parted pciutils procps psmisc rsync squashfs sysconfig sysfsutils sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz ++++++ python-kiwi.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.16/.bumpversion.cfg new/kiwi-9.11.17/.bumpversion.cfg --- old/kiwi-9.11.16/.bumpversion.cfg 2017-10-25 16:32:35.000000000 +0200 +++ new/kiwi-9.11.17/.bumpversion.cfg 2017-11-08 10:16:00.000000000 +0100 @@ -1,5 +1,5 @@ [bumpversion] -current_version = 9.11.16 +current_version = 9.11.17 commit = True tag = True diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.16/PKG-INFO new/kiwi-9.11.17/PKG-INFO --- old/kiwi-9.11.16/PKG-INFO 2017-10-25 17:01:01.000000000 +0200 +++ new/kiwi-9.11.17/PKG-INFO 2017-11-08 10:22:24.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: kiwi -Version: 9.11.16 +Version: 9.11.17 Summary: KIWI - Appliance Builder (next generation) Home-page: http://suse.github.io/kiwi Author: Marcus Schaefer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.16/README.rst new/kiwi-9.11.17/README.rst --- old/kiwi-9.11.16/README.rst 2017-09-15 10:37:16.000000000 +0200 +++ new/kiwi-9.11.17/README.rst 2017-11-03 11:17:25.000000000 +0100 @@ -7,7 +7,7 @@ :target: https://landscape.io/github/SUSE/kiwi/master .. |Doc| replace:: `Documentation <https://suse.github.io/kiwi>`__ .. |Installation| replace:: `Installation <https://suse.github.io/kiwi/quickstart.html>`__ -.. |Contributing| replace:: `Contributing <https://suse.github.io/kiwi/contributing.html>`__ +.. |Contributing| replace:: `Contributing <https://suse.github.io/kiwi/development.html>`__ .. |Donate| image:: https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif :target: https://www.paypal.me/SchaeferMarcus Binary files old/kiwi-9.11.16/boot_arch.tgz and new/kiwi-9.11.17/boot_arch.tgz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.16/doc/build/man/kiwi.8 new/kiwi-9.11.17/doc/build/man/kiwi.8 --- old/kiwi-9.11.16/doc/build/man/kiwi.8 2017-10-25 17:01:00.000000000 +0200 +++ new/kiwi-9.11.17/doc/build/man/kiwi.8 2017-11-08 10:22:15.000000000 +0100 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "KIWI" "8" "Oct 25, 2017" "9.11.16" "kiwi" +.TH "KIWI" "8" "Nov 08, 2017" "9.11.17" "kiwi" .SH NAME kiwi \- Creating Operating System Images . @@ -147,7 +147,7 @@ $ git clone https://github.com/SUSE/kiwi\-descriptions $ kiwi \-\-type vmx system build \e - \-\-description kiwi\-descriptions/suse/x86_64/suse\-leap\-42.1\-JeOS \e + \-\-description kiwi\-descriptions/suse/x86_64/suse\-leap\-42.3\-JeOS \e \-\-target\-dir /tmp/myimage .ft P .fi @@ -198,7 +198,7 @@ .nf .ft C $ kiwi compat \e - \-\-build kiwi\-descriptions/suse/x86_64/suse\-leap\-42.1\-JeOS \e + \-\-build kiwi\-descriptions/suse/x86_64/suse\-leap\-42.3\-JeOS \e \-\-type vmx \-d /tmp/myimage .ft P .fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.16/doc/build/man/kiwi::image::info.8 new/kiwi-9.11.17/doc/build/man/kiwi::image::info.8 --- old/kiwi-9.11.16/doc/build/man/kiwi::image::info.8 2017-10-25 17:01:00.000000000 +0200 +++ new/kiwi-9.11.17/doc/build/man/kiwi::image::info.8 2017-11-08 10:22:15.000000000 +0100 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "KIWI::IMAGE::INFO" "8" "Oct 25, 2017" "9.11.16" "kiwi" +.TH "KIWI::IMAGE::INFO" "8" "Nov 08, 2017" "9.11.17" "kiwi" .SH NAME kiwi::image::info \- Provide detailed information about an image description . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.16/doc/build/man/kiwi::image::resize.8 new/kiwi-9.11.17/doc/build/man/kiwi::image::resize.8 --- old/kiwi-9.11.16/doc/build/man/kiwi::image::resize.8 2017-10-25 17:01:00.000000000 +0200 +++ new/kiwi-9.11.17/doc/build/man/kiwi::image::resize.8 2017-11-08 10:22:15.000000000 +0100 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "KIWI::IMAGE::RESIZE" "8" "Oct 25, 2017" "9.11.16" "kiwi" +.TH "KIWI::IMAGE::RESIZE" "8" "Nov 08, 2017" "9.11.17" "kiwi" .SH NAME kiwi::image::resize \- Resize disk images to new geometry . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.16/doc/build/man/kiwi::result::bundle.8 new/kiwi-9.11.17/doc/build/man/kiwi::result::bundle.8 --- old/kiwi-9.11.16/doc/build/man/kiwi::result::bundle.8 2017-10-25 17:01:00.000000000 +0200 +++ new/kiwi-9.11.17/doc/build/man/kiwi::result::bundle.8 2017-11-08 10:22:15.000000000 +0100 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "KIWI::RESULT::BUNDLE" "8" "Oct 25, 2017" "9.11.16" "kiwi" +.TH "KIWI::RESULT::BUNDLE" "8" "Nov 08, 2017" "9.11.17" "kiwi" .SH NAME kiwi::result::bundle \- Bundle build results . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.16/doc/build/man/kiwi::result::list.8 new/kiwi-9.11.17/doc/build/man/kiwi::result::list.8 --- old/kiwi-9.11.16/doc/build/man/kiwi::result::list.8 2017-10-25 17:01:00.000000000 +0200 +++ new/kiwi-9.11.17/doc/build/man/kiwi::result::list.8 2017-11-08 10:22:15.000000000 +0100 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "KIWI::RESULT::LIST" "8" "Oct 25, 2017" "9.11.16" "kiwi" +.TH "KIWI::RESULT::LIST" "8" "Nov 08, 2017" "9.11.17" "kiwi" .SH NAME kiwi::result::list \- List build results . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.16/doc/build/man/kiwi::system::build.8 new/kiwi-9.11.17/doc/build/man/kiwi::system::build.8 --- old/kiwi-9.11.16/doc/build/man/kiwi::system::build.8 2017-10-25 17:01:00.000000000 +0200 +++ new/kiwi-9.11.17/doc/build/man/kiwi::system::build.8 2017-11-08 10:22:15.000000000 +0100 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "KIWI::SYSTEM::BUILD" "8" "Oct 25, 2017" "9.11.16" "kiwi" +.TH "KIWI::SYSTEM::BUILD" "8" "Nov 08, 2017" "9.11.17" "kiwi" .SH NAME kiwi::system::build \- Build image in combined prepare and create step . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.16/doc/build/man/kiwi::system::create.8 new/kiwi-9.11.17/doc/build/man/kiwi::system::create.8 --- old/kiwi-9.11.16/doc/build/man/kiwi::system::create.8 2017-10-25 17:01:00.000000000 +0200 +++ new/kiwi-9.11.17/doc/build/man/kiwi::system::create.8 2017-11-08 10:22:15.000000000 +0100 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "KIWI::SYSTEM::CREATE" "8" "Oct 25, 2017" "9.11.16" "kiwi" +.TH "KIWI::SYSTEM::CREATE" "8" "Nov 08, 2017" "9.11.17" "kiwi" .SH NAME kiwi::system::create \- Create image from prepared root system . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.16/doc/build/man/kiwi::system::prepare.8 new/kiwi-9.11.17/doc/build/man/kiwi::system::prepare.8 --- old/kiwi-9.11.16/doc/build/man/kiwi::system::prepare.8 2017-10-25 17:01:00.000000000 +0200 +++ new/kiwi-9.11.17/doc/build/man/kiwi::system::prepare.8 2017-11-08 10:22:15.000000000 +0100 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "KIWI::SYSTEM::PREPARE" "8" "Oct 25, 2017" "9.11.16" "kiwi" +.TH "KIWI::SYSTEM::PREPARE" "8" "Nov 08, 2017" "9.11.17" "kiwi" .SH NAME kiwi::system::prepare \- Prepare image root system . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.16/doc/build/man/kiwi::system::update.8 new/kiwi-9.11.17/doc/build/man/kiwi::system::update.8 --- old/kiwi-9.11.16/doc/build/man/kiwi::system::update.8 2017-10-25 17:01:00.000000000 +0200 +++ new/kiwi-9.11.17/doc/build/man/kiwi::system::update.8 2017-11-08 10:22:15.000000000 +0100 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "KIWI::SYSTEM::UPDATE" "8" "Oct 25, 2017" "9.11.16" "kiwi" +.TH "KIWI::SYSTEM::UPDATE" "8" "Nov 08, 2017" "9.11.17" "kiwi" .SH NAME kiwi::system::update \- Update/Upgrade image root system . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.16/doc/source/building/build_containerized.rst new/kiwi-9.11.17/doc/source/building/build_containerized.rst --- old/kiwi-9.11.16/doc/source/building/build_containerized.rst 2017-09-15 10:37:16.000000000 +0200 +++ new/kiwi-9.11.17/doc/source/building/build_containerized.rst 2017-11-03 11:17:25.000000000 +0100 @@ -241,8 +241,8 @@ $ cd <git-clone-result-kiwi-descriptions> - $ dice build suse/x86_64/suse-leap-42.1-JeOS - $ dice status suse/x86_64/suse-leap-42.1-JeOS + $ dice build suse/x86_64/suse-leap-42.3-JeOS + $ dice status suse/x86_64/suse-leap-42.3-JeOS Buildsystem Backends diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.16/doc/source/building/build_live_iso.rst new/kiwi-9.11.17/doc/source/building/build_live_iso.rst --- old/kiwi-9.11.16/doc/source/building/build_live_iso.rst 2017-09-15 10:37:16.000000000 +0200 +++ new/kiwi-9.11.17/doc/source/building/build_live_iso.rst 2017-11-03 11:17:25.000000000 +0100 @@ -26,7 +26,7 @@ .. code:: bash $ sudo kiwi-ng --type iso system build \ - --description kiwi-descriptions/suse/x86_64/suse-leap-42.1-JeOS \ + --description kiwi-descriptions/suse/x86_64/suse-leap-42.3-JeOS \ --target-dir /tmp/myimage Find the image with the suffix :file:`.iso` below :file:`/tmp/myimage`. @@ -35,7 +35,7 @@ .. code:: bash - $ qemu -cdrom LimeJeOS-Leap-42.1.x86_64-1.42.1.iso -m 4096 + $ qemu -cdrom LimeJeOS-Leap-42.3.x86_64-1.42.3.iso -m 4096 After the test was successful, the image is complete and ready to use. See :ref:`iso_to_usb_stick` for further information. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.16/doc/source/building/build_oem_disk.rst new/kiwi-9.11.17/doc/source/building/build_oem_disk.rst --- old/kiwi-9.11.16/doc/source/building/build_oem_disk.rst 2017-09-15 10:37:16.000000000 +0200 +++ new/kiwi-9.11.17/doc/source/building/build_oem_disk.rst 2017-11-03 11:17:25.000000000 +0100 @@ -26,7 +26,7 @@ .. code:: bash $ sudo kiwi-ng --type oem system build \ - --description kiwi-descriptions/suse/x86_64/suse-leap-42.1-JeOS \ + --description kiwi-descriptions/suse/x86_64/suse-leap-42.3-JeOS \ --target-dir /tmp/myimage Find the following result images below :file:`/tmp/myimage`. @@ -87,7 +87,7 @@ .. code:: bash - $ dd if=LimeJeOS-Leap-42.1.x86_64-1.42.1.raw of=target_disk conv=notrunc + $ dd if=LimeJeOS-Leap-42.3.x86_64-1.42.3.raw of=target_disk conv=notrunc 3. Boot the target disk @@ -118,7 +118,7 @@ .. code:: bash - $ qemu -cdrom LimeJeOS-Leap-42.1.x86_64-1.42.1.install.iso -hda target_disk -boot d -m 4096 + $ qemu -cdrom LimeJeOS-Leap-42.3.x86_64-1.42.3.install.iso -hda target_disk -boot d -m 4096 .. note:: USB Stick Deployment @@ -142,7 +142,7 @@ 1. Make sure to create an installation PXE TAR archive along with your OEM image by replacing the following setup in - kiwi-descriptions/suse/x86_64/suse-leap-42.1-JeOS/config.xml + kiwi-descriptions/suse/x86_64/suse-leap-42.3-JeOS/config.xml .. code:: xml @@ -156,13 +156,13 @@ 2. Rebuild the image, unpack the resulting - LimeJeOS-Leap-42.1.x86_64-1.42.1.install.tar.xz file to a temporary + LimeJeOS-Leap-42.3.x86_64-1.42.3.install.tar.xz file to a temporary directory and copy the initrd and kernel images to the PXE server: .. code:: bash mkdir /tmp/pxe && cd /tmp/pxe - tar -xf LimeJeOS-Leap-42.1.x86_64-1.42.1.install.tar.xz + tar -xf LimeJeOS-Leap-42.3.x86_64-1.42.3.install.tar.xz scp initrd-oemboot-*.install.* PXE_SERVER_IP:/srv/tftpboot/boot/initrd scp initrd-oemboot-*.kernel.* PXE_SERVER_IP:/srv/tftpboot/boot/linux @@ -170,11 +170,11 @@ .. code:: bash - scp LimeJeOS-Leap-42.1.x86_64-1.42.1.xz PXE_SERVER_IP:/srv/tftpboot/image/ - scp LimeJeOS-Leap-42.1.x86_64-1.42.1.md5 PXE_SERVER_IP:/srv/tftpboot/image/ + scp LimeJeOS-Leap-42.3.x86_64-1.42.3.xz PXE_SERVER_IP:/srv/tftpboot/image/ + scp LimeJeOS-Leap-42.3.x86_64-1.42.3.md5 PXE_SERVER_IP:/srv/tftpboot/image/ 3. Copy the kernel command line parameters from - LimeJeOS-Leap-42.1.x86_64-1.42.1.append. Edit your PXE configuration + LimeJeOS-Leap-42.3.x86_64-1.42.3.append. Edit your PXE configuration (for example pxelinux.cfg/default) on the PXE server and add these parameters to the append line diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.16/doc/source/building/build_pxe_root_filesystem.rst new/kiwi-9.11.17/doc/source/building/build_pxe_root_filesystem.rst --- old/kiwi-9.11.16/doc/source/building/build_pxe_root_filesystem.rst 2017-09-15 10:37:16.000000000 +0200 +++ new/kiwi-9.11.17/doc/source/building/build_pxe_root_filesystem.rst 2017-11-03 11:17:25.000000000 +0100 @@ -68,7 +68,7 @@ .. code:: bash $ sudo kiwi-ng --profile netboot --type pxe system build \ - --description kiwi-descriptions/suse/x86_64/suse-leap-42.1-JeOS \ + --description kiwi-descriptions/suse/x86_64/suse-leap-42.3-JeOS \ --target-dir /tmp/mypxe-result 3. Change into the build directory: @@ -88,8 +88,8 @@ .. code:: bash - $ cp LimeJeOS-Leap-42.1.x86_64-1.42.1 /srv/tftpboot/image - $ cp LimeJeOS-Leap-42.1.x86_64-1.42.1.md5 /srv/tftpboot/image + $ cp LimeJeOS-Leap-42.3.x86_64-1.42.3 /srv/tftpboot/image + $ cp LimeJeOS-Leap-42.3.x86_64-1.42.3.md5 /srv/tftpboot/image 6. Adjust the PXE configuration file. The configuration file controls which kernel and initrd is @@ -115,7 +115,7 @@ $ vi /srv/tftpboot/KIWI/config.default - IMAGE=/dev/ram1;LimeJeOS-Leap-42.1.x86_64;1.42.1;192.168.100.2;4096 + IMAGE=/dev/ram1;LimeJeOS-Leap-42.3.x86_64;1.42.3;192.168.100.2;4096 UNIONFS_CONFIG=/dev/ram2,/dev/ram1,overlay All PXE boot based deployment methods are controlled by a client diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.16/doc/source/building/build_vmx_disk.rst new/kiwi-9.11.17/doc/source/building/build_vmx_disk.rst --- old/kiwi-9.11.16/doc/source/building/build_vmx_disk.rst 2017-09-15 10:37:16.000000000 +0200 +++ new/kiwi-9.11.17/doc/source/building/build_vmx_disk.rst 2017-11-03 11:17:25.000000000 +0100 @@ -25,7 +25,7 @@ .. code:: bash $ sudo kiwi-ng --type vmx system build \ - --description kiwi-descriptions/suse/x86_64/suse-leap-42.1-JeOS \ + --description kiwi-descriptions/suse/x86_64/suse-leap-42.3-JeOS \ --target-dir /tmp/myimage Find the image with the suffix :file:`.raw` below :file:`/tmp/myimage`. @@ -35,7 +35,7 @@ .. code:: bash $ qemu \ - -drive file=LimeJeOS-Leap-42.1.x86_64-1.42.1.raw,format=raw,if=virtio \ + -drive file=LimeJeOS-Leap-42.3.x86_64-1.42.3.raw,format=raw,if=virtio \ -m 4096 After the test was successful, the image is complete. For further information diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.16/doc/source/building/working_with_images/iso_to_usb_stick_deployment.rst new/kiwi-9.11.17/doc/source/building/working_with_images/iso_to_usb_stick_deployment.rst --- old/kiwi-9.11.16/doc/source/building/working_with_images/iso_to_usb_stick_deployment.rst 2017-09-15 10:37:16.000000000 +0200 +++ new/kiwi-9.11.17/doc/source/building/working_with_images/iso_to_usb_stick_deployment.rst 2017-11-03 11:17:25.000000000 +0100 @@ -39,7 +39,7 @@ .. code:: bash - $ dd if=LimeJeOS-Leap-42.1.x86_64-1.42.1.iso of=/dev/<stickdevice> + $ dd if=LimeJeOS-Leap-42.3.x86_64-1.42.3.iso of=/dev/<stickdevice> 3. Boot from your USB Stick diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.16/doc/source/building/working_with_images/pxe_client_configuration.rst new/kiwi-9.11.17/doc/source/building/working_with_images/pxe_client_configuration.rst --- old/kiwi-9.11.16/doc/source/building/working_with_images/pxe_client_configuration.rst 2017-09-15 10:37:16.000000000 +0200 +++ new/kiwi-9.11.17/doc/source/building/working_with_images/pxe_client_configuration.rst 2017-11-03 11:17:25.000000000 +0100 @@ -96,17 +96,17 @@ .. note:: - In the referenced :file:`suse-leap-42.1-JeOS` XML description the ``pxe`` + In the referenced :file:`suse-leap-42.3-JeOS` XML description the ``pxe`` type must be changed as follows and the image needs to be rebuild: .. code:: xml - <type image="pxe" filesystem="ext3" boot="netboot/suse-leap42.1"/> + <type image="pxe" filesystem="ext3" boot="netboot/suse-leap42.3"/> .. code:: bash - IMAGE="/dev/sda2;LimeJeOS-Leap-42.1.x86_64;1.42.1;192.168.100.2;4096" + IMAGE="/dev/sda2;LimeJeOS-Leap-42.3.x86_64;1.42.3;192.168.100.2;4096" DISK="/dev/sda" PART="5;S;X,X;L;/" @@ -123,18 +123,18 @@ .. note:: - In the referenced :file:`suse-leap-42.1-JeOS` XML description the ``pxe`` + In the referenced :file:`suse-leap-42.3-JeOS` XML description the ``pxe`` type must be changed as follows and the image needs to be rebuild: .. code:: xml - <type image="pxe" filesystem="ext3" boot="netboot/suse-leap42.1"/> + <type image="pxe" filesystem="ext3" boot="netboot/suse-leap42.3"/> .. code:: bash RAID='1;/dev/sda;/dev/sdb' - IMAGE="/dev/md1;LimeJeOS-Leap-42.1.x86_64;1.42.1;192.168.100.2;4096" + IMAGE="/dev/md1;LimeJeOS-Leap-42.3.x86_64;1.42.3;192.168.100.2;4096" PART="5;S;x,x;L;/" The first parameter of the RAID line is the RAID level. So far only raid1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.16/doc/source/building/working_with_images/vmx_setup_for_google.rst new/kiwi-9.11.17/doc/source/building/working_with_images/vmx_setup_for_google.rst --- old/kiwi-9.11.16/doc/source/building/working_with_images/vmx_setup_for_google.rst 2017-09-15 10:37:16.000000000 +0200 +++ new/kiwi-9.11.17/doc/source/building/working_with_images/vmx_setup_for_google.rst 2017-11-03 11:17:25.000000000 +0100 @@ -53,7 +53,7 @@ .. code:: xml <type image="oem" - boot="oemboot/suse-leap42.1" + boot="oemboot/suse-leap42.3" filesystem="ext4" boottimeout="1" kernelcmdline="console=ttyS0,38400n8 net.ifnames=0 NON_PERSISTENT_DEVICE_NAMES=1" format="gce" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.16/doc/source/commands/kiwi.rst new/kiwi-9.11.17/doc/source/commands/kiwi.rst --- old/kiwi-9.11.16/doc/source/commands/kiwi.rst 2017-09-15 10:37:16.000000000 +0200 +++ new/kiwi-9.11.17/doc/source/commands/kiwi.rst 2017-11-03 11:17:25.000000000 +0100 @@ -117,7 +117,7 @@ $ git clone https://github.com/SUSE/kiwi-descriptions $ kiwi --type vmx system build \ - --description kiwi-descriptions/suse/x86_64/suse-leap-42.1-JeOS \ + --description kiwi-descriptions/suse/x86_64/suse-leap-42.3-JeOS \ --target-dir /tmp/myimage RUNTIME CONFIG FILE @@ -160,5 +160,5 @@ .. code-block:: bash $ kiwi compat \ - --build kiwi-descriptions/suse/x86_64/suse-leap-42.1-JeOS \ + --build kiwi-descriptions/suse/x86_64/suse-leap-42.3-JeOS \ --type vmx -d /tmp/myimage diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.16/doc/source/conf.py new/kiwi-9.11.17/doc/source/conf.py --- old/kiwi-9.11.16/doc/source/conf.py 2017-10-25 16:32:35.000000000 +0200 +++ new/kiwi-9.11.17/doc/source/conf.py 2017-11-08 10:16:00.000000000 +0100 @@ -93,7 +93,7 @@ # built documents. # # The short X.Y version. -version = u'9.11.16' +version = u'9.11.17' # The full version, including alpha/beta/rc tags. release = version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.16/doc/source/overview/workflow.rst new/kiwi-9.11.17/doc/source/overview/workflow.rst --- old/kiwi-9.11.16/doc/source/overview/workflow.rst 2017-10-25 12:23:42.000000000 +0200 +++ new/kiwi-9.11.17/doc/source/overview/workflow.rst 2017-11-03 11:17:25.000000000 +0100 @@ -854,6 +854,18 @@ The hooks are called before and after the loading of modules not handled by udev, respectively. +``preinstall`` | ``postinstall`` + The hooks are called before and after the OEM imaging of the target disk. The hooks only exist for the *OEM* image type. + +``prerepart`` | ``postrepart`` + The hooks are called before and after the OEM repartition of the target disk. The hooks only exist for the *OEM* image type. + +``preresize`` | ``postresize`` + The hooks are called before and after the OEM resize of filesystem to full space. The hooks only exist for the *OEM* image type. + +``premount`` | ``postmount`` + The hooks are called before and after the mounting of the system image into /mnt. The hooks only exist for the *OEM* image type. + ``preswap`` | ``postswap`` The hooks are called before and after the creation of the swap space, respectively. The hooks only exist for the *PXE* image type. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.16/doc/source/quickstart.rst new/kiwi-9.11.17/doc/source/quickstart.rst --- old/kiwi-9.11.16/doc/source/quickstart.rst 2017-09-15 10:37:16.000000000 +0200 +++ new/kiwi-9.11.17/doc/source/quickstart.rst 2017-11-03 11:17:25.000000000 +0100 @@ -24,7 +24,7 @@ .. code:: bash $ sudo kiwi-ng --type vmx system build \ - --description kiwi-descriptions/suse/x86_64/suse-leap-42.1-JeOS \ + --description kiwi-descriptions/suse/x86_64/suse-leap-42.3-JeOS \ --target-dir /tmp/myimage Find the image with the suffix :file:`.raw` below :file:`/tmp/myimage`. @@ -40,5 +40,5 @@ $ qemu \ -boot c - -drive file=LimeJeOS-Leap-42.1.x86_64-1.42.1.raw,format=raw,if=virtio \ + -drive file=LimeJeOS-Leap-42.3.x86_64-1.42.3.raw,format=raw,if=virtio \ -m 4096 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.16/kiwi/boot/functions.sh new/kiwi-9.11.17/kiwi/boot/functions.sh --- old/kiwi-9.11.16/kiwi/boot/functions.sh 2017-09-15 10:37:16.000000000 +0200 +++ new/kiwi-9.11.17/kiwi/boot/functions.sh 2017-11-08 10:11:07.000000000 +0100 @@ -9616,11 +9616,11 @@ function loop_setup { local IFS=$IFS_ORIG local target="$@" - local logical_sector_size + local logical_block_size if [ ! -z "$kiwi_target_blocksize" ];then - logical_sector_size="-L $kiwi_target_blocksize" + logical_block_size="--logical-blocksize $kiwi_target_blocksize" fi - local loop=$(losetup $logical_sector_size -f --show "$target") + local loop=$(losetup $logical_block_size -f --show "$target") if [ ! -e "$loop" ];then return 1 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.16/kiwi/package_manager/zypper.py new/kiwi-9.11.17/kiwi/package_manager/zypper.py --- old/kiwi-9.11.16/kiwi/package_manager/zypper.py 2017-09-15 10:37:16.000000000 +0200 +++ new/kiwi-9.11.17/kiwi/package_manager/zypper.py 2017-11-08 10:11:07.000000000 +0100 @@ -251,27 +251,38 @@ 45: 'db45_load', 48: 'db48_load' } + + rpmdb_path_request = Command.run( + ['chroot', self.root_dir, 'rpm', '-E', '%_dbpath'] + ) + rpmdb_path = os.path.normpath(os.sep.join( + [self.root_dir, rpmdb_path_request.output.strip()] + )) + if not os.path.exists(rpmdb_path): + raise KiwiRpmDatabaseReloadError( + 'Unable to get the rpmdb location {0}'.format(rpmdb_path) + ) + if version not in db_load_for_version: raise KiwiRpmDatabaseReloadError( 'Dump reload for rpm DB version: %s not supported' % version ) if not self.database_consistent(): reload_db_files = [ - '/var/lib/rpm/Name', - '/var/lib/rpm/Packages' + os.sep.join([rpmdb_path, 'Name']), + os.sep.join([rpmdb_path, 'Packages']) ] for db_file in reload_db_files: - root_db_file = self.root_dir + db_file - root_db_file_backup = root_db_file + '.bak' + db_file_backup = '{0}.bak'.format(db_file) Command.run([ - 'db_dump', '-f', root_db_file_backup, root_db_file + 'db_dump', '-f', db_file_backup, db_file ]) - Command.run(['rm', '-f', root_db_file]) + Command.run(['rm', '-f', db_file]) Command.run([ db_load_for_version[version], - '-f', root_db_file_backup, root_db_file + '-f', db_file_backup, db_file ]) - Command.run(['rm', '-f', root_db_file_backup]) + Command.run(['rm', '-f', db_file_backup]) Command.run([ 'chroot', self.root_dir, 'rpm', '--rebuilddb' ]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.16/kiwi/repository/apt.py new/kiwi-9.11.17/kiwi/repository/apt.py --- old/kiwi-9.11.16/kiwi/repository/apt.py 2017-09-15 10:37:16.000000000 +0200 +++ new/kiwi-9.11.17/kiwi/repository/apt.py 2017-11-03 11:17:25.000000000 +0100 @@ -17,6 +17,7 @@ # import os from tempfile import NamedTemporaryFile +from six.moves.urllib.parse import urlparse # project from kiwi.repository.template.apt import PackageManagerTemplateAptGet @@ -148,6 +149,9 @@ list_file = '/'.join( [self.shared_apt_get_dir['sources-dir'], name + '.list'] ) + pref_file = '/'.join( + [self.shared_apt_get_dir['preferences-dir'], name + '.pref'] + ) self.repo_names.append(name + '.list') if os.path.exists(uri): # apt-get requires local paths to take the file: type @@ -176,6 +180,23 @@ self.distribution_path = uri repo_line += ' {0} {1}\n'.format(dist, components) repo.write(repo_line) + if prio: + uri_parsed = urlparse(uri.replace('file://', 'file:/')) + with open(pref_file, 'w') as pref: + pref.write('Package: *{0}'.format(os.linesep)) + if not uri_parsed.hostname: + pref.write( + 'Pin: origin ""{0}'.format(os.linesep) + ) + else: + pref.write( + 'Pin: origin "{0}"{1}'.format( + uri_parsed.hostname, os.linesep + ) + ) + pref.write( + 'Pin-Priority: {0}{1}'.format(prio, os.linesep) + ) def import_trusted_keys(self, signing_keys): """ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.16/kiwi/runtime_checker.py new/kiwi-9.11.17/kiwi/runtime_checker.py --- old/kiwi-9.11.16/kiwi/runtime_checker.py 2017-09-15 10:37:16.000000000 +0200 +++ new/kiwi-9.11.17/kiwi/runtime_checker.py 2017-11-07 10:48:47.000000000 +0100 @@ -391,12 +391,25 @@ Checkmedia tool and its related boot code are only available for x86 platforms. """ - arch = platform.machine() - message = dedent('''\n + message_arch_unsupported = dedent('''\n The attribute 'mediacheck' is only supported for x86 platforms, thus it can't be set to 'true' for the current ({0}) architecture. ''') - if self.xml_state.build_type.get_mediacheck() is True and \ - arch not in ['x86_64', 'i586', 'i686']: - raise KiwiRuntimeError(message.format(arch)) + message_tool_not_found = dedent('''\n + Required tool {name} not found in caller environment + + The attribute 'mediacheck' is set to 'true' which requires + the above tool to be installed on the build system + ''') + if self.xml_state.build_type.get_mediacheck() is True: + arch = platform.machine() + tool = 'tagmedia' + if arch not in ['x86_64', 'i586', 'i686']: + raise KiwiRuntimeError( + message_arch_unsupported.format(arch) + ) + elif not Path.which(filename=tool, access_mode=os.X_OK): + raise KiwiRuntimeError( + message_tool_not_found.format(name=tool) + ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.16/kiwi/schema/kiwi.rnc new/kiwi-9.11.17/kiwi/schema/kiwi.rnc --- old/kiwi-9.11.16/kiwi/schema/kiwi.rnc 2017-09-15 10:37:16.000000000 +0200 +++ new/kiwi-9.11.17/kiwi/schema/kiwi.rnc 2017-11-03 11:17:25.000000000 +0100 @@ -2056,8 +2056,8 @@ k.strip.type.attribute = ## Specifies the strip data type. `delete` references ## a list of custom files and directories to delete, `tools` - ## references file names in linux bin/sbin directories, `libs` - ## references file names in linux lib directories. + ## references file names in linux bin/sbin directories to keep, `libs` + ## references file names in linux lib directories to keep. attribute type { "delete" | "tools" | "libs" } k.strip.profiles.attribute = k.profiles.attribute k.strip.attlist = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.16/kiwi/schema/kiwi.rng new/kiwi-9.11.17/kiwi/schema/kiwi.rng --- old/kiwi-9.11.16/kiwi/schema/kiwi.rng 2017-09-15 10:37:16.000000000 +0200 +++ new/kiwi-9.11.17/kiwi/schema/kiwi.rng 2017-11-03 11:17:25.000000000 +0100 @@ -3193,8 +3193,8 @@ <attribute name="type"> <a:documentation>Specifies the strip data type. `delete` references a list of custom files and directories to delete, `tools` -references file names in linux bin/sbin directories, `libs` -references file names in linux lib directories.</a:documentation> +references file names in linux bin/sbin directories to keep, `libs` +references file names in linux lib directories to keep.</a:documentation> <choice> <value>delete</value> <value>tools</value> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.16/kiwi/storage/loop_device.py new/kiwi-9.11.17/kiwi/storage/loop_device.py --- old/kiwi-9.11.16/kiwi/storage/loop_device.py 2017-09-15 10:37:16.000000000 +0200 +++ new/kiwi-9.11.17/kiwi/storage/loop_device.py 2017-11-08 10:11:07.000000000 +0100 @@ -82,7 +82,7 @@ ) loop_options = [] if self.blocksize_bytes and self.blocksize_bytes != 512: - loop_options.append('-L') + loop_options.append('--logical-blocksize') loop_options.append(format(self.blocksize_bytes)) loop_call = Command.run( ['losetup'] + loop_options + ['-f', '--show', self.filename] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.16/kiwi/version.py new/kiwi-9.11.17/kiwi/version.py --- old/kiwi-9.11.16/kiwi/version.py 2017-10-25 16:32:35.000000000 +0200 +++ new/kiwi-9.11.17/kiwi/version.py 2017-11-08 10:16:00.000000000 +0100 @@ -18,5 +18,5 @@ """ Global version information used in kiwi and the package """ -__version__ = '9.11.16' -__githash__ = '6232cd9c7e610fc87a66d390a06dab659e13a30c' +__version__ = '9.11.17' +__githash__ = 'e0348ae1d77b964456a5c5d77243dc8d38646933' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.16/kiwi.egg-info/PKG-INFO new/kiwi-9.11.17/kiwi.egg-info/PKG-INFO --- old/kiwi-9.11.16/kiwi.egg-info/PKG-INFO 2017-10-25 17:01:01.000000000 +0200 +++ new/kiwi-9.11.17/kiwi.egg-info/PKG-INFO 2017-11-08 10:22:18.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: kiwi -Version: 9.11.16 +Version: 9.11.17 Summary: KIWI - Appliance Builder (next generation) Home-page: http://suse.github.io/kiwi Author: Marcus Schaefer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.16/test/unit/package_manager_zypper_test.py new/kiwi-9.11.17/test/unit/package_manager_zypper_test.py --- old/kiwi-9.11.16/test/unit/package_manager_zypper_test.py 2017-09-15 10:37:16.000000000 +0200 +++ new/kiwi-9.11.17/test/unit/package_manager_zypper_test.py 2017-11-08 10:11:07.000000000 +0100 @@ -1,4 +1,6 @@ from mock import patch +from mock import call +from collections import namedtuple import mock @@ -160,61 +162,75 @@ mock_command.side_effect = Exception assert self.manager.database_consistent() is False + @patch('os.path.exists') @patch('kiwi.command.Command.run') @patch('kiwi.package_manager.zypper.PackageManagerZypper.database_consistent') - def test_reload_package_database(self, mock_consistent, mock_command): + def test_reload_package_database( + self, mock_consistent, mock_command, mock_exists + ): + command_type = namedtuple('command', ['output']) + cmd = command_type(output='var/lib/rpm') + mock_command.return_value = cmd + mock_exists.return_value = True mock_consistent.return_value = False self.manager.dump_reload_package_database() - call = mock_command.call_args_list[0] - assert mock_command.call_args_list[0] == \ + assert mock_command.call_args_list == [ + call([ + 'chroot', 'root-dir', 'rpm', '-E', '%_dbpath' + ]), call([ 'db_dump', '-f', 'root-dir/var/lib/rpm/Name.bak', 'root-dir/var/lib/rpm/Name' - ]) - call = mock_command.call_args_list[1] - assert mock_command.call_args_list[1] == \ + ]), call([ 'rm', '-f', 'root-dir/var/lib/rpm/Name' - ]) - call = mock_command.call_args_list[2] - assert mock_command.call_args_list[2] == \ + ]), call([ 'db45_load', '-f', 'root-dir/var/lib/rpm/Name.bak', 'root-dir/var/lib/rpm/Name' - ]) - call = mock_command.call_args_list[3] - assert mock_command.call_args_list[3] == \ + ]), call([ 'rm', '-f', 'root-dir/var/lib/rpm/Name.bak' - ]) - call = mock_command.call_args_list[4] - assert mock_command.call_args_list[4] == \ + ]), call([ 'db_dump', '-f', 'root-dir/var/lib/rpm/Packages.bak', 'root-dir/var/lib/rpm/Packages' - ]) - call = mock_command.call_args_list[5] - assert mock_command.call_args_list[5] == \ + ]), call([ 'rm', '-f', 'root-dir/var/lib/rpm/Packages' - ]) - call = mock_command.call_args_list[6] - assert mock_command.call_args_list[6] == \ + ]), call([ 'db45_load', '-f', 'root-dir/var/lib/rpm/Packages.bak', 'root-dir/var/lib/rpm/Packages' - ]) - call = mock_command.call_args_list[7] - assert mock_command.call_args_list[7] == \ + ]), call([ 'rm', '-f', 'root-dir/var/lib/rpm/Packages.bak' - ]) - call = mock_command.call_args_list[8] - assert mock_command.call_args_list[8] == \ + ]), call([ 'chroot', 'root-dir', 'rpm', '--rebuilddb' ]) + ] + @patch('os.path.exists') + @patch('kiwi.command.Command.run') + @raises(KiwiRpmDatabaseReloadError) + def test_reload_package_database_wrong_db_path( + self, mock_command, mock_exists + ): + command_type = namedtuple('command', ['output']) + cmd = command_type(output='var/lib/rpm') + mock_command.return_value = cmd + mock_exists.return_value = False + self.manager.dump_reload_package_database() + + @patch('os.path.exists') + @patch('kiwi.command.Command.run') @raises(KiwiRpmDatabaseReloadError) - def test_reload_package_database_wrong_db_version(self): + def test_reload_package_database_wrong_db_version( + self, mock_command, mock_exists + ): + command_type = namedtuple('command', ['output']) + cmd = command_type(output='var/lib/rpm') + mock_command.return_value = cmd + mock_exists.return_value = True self.manager.dump_reload_package_database(42) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.16/test/unit/repository_apt_test.py new/kiwi-9.11.17/test/unit/repository_apt_test.py --- old/kiwi-9.11.16/test/unit/repository_apt_test.py 2017-09-15 10:37:16.000000000 +0200 +++ new/kiwi-9.11.17/test/unit/repository_apt_test.py 2017-11-03 11:17:25.000000000 +0100 @@ -85,6 +85,42 @@ @patch('os.path.exists') @patch_open + def test_add_repo_with_priority(self, mock_open, mock_exists): + mock_open.return_value = self.context_manager_mock + mock_exists.return_value = True + self.repo.add_repo( + 'foo', '/srv/my-repo', 'deb', '42', 'xenial', 'a b' + ) + assert mock_open.call_args_list == [ + call('/shared-dir/apt-get/sources.list.d/foo.list', 'w'), + call('/shared-dir/apt-get/preferences.d/foo.pref', 'w') + ] + print(self.file_mock.write.call_args_list) + assert self.file_mock.write.call_args_list == [ + call('deb file://srv/my-repo xenial a b\n'), + call('Package: *\n'), + call('Pin: origin ""\n'), + call('Pin-Priority: 42\n') + ] + self.file_mock.reset_mock() + mock_exists.return_value = False + self.repo.add_repo( + 'foo', + 'http://download.opensuse.org/repositories/V:/A:/C/Debian_9.0/', + 'deb', '99', 'xenial', 'a b' + ) + assert self.file_mock.write.call_args_list == [ + call( + 'deb http://download.opensuse.org/repositories/' + + 'V:/A:/C/Debian_9.0/ xenial a b\n' + ), + call('Package: *\n'), + call('Pin: origin "download.opensuse.org"\n'), + call('Pin-Priority: 99\n') + ] + + @patch('os.path.exists') + @patch_open def test_add_repo_distribution(self, mock_open, mock_exists): mock_open.return_value = self.context_manager_mock mock_exists.return_value = True diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.16/test/unit/runtime_checker_test.py new/kiwi-9.11.17/test/unit/runtime_checker_test.py --- old/kiwi-9.11.16/test/unit/runtime_checker_test.py 2017-09-15 10:37:16.000000000 +0200 +++ new/kiwi-9.11.17/test/unit/runtime_checker_test.py 2017-11-07 10:48:47.000000000 +0100 @@ -156,13 +156,27 @@ @raises(KiwiRuntimeError) @patch('platform.machine') - def test_check_mediacheck_only_for_x86_arch( + def test_check_mediacheck_only_for_x86_arch_invalid_arch( self, mock_machine ): mock_machine.return_value = 'aarch64' xml_state = XMLState( self.description.load(), ['vmxFlavour'], 'iso' ) + runtime_checker = RuntimeChecker(xml_state) + runtime_checker.check_mediacheck_only_for_x86_arch() + + @raises(KiwiRuntimeError) + @patch('platform.machine') + @patch('kiwi.runtime_checker.Path.which') + def test_check_mediacheck_only_for_x86_arch_tagmedia_missing( + self, mock_which, mock_machine + ): + mock_machine.return_value = 'x86_64' + mock_which.return_value = False + xml_state = XMLState( + self.description.load(), ['vmxFlavour'], 'iso' + ) runtime_checker = RuntimeChecker(xml_state) runtime_checker.check_mediacheck_only_for_x86_arch() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.16/test/unit/storage_loop_device_test.py new/kiwi-9.11.17/test/unit/storage_loop_device_test.py --- old/kiwi-9.11.16/test/unit/storage_loop_device_test.py 2017-09-15 10:37:16.000000000 +0200 +++ new/kiwi-9.11.17/test/unit/storage_loop_device_test.py 2017-11-08 10:11:07.000000000 +0100 @@ -36,7 +36,8 @@ call = mock_command.call_args_list[1] assert mock_command.call_args_list[1] == \ call([ - 'losetup', '-L', '4096', '-f', '--show', 'loop-file' + 'losetup', '--logical-blocksize', '4096', + '-f', '--show', 'loop-file' ]) self.loop.node_name = None
