Hello community,
here is the log from the commit of package kiwi for openSUSE:Factory checked in
at 2012-11-17 07:25:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kiwi (Old)
and /work/SRC/openSUSE:Factory/.kiwi.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi", Maintainer is "m...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2012-11-12
07:03:45.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2012-11-17
07:25:33.000000000 +0100
@@ -1,0 +2,97 @@
+Fri Nov 16 15:16:58 CET 2012 - m...@suse.de
+
+- v5.04.25 released
+
+-------------------------------------------------------------------
+Fri Nov 16 09:55:38 CET 2012 - m...@suse.de
+
+- arm: removed match for image-$VERSION in suseStripKernel
+
+-------------------------------------------------------------------
+Thu Nov 15 16:18:51 CET 2012 - m...@suse.de
+
+- fixed kernel search in suseStripKernel for armv5 kernel.
+ There we have Image-* (with a capital 'I')
+
+-------------------------------------------------------------------
+Thu Nov 15 16:15:09 CET 2012 - m...@suse.de
+
+- fixed spec file requirements: kiwi has a create mode runtime check
+ for the vgs command. Thus the kiwi package should require lvm2 to
+ become installed
+
+-------------------------------------------------------------------
+Thu Nov 15 12:41:51 CET 2012 - m...@suse.de
+
+- make sure possibly left over dhcpcd pid file from a -T (test) call
+ is removed before requesting the IP address for the interface. It
+ has turned out that the sle10 dhcpcd has this bug and kiwi works
+ around this one by actively checking for a pid file after the
+ dhcpcd -T (test) call (bnc #787924)
+
+-------------------------------------------------------------------
+Thu Nov 15 10:19:29 CET 2012 - m...@suse.de
+
+- use baseUpdateSysConfig() function to update variable contents
+ of sysconfig files as required in the suseConfig() function.
+ This eliminates the various sed statements here and uses one
+ common function for all sysconfig updates
+
+-------------------------------------------------------------------
+Tue Nov 13 18:18:35 CET 2012 - bgeu...@suse.de
+
+- Fixed regular expression for replacing HWCLOCK in clock config file
+ This fixes a bug that causes a wrong '--localtime' / '--utc' entry
+ in USE_HWCLOCK setting. This setting got introduced first with
+ openSUSE 12.2
+
+-------------------------------------------------------------------
+Tue Nov 13 17:17:31 CET 2012 - m...@suse.de
+
+- fix use of uninitialized variables
+
+-------------------------------------------------------------------
+Tue Nov 13 15:44:44 CET 2012 - m...@suse.de
+
+- netboot: fixed dhcpcd '-r' option name clash. Older versions of
+ dhcpcd use that option in a completely different meaning, thus
+ we distinguish the call by the the capability of the '-p' option
+ (interface persistency) which was introduced in newer versions
+ of dhcpcd only (bnc #787924)
+
+-------------------------------------------------------------------
+Tue Nov 13 10:12:19 CET 2012 - m...@suse.de
+
+- fix use of uninitialized variables
+
+-------------------------------------------------------------------
+Tue Nov 13 08:16:29 CET 2012 - rjsch...@suse.de
+
+- add spaces to separate option arguments
+
+-------------------------------------------------------------------
+Mon Nov 12 18:18:00 CET 2012 - rjsch...@suse.de
+
+- fix use of uninitialized variables
+- do not clobber the FS tune settings for ext2,3,4 if fsnocheck and tune
+ settings are provided
+
+-------------------------------------------------------------------
+Mon Nov 12 09:55:32 CET 2012 - m...@suse.de
+
+- fixed use of implicit split to @_ with a temporary variable
+
+-------------------------------------------------------------------
+Sun Nov 11 20:46:42 CET 2012 - m...@suse.de
+
+- v5.04.24 released
+
+-------------------------------------------------------------------
+Sun Nov 11 13:41:31 CET 2012 - m...@suse.de
+
+- fixed build of plain bootiso/bootstick from kiwi initrd without
+ system image. The call kiwi --bootusb <initrd> failed to work
+ because it tried to access the XML description which can't
+ work when no system image is specified
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.wqQvB6/_old 2012-11-17 07:25:36.000000000 +0100
+++ /var/tmp/diff_new_pack.wqQvB6/_new 2012-11-17 07:25:36.000000000 +0100
@@ -21,7 +21,7 @@
Summary: openSUSE - KIWI Image System
License: GPL-2.0
Group: System/Management
-Version: 5.04.23
+Version: 5.04.25
Release: 0
# requirements to build packages
BuildRequires: gcc-c++
@@ -57,6 +57,7 @@
Requires: coreutils
Requires: kiwi-tools >= %{version}
Requires: libxslt
+Requires: lvm2
Requires: perl = %{perl_version}
Requires: perl-Config-IniFiles
Requires: perl-Readonly
++++++ kiwi-docu.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/kiwi/kiwi-docu.tar.bz2
/work/SRC/openSUSE:Factory/.kiwi.new/kiwi-docu.tar.bz2 differ: char 11, line 1
++++++ 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 2012-11-09 15:58:38.000000000 +0100
+++ new/kiwi/.revision 2012-11-16 15:17:34.000000000 +0100
@@ -1 +1 @@
-377303476759ed9f9e22dc5a4ab2f30abe4b47af
+e0ee446039ea4624686aa680df137202a5d1f019
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 2012-11-09 15:58:53.000000000 +0100
+++ new/kiwi/modules/KIWIBoot.pm 2012-11-16 15:17:34.000000000 +0100
@@ -42,7 +42,7 @@
sub new {
# ...
# Create KIWIBoot object which is used to create bootable
- # media images like CD/DVD's , USB sticks or Virtual disks
+ # media images like CD/DVD's , USB sticks or Virtual disks
# ---
#==========================================
# Object setup
@@ -187,7 +187,7 @@
}
if (! $isxen) {
my $kernel = readlink $xengz.".kernel";
- if ($kernel =~ /.*-xen$/) {
+ if (($kernel) && ($kernel =~ /.*-xen$/)) {
$isxen = 1;
}
}
@@ -619,7 +619,7 @@
#==========================================
# Check for disk device
#------------------------------------------
- if (-b $system) {
+ if (($system) && (-b $system)) {
$haveDiskDevice = $system;
$version = $xml -> getImageVersion();
$system = $xml -> getImageName();
@@ -1060,7 +1060,6 @@
my $efi = $this->{efi};
my $irdsize = $main::global -> isize ($initrd);
my $vmsize = $main::global -> isize ($system);
- my $diskname = $system.".install.raw";
my $md5name = $system;
my $destdir = dirname ($initrd);
my %deviceMap = ();
@@ -1081,6 +1080,7 @@
my $tmpdir;
my %type;
my $stick;
+ my $diskname;
#==========================================
# Create new MBR label for install disk
#------------------------------------------
@@ -1088,12 +1088,11 @@
#==========================================
# Check for disk device
#------------------------------------------
- if (-b $system) {
+ if (($system) && (-b $system)) {
$haveDiskDevice = $system;
$version = $xml -> getImageVersion();
$system = $xml -> getImageName();
$system = $destdir."/".$system.".".$arch."-".$version.".raw";
- $diskname= $system.".install.raw";
$md5name = $system;
$this->{system} = $system;
}
@@ -1132,10 +1131,12 @@
#==========================================
# check if system image is given
#------------------------------------------
- if (! defined $system) {
+ if ($system) {
+ $diskname = $system.".install.raw";
+ } else {
$system = $initrd;
$diskname = $initrd;
- $diskname =~ s/gz$/raw/;
+ $diskname =~ s/gz$/install\.raw/;
$gotsys = 0;
}
#==========================================
@@ -2441,7 +2442,8 @@
push @paths,$pname;
}
foreach my $name (@paths) {
- my $part = split (/\//,$name);
+ my @parts = split (/\//,$name);
+ my $part = @parts;
push @{$phash{$part}},$name;
}
#==========================================
@@ -2553,6 +2555,9 @@
@{$cmdL -> getFilesystemOptions()}
);
my $fsopts = $FSopts{ext3};
+ if (! $fsopts) {
+ $fsopts = '';
+ }
my $fstool = "mkfs.ext3";
$status = qxx ("$fstool $fsopts $root 2>&1");
$result = $? >> 8;
@@ -3579,6 +3584,12 @@
my %type;
my $title;
#==========================================
+ # set empty label if not defined
+ #------------------------------------------
+ if (! $label) {
+ $label = "";
+ }
+ #==========================================
# store loader type in object instance
#------------------------------------------
$this->{loader} = $loader;
@@ -3590,7 +3601,7 @@
%type = %{$xml->getImageTypeAndAttributes_legacy()};
$cmdline = $type{cmdline};
}
- if ($type =~ /^KIWI CD Boot/) {
+ if ($type =~ /^KIWI (CD|USB) Boot/) {
# /.../
# use predefined set of parameters for simple boot CD
# not including a system image
@@ -5951,7 +5962,12 @@
my $kiwi = $this->{kiwi};
my $xml = $this->{xml};
my $cmdL = $this->{cmdL};
- my %type = %{$xml->getImageTypeAndAttributes_legacy()};
+ my %type = ();
+ if ($xml) {
+ %type = %{$xml->getImageTypeAndAttributes_legacy()};
+ } else {
+ $type{fsnocheck} = 'true';
+ }
my %FSopts = $main::global -> checkFSOptions(
@{$cmdL -> getFilesystemOptions()}
);
@@ -5969,6 +5985,9 @@
/^ext[234]/ && do {
$kiwi -> info ("Creating $_ $name filesystem");
my $fsopts = $FSopts{$_};
+ if (! $fsopts) {
+ $fsopts = '';
+ }
my $fstool = "mkfs.".$fstype;
if ($this->{inodes}) {
$fsopts.= " -N $this->{inodes}";
@@ -5977,11 +5996,13 @@
$fsopts.= " -L 'BOOT'";
$type{fsnocheck} = 'true';
}
- my $tuneopts = "";
+ my $tuneopts = '';
if (($type{fsnocheck}) && ($type{fsnocheck} eq "true"))
{
- $tuneopts = "-c 0 -i 0";
+ $tuneopts = "-c 0 -i 0 ";
+ }
+ if ($FSopts{extfstune}) {
+ $tuneopts .= $FSopts{extfstune};
}
- $tuneopts = $FSopts{extfstune} if $FSopts{extfstune};
$status = qxx ("$fstool $fsopts $device 2>&1");
$result = $? >> 8;
if (!$result && $tuneopts) {
@@ -5992,7 +6013,7 @@
};
/^fat16|fat32/ && do {
my $fstool = 'mkdosfs';
- my $fsopts;
+ my $fsopts = '';
if ($name eq 'fat16') {
$kiwi -> info ("Creating DOS [Fat16]
filesystem");
$fsopts.= " -F 16";
@@ -6010,7 +6031,10 @@
/^reiserfs/ && do {
$kiwi -> info ("Creating reiserfs $name filesystem");
my $fsopts = $FSopts{reiserfs};
- $fsopts.= "-f";
+ if (! $fsopts) {
+ $fsopts = '';
+ }
+ $fsopts.= " -f";
$status = qxx (
"/sbin/mkreiserfs $fsopts $device 2>&1"
);
@@ -6020,6 +6044,9 @@
/^btrfs/ && do {
$kiwi -> info ("Creating btrfs $name filesystem");
my $fsopts = $FSopts{btrfs};
+ if (! $fsopts) {
+ $fsopts = '';
+ }
$status = qxx (
"/sbin/mkfs.btrfs $fsopts $device 2>&1"
);
@@ -6029,6 +6056,9 @@
/^xfs/ && do {
$kiwi -> info ("Creating xfs $name filesystem");
my $fsopts = $FSopts{xfs};
+ if (! $fsopts) {
+ $fsopts = '';
+ }
$status = qxx (
"/sbin/mkfs.xfs $fsopts $device 2>&1"
);
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 2012-11-09 15:58:53.000000000 +0100
+++ new/kiwi/modules/KIWIConfig.sh 2012-11-16 15:17:38.000000000 +0100
@@ -310,20 +310,16 @@
# keytable
#--------------------------------------
if [ ! -z "$kiwi_keytable" ];then
- cat etc/sysconfig/keyboard |\
- sed -e s"@KEYTABLE=\".*\"@KEYTABLE=\"$kiwi_keytable\"@"
\
- > etc/sysconfig/keyboard.new
- mv etc/sysconfig/keyboard.new etc/sysconfig/keyboard
+ baseUpdateSysConfig \
+ /etc/sysconfig/keyboard KEYTABLE $kiwi_keytable
fi
#======================================
# locale
#--------------------------------------
if [ ! -z "$kiwi_language" ];then
language=$(echo $kiwi_language | cut -f1 -d,).UTF-8
- cat /etc/sysconfig/language |\
- sed -e s"@RC_LANG=\".*\"@RC_LANG=\"$language\"@" \
- > etc/sysconfig/language.new
- mv etc/sysconfig/language.new etc/sysconfig/language
+ baseUpdateSysConfig \
+ /etc/sysconfig/language RC_LANG $language
fi
#======================================
# timezone
@@ -331,10 +327,8 @@
if [ ! -z "$kiwi_timezone" ];then
if [ -f /usr/share/zoneinfo/$kiwi_timezone ];then
cp /usr/share/zoneinfo/$kiwi_timezone /etc/localtime
- cat /etc/sysconfig/clock |\
- sed -e
s"@TIMEZONE=\".*\"@TIMEZONE=\"$kiwi_timezone\"@" \
- > etc/sysconfig/clock.new
- mv etc/sysconfig/clock.new etc/sysconfig/clock
+ baseUpdateSysConfig \
+ /etc/sysconfig/clock TIMEZONE $kiwi_timezone
else
echo "timezone: $kiwi_timezone not found"
fi
@@ -343,10 +337,8 @@
# hwclock
#--------------------------------------
if [ ! -z "$kiwi_hwclock" ];then
- cat /etc/sysconfig/clock |\
- sed -e s"@HWCLOCK=\".*\"@HWCLOCK=\"--$kiwi_hwclock\"@" \
- > etc/sysconfig/clock.new
- mv etc/sysconfig/clock.new etc/sysconfig/clock
+ baseUpdateSysConfig \
+ /etc/sysconfig/clock HWCLOCK "--$kiwi_hwclock"
fi
#======================================
# SuSEconfig
@@ -898,7 +890,7 @@
}
#======================================
-# baseSysConfig
+# baseUpdateSysConfig
#--------------------------------------
function baseUpdateSysConfig {
# /.../
@@ -1541,8 +1533,8 @@
pushd /boot
if [ -f uImage-$VERSION ];then
mv uImage-$VERSION vmlinuz
- elif [[ $arch =~ ^arm ]] && [ -f image-$VERSION ];then
- mv image-$VERSION vmlinuz
+ elif [[ $arch =~ ^arm ]] && [ -f Image-$VERSION ];then
+ mv Image-$VERSION vmlinuz
elif [ -f vmlinux-$VERSION.gz ];then
mv vmlinux-$VERSION.gz vmlinux.gz
mv vmlinuz-$VERSION vmlinuz
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-11-09 15:58:53.000000000 +0100
+++ new/kiwi/modules/KIWIGlobals.pm 2012-11-16 15:17:38.000000000 +0100
@@ -50,7 +50,7 @@
# Globals (generic)
#------------------------------------------
my %data;
- $data{Version} = "5.04.23";
+ $data{Version} = "5.04.25";
$data{Publisher} = "SUSE LINUX Products 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/KIWIImage.pm
new/kiwi/modules/KIWIImage.pm
--- old/kiwi/modules/KIWIImage.pm 2012-11-09 15:58:53.000000000 +0100
+++ new/kiwi/modules/KIWIImage.pm 2012-11-16 15:17:38.000000000 +0100
@@ -3388,7 +3388,7 @@
#==========================================
# Create image md5sum
#------------------------------------------
- if ($fstype ne "clicfs") {
+ if (($fstype) && ($fstype ne "clicfs")) {
if (! $this -> buildMD5Sum ($name)) {
return;
}
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-11-09 15:58:53.000000000 +0100
+++ new/kiwi/modules/KIWILinuxRC.sh 2012-11-16 15:17:38.000000000 +0100
@@ -4158,7 +4158,18 @@
eval `grep "^IPADDR="
/var/lib/dhcpcd/dhcpcd-$try_iface.info`
rm /var/lib/dhcpcd/dhcpcd-$try_iface.info
# continue with the DHCP protocol on the selected
interface
- dhcpcd $opts -r $IPADDR $PXE_IFACE 2>&1
+ if [ -e /var/run/dhcpcd-$PXE_IFACE.pid ];then
+ rm -f /var/run/dhcpcd-$PXE_IFACE.pid
+ fi
+ if [ $DHCPCD_HAVE_PERSIST -eq 0 ];then
+ # /.../
+ # older version of dhcpd which doesn't provide
+ # an option to request a specific IP address
+ # ----
+ dhcpcd $opts $PXE_IFACE 2>&1
+ else
+ dhcpcd $opts -r $IPADDR $PXE_IFACE 2>&1
+ fi
break
fi
done
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
