Hello community,
here is the log from the commit of package kiwi
checked in at Fri Jul 27 01:46:35 CEST 2007.
--------
--- arch/i386/kiwi/kiwi.changes 2007-07-24 16:37:20.000000000 +0200
+++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2007-07-25 15:31:53.631823000 +0200
@@ -1,0 +2,14 @@
+Wed Jul 25 10:00:25 CEST 2007 - ms@suse.de
+
+- v1.49
+- added setValidateRepositoryType() method
+- fixed creation of stick image, it might happen that there is no space
+ left to copy the grub stages or the grub message file
+- fixed mountSystem() in case of squashfs/aufs mounts to use
+ eventually existing write extend instead of creating a new one
+ all the time which overwrites the previously stored data.
+- fix by Jan-Christoph Bornschlegel
+ extraction of message file from initrd doesn't work in case of
+ relative paths
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.q27082/_old 2007-07-27 01:46:24.000000000 +0200
+++ /var/tmp/diff_new_pack.q27082/_new 2007-07-27 01:46:24.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kiwi (Version 1.48)
+# spec file for package kiwi (Version 1.49)
#
# 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.48
+Version: 1.49
Release: 1
Group: System/Management
License: GPL v2 or later
@@ -302,6 +302,17 @@
%{_datadir}/kiwi/image/xenboot/suse*
%changelog
+* Wed Jul 25 2007 - ms@suse.de
+- v1.49
+- added setValidateRepositoryType() method
+- fixed creation of stick image, it might happen that there is no space
+ left to copy the grub stages or the grub message file
+- fixed mountSystem() in case of squashfs/aufs mounts to use
+ eventually existing write extend instead of creating a new one
+ all the time which overwrites the previously stored data.
+- fix by Jan-Christoph Bornschlegel
+ extraction of message file from initrd doesn't work in case of
+ relative paths
* Tue Jul 24 2007 - ms@suse.de
- v1.48
- fixed pattern support for local repositories
++++++ 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-07-24 14:03:52.000000000 +0200
+++ new/kiwi/kiwi.pl 2007-07-25 15:30:58.000000000 +0200
@@ -31,7 +31,7 @@
#============================================
# Globals (Version)
#--------------------------------------------
-our $Version = "1.48";
+our $Version = "1.49";
our $SchemeVersion = "1.4";
our $openSUSE = "http://software.opensuse.org/download/";
#============================================
@@ -195,6 +195,10 @@
$xml -> addRepository (\@AddRepositoryType,\@AddRepository);
}
#==========================================
+ # Validate repo types
+ #------------------------------------------
+ $xml -> setValidateRepositoryType();
+ #==========================================
# Check for add-package option
#------------------------------------------
if (defined @AddPackage) {
@@ -381,6 +385,10 @@
$xml -> addRepository (\@AddRepositoryType,\@AddRepository);
}
#==========================================
+ # Validate repo types
+ #------------------------------------------
+ $xml -> setValidateRepositoryType();
+ #==========================================
# Initialize root system, use existing root
#------------------------------------------
$root = new KIWIRoot (
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-23 17:58:43.000000000 +0200
+++ new/kiwi/modules/KIWIBoot.pm 2007-07-25 15:30:58.000000000 +0200
@@ -338,7 +338,7 @@
$kiwi -> info ("Creating stick image");
my $name = $initrd; $name =~ s/gz$/stickboot/;
my $size = qx (du -ks $tmpdir | cut -f1 2>&1);
- chomp ($size); $size += 1024;
+ chomp ($size); $size += 2048;
$sysird = int ( $size / 1024 );
$sysird = $sysird + 1;
$status = qx (dd if=/dev/zero of=$name bs=1k count=$size 2>&1);
@@ -377,12 +377,13 @@
# check for message file in initrd
#------------------------------------------
my $message = "'image/loader/message'";
- $status = qx (cd /mnt/ && gzip -cd $initrd | cpio -d -i $message 2>&1);
+ $status = qx (gzip -cd $initrd | (cd /mnt && cpio -d -i $message 2>&1));
$result = $? >> 8;
if ($result != 0) {
$kiwi -> failed ();
$kiwi -> error ("Couldn't find message file: $status");
$kiwi -> failed ();
+ qx (umount /mnt/ 2>&1);
return undef;
}
qx (umount /mnt/ 2>&1);
@@ -693,13 +694,9 @@
#------------------------------------------
if ($syszip > 0) {
$kiwi -> info ("Creating VM boot image");
- my $size = qx (du -ks $tmpdir | cut -f1 2>&1);
- chomp ($size); $size += 1024;
- $sysird = int ( $size / 1024 );
- $sysird = $sysird + 1;
$sysname= $initrd; $sysname =~ s/gz$/vmboot/;
my $size = qx (du -ks $tmpdir | cut -f1 2>&1);
- chomp ($size); $size += 1024;
+ chomp ($size); $size += 2048;
$sysird = int ( $size / 1024 );
$sysird = $sysird + 1;
$status = qx (dd if=/dev/zero of=$sysname bs=1k count=$size 2>&1);
@@ -873,7 +870,7 @@
# check for message file in initrd
#------------------------------------------
my $message = "'image/loader/message'";
- $status = qx (cd /mnt/ && gzip -cd $initrd | cpio -d -i $message 2>&1);
+ $status = qx (gzip -cd $initrd | (cd /mnt && cpio -d -i $message 2>&1));
$result = $? >> 8;
if ($result != 0) {
$kiwi -> failed ();
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 2007-07-23 17:58:43.000000000 +0200
+++ new/kiwi/modules/KIWILinuxRC.sh 2007-07-25 15:30:58.000000000 +0200
@@ -1031,14 +1031,18 @@
# check and mount the filesystem
# ----
if test $LOCAL_BOOT = "no" && test $systemIntegrity = "clean";then
- Echo "Creating EXT2 filesystem for write extend on $rwDevice..."
- if ! mke2fs $rwDevice >/dev/null 2>&1;then
- systemException \
- "Failed to create ext2 filesystem" \
- "reboot"
+ if ! mount $rwDevice $rwDir >/dev/null 2>&1;then
+ Echo "Creating EXT2 filesystem for RW data on $rwDevice..."
+ if ! mke2fs $rwDevice >/dev/null 2>&1;then
+ systemException \
+ "Failed to create ext2 filesystem" \
+ "reboot"
+ fi
+ Echo "Checking EXT2 write extend..."
+ e2fsck -y -f $rwDevice >/dev/null 2>&1
+ else
+ umount $rwDevice
fi
- Echo "Checking EXT2 write extend..."
- e2fsck -y -f $rwDevice >/dev/null 2>&1
fi
if ! mount $rwDevice $rwDir >/dev/null 2>&1;then
retval=1
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-07-19 17:26:08.000000000 +0200
+++ new/kiwi/modules/KIWIManager.pm 2007-07-25 15:30:58.000000000 +0200
@@ -398,7 +398,7 @@
}
}
my $sadd = "--non-interactive";
- $sadd = $sadd." --auto-agree-with-licenses";
+ #$sadd = $sadd." --auto-agree-with-licenses";
$sadd = $sadd." service-add @zopts $alias";
if (! $chroot) {
$kiwi -> info ("Adding local zypper service: $alias");
@@ -692,7 +692,8 @@
$kiwi -> info ("Initializing image system on: $root...");
my $forceChannels = join (",",@channelList);
my @installOpts = (
- "--catalog $forceChannels"
+ "--catalog $forceChannels",
+ "-y"
);
#==========================================
# Add package manager to package list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/modules/KIWIXML.pm new/kiwi/modules/KIWIXML.pm
--- old/kiwi/modules/KIWIXML.pm 2007-07-18 10:02:51.000000000 +0200
+++ new/kiwi/modules/KIWIXML.pm 2007-07-25 15:30:58.000000000 +0200
@@ -695,28 +695,43 @@
# types refer to the package manager documentation
# ---
my $this = shift;
- my $kiwi = $this->{kiwi};
my @node = $this->{repositNodeList} -> get_nodelist();
my %result;
foreach my $element (@node) {
my $type = $element -> getAttribute("type");
my $stag = $element -> getElementsByTagName ("source") -> get_node(1);
my $source = $this -> resolveLink ( $stag -> getAttribute ("path") );
- if (($source =~ /^opensuse:\/\//) && ($type ne "rpm-md")) {
- my $state = $kiwi -> state();
- if ($state eq "I") {
- $kiwi -> done ();
- }
- $kiwi -> warning ("opensuse URL used, forcing repo type [rpm-md]");
- $type = "rpm-md";
- $element -> setAttribute ("type",$type);
- }
$result{$source} = $type;
}
return %result;
}
#==========================================
+# setValidateRepositoryType
+#------------------------------------------
+sub setValidateRepositoryType {
+ # ...
+ # check the source URL and the used repo type. in case of
+ # opensuse:// we have to use the rpm-md repo type because the
+ # openSUSE buildservice repositories are no valid yast2 repos
+ # ---
+ my $this = shift;
+ my $kiwi = $this->{kiwi};
+ my @node = $this->{repositNodeList} -> get_nodelist();
+ foreach my $element (@node) {
+ my $type = $element -> getAttribute("type");
+ my $stag = $element -> getElementsByTagName ("source") -> get_node(1);
+ my $source = $this -> resolveLink ( $stag -> getAttribute ("path") );
+ if (($source =~ /^opensuse:\/\//) && ($type ne "rpm-md")) {
+ $kiwi -> warning ("$source: forcing repo type [rpm-md]");
+ $element -> setAttribute ("type","rpm-md");
+ $kiwi -> done();
+ }
+ }
+ return $this;
+}
+
+#==========================================
# setRepository
#------------------------------------------
sub setRepository {
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org