Hello community,
here is the log from the commit of package kiwi
checked in at Mon Oct 29 15:55:47 CET 2007.
--------
--- arch/i386/kiwi/kiwi.changes 2007-10-26 19:31:01.000000000 +0200
+++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2007-10-29 13:50:20.563325000 +0100
@@ -1,0 +2,13 @@
+Sat Oct 27 16:01:44 CEST 2007 - ms@suse.de
+
+- v1.78
+- activated shell set -x mode (#335573)
+- fixed createLiveCD script due to renaming of image (#337391
+- use Recommends flag for packagemanager (#300981)
+- disable use of zypper --catalog option it doesn't exist in newer
+ versions. zypper v0.9.0-7 (#335116)
+- fixed users and group matching (#336884)
+- fixed integration of template files while starting to create
+ a new root system (#335268)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.m29210/_old 2007-10-29 15:53:05.000000000 +0100
+++ /var/tmp/diff_new_pack.m29210/_new 2007-10-29 15:53:05.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kiwi (Version 1.77)
+# spec file for package kiwi (Version 1.78)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -18,13 +18,14 @@
%endif
Requires: perl perl-XML-LibXML perl-libwww-perl screen coreutils
Summary: OpenSuSE - KIWI Image System
-Version: 1.77
+Version: 1.78
Release: 1
Group: System/Management
License: GPL v2 or later
Source: kiwi.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExcludeArch: ia64 ppc64 s390x s390 ppc
+Recommends: smart zypper
%description
The OpenSuSE KIWI Image System provides a complete operating system
@@ -66,7 +67,7 @@
Marcus Schaefer
%package -n kiwi-desc-isoboot
-Requires: kiwi smart syslinux
+Requires: kiwi syslinux
Summary: OpenSuSE - KIWI Image System ISO boot
Group: System/Management
@@ -80,7 +81,7 @@
Marcus Schaefer
%package -n kiwi-desc-usbboot
-Requires: kiwi smart
+Requires: kiwi
Summary: OpenSuSE - KIWI Image System USB boot
Group: System/Management
@@ -94,7 +95,7 @@
Marcus Schaefer
%package -n kiwi-desc-vmxboot
-Requires: kiwi qemu multipath-tools smart
+Requires: kiwi qemu multipath-tools
Summary: OpenSuSE - KIWI Image System Virtual Machine boot
Group: System/Management
@@ -108,7 +109,7 @@
Marcus Schaefer
%package -n kiwi-desc-netboot
-Requires: kiwi smart
+Requires: kiwi
Summary: OpenSuSE - KIWI Image System PXE network boot
Group: System/Management
@@ -122,7 +123,7 @@
Marcus Schaefer
%package -n kiwi-desc-xenboot
-Requires: kiwi smart
+Requires: kiwi
Summary: OpenSuSE - KIWI Image System Xen Virtual Machine boot
Group: System/Management
@@ -136,7 +137,7 @@
Marcus Schaefer
%package -n kiwi-desc-oemboot
-Requires: kiwi smart
+Requires: kiwi qemu multipath-tools
Summary: OpenSuSE - KIWI image descriptions
Group: System/Management
@@ -329,6 +330,16 @@
%doc %{_datadir}/kiwi/image/oemboot/README
%{_datadir}/kiwi/image/oemboot/suse*
%changelog
+* Sat Oct 27 2007 - ms@suse.de
+- v1.78
+- activated shell set -x mode (#335573)
+- fixed createLiveCD script due to renaming of image (#337391
+- use Recommends flag for packagemanager (#300981)
+- disable use of zypper --catalog option it doesn't exist in newer
+ versions. zypper v0.9.0-7 (#335116)
+- fixed users and group matching (#336884)
+- fixed integration of template files while starting to create
+ a new root system (#335268)
* Thu Oct 25 2007 - ms@suse.de
- v1.77
- fixed exit code of kiwi call. Some module destructors call
++++++ kiwi.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/.kiwi.dot new/kiwi/.kiwi.dot
--- old/kiwi/.kiwi.dot 2007-04-19 14:10:16.000000000 +0200
+++ new/kiwi/.kiwi.dot 2007-10-29 10:29:17.000000000 +0100
@@ -3,30 +3,27 @@
"kiwi" -> "perl-XML-LibXML"
"kiwi" -> "perl-libwww-perl"
"kiwi" -> "screen"
+ "kiwi" -> "coreutils"
+ "kiwi" -> "[RECOMMENDS] smart zypper"
"kiwi-pxeboot" -> "syslinux"
+ "kiwi-pxeboot-prebuild" -> "syslinux"
+
"kiwi-desc-isoboot" -> "kiwi"
- "kiwi-desc-isoboot" -> "smart"
"kiwi-desc-isoboot" -> "syslinux"
"kiwi-desc-usbboot" -> "kiwi"
- "kiwi-desc-usbboot" -> "smart"
"kiwi-desc-vmxboot" -> "kiwi"
"kiwi-desc-vmxboot" -> "qemu"
-
"kiwi-desc-vmxboot" -> "multipath-tools"
- "kiwi-desc-vmxboot" -> "smart"
- "kiwi-desc-vmxboot" -> "qemu"
"kiwi-desc-netboot" -> "kiwi"
- "kiwi-desc-netboot" -> "smart"
-
- "kiwi-desc-xennetboot" -> "kiwi"
- "kiwi-desc-xennetboot" -> "smart"
- "kiwi-desc-xennetboot" -> "kiwi-desc-netboot"
"kiwi-desc-xenboot" -> "kiwi"
- "kiwi-desc-xenboot" -> "smart"
+
+ "kiwi-desc-oemboot" -> "kiwi"
+ "kiwi-desc-oemboot" -> "qemu"
+ "kiwi-desc-oemboot" -> "multipath-tools"
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/kiwi.pl new/kiwi/kiwi.pl
--- old/kiwi/kiwi.pl 2007-10-26 19:20:19.000000000 +0200
+++ new/kiwi/kiwi.pl 2007-10-29 10:29:17.000000000 +0100
@@ -32,7 +32,7 @@
#============================================
# Globals (Version)
#--------------------------------------------
-our $Version = "1.77";
+our $Version = "1.78";
our $openSUSE = "http://software.opensuse.org/download/";
our $ConfigFile = "$ENV{'HOME'}/.kiwirc";
our $ConfigStatus = 0;
@@ -1030,7 +1030,7 @@
$kiwi -> setLogHumanReadable();
if (! defined $LogFile) {
my $rootLog = $kiwi -> getRootLog();
- if (( -f $rootLog) && ($rootLog =~ /(.*)\..*\.screenrc\.log/)) {
+ if ((defined $rootLog) && ( -f $rootLog) && ($rootLog =~ /(.*)\..*\.screenrc\.log/)) {
my $logfile = $1;
$logfile = "$logfile.log";
$kiwi -> info ("Logfile available at: $logfile");
@@ -1038,7 +1038,7 @@
$kiwi -> done ();
}
}
- if ($Survive eq "yes") {
+ if ((defined $Survive) && ($Survive eq "yes")) {
if ($code != 0) {
return undef;
}
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 2007-10-26 19:20:17.000000000 +0200
+++ new/kiwi/modules/KIWIConfig.sh 2007-10-29 10:29:16.000000000 +0100
@@ -368,6 +368,18 @@
rm -rf $i
done
#==========================================
+ # remove unneeded files
+ #------------------------------------------
+ if [ -d /var/cache/zypp ];then
+ files="
+ /usr/lib*/libzypp* /usr/lib*/libx*
+ /var/cache/zypp /usr/X11R6/lib /usr/lib/xorg
+ "
+ for i in $files;do
+ rm -rf $i
+ done
+ fi
+ #==========================================
# remove unneeded tools
#------------------------------------------
local tools="
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/modules/KIWIConfigure.pm new/kiwi/modules/KIWIConfigure.pm
--- old/kiwi/modules/KIWIConfigure.pm 2007-10-26 19:20:16.000000000 +0200
+++ new/kiwi/modules/KIWIConfigure.pm 2007-10-29 10:29:15.000000000 +0100
@@ -104,7 +104,7 @@
$adduser .= " -m -d $home";
}
if (defined $group) {
- my $data = qx ( chroot $root grep -q $group /etc/group 2>&1 );
+ my $data = qx ( chroot $root grep -q ^$group: /etc/group 2>&1 );
my $code = $? >> 8;
if ($code != 0) {
$kiwi -> info ("Adding group: $group");
@@ -124,7 +124,7 @@
$adduser .= " -c '$realname'";
$moduser .= " -c '$realname'";
}
- my $data = qx ( chroot $root grep -q $user /etc/passwd 2>&1 );
+ my $data = qx ( chroot $root grep -q ^$user: /etc/passwd 2>&1 );
my $code = $? >> 8;
if ($code != 0) {
$kiwi -> info ("Adding user: $user [$group]");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/modules/KIWILog.pm new/kiwi/modules/KIWILog.pm
--- old/kiwi/modules/KIWILog.pm 2007-10-26 19:20:16.000000000 +0200
+++ new/kiwi/modules/KIWILog.pm 2007-10-29 10:29:15.000000000 +0100
@@ -684,7 +684,7 @@
my $this = shift;
my $rootLog = $this->{rootLog};
local $/;
- if (! open (FD, $rootLog)) {
+ if ((! defined $rootLog) || (! open (FD, $rootLog))) {
return undef;
}
my $stream = <FD>; close FD;
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 2007-10-26 19:20:17.000000000 +0200
+++ new/kiwi/modules/KIWIManager.pm 2007-10-29 10:29:16.000000000 +0100
@@ -176,6 +176,7 @@
my $screenLogs = $this->{screenLogs};
my $logs = 1;
my $code;
+ my $data;
#==========================================
# Check log location
#------------------------------------------
@@ -183,10 +184,21 @@
$logs = 0;
}
#==========================================
- # run process in screen session
+ # activate shell set -x mode
#------------------------------------------
- my $data = qx ( chmod 755 $screenCall );
my $fd = new FileHandle;
+ if ($fd -> open ($screenCall)) {
+ local $/; $data = <$fd>; $fd -> close();
+ if ($fd -> open (">$screenCall")) {
+ print $fd "set -x\n";
+ print $fd $data;
+ $fd -> close();
+ }
+ }
+ #==========================================
+ # run process in screen session
+ #------------------------------------------
+ $data = qx ( chmod 755 $screenCall );
if ($logs) {
$kiwi -> closeRootChannel();
$data = qx ( screen -L -D -m -c $screenCtrl $screenCall );
@@ -217,6 +229,7 @@
if ( $logs ) {
$kiwi -> error ($data);
}
+ $this -> freeLock();
$this -> resetInstallationSource();
return undef;
}
@@ -418,6 +431,7 @@
my @sopts = @{$source{$stype}{$alias}};
my @zopts = ();
foreach my $opt (@sopts) {
+ next if ! defined $opt;
my ($key,$val) = split (/=/,$opt);
#==========================================
# Adapt URI parameter
@@ -772,11 +786,19 @@
if (! $chroot) {
$this -> checkExclusiveLock();
$kiwi -> info ("Initializing image system on: $root...");
- my $forceChannels = join (",",@channelList);
my @installOpts = (
- "--catalog $forceChannels",
"--auto-agree-with-licenses"
);
+ #FIXME:
+ # zypper can't setup multiple --repo options and --catalog
+ # option is gone. I'm lost here in saying use only the kiwi
+ # created zypper services for this image. Therefore this is
+ # disabled now. I hope if the --data-dir options are available
+ # we can solve this in a clean way
+ # ----
+ #foreach my $c (@channelList) {
+ # push (@installOpts,"--repo $c");
+ #}
#==========================================
# Add package manager to package list
#------------------------------------------
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/modules/KIWIPattern.pm new/kiwi/modules/KIWIPattern.pm
--- old/kiwi/modules/KIWIPattern.pm 2007-10-04 16:21:22.000000000 +0200
+++ new/kiwi/modules/KIWIPattern.pm 2007-10-29 10:29:16.000000000 +0100
@@ -126,7 +126,10 @@
}
foreach my $url (@urllist) {
my @load = $this -> downloadPattern ( $url,$pat );
- $result .= $load[0]; push (@errors,$load[1]);
+ if ($load[0]) {
+ $result .= $load[0];
+ }
+ push (@errors,$load[1]);
}
if (! $result) {
if ($printinfo) {
@@ -159,6 +162,12 @@
my $pattern = shift;
my $arch = $this->{arch};
#==========================================
+ # check content...
+ #------------------------------------------
+ if (! $content) {
+ return undef;
+ }
+ #==========================================
# check content: DESCRDIR...
#------------------------------------------
my $perr = 1;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/modules/KIWIRoot.pm new/kiwi/modules/KIWIRoot.pm
--- old/kiwi/modules/KIWIRoot.pm 2007-10-26 19:20:17.000000000 +0200
+++ new/kiwi/modules/KIWIRoot.pm 2007-10-29 10:29:16.000000000 +0100
@@ -139,7 +139,7 @@
my $overlay = $root[2];
my $root = $root[0];
if ( ! defined $root ) {
- $kiwi -> error ("Couldn't create root dir: $root: $!");
+ $kiwi -> error ("Couldn't create root directory: $!");
$kiwi -> failed ();
return undef;
}
@@ -224,31 +224,10 @@
if (! $manager -> setupSignatureCheck()) {
return undef;
}
- #==========================================
- # Add source, install and clean source
- #------------------------------------------
- if (! $manager -> setupInstallationSource()) {
- return undef;
- }
- if (! $manager -> setupRootSystem(@initPacs)) {
- $manager -> resetInstallationSource();
- return undef;
- }
- #==========================================
- # reset installation source
- #------------------------------------------
- if (! $manager -> resetInstallationSource()) {
- return undef;
- }
- #==========================================
- # Reset preperation checks
- #------------------------------------------
- if (! $manager -> resetSignatureCheck()) {
- return undef;
- }
#==================================
# Copy/touch some defaults files
#----------------------------------
+ $kiwi -> info ("Creating default template files for new root system");
qx ( mkdir -p $root/etc/sysconfig );
qx ( mkdir -p $root/var/log/YaST2 );
# need mtab at least empty for mount calls
@@ -279,7 +258,30 @@
# need resolv.conf for internal chroot name resolution
qx ( cp /etc/resolv.conf $root/etc 2>&1 );
qx ( cp $main::KConfig $root/.kconfig 2>&1 );
+ $kiwi -> done();
+ #==========================================
+ # Add source, install and clean source
+ #------------------------------------------
+ if (! $manager -> setupInstallationSource()) {
+ return undef;
+ }
+ if (! $manager -> setupRootSystem(@initPacs)) {
+ $manager -> resetInstallationSource();
+ return undef;
+ }
+ #==========================================
+ # reset installation source
+ #------------------------------------------
+ if (! $manager -> resetInstallationSource()) {
+ return undef;
+ }
+ #==========================================
+ # Reset preperation checks
+ #------------------------------------------
+ if (! $manager -> resetSignatureCheck()) {
+ return undef;
+ }
#==================================
# Create default fstab file
#----------------------------------
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/.revision new/kiwi/.revision
--- old/kiwi/.revision 2007-10-26 19:29:48.000000000 +0200
+++ new/kiwi/.revision 2007-10-29 13:49:25.000000000 +0100
@@ -1 +1 @@
-735
\ No newline at end of file
+737
\ No newline at end of file
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/tools/helper/createLiveCD new/kiwi/tools/helper/createLiveCD
--- old/kiwi/tools/helper/createLiveCD 2007-08-23 16:19:46.000000000 +0200
+++ new/kiwi/tools/helper/createLiveCD 2007-10-29 10:29:14.000000000 +0100
@@ -5,8 +5,8 @@
exit 1
fi
-kiwi --root $HOME/mydvd --prepare /usr/share/kiwi/image/kwliveDVD-suse-10.3 && \
+kiwi --root $HOME/mydvd --prepare /usr/share/kiwi/image/kwliveCD-suse-10.3 && \
kiwi --create $HOME/mydvd -d $HOME
-file=`ls -1 $HOME/liveDVD-suse-10.3*.iso`
+file=`ls -1 $HOME/openSUSE-10.3*.iso`
echo "ISO image created: $file"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org