Hello community,
here is the log from the commit of package kiwi for openSUSE:Factory checked in
at 2012-01-26 14:05:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-01-25
11:08:06.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2012-01-26
14:05:49.000000000 +0100
@@ -1,0 +2,24 @@
+Thu Jan 26 12:25:39 CET 2012 - m...@suse.de
+
+- v5.02.6 released
+
+-------------------------------------------------------------------
+Thu Jan 26 12:24:20 CET 2012 - m...@suse.de
+
+- fixed setupKernelModules and init call for CentOS
+
+-------------------------------------------------------------------
+Wed Jan 25 21:18:05 CET 2012 - rjsch...@suse.de
+
+- implement method to allow us to handle different command line argument
+ implementations, i.e. -longOpt vs --longOpt. This problem is currently
+ experienced on different versions of the isohybrid executable
+- use newly implemented method to properly determine the argument format
+ when calling the isohybrid executable. Really fixes (bnc #742836)
+
+-------------------------------------------------------------------
+Wed Jan 25 11:17:08 CET 2012 - m...@suse.de
+
+- fixed error console setup in arm JeOS description
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.IfhbHG/_old 2012-01-26 14:05:51.000000000 +0100
+++ /var/tmp/diff_new_pack.IfhbHG/_new 2012-01-26 14:05:51.000000000 +0100
@@ -22,7 +22,7 @@
Summary: OpenSuSE - KIWI Image System
License: GPL-2.0
Group: System/Management
-Version: 5.02.5
+Version: 5.02.6
Release: 0
# requirements to build packages
BuildRequires: gcc-c++
++++++ 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-01-23 16:11:17.000000000 +0100
+++ new/kiwi/.revision 2012-01-26 12:27:49.000000000 +0100
@@ -1 +1 @@
-20a46ad74acfd1417abcb6d451a3a7186610cc4c
+b346e55a98c767650ab06cd2fdec7c180cd54b16
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-01-24 17:33:08.000000000 +0100
+++ new/kiwi/modules/KIWIGlobals.pm 2012-01-26 12:27:55.000000000 +0100
@@ -42,7 +42,7 @@
# Globals (generic)
#------------------------------------------
my %data;
- $data{Version} = "5.02.5";
+ $data{Version} = "5.02.6";
$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/KIWIIsoLinux.pm
new/kiwi/modules/KIWIIsoLinux.pm
--- old/kiwi/modules/KIWIIsoLinux.pm 2012-01-24 17:33:08.000000000 +0100
+++ new/kiwi/modules/KIWIIsoLinux.pm 2012-01-26 12:27:55.000000000 +0100
@@ -347,7 +347,7 @@
my $boot = $base{$arch}{boot};
$para.= " -chrp-boot";
- $para.= " -hfs-bless $src/$boot"; # CHECK: maybe $src is not necessary
+ $para.= " -hfs-bless $src/$boot"; # CHECK: maybe $src is not
necessary
$para.= " -hfs-volid FIXME"; # FIXME should be same as value of -A
$para.= " -l";
$para.= " --macbin";
@@ -765,24 +765,42 @@
my $code;
my $loop;
my $FD;
+
+ my $locator = KIWILocator -> new($kiwi);
+ my $isoHybrid = $locator -> getExecPath('isohybrid');
+
+ if (! $isoHybrid) {
+ $kiwi -> error ("Can't find isohybrid, check your syslinux
version");
+ $kiwi -> failed ();
+ return;
+ }
+
+ my @neededOpts = qw(id offset type);
+ my %optNames = %{$locator -> getExecArgsFormat($isoHybrid,
\@neededOpts)};
+ if (! $optNames{'status'}) {
+ $kiwi -> error ($optNames{'error'});
+ $kiwi -> failed ();
+ return;
+ }
+
+ my $idOpt = $optNames{'id'};
+ my $offsetOpt = $optNames{'offset'};
+ my $typeOpt = $optNames{'type'};
#==========================================
# Create partition table on iso
#------------------------------------------
- if (! -x "/usr/bin/isohybrid") {
- $kiwi -> error ("Can't find isohybrid, check your syslinux
version");
- $kiwi -> failed ();
- return undef;
- }
if ($mbrid) {
- $data = qxx ("isohybrid -id $mbrid -type 0x83 -offset 64 $iso
2>&1");
+ my $cmd = "$isoHybrid $idOpt $mbrid $typeOpt 0x83 "
+ . "$offsetOpt 64 $iso 2>&1";
+ $data = qxx ($cmd)
} else {
- $data = qxx ("isohybrid -offset 64 $iso 2>&1");
+ $data = qxx ("$isoHybrid $offsetOpt 64 $iso 2>&1");
}
$code = $? >> 8;
if ($code != 0) {
$kiwi -> error ("Failed to call isohybrid: $data");
$kiwi -> failed ();
- return undef;
+ return;
}
return $this;
}
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-01-23 16:11:22.000000000 +0100
+++ new/kiwi/modules/KIWILinuxRC.sh 2012-01-26 12:27:55.000000000 +0100
@@ -2702,6 +2702,7 @@
local sysimg_ktempl=$srcprefix/var/adm/fillup-templates/sysconfig.kernel
local sysimg_ktempl2=$sysimg_ktempl-mkinitrd
local sysimg_ktempl3=/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+ local sysimg_ktempl4=/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-Security-6
local sysimg_syskernel=$srcprefix/etc/sysconfig/kernel
local syskernel=$destprefix/etc/sysconfig/kernel
local newstyle_mkinitrd=$srcprefix/lib/mkinitrd/scripts/boot-usb.sh
@@ -2714,7 +2715,8 @@
if \
[ ! -f $sysimg_ktempl ] && \
[ ! -f $sysimg_ktempl2 ] && \
- [ ! -f $sysimg_ktempl3 ]
+ [ ! -f $sysimg_ktempl3 ] && \
+ [ ! -f $sysimg_ktempl4 ]
then
systemException \
"Can't find kernel sysconfig template in system image
!" \
@@ -6012,8 +6014,10 @@
exec /lib/mkinitrd/bin/run-init -c ./dev/console /mnt
/sbin/halt -fihp
fi
if \
- [ ! "$haveClicFS" = "yes" ] && [ -z "$NFSROOT" ] && \
- [ ! -e /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release ]
+ [ ! "$haveClicFS" = "yes" ] && \
+ [ -z "$NFSROOT" ] && \
+ [ ! -e $sysimg_ktempl3 ] && \
+ [ ! -e $sysimg_ktempl4 ]
then
# for systemd debugging set: --log-level=debug --log-target=kmsg
exec /lib/mkinitrd/bin/run-init -c ./dev/console /mnt $init
$option
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/modules/KIWILocator.pm
new/kiwi/modules/KIWILocator.pm
--- old/kiwi/modules/KIWILocator.pm 2012-01-23 16:11:17.000000000 +0100
+++ new/kiwi/modules/KIWILocator.pm 2012-01-26 12:27:55.000000000 +0100
@@ -20,6 +20,7 @@
use strict;
use warnings;
require Exporter;
+use IPC::Open3;
use KIWILog;
use KIWIQX;
@@ -186,9 +187,93 @@
}
#============================================
+# getExecArgsFormat
+#--------------------------------------------
+sub getExecArgsFormat {
+ # ...
+ # Return a hash ref of the argument format for the sought after
+ # arguments.
+ # The method handles long arguments and deals with difference in
+ # version where arguments may have changed from -argument to --argument
+ # ---
+ my $this = shift;
+ my $execName = shift;
+ my $opts = shift;
+ my @optsToGet = @{ $opts };
+ my %optInfo;
+ my $CHILDWRITE;
+ my $CHILDSTDOUT;
+ my $CHILDSTDERR;
+
+ if (! -f $execName) {
+ $execName = $this -> getExecPath($execName);
+ }
+
+ if (! $execName) {
+ $optInfo{'status'} = 0;
+ $optInfo{'error'} = "Could not find $execName";
+ return \%optInfo;
+ }
+
+ my $pid = open3($CHILDWRITE, $CHILDSTDOUT, $CHILDSTDERR,
+ "$execName --help");
+ waitpid( $pid, 0 );
+ my $status = $? >> 8;
+
+ my @help = <$CHILDSTDOUT>;
+ if ($status) {
+ my @chldstderr = <$CHILDSTDERR>;
+ @help = (@help, @chldstderr);
+ }
+
+ my $allOptionsFound;
+ my $numOptsToGet = @optsToGet;
+ my $numOptsFound = 0;
+
+ HELPOPTS:
+ for my $opt (@help) {
+ GETOPTS:
+ for my $seekOpt (@optsToGet) {
+ if ($opt =~ /$seekOpt\s+/x) {
+ my @prts = split / /, $opt;
+ OPTLINE:
+ for my $item (@prts) {
+ if ($item =~ /-+$seekOpt/x) {
+ $optInfo{$seekOpt} = $item;
+ $numOptsFound += 1;
+ last OPTLINE;
+ }
+ }
+ }
+ }
+ if ($numOptsFound == $numOptsToGet) {
+ $allOptionsFound = 1;
+ last HELPOPTS;
+ }
+ }
+ if ($allOptionsFound) {
+ $optInfo{'status'} = 1;
+ } else {
+ $optInfo{'status'} = 0;
+ for my $item (keys %optInfo) {
+ if (! grep { /$item/x } @optsToGet) {
+ my $msg = "Could not find argument $item for
$execName";
+ $optInfo{'error'} = $msg;
+ last;
+ }
+ }
+ }
+
+ return \%optInfo;
+}
+
+#============================================
# getExecPath
#--------------------------------------------
sub getExecPath {
+ # ...
+ # Return the full path of the given executable
+ # ---
my $this = shift;
my $execName = shift;
my $kiwi = $this->{kiwi};
@@ -203,4 +288,6 @@
return $execPath;
}
+
+
1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/template/armv7l/suse-SLE12-JeOS/config.xml
new/kiwi/template/armv7l/suse-SLE12-JeOS/config.xml
--- old/kiwi/template/armv7l/suse-SLE12-JeOS/config.xml 2012-01-24
17:33:08.000000000 +0100
+++ new/kiwi/template/armv7l/suse-SLE12-JeOS/config.xml 2012-01-26
12:27:55.000000000 +0100
@@ -24,10 +24,10 @@
<boot-theme>openSUSE</boot-theme>
</preferences>
<preferences profiles="pandaFlavour">
- <type image="vmx" filesystem="ext3" boot="vmxboot/suse-SLES12"
bootloader="uboot" bootkernel="omap4panda"
kernelcmdline="kiwistderr=/dev/console console=ttyO2 ethaddr=f2:9e:1a:ca:d9:99">
+ <type image="vmx" filesystem="ext3" boot="vmxboot/suse-SLES12"
bootloader="uboot" bootkernel="omap4panda" kernelcmdline="kiwistderr=/dev/ttyO2
console=ttyO2 ethaddr=f2:9e:1a:ca:d9:99">
<systemdisk/>
</type>
- <type image="oem" filesystem="ext3" boot="oemboot/suse-SLES12"
bootloader="uboot" bootkernel="omap4panda"
kernelcmdline="kiwistderr=/dev/console console=ttyO2 ethaddr=f2:9e:1a:ca:d9:99">
+ <type image="oem" filesystem="ext3" boot="oemboot/suse-SLES12"
bootloader="uboot" bootkernel="omap4panda" kernelcmdline="kiwistderr=/dev/ttyO2
console=ttyO2 ethaddr=f2:9e:1a:ca:d9:99">
<systemdisk/>
<oemconfig>
<oem-swapsize>500</oem-swapsize>
@@ -35,10 +35,10 @@
</type>
</preferences>
<preferences profiles="efikaFLavour">
- <type image="vmx" filesystem="ext3" boot="vmxboot/suse-SLES12"
bootloader="uboot" bootkernel="imx51" kernelcmdline="kiwistderr=/dev/console
console=ttymxc0">
+ <type image="vmx" filesystem="ext3" boot="vmxboot/suse-SLES12"
bootloader="uboot" bootkernel="imx51" kernelcmdline="kiwistderr=/dev/ttymxc0
console=ttymxc0">
<systemdisk/>
</type>
- <type image="oem" filesystem="ext3" boot="oemboot/suse-SLES12"
bootloader="uboot" bootkernel="imx51" kernelcmdline="kiwistderr=/dev/console
console=ttymxc0">
+ <type image="oem" filesystem="ext3" boot="oemboot/suse-SLES12"
bootloader="uboot" bootkernel="imx51" kernelcmdline="kiwistderr=/dev/ttymxc0
console=ttymxc0">
<systemdisk/>
<oemconfig>
<oem-swapsize>500</oem-swapsize>
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
