Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2016-02-25 22:00:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi (Old) and /work/SRC/openSUSE:Factory/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2016-02-09 16:49:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2016-02-25 22:40:52.000000000 +0100 @@ -1,0 +2,122 @@ +Tue Feb 23 09:00:15 CET 2016 - [email protected] + +- v7.03.58 released + +------------------------------------------------------------------- +Tue Feb 23 08:59:26 CET 2016 - [email protected] + +- Fixed shell syntax in grub2 template + + Fixes (bnc#961334) + +------------------------------------------------------------------- +Mon Feb 22 17:43:30 CET 2016 - [email protected] + +- v7.03.57 released + +------------------------------------------------------------------- +Mon Feb 22 17:40:28 CET 2016 - [email protected] + +- Refactor suseStripKernel + + The way the method downsizes the kernel tree is wrong in + several places and very hard to read. Therefore the code + has been refactored and splitted into task methods which + can run independently from each other. As one result the + kernel tree is not missing any metadata and/or update + weak-updates paths anymore. Fixes (bnc#965830) + +------------------------------------------------------------------- +Mon Feb 22 09:58:04 CET 2016 - [email protected] + +- v7.03.56 released + +------------------------------------------------------------------- +Sun Feb 21 22:04:30 CET 2016 - [email protected] + +- Fix filesystem check on boot + + In the refactoring fc363cc06, the parameters of checkFileSystem got + changed to expect the device name, but one of the invocations didn't + pass down the device name due to a typo. + +------------------------------------------------------------------- +Sat Feb 20 21:29:02 CET 2016 - [email protected] + +- Remove grub2 from the armv6/v7 initrd + + Grub2 adds 35MB to the initrd for no reason on armv6/v7, as + those images use u-boot scripts for booting. + +------------------------------------------------------------------- +Sat Feb 20 21:20:24 CET 2016 - [email protected] + +- Remove flush before resize filesystem + + According to the manpage, -F is flushing the fileystem buffer + caches. which is only really useful for doing resize2fs time trials. + + With current Tumbleweed installed on MMC, -F triggers a Inappropriate ioctl for device + while trying to flush error, and then fails to resize. + +------------------------------------------------------------------- +Thu Feb 18 11:14:40 CET 2016 - [email protected] + +- DB: rebuild documentation + +------------------------------------------------------------------- +Wed Feb 17 13:42:29 CET 2016 - [email protected] + +- Do not activate dmraid paritions + + This only activates the device itself, not the partitions, that may also exist. If partitions exist, the UDEV rules will create the corresponding "_partX" symlinks for each partition within "/dev/mapper, which are totally sufficient. + +------------------------------------------------------------------- +Mon Feb 15 10:13:04 CET 2016 - [email protected] + +- v7.03.55 released + +------------------------------------------------------------------- +Mon Feb 15 10:07:03 CET 2016 - [email protected] + +- s390: Don't strip ctc_configure from initrd + +------------------------------------------------------------------- +Sat Feb 13 09:04:18 CET 2016 - [email protected] + +- Translated using Weblate (German) + + Currently translated at 100.0% (28 of 28 strings) + + Author: Bernhard M. Wiedemann <bernhard+kiwigit lsmod.de> +------------------------------------------------------------------- +Thu Feb 11 17:26:39 CET 2016 - [email protected] + +- doc: fix typo + + Author: Bernhard M. Wiedemann <bernhard+kiwigit lsmod.de> +------------------------------------------------------------------- +Thu Feb 11 17:01:58 CET 2016 - [email protected] + +- make xml example valid + + the <strip> tag needs to remain open here. + +------------------------------------------------------------------- +Thu Feb 11 11:41:51 CET 2016 - [email protected] + +- v7.03.54 released + +------------------------------------------------------------------- +Thu Feb 11 11:40:28 CET 2016 - [email protected] + +- Fixed validation of custom root cmdline variable + + A variable of the format root=LABEL=x was not correctly validated + +------------------------------------------------------------------- +Wed Feb 10 14:19:35 CET 2016 - [email protected] + +- Enable pvops builds for EC2 + +------------------------------------------------------------------- @@ -28,0 +151,15 @@ +Wed Feb 3 17:33:39 CET 2016 - [email protected] + +- output correct sha256 file + + whether or not the argument to $sha->addfile is absolute doesn't + actually matter as $sha->hexdigest never outputs any file name. We + have to add the file name ourselves. + + Reason for the confusion is code in OBS's build script that under + certain conditions computes the sha256sum file itself. So this code here + was never used where it actually matters. + + This reverts commit 97b92d0e0a58cdd237b109efbf843b6057172164. + +------------------------------------------------------------------- @@ -31,0 +169,9 @@ + +------------------------------------------------------------------- +Wed Feb 3 15:16:35 CET 2016 - [email protected] + +- always sign bundled result + + no matter what the output format is we want OBS to add a gpg + signature on the result. Therefore always also produce a .sha256 + sums file for that purpose. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.lMY2r3/_old 2016-02-25 22:41:58.000000000 +0100 +++ /var/tmp/diff_new_pack.lMY2r3/_new 2016-02-25 22:41:58.000000000 +0100 @@ -27,7 +27,7 @@ Name: kiwi License: GPL-2.0 Group: System/Management -Version: 7.03.53 +Version: 7.03.58 Provides: kiwi-schema = 6.2 Provides: kiwi-image:aci Provides: kiwi-image:lxc ++++++ kiwi-docu.tar.bz2 ++++++ ++++ 7897 lines of diff (skipped) ++++++ kiwi-repo.tar.bz2 ++++++ ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2015-12-17 09:28:28.000000000 +0100 +++ new/kiwi/.revision 2015-12-17 09:28:28.000000000 +0100 @@ -1 +1 @@ -46c29b431f98d68f651a34cc0059c3d689ebf874 +0a18e00e380b8c8090bf8eb0e2ae8e1f3331e18e diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/locale/de/LC_MESSAGES/kiwi.po new/kiwi/locale/de/LC_MESSAGES/kiwi.po --- old/kiwi/locale/de/LC_MESSAGES/kiwi.po 2015-10-13 18:14:51.000000000 +0200 +++ new/kiwi/locale/de/LC_MESSAGES/kiwi.po 2016-02-15 10:13:48.000000000 +0100 @@ -5,15 +5,15 @@ "Project-Id-Version: @PACKAGE@\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-07-27 16:23+0200\n" -"PO-Revision-Date: 2013-02-08 12:52+0100\n" -"Last-Translator: Hermann J. Beckers <[email protected]>\n" -"Language-Team: German <[email protected]>\n" +"PO-Revision-Date: 2016-02-13 09:04+0200\n" +"Last-Translator: Ettore Atalan <[email protected]>\n" +"Language-Team: German <http://l10n.opensuse.org/projects/kiwi/master/de/>\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 1.2\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 2.3\n" #. /.../ #. Copyright (c) 2005 SuSE GmbH Nuernberg, Germany. All rights reserved. @@ -72,7 +72,7 @@ msgstr "Verwerfen" msgid "Exit" -msgstr "Exit" +msgstr "Beenden" msgid "Bootloader installation has failed" msgstr "Bootloader Installation nicht möglich" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/metadata/KIWIConfig.xml new/kiwi/metadata/KIWIConfig.xml --- old/kiwi/metadata/KIWIConfig.xml 2016-01-14 12:53:04.000000000 +0100 +++ new/kiwi/metadata/KIWIConfig.xml 2016-02-15 10:14:01.000000000 +0100 @@ -69,6 +69,7 @@ <file name="column"/> <file name="cp"/> <file name="cryptsetup"/> + <file name="ctc_configure"/> <file name="curl"/> <file name="cut"/> <file name="dasd_configure"/> @@ -130,6 +131,7 @@ <file name="init"/> <file name="insmod"/> <file name="id"/> + <file name="iucv_configure"/> <file name="kexec"/> <file name="kill"/> <file name="killall"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIBoot.pm new/kiwi/modules/KIWIBoot.pm --- old/kiwi/modules/KIWIBoot.pm 2016-01-29 11:53:03.000000000 +0100 +++ new/kiwi/modules/KIWIBoot.pm 2016-02-23 08:53:08.000000000 +0100 @@ -303,6 +303,7 @@ $type{boottimeout} = $xmltype -> getBootTimeout(); $type{btrfs_root_is_snapshot} = $xmltype -> getBtrfsRootIsSnapshot(); $type{cmdline} = $xmltype -> getKernelCmdOpts(); + $type{devicepersistency} = $xmltype -> getDevicePersistent(); $type{filesystem} = $xmltype -> getFilesystem(); $type{firmware} = $xmltype -> getFirmwareType(); $type{fsmountoptions} = $xmltype -> getFSMountOptions(); @@ -4330,7 +4331,21 @@ $kiwi -> info ( "Kernel root device set to $1 via custom cmdline\n" ); - } elsif ($firmware eq 'ec2') { + } elsif ( ($this->{type}->{devicepersistency}) && ($firmware =~ /ec2/)) { + # /.../ + # With the introduction of the 4.4 kernel in openSUSE and SLE + # the SUSE Xen patches were all upstremead and we enabled the so + # called "pvops kernel" as the -default kernel. With this the + # behavior for PV images in EC2 changes and we can now treat + # PV and HVM as equals. For PV image we still need to handle + # pv-grub and thus we just tell it to mount with the default + # file system label that kiwi creates anyway. This also works + # for HVM and one no longer has to maintain separarate image builds + $kiwi -> info ( + "Kernel root device set via label 'ROOT' for firmware $firmware\n" + ); + $cmdline .= ' root=LABEL=ROOT'; + } elsif ($firmware eq 'ec2') { # /.../ # EC2 requires to specifiy the root device in the bootloader # configuration. EC2 extracts this information via pygrub and @@ -4567,9 +4582,9 @@ # print $FD "set debug=all\n"; print $FD 'set linux=linux'."\n"; print $FD 'set initrd=initrd'."\n"; - print $FD 'if [ "${grub_cpu}" = "x86_64" ] or '; - print $FD '[ "${grub_cpu}" = "i386" ]; then'."\n"; - print $FD ' if [ $grub_platform = "efi" ]; then'."\n"; + print $FD 'if [ "${grub_cpu}" = "x86_64" -o "${grub_cpu}" = "i386" ]'; + print $FD '; then'."\n"; + print $FD ' if [ "${grub_platform}" = "efi" ]; then'."\n"; print $FD ' set linux=linuxefi'."\n"; print $FD ' set initrd=initrdefi'."\n"; print $FD ' fi'."\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIConfig.sh new/kiwi/modules/KIWIConfig.sh --- old/kiwi/modules/KIWIConfig.sh 2016-02-05 09:43:10.000000000 +0100 +++ new/kiwi/modules/KIWIConfig.sh 2016-02-22 17:32:09.000000000 +0100 @@ -1330,9 +1330,9 @@ } #====================================== -# suseStripFirmware +# baseStripFirmware #-------------------------------------- -function suseStripFirmware { +function baseStripFirmware { # /.../ # check all kernel modules if they require a firmware and # strip out all firmware files which are not referenced @@ -1353,6 +1353,8 @@ bmdir=$(dirname $match) mkdir -p /lib/firmware-required/$bmdir mv /lib/firmware/$match /lib/firmware-required/$bmdir + else + echo "Deleting unwanted firmware: $match" fi done done @@ -1361,9 +1363,9 @@ } #====================================== -# suseStripModules +# baseStripModules #-------------------------------------- -function suseStripModules { +function baseStripModules { # /.../ # search for update modules and remove the old version # which might be provided by the standard kernel @@ -1402,14 +1404,14 @@ # sort out duplicates prefer updates #-------------------------------------- if [ -z "$modup" ];then - echo "suseStripModules: No update drivers found" + echo "baseStripModules: No old versions for update drivers found" return fi for file in $files;do for mod in $modup;do if [[ $file =~ $mod ]] && [[ ! $file =~ "updates" ]];then - echo "suseStripModules: Update driver found for $mod" - echo "suseStripModules: Removing old version: $file" + echo "baseStripModules: Update driver found for $mod" + echo "baseStripModules: Removing old version: $file" rm -f $file fi done @@ -1417,32 +1419,129 @@ } #====================================== +# baseCreateKernelTree +#-------------------------------------- +function baseCreateKernelTree { + echo "Creating copy of kernel tree for strip operations" + mkdir -p /kernel-tree + cp -a /lib/modules/* /kernel-tree/ +} + +#====================================== +# baseSyncKernelTree +#-------------------------------------- +function baseSyncKernelTree { + echo "Replace kernel tree with downsized version" + rm -rf /lib/modules/* + cp -a /kernel-tree/* /lib/modules/ + rm -rf /kernel-tree +} + +#====================================== +# baseKernelDriverMatches +#-------------------------------------- +function baseKernelDriverMatches { + module=$1 + for pattern in $(echo $kiwi_drivers | tr , ' '); do + if [[ $module =~ $pattern ]];then + return 0 + fi + done + return 1 +} + +#====================================== +# baseStripKernelModules +#-------------------------------------- +function baseStripKernelModules { + for kernel_dir in /kernel-tree/*;do + kernel_version=$(/usr/bin/basename $kernel_dir) + if [ ! -d /kernel-tree/$kernel_version/kernel ]; then + continue + fi + echo "Downsizing kernel modules for $kernel_dir" + for module in $( + find /kernel-tree/$kernel_version/kernel -name "*.ko" | sort + ); do + if ! baseKernelDriverMatches $module; then + echo "Deleting unwanted module: $module" + rm -f $module + fi + done + done +} + +#====================================== +# baseFixupKernelModuleDependencies +#-------------------------------------- +function baseFixupKernelModuleDependencies { + local kernel_dir + local kernel_version + local module + local module_name + local module_info + local dependency + for kernel_dir in /kernel-tree/*;do + echo "Checking kernel dependencies for $kernel_dir" + kernel_version=$(/usr/bin/basename $kernel_dir) + + for module in $(find /kernel-tree/$kernel_version -name "*.ko");do + module_name=$(/usr/bin/basename $module) + module_info=$(/sbin/modprobe \ + --set-version $kernel_version --ignore-install --show-depends \ + ${module_name%.ko} | sed -ne 's:.*insmod /\?::p' + ) + + for dependency in $module_info; do + if [ ! -f /$dependency ]; then + continue + fi + dependency_module=$(echo ${dependency/lib\/modules/kernel-tree}) + if [ ! -f $dependency_module ];then + echo -e "Fix $module:\n --> needs: $dependency_module" + mkdir -p $(/usr/bin/dirname $dependency_module) + cp -a $dependency $dependency_module + fi + done + done + done +} + +#====================================== # suseStripKernel #-------------------------------------- function suseStripKernel { # /.../ - # this function will strip the kernel according to the - # drivers information in the xml descr. It also will create - # the vmlinux.gz and vmlinuz files which are required - # for the kernel extraction in case of kiwi boot images + # this function will strip the kernel according to the drivers + # information in the xml description. It also creates the + # vmlinux.gz and vmlinuz files which are required for the + # kernel extraction in case of kiwi boot images # ---- - local arch=$(uname -m) - local kversion - local i - local d - local mod - local stripdir - local kdata - for kversion in /lib/modules/*;do - if [ ! -d "$kversion" ];then + local kernel_dir + local kernel_names + local kernel_name + local kernel_version + + baseCreateKernelTree + baseStripKernelModules + baseFixupKernelModuleDependencies + baseSyncKernelTree + + for kernel_dir in /lib/modules/*;do + if [ ! -d "$kernel_dir" ];then continue fi if [ -x /bin/rpm ];then - kdata=$(rpm -qf $kversion) + # if we have a package database take the kernel name from + # the package name. This could result in multiple kernel + # names + kernel_names=$(rpm -qf $kernel_dir) else - kdata=$kversion + # without a package database take the installed kernel + # directory name as the kernel name + kernel_names=$kernel_dir fi - for p in $kdata;do + for kernel_name in $kernel_names;do #========================================== # get kernel VERSION information #------------------------------------------ @@ -1450,149 +1549,67 @@ # not in a package... continue fi - if echo $p | grep -q "\-kmp\-";then + if echo $kernel_name | grep -q "\-kmp\-";then # a kernel module package... continue fi - if echo $p | grep -q "\-source\-";then + if echo $kernel_name | grep -q "\-source\-";then # a kernel source package... continue fi - VERSION=$(/usr/bin/basename $kversion) - echo "Found kernel version: $VERSION" - echo "Stripping kernel $p: Image [$kiwi_iname]..." + kernel_version=$(/usr/bin/basename $kernel_dir) #========================================== # run depmod, deps should be up to date #------------------------------------------ - if [ ! -f /boot/System.map-$VERSION ];then - # no system map for kernel - echo "no system map for kernel: $p found... skip it" + if [ ! -f /boot/System.map-$kernel_version ];then + # no system map for this kernel + echo "no system map for kernel: $kernel_name found... skip it" continue fi - /sbin/depmod -F /boot/System.map-$VERSION $VERSION - #========================================== - # check for modules.order and backup it - #------------------------------------------ - if [ -f $kversion/modules.order ];then - mv $kversion/modules.order /tmp - fi - #========================================== - # check for weak-/updates and backup them - #------------------------------------------ - stripdir=/tmp/stripped_modules - if [ -d $kversion/weak-updates ];then - mkdir -pv $stripdir$kversion - mv $kversion/weak-updates $stripdir$kversion - fi - if [ -d $kversion/updates ];then - mkdir -pv $stripdir$kversion - mv $kversion/updates $stripdir$kversion - fi - #========================================== - # strip the modules but take care for deps - #------------------------------------------ - for mod in $(echo $kiwi_drivers | tr , ' '); do - local path=$(/usr/bin/dirname $mod) - local base=$(/usr/bin/basename $mod) - for d in "." kernel;do - if [ "$base" = "*" ];then - if test -d $kversion/$d/$path ; then - mkdir -pv $stripdir$kversion/$d/$path - cp -avl $kversion/$d/$path/* \ - $stripdir$kversion/$d/$path - fi - else - if test -f $kversion/$d/$mod ; then - mkdir -pv $stripdir$kversion/$d/$path - cp -avl $kversion/$d/$mod \ - $stripdir$kversion/$d/$mod - elif test -L $kversion/$d/$base ; then - mkdir -pv $stripdir$kversion/$d - cp -avl $kversion/$d/$base \ - $stripdir$kversion/$d - elif test -f $kversion/$d/$base ; then - mkdir -pv $stripdir$kversion/$d - cp -avl $kversion/$d/$base \ - $stripdir$kversion/$d - fi - fi - done - done - for mod in $(find $stripdir -name "*.ko");do - d=$(/usr/bin/basename $mod) - i=$(/sbin/modprobe \ - --set-version $VERSION \ - --ignore-install \ - --show-depends \ - ${d%.ko} | sed -ne 's:.*insmod /\?::p') - for d in $i; do - case "$d" in - *=*) ;; - *) - if [ -f $d ] && [ ! -f $stripdir/$d ]; then - echo "Fixing kernel module Dependency: $d" - mkdir -vp $(/usr/bin/dirname $stripdir/$d) - cp -flav $d $stripdir/$d - fi - ;; - esac - done - done - rm -rf $kversion - mv -v $stripdir/$kversion $kversion - rm -rf $stripdir - #========================================== - # restore backed up files and directories - #------------------------------------------ - if [ -f /tmp/modules.order ];then - mv /tmp/modules.order $kversion - fi - #========================================== - # run depmod - #------------------------------------------ - /sbin/depmod -F /boot/System.map-$VERSION $VERSION + /sbin/depmod -F /boot/System.map-$kernel_version $kernel_version #========================================== # create common kernel files, last wins ! #------------------------------------------ pushd /boot - if [ -f uImage-$VERSION ];then + if [ -f uImage-$kernel_version ];then # dedicated to kernels on arm - mv uImage-$VERSION vmlinuz - elif [ -f Image-$VERSION ];then + mv uImage-$kernel_version vmlinuz + elif [ -f Image-$kernel_version ];then # dedicated to kernels on arm - mv Image-$VERSION vmlinuz - elif [ -f zImage-$VERSION ];then + mv Image-$kernel_version vmlinuz + elif [ -f zImage-$kernel_version ];then # dedicated to kernels on arm - mv zImage-$VERSION vmlinuz - elif [ -f vmlinuz-$VERSION.gz ];then + mv zImage-$kernel_version vmlinuz + elif [ -f vmlinuz-${kernel_version}.gz ];then # dedicated to kernels on x86 - mv vmlinuz-$VERSION vmlinuz - elif [ -f vmlinuz-$VERSION.el5 ];then + mv vmlinuz-$kernel_version vmlinuz + elif [ -f vmlinuz-${kernel_version}.el5 ];then # dedicated to kernels on ppc - mv vmlinux-$VERSION.el5 vmlinuz - elif [ -f vmlinux-$VERSION ];then + mv vmlinux-${kernel_version}.el5 vmlinuz + elif [ -f vmlinux-$kernel_version ];then # dedicated to kernels on ppc - mv vmlinux-$VERSION vmlinux - elif [ -f image-$VERSION ];then + mv vmlinux-$kernel_version vmlinux + elif [ -f image-$kernel_version ];then # dedicated to kernels on s390 - mv image-$VERSION vmlinuz - elif [ -f vmlinuz-$VERSION ];then + mv image-$kernel_version vmlinuz + elif [ -f vmlinuz-$kernel_version ];then # dedicated to xz kernels - mv vmlinuz-$VERSION vmlinuz + mv vmlinuz-$kernel_version vmlinuz elif [ -f vmlinuz ];then # nothing to map, vmlinuz already there : else echo "Failed to find a mapping kernel" fi - if [ -f vmlinux-$VERSION.gz ];then - mv vmlinux-$VERSION.gz vmlinux.gz + if [ -f vmlinux-${kernel_version}.gz ];then + mv vmlinux-${kernel_version}.gz vmlinux.gz fi popd done done - suseStripModules - suseStripFirmware + + baseStripModules + baseStripFirmware } #====================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIGlobals.pm new/kiwi/modules/KIWIGlobals.pm --- old/kiwi/modules/KIWIGlobals.pm 2016-02-05 16:02:11.000000000 +0100 +++ new/kiwi/modules/KIWIGlobals.pm 2016-02-23 09:00:09.000000000 +0100 @@ -2001,7 +2001,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "7.03.53"; + $data{Version} = "7.03.58"; $data{Publisher} = "SUSE LINUX GmbH"; $data{Preparer} = "KIWI - http://opensuse.github.com/kiwi";; $data{ConfigName} = "config.xml"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh --- old/kiwi/modules/KIWILinuxRC.sh 2016-02-03 12:26:58.000000000 +0100 +++ new/kiwi/modules/KIWILinuxRC.sh 2016-02-22 09:56:57.000000000 +0100 @@ -4197,7 +4197,7 @@ #====================================== # Manual loading of modules #-------------------------------------- - for i in rd brd edd dm-mod xennet xenblk virtio_blk loop squashfs fuse;do + for i in rd brd edd dm-mod xen:vif xen:vbd virtio_blk loop squashfs fuse;do modprobe $i &>/dev/null done udevPending @@ -4717,6 +4717,11 @@ # Check root variable #-------------------------------------- if [ ! -z "$root" ];then + if [[ $root =~ "UUID=" ]];then + root=/dev/disk/by-uuid/$(echo $root | cut -f2 -d=) + elif [[ $root =~ "LABEL=" ]];then + root=/dev/disk/by-label/$(echo $root | cut -f2 -d=) + fi if ! waitForStorageDevice $root;then Echo "Specified root device $root not found. Found devices:" hwinfo --disk @@ -6302,7 +6307,7 @@ if [ "$translate" = "lowercase" ];then kernelKey=`echo $kernelKey | tr [:upper:] [:lower:]` fi - kernelVal=$(echo $i | cut -f2 -d=) + kernelVal=$(echo $i | cut -f2- -d=) kernelVal=$(echo $kernelVal | sed -e 's/\o30/ /g') eval export $kernelKey=$kernelVal done @@ -7384,7 +7389,7 @@ if [ $check -eq 30 ];then return 1 fi - Echo "Waiting for device $device to settle..." + Echo "Waiting for storage device $device to settle..." check=$((check + 1)) sleep 2 done @@ -7429,7 +7434,7 @@ if [ -b $device ] || [ $check -eq 4 ];then break fi - Echo "Waiting for device $device to settle..." + Echo "Waiting for block device $device to settle..." check=$((check + 1)) sleep 2 done @@ -9866,17 +9871,17 @@ if [ "$FSTYPE" = "reiserfs" ];then resize_fs="resize_reiserfs -q $deviceResize" elif [ "$FSTYPE" = "ext2" ];then - resize_fs="resize2fs -f -F -p $deviceResize" + resize_fs="resize2fs -f -p $deviceResize" if [ $ramdisk -eq 1 ];then resize_fs="resize2fs -f $deviceResize" fi elif [ "$FSTYPE" = "ext3" ];then - resize_fs="resize2fs -f -F -p $deviceResize" + resize_fs="resize2fs -f -p $deviceResize" if [ $ramdisk -eq 1 ];then resize_fs="resize2fs -f $deviceResize" fi elif [ "$FSTYPE" = "ext4" ];then - resize_fs="resize2fs -f -F -p $deviceResize" + resize_fs="resize2fs -f -p $deviceResize" if [ $ramdisk -eq 1 ];then resize_fs="resize2fs -f $deviceResize" fi @@ -9904,7 +9909,7 @@ if [ -z "$callme" ];then if [ $ramdisk -eq 0 ]; then Echo "Checking $FSTYPE filesystem on ${deviceResize}..." - checkFilesystem $check + checkFilesystem $deviceResize fi Echo "Resizing $FSTYPE filesystem on ${deviceResize}..." eval $resize_fs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIResult.pm new/kiwi/modules/KIWIResult.pm --- old/kiwi/modules/KIWIResult.pm 2016-02-05 15:58:24.000000000 +0100 +++ new/kiwi/modules/KIWIResult.pm 2016-02-11 11:38:59.000000000 +0100 @@ -21,7 +21,6 @@ use warnings; use Config::IniFiles; use Digest::SHA qw(sha256); -use Cwd; #========================================== # KIWI Modules @@ -131,13 +130,8 @@ #========================================== # Evaluate bundler method #------------------------------------------ - my $type = $buildinfo->val('main','image.type'); - if (! $type) { - $kiwi -> info ("--> Calling default bundler\n"); - $result = $this -> __bundleDefault(); - $this->DESTROY if ! $result; - return $result; - } + my $type = $buildinfo->val('main','image.type')//''; + if ($type eq 'product') { $kiwi -> info ("--> Calling product bundler\n"); $result = $this -> __bundleProduct(); @@ -166,6 +160,9 @@ $kiwi -> info ("--> Calling default bundler\n"); $result = $this -> __bundleDefault(); } + if ($result) { + $result = $this -> __sign_with_sha256sum(); + } $this->DESTROY if ! $result; return $result; } @@ -339,10 +336,7 @@ #------------------------------------------ sub __bundleProduct { my $this = shift; - if ($this -> __bundleExtension ('iso')) { - return $this -> __sign_with_sha256sum(); - } - return; + return $this -> __bundleExtension ('iso'); } #========================================== @@ -492,11 +486,9 @@ $kiwi -> failed (); return; } - my $orig_cwd = getcwd; - chdir $tmpdir; while (my $entry = readdir ($dh)) { next if $entry eq "." || $entry eq ".."; - next if ! -f $entry; + next if ! -f "$tmpdir/$entry"; my $alg = 'sha256'; my $sha = Digest::SHA->new($alg); if (! $sha) { @@ -504,7 +496,7 @@ $kiwi -> failed (); return; } - $sha -> addfile ($entry); + $sha -> addfile ($tmpdir."/".$entry); my $digest = $sha -> hexdigest; my $fd = FileHandle -> new(); if (! $fd -> open (">$tmpdir/$entry.sha256")) { @@ -512,10 +504,9 @@ $kiwi -> failed (); return; } - print $fd $digest."\n"; + print $fd "$digest $entry\n"; $fd -> close(); } - chdir $orig_cwd; closedir $dh; return $this; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/armv7l/oemboot/suse-SLES12/config.xml new/kiwi/system/boot/armv7l/oemboot/suse-SLES12/config.xml --- old/kiwi/system/boot/armv7l/oemboot/suse-SLES12/config.xml 2015-09-21 16:23:19.000000000 +0200 +++ new/kiwi/system/boot/armv7l/oemboot/suse-SLES12/config.xml 2016-02-22 09:56:57.000000000 +0100 @@ -105,7 +105,6 @@ <package name="fribidi"/> <package name="genisoimage"/> <package name="gettext-runtime"/> - <package name="grub2"/> <package name="grub2-arm64-efi" arch="aarch64"/> <package name="hwinfo"/> <package name="iputils"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/armv7l/oemboot/suse-leap42.1/config.xml new/kiwi/system/boot/armv7l/oemboot/suse-leap42.1/config.xml --- old/kiwi/system/boot/armv7l/oemboot/suse-leap42.1/config.xml 2015-09-24 12:06:06.000000000 +0200 +++ new/kiwi/system/boot/armv7l/oemboot/suse-leap42.1/config.xml 2016-02-22 09:56:57.000000000 +0100 @@ -104,7 +104,6 @@ <package name="fribidi"/> <package name="genisoimage"/> <package name="gettext-runtime"/> - <package name="grub2"/> <package name="grub2-arm64-efi" arch="aarch64"/> <package name="hwinfo"/> <package name="iputils"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/armv7l/oemboot/suse-tumbleweed/config.xml new/kiwi/system/boot/armv7l/oemboot/suse-tumbleweed/config.xml --- old/kiwi/system/boot/armv7l/oemboot/suse-tumbleweed/config.xml 2015-09-25 09:00:30.000000000 +0200 +++ new/kiwi/system/boot/armv7l/oemboot/suse-tumbleweed/config.xml 2016-02-22 09:56:57.000000000 +0100 @@ -104,7 +104,6 @@ <package name="fribidi"/> <package name="genisoimage"/> <package name="gettext-runtime"/> - <package name="grub2"/> <package name="grub2-arm64-efi" arch="aarch64"/> <package name="hwinfo"/> <package name="iputils"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-dump new/kiwi/system/boot/ix86/oemboot/suse-dump --- old/kiwi/system/boot/ix86/oemboot/suse-dump 2015-10-19 12:51:10.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/suse-dump 2016-02-18 11:06:44.000000000 +0100 @@ -1037,7 +1037,7 @@ #====================================== # activate raid disks #-------------------------------------- - dmraid -a y + dmraid -a y -p #====================================== # wait for devices to settle #-------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-SLES12/config.xml new/kiwi/system/boot/ix86/vmxboot/suse-SLES12/config.xml --- old/kiwi/system/boot/ix86/vmxboot/suse-SLES12/config.xml 2015-12-17 09:35:46.000000000 +0100 +++ new/kiwi/system/boot/ix86/vmxboot/suse-SLES12/config.xml 2016-02-11 11:37:16.000000000 +0100 @@ -70,6 +70,11 @@ </drivers> <drivers profiles="xen,ec2"> <file name="drivers/xen/*"/> + <file name="drivers/block/xen-blkfront.ko"/> + <file name="drivers/net/xen-netfront.ko"/> + <file name="drivers/scsi/xen-scsifront.ko"/> + <file name="drivers/input/misc/xen-kbdfront.ko"/> + <file name="drivers/pci/xen-pcifront.ko"/> </drivers> <repository type="yast2" status="replaceable"> <source path="obs://SUSE:SLE-12:GA/standard"/>
