Hello community,
here is the log from the commit of package kiwi
checked in at Fri Aug 24 01:27:46 CEST 2007.
--------
--- arch/i386/kiwi/kiwi.changes 2007-08-20 09:28:06.000000000 +0200
+++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2007-08-22 14:02:19.552112000 +0200
@@ -1,0 +2,11 @@
+Mon Aug 20 10:00:49 CEST 2007 - ms@suse.de
+
+- v1.54
+- use gzip --force in KIWIImage to compress data
+- added configuration of timezone/locale and keytable
+- activate splash screen for isoboot images, live media (#293742)
+- added zypper type conversion from rpm-dir to plaindir (#301839)
+- implement splash support if installed (#293742)
+- added loop detection for image inheritance (#296397)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.M28035/_old 2007-08-24 01:26:58.000000000 +0200
+++ /var/tmp/diff_new_pack.M28035/_new 2007-08-24 01:26:58.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kiwi (Version 1.53)
+# spec file for package kiwi (Version 1.54)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -15,7 +15,7 @@
BuildRequires: module-init-tools perl perl-XML-LibXML perl-libwww-perl screen smart syslinux
Requires: perl perl-XML-LibXML perl-libwww-perl screen
Summary: OpenSuSE - KIWI Image System
-Version: 1.53
+Version: 1.54
Release: 1
Group: System/Management
License: GPL v2 or later
@@ -343,6 +343,14 @@
%changelog
* Mon Aug 20 2007 - ms@suse.de
+- v1.54
+- use gzip --force in KIWIImage to compress data
+- added configuration of timezone/locale and keytable
+- activate splash screen for isoboot images, live media (#293742)
+- added zypper type conversion from rpm-dir to plaindir (#301839)
+- implement splash support if installed (#293742)
+- added loop detection for image inheritance (#296397)
+* Mon Aug 20 2007 - ms@suse.de
- v1.53
- make zypper work with kiwi (#298731,#300133)
* Tue Aug 14 2007 - ms@suse.de
++++++ kiwi.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/kiwi.pl new/kiwi/kiwi.pl
--- old/kiwi/kiwi.pl 2007-08-20 09:26:09.000000000 +0200
+++ new/kiwi/kiwi.pl 2007-08-21 10:40:32.000000000 +0200
@@ -31,7 +31,7 @@
#============================================
# Globals (Version)
#--------------------------------------------
-our $Version = "1.53";
+our $Version = "1.54";
our $SchemeVersion = "1.4";
our $openSUSE = "http://software.opensuse.org/download/";
#============================================
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 2007-07-27 14:53:01.000000000 +0200
+++ new/kiwi/modules/KIWIBoot.pm 2007-08-21 10:40:28.000000000 +0200
@@ -325,7 +325,7 @@
print FD "\n";
print FD "title KIWI Stick boot\n";
print FD " root (hd0,0)\n";
- print FD " kernel /boot/linux vga=0x318\n";
+ print FD " kernel /boot/linux vga=0x317\n";
print FD " initrd /boot/initrd\n";
close FD;
$kiwi -> done();
@@ -580,7 +580,7 @@
print FD "timeout 10\n";
print FD "framebuffer 1\n";
print FD "title KIWI CD boot\n";
- print FD " kernel (cd)/boot/linux vga=0x318 ramdisk_size=256000\n";
+ print FD " kernel (cd)/boot/linux vga=0x317 ramdisk_size=256000\n";
print FD " initrd (cd)/boot/initrd\n";
close FD;
$kiwi -> done();
@@ -686,7 +686,7 @@
print FD "\n";
print FD "title KIWI VM boot\n";
print FD " root (hd0,0)\n";
- print FD " kernel /boot/linux.vmx vga=0x318\n";
+ print FD " kernel /boot/linux.vmx vga=0x317\n";
print FD " initrd /boot/initrd.vmx\n";
close FD;
$kiwi -> done();
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-08-13 14:58:02.000000000 +0200
+++ new/kiwi/modules/KIWIConfig.sh 2007-08-22 13:58:27.000000000 +0200
@@ -163,6 +163,37 @@
# suseConfig
#--------------------------------------
function suseConfig {
+ #======================================
+ # keytable
+ #--------------------------------------
+ if [ ! -z "$keytable" ];then
+ cat etc/sysconfig/keyboard |\
+ sed -e s@KEYTABLE=\".*\"@KEYTABLE=\"$keytable\"@ \
+ > etc/sysconfig/keyboard.new
+ mv etc/sysconfig/keyboard.new etc/sysconfig/keyboard
+ fi
+ #======================================
+ # locale
+ #--------------------------------------
+ if [ ! -z "$locale" ];then
+ cat /etc/sysconfig/language |\
+ sed -e s@RC_LANG=\".*\"@RC_LANG=\"$locale\"@ \
+ > etc/sysconfig/language.new
+ mv etc/sysconfig/language.new etc/sysconfig/language
+ fi
+ #======================================
+ # timezone
+ #--------------------------------------
+ if [ ! -z "$timezone" ];then
+ if [ -f /usr/share/zoneinfo/$timezone ];then
+ mv /usr/share/zoneinfo/$timezone /etc/localtime
+ else
+ echo "timezone: $timezone not found"
+ fi
+ fi
+ #======================================
+ # SuSEconfig
+ #--------------------------------------
/sbin/SuSEconfig
}
@@ -286,10 +317,16 @@
local theme=$1
local loader=$2
export PATH=$PATH:/usr/sbin
+ #======================================
+ # check for gfxboot package
+ #--------------------------------------
if [ ! -d /usr/share/gfxboot ];then
echo "gfxboot not installed... skipped"
return
fi
+ #======================================
+ # create boot theme
+ #--------------------------------------
cd /usr/share/gfxboot
make -C themes/$theme prep
make -C themes/$theme
@@ -308,4 +345,39 @@
mv themes/$theme/boot/message /image/loader
fi
make -C themes/$theme clean
+ #======================================
+ # create splash screen
+ #--------------------------------------
+ if [ ! -f /sbin/splash ];then
+ echo "bootsplash not installed... skipped"
+ return
+ fi
+ sname[0]="08000600.spl"
+ sname[1]="10240768.spl"
+ sname[2]="12801024.spl"
+ sname[3]="14001050.spl"
+ sname[4]="16001200.spl"
+ index=0
+ if [ ! $theme = "SuSE" ];then
+ theme="SuSE-$theme"
+ fi
+ for cfg in 800x600 1024x768 1280x1024 1400x1050 1600x1200;do
+ /sbin/splash -s -c -f \
+ /etc/bootsplash/themes/$theme/config/bootsplash-$cfg.cfg |\
+ gzip -9c \
+ > /image/loader/${sname[$index]}
+ index=`expr $index + 1`
+ tdir=/image/loader/xxx
+ mkdir $tdir
+ cp -a --parents /etc/bootsplash/themes/$theme/config/*-$cfg.* $tdir
+ cp -a --parents /etc/bootsplash/themes/$theme/images/*-$cfg.* $tdir
+ ln -s /etc/bootsplash/themes/$theme/config/bootsplash-$cfg.cfg \
+ $tdir/etc/splash.cfg
+ pushd $tdir
+ chmod -R a+rX .
+ find | cpio --quiet -o -H newc |\
+ gzip -9 >> /image/loader/${sname[$index]}
+ popd
+ rm -rf $tdir
+ done
}
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 2007-07-23 17:58:43.000000000 +0200
+++ new/kiwi/modules/KIWIImage.pm 2007-08-21 10:40:28.000000000 +0200
@@ -280,7 +280,7 @@
if ($dest !~ /^\//) {
$dest = $pwd."/".$dest;
}
- my $data = qx (cd $tree && find . | cpio @cpio | gzip > $dest);
+ my $data = qx (cd $tree && find . | cpio @cpio | gzip -f > $dest);
my $code = $? >> 8;
if ($code != 0) {
$kiwi -> error ("Couldn't create cpio archive");
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-08-20 09:26:08.000000000 +0200
+++ new/kiwi/modules/KIWIManager.pm 2007-08-22 13:58:28.000000000 +0200
@@ -398,6 +398,12 @@
if ($val eq "yast2") {
$val = "YaST";
}
+ if ($val eq "rpm-dir") {
+ $val = "plaindir";
+ }
+ if ($val eq "rpm-md") {
+ $val = "YUM";
+ }
push (@zopts,"--type $val");
}
}
@@ -649,8 +655,9 @@
#==========================================
# Create screen call file
#------------------------------------------
- print $fd "smart update @channelList\n";
- print $fd "test \$? = 0 && smart install @packs @installOpts\n";
+ #print $fd "smart update @channelList\n";
+ #print $fd "test \$? = 0 && smart install @packs @installOpts\n";
+ print $fd "smart install @packs @installOpts\n";
print $fd "echo \$? > $screenCall.exit\n";
print $fd "rm -f $root/etc/smart/channels/*\n";
} else {
@@ -682,8 +689,9 @@
#==========================================
# Create screen call file
#------------------------------------------
- print $fd "chroot $root smart update\n";
- print $fd "test \$? = 0 && chroot $root smart install @install ";
+ #print $fd "chroot $root smart update\n";
+ #print $fd "test \$? = 0 && chroot $root smart install @install ";
+ print $fd "chroot $root smart install @install ";
print $fd "@installOpts\n";
print $fd "echo \$? > $screenCall.exit\n";
}
@@ -710,7 +718,22 @@
print $fd "echo \$? > $screenCall.exit\n";
} else {
$kiwi -> info ("Installing image packages...");
- print $fd "chroot $root @zypper install @packs\n";
+ my $querypack = "rpm -qa --qf %'{NAME}\n'";
+ my @installed = qx ( chroot $root $querypack 2>/dev/null);
+ chomp ( @installed );
+ my @install = ();
+ foreach my $need (@packs) {
+ my $found = 0;
+ foreach my $have (@installed) {
+ if ($have eq $need) {
+ $found = 1; last;
+ }
+ }
+ if (! $found) {
+ push @install,$need;
+ }
+ }
+ print $fd "chroot $root @zypper install @install\n";
print $fd "echo \$? > $screenCall.exit\n";
}
$fd -> close();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/modules/KIWIScheme.xsd new/kiwi/modules/KIWIScheme.xsd
--- old/kiwi/modules/KIWIScheme.xsd 2007-07-18 10:02:51.000000000 +0200
+++ new/kiwi/modules/KIWIScheme.xsd 2007-08-22 13:58:27.000000000 +0200
@@ -240,6 +240,7 @@