Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2012-07-02 21:23:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi (Old) and /work/SRC/openSUSE:Factory/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2012-07-02 10:28:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2012-07-02 21:23:10.000000000 +0200 @@ -1,0 +2,15 @@ +Mon Jul 2 20:47:28 CEST 2012 - [email protected] + +- v5.03.28 released + +------------------------------------------------------------------- +Mon Jul 2 17:19:02 CEST 2012 - [email protected] + +- make sure possible proxy setting is transfered to the kiwi chroot + +------------------------------------------------------------------- +Mon Jul 2 16:43:16 CEST 2012 - [email protected] + +- don't call resetBootBind using chroot to workaround (bnc #769634) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.TZeMiy/_old 2012-07-02 21:23:12.000000000 +0200 +++ /var/tmp/diff_new_pack.TZeMiy/_new 2012-07-02 21:23:12.000000000 +0200 @@ -21,7 +21,7 @@ Summary: OpenSuSE - KIWI Image System License: GPL-2.0 Group: System/Management -Version: 5.03.27 +Version: 5.03.28 Release: 0 # requirements to build packages BuildRequires: gcc-c++ ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2012-06-27 14:36:32.000000000 +0200 +++ new/kiwi/.revision 2012-06-27 14:36:32.000000000 +0200 @@ -1 +1 @@ -de89ef19625bf365555c3b70e5da39972bda5354 +bbb46580bfb055545c3684d8dbec559229207502 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 2012-06-29 21:57:48.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2012-07-02 20:48:52.000000000 +0200 @@ -50,7 +50,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "5.03.27"; + $data{Version} = "5.03.28"; $data{Publisher} = "SUSE LINUX Products GmbH"; $data{Preparer} = "KIWI - http://kiwi.berlios.de";; $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 2012-06-29 21:57:48.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2012-07-02 20:48:52.000000000 +0200 @@ -5956,6 +5956,10 @@ fi fi #====================================== + # run resetBootBind + #-------------------------------------- + resetBootBind /mnt + #====================================== # kill initial tail and utimer #-------------------------------------- . /iprocs @@ -5977,11 +5981,9 @@ umount proc &>/dev/null && \ umount proc &>/dev/null #====================================== - # run resetBootBind preinit cleanImage + # run preinit and cleanImage #-------------------------------------- chroot /mnt /bin/bash -c \ - ". /include ; exec 2>>$ELOG_FILE ; set -x ; resetBootBind" - chroot /mnt /bin/bash -c \ "/preinit" chroot /mnt /bin/bash -c \ ". /include ; exec 2>>$ELOG_FILE ; set -x ; cleanImage" @@ -8153,7 +8155,11 @@ # symbolic link to make the suse kernel update process # to work correctly # ---- - local bootdir=boot_bind + local bprefix=$1 + local bootdir=$bprefix/boot_bind + if [ ! -e /proc/mounts ];then + mount -t proc proc /proc + fi #====================================== # find bind boot dir #-------------------------------------- @@ -8163,7 +8169,7 @@ #====================================== # reset bind mount to standard boot dir #-------------------------------------- - umount /boot + umount $bprefix/boot mv /$bootdir/boot /$bootdir/tmp mv /$bootdir/tmp/* /$bootdir rmdir /$bootdir/tmp @@ -8172,14 +8178,13 @@ #====================================== # update fstab entry #-------------------------------------- - cat /etc/fstab | grep -v ^boot_bind > /etc/fstab.new - mv /etc/fstab.new /etc/fstab - cat /etc/fstab | sed -e s@/$bootdir@/boot@ > /etc/fstab.new - mv /etc/fstab.new /etc/fstab + grep -v ^boot_bind $bprefix/etc/fstab > $bprefix/etc/fstab.new + mv $bprefix/etc/fstab.new $bprefix/etc/fstab + sed -i -e s@/boot_bind@/boot@ $bprefix/etc/fstab #====================================== # mount boot again #-------------------------------------- - mount $imageBootDevice /boot + chroot $bprefix mount $imageBootDevice /boot #====================================== # check for syslinux requirements #-------------------------------------- @@ -8199,9 +8204,9 @@ break done IFS=$IFS_ORIG - mkdir -p /boot/boot - mv /boot/$kernel /boot/boot/ - mv /boot/$initrd /boot/boot/ + mkdir -p $bprefix/boot/boot + mv $bprefix/boot/$kernel $bprefix/boot/boot/ + mv $bprefix/boot/$initrd $bprefix/boot/boot/ fi } #====================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIManager.pm new/kiwi/modules/KIWIManager.pm --- old/kiwi/modules/KIWIManager.pm 2012-06-27 14:36:16.000000000 +0200 +++ new/kiwi/modules/KIWIManager.pm 2012-07-02 20:48:52.000000000 +0200 @@ -20,6 +20,7 @@ require Exporter; use strict; use Carp qw (cluck); +use Env; use FileHandle; use File::Basename; use Config::IniFiles; @@ -262,12 +263,25 @@ print $cd "logfile $screenLogs\n"; print $cd "logfile flush 1\n"; $cd -> close(); - #========================================== # Global exports #------------------------------------------ print $fd "export PBL_SKIP_BOOT_TEST=1"."\n"; - + #========================================== + # Global exports [ proxy setup ] + #------------------------------------------ + if ($ENV{http_proxy}) { + print $fd "export http_proxy=\"$ENV{http_proxy}\""."\n"; + } + if ($ENV{ftp_proxy}) { + print $fd "export ftp_proxy=\"$ENV{ftp_proxy}\""."\n"; + } + if ($ENV{https_proxy}) { + print $fd "export https_proxy=\"$ENV{https_proxy}\""."\n"; + } + if ($ENV{no_proxy}) { + print $fd "export no_proxy=\"$ENV{no_proxy}\""."\n"; + } #========================================== # return screen call file handle #------------------------------------------ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
