Hello community,
here is the log from the commit of package kiwi for openSUSE:Factory checked in
at 2012-03-09 21:22:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-03-06
13:38:14.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2012-03-09
21:22:21.000000000 +0100
@@ -1,0 +2,84 @@
+Fri Mar 9 14:56:40 CET 2012 - m...@suse.de
+
+- v5.02.18 released
+
+-------------------------------------------------------------------
+Fri Mar 9 12:07:03 CET 2012 - m...@suse.de
+
+- fixed entry for hv_netvsc.ko driver
+
+-------------------------------------------------------------------
+Thu Mar 8 15:51:18 CET 2012 - m...@suse.de
+
+- fixed rpm database consistency check
+
+-------------------------------------------------------------------
+Thu Mar 8 15:01:47 CET 2012 - m...@suse.de
+
+- use string comparison operator for strings and not numeric op
+
+-------------------------------------------------------------------
+Thu Mar 8 12:23:37 CET 2012 - m...@suse.de
+
+- add new kernel module paths for Microsoft HyperV (hv) modules
+
+-------------------------------------------------------------------
+Tue Mar 6 22:23:39 CET 2012 - m...@suse.de
+
+- fixed use of != operator in KIWIXMLValidator
+
+-------------------------------------------------------------------
+Tue Mar 6 20:50:32 CET 2012 - m...@suse.de
+
+- removed the rpmLibs() tricks, all that sucks
+
+-------------------------------------------------------------------
+Tue Mar 6 16:34:41 CET 2012 - m...@suse.de
+
+- fixed typo in KIWICollect.pm
+
+-------------------------------------------------------------------
+Tue Mar 6 16:30:37 CET 2012 - m...@suse.de
+
+- added which based search for dracut/mkinitrd/depmod
+
+-------------------------------------------------------------------
+Tue Mar 6 09:18:44 CET 2012 - rjsch...@suse.de
+
+- remove unused function callSUSEInitrdScripts
+ The initrd is created by setupRHELInitrd and setupSUSEInitrd, there is no
+ call in the code to callSUSEInitrdScripts
+
+-------------------------------------------------------------------
+Mon Mar 5 22:41:46 CET 2012 - m...@suse.de
+
+- fixed removePackages():
+ * use options --noscripts --allmatches
+ * respect return code from rpm call
+ * make sure proc is mounted
+
+-------------------------------------------------------------------
+Mon Mar 5 22:14:03 CET 2012 - rjsch...@suse.de
+
+- added function updateModuleDependencies() to update the kernel
+ modules dependency list. Call this function prior to creating
+ the initrd. This allows the user to add custom kernel modules
+ and makes sure these get picked up when mkinitrd runs
+
+-------------------------------------------------------------------
+Mon Mar 5 20:55:48 CET 2012 - m...@suse.de
+
+- make removePackages() to work with yum
+
+-------------------------------------------------------------------
+Mon Mar 5 17:42:56 CET 2012 - m...@suse.de
+
+- allow fixup of image min size if given size is too small
+- fixed partition size check
+
+-------------------------------------------------------------------
+Mon Mar 5 15:49:49 CET 2012 - m...@suse.de
+
+- fixed logging of non CR terminated lines when in --logfile mode
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.Lk05x0/_old 2012-03-09 21:22:24.000000000 +0100
+++ /var/tmp/diff_new_pack.Lk05x0/_new 2012-03-09 21:22:24.000000000 +0100
@@ -22,7 +22,7 @@
Summary: OpenSuSE - KIWI Image System
License: GPL-2.0
Group: System/Management
-Version: 5.02.17
+Version: 5.02.18
Release: 0
# requirements to build packages
BuildRequires: gcc-c++
@@ -363,11 +363,11 @@
%build
# empty because of rpmlint warning rpm-buildroot-usage
-%if %{suse_version} > 1140
-
-%check
-make test
-%endif
+#%if %{suse_version} > 1140
+#
+#%check
+#make test
+#%endif
%install
# build
++++++ 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-03-02 16:26:37.000000000 +0100
+++ new/kiwi/.revision 2012-03-09 14:57:02.000000000 +0100
@@ -1 +1 @@
-de229f456ecadd7dfbcc408253808b79b48f4d08
+0ed9c17c2b116ea83c6e790467e755f06f2a100c
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-03-05 10:39:10.000000000 +0100
+++ new/kiwi/modules/KIWIBoot.pm 2012-03-09 14:57:02.000000000 +0100
@@ -2003,36 +2003,26 @@
$root = $deviceMap{2};
}
#==========================================
- # check partition sizes
+ # check system partition size
#------------------------------------------
- if ($syszip > 0) {
- my $sizeOK = 1;
- my $systemPSize = $this->getStorageSize ($deviceMap{2});
- my $systemISize = $main::global -> isize ($system);
- $systemISize /= 1024;
- chomp $systemPSize;
- #print "_______A $systemPSize : $systemISize\n";
- if ($systemPSize < $systemISize) {
- $syszip += 10;
- $sizeOK = 0;
- }
- if (! $sizeOK) {
- #==========================================
- # bad partition alignment try again
- #------------------------------------------
- sleep (1);
- $this -> deleteVolumeGroup();
- $this -> cleanLoopMaps();
- qxx ("/sbin/losetup -d $this->{loop}");
- } else {
- #==========================================
- # looks good go for it
- #------------------------------------------
- last;
- }
+ my $sizeOK = 1;
+ my $systemPSize = $this->getStorageSize ($root);
+ my $systemISize = $main::global -> isize ($system);
+ $systemISize /= 1024;
+ chomp $systemPSize;
+ #print "_______A $systemPSize : $systemISize\n";
+ if ($systemPSize <= $systemISize) {
+ #==========================================
+ # system partition still too small
+ #------------------------------------------
+ sleep (1);
+ $this -> deleteVolumeGroup();
+ $this -> cleanLoopMaps();
+ qxx ("/sbin/losetup -d $this->{loop}");
+ $this -> __updateDiskSize (100);
} else {
#==========================================
- # entire disk used
+ # looks good go for it
#------------------------------------------
last;
}
@@ -5702,18 +5692,20 @@
if ($cmdlBytes > 0) {
if ($cmdlBytes < $minBytes) {
$kiwi -> warning (
- "given size is smaller than calculated min size"
+ "given size is smaller than calculated min
size, fixing"
);
$kiwi -> oops();
+ $cmdlBytes = $minBytes;
}
$minBytes = $cmdlBytes;
$this->{sizeSetByUser} = 1;
} elsif ($XMLBytes > 0) {
if ($XMLBytes < $minBytes) {
$kiwi -> warning (
- "given size is smaller than calculated min size"
+ "given size is smaller than calculated min
size, fixing"
);
$kiwi -> oops();
+ $XMLBytes = $minBytes;
}
$this->{sizeSetByUser} = 1;
$minBytes = $XMLBytes;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/modules/KIWICollect.pm
new/kiwi/modules/KIWICollect.pm
--- old/kiwi/modules/KIWICollect.pm 2012-03-02 16:26:37.000000000 +0100
+++ new/kiwi/modules/KIWICollect.pm 2012-03-09 14:57:02.000000000 +0100
@@ -838,7 +838,7 @@
$this->logMsg('I', "taking $packPointer->{'appdata'}");
open(XML, '<', $packPointer->{'appdata'});
while ( <XML> ) {
- next if m,<?xml,;
+ next if m,<\?xml,;
next if m,^\s*</?applications,;
$this->{m_appdata} .= $_;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/modules/KIWIConfig.txt
new/kiwi/modules/KIWIConfig.txt
--- old/kiwi/modules/KIWIConfig.txt 2012-03-02 16:26:37.000000000 +0100
+++ new/kiwi/modules/KIWIConfig.txt 2012-03-09 14:57:02.000000000 +0100
@@ -5,6 +5,7 @@
<strip type="delete">
<file name="/usr/share/info"/>
<file name="/usr/share/X11/locale"/>
+ <file name="/usr/share/backgrounds"/>
<file name="/var/log/*"/>
</strip>
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-03-05 15:21:28.000000000 +0100
+++ new/kiwi/modules/KIWIGlobals.pm 2012-03-09 14:57:07.000000000 +0100
@@ -42,7 +42,7 @@
# Globals (generic)
#------------------------------------------
my %data;
- $data{Version} = "5.02.17";
+ $data{Version} = "5.02.18";
$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/KIWILinuxRC.sh
new/kiwi/modules/KIWILinuxRC.sh
--- old/kiwi/modules/KIWILinuxRC.sh 2012-03-05 15:21:28.000000000 +0100
+++ new/kiwi/modules/KIWILinuxRC.sh 2012-03-09 14:57:02.000000000 +0100
@@ -889,19 +889,38 @@
Echo "*** not implemented ***"
}
#======================================
+# updateModuleDependencies
+#--------------------------------------
+function updateModuleDependencies {
+ # /.../
+ # update the kernel module dependencies list
+ # ---
+ local depmodExec=$(which depmod 2>/dev/null)
+ if [ ! -x "$depmodExec" ];then
+ Echo "Could not find depmod executable"
+ Echo "Skipping module dependency update"
+ systemIntegrity=unknown
+ return
+ fi
+ if ! $depmodExec -a;then
+ Echo "Module dependency update failed."
+ systemIntegrity=unknown
+ fi
+}
+#======================================
# setupRHELInitrd
#--------------------------------------
function setupRHELInitrd {
# /.../
- # call mkinitrd on RHEL systems to create the distro initrd.
- # Note: mkinitrd will be obsolete on RHEL in future releases
- # so this function is a candiate for a rewrite
+ # call mkinitrd/dracut on RHEL systems to create the distro initrd.
# ----
bootLoaderOK=1
local umountProc=0
local umountSys=0
local systemMap=0
local haveVMX=0
+ local dracutExec=$(which dracut 2>/dev/null)
+ local mkinitrdExec=$(which mkinitrd 2>/dev/null)
local params
local running
local rlinux
@@ -927,15 +946,16 @@
haveVMX=1
fi
fi
+ updateModuleDependencies
params=" -f /boot/initrd-$kernel_version $kernel_version"
- if [ -x /sbin/mkinitrd ] ; then
- if ! mkinitrd $params;then
+ if [ -x "$mkinitrdExec" ] ; then
+ if ! $mkinitrdExec $params;then
Echo "Can't create initrd"
systemIntegrity=unknown
bootLoaderOK=0
fi
- elif [ -x /sbin/dracut ]; then
- if ! dracut -H $params;then
+ elif [ -x "$dracutExec" ]; then
+ if ! $dracutExec -H $params;then
Echo "Can't create initrd"
systemIntegrity=unknown
bootLoaderOK=0
@@ -971,6 +991,7 @@
local umountSys=0
local systemMap=0
local haveVMX=0
+ local mkinitrdExec=$(which mkinitrd 2>/dev/null)
local params
local running
local rlinux
@@ -990,7 +1011,8 @@
if [ -f /etc/init.d/boot.device-mapper ];then
/etc/init.d/boot.device-mapper start
fi
- if grep -qi param_B /sbin/mkinitrd;then
+ updateModuleDependencies
+ if grep -qi param_B $mkinitrdExec;then
params="-B"
fi
if [ $bootLoaderOK = "1" ];then
@@ -1000,7 +1022,7 @@
haveVMX=1
fi
fi
- if ! mkinitrd $params;then
+ if ! $mkinitrdExec $params;then
Echo "Can't create initrd"
systemIntegrity=unknown
bootLoaderOK=0
@@ -1022,37 +1044,6 @@
fi
}
#======================================
-# callSUSEInitrdScripts
-#--------------------------------------
-function callSUSEInitrdScripts {
- # /.../
- # create initrd with mkinitrd and extract the run_all.sh script
- # after that call the script in /lib/mkinitrd. The mkinitrd
- # package must be installed in the system image to do that
- # ----
- local prefix=$1
- if [ ! -d $prefix/lib/mkinitrd ];then
- Echo "No mkinitrd package installed"
- Echo "Can't call initrd scripts"
- return
- fi
- mkinitrd >/dev/null
- if [ ! -f $prefix/boot/initrd ];then
- Echo "No initrd file found"
- Echo "Can't call initrd scripts"
- return
- fi
- mkdir $prefix/tmp/suse
- cd $prefix/tmp/suse && gzip -cd $prefix/boot/initrd | cpio -i
- if [ ! -f $prefix/tmp/suse/run_all.sh ];then
- Echo "No run_all.sh script in initrd"
- Echo "Can't call initrd scripts"
- return
- fi
- Echo "Calling SUSE initrd scripts"
- chroot . bash ./run_all.sh
-}
-#======================================
# setupBootLoader
#--------------------------------------
function setupBootLoader {
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 2012-03-02 16:26:37.000000000 +0100
+++ new/kiwi/modules/KIWILog.pm 2012-03-09 14:57:02.000000000 +0100
@@ -505,7 +505,11 @@
# print message to log channel (stdin,file)
#------------------------------------------
if ((! defined $flag) || ($this->{fileLog})) {
- print $FD $result;
+ my $msg = $result;
+ if ($this->{fileLog}) {
+ $msg .= "\n" if ($msg !~ /\n$/);
+ }
+ print $FD $msg;
}
#==========================================
# save in cache if needed
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 2012-03-02 16:26:37.000000000 +0100
+++ new/kiwi/modules/KIWIManager.pm 2012-03-09 14:57:07.000000000 +0100
@@ -1384,16 +1384,15 @@
$fd -> close();
}
#==========================================
- # zypper
+ # zypper | ensconce | yum
#------------------------------------------
- if (($manager eq "zypper") || ($manager eq "ensconce")) {
- my @zypper = @{$this->{zypper_chroot}};
+ if (($manager eq "zypper")||($manager eq "ensconce")||($manager eq
"yum")) {
#==========================================
# Create screen call file
#------------------------------------------
$kiwi -> info ("Removing packages...");
my @removeOpts = (
- "--nodeps"
+ "--nodeps --allmatches --noscripts"
);
print $fd "function clean { kill \$SPID;";
print $fd "while kill -0 \$SPID &>/dev/null; do sleep 1;";
@@ -1402,36 +1401,15 @@
print $fd "while kill -0 \$SPID &>/dev/null; do sleep 1;done\n";
print $fd "echo 1 > $screenCall.exit; exit 1; }\n";
print $fd "trap clean INT TERM\n";
+ print $fd "@kchroot mount -t proc proc /proc"."\n";
print $fd "final=\$(@kchroot rpm -q @removePackages ";
print $fd " | grep -v 'is not installed')"."\n";
- print $fd "@kchroot rpm -e ";
- print $fd "@removeOpts \$final || true &\n";
- print $fd "SPID=\$!;wait \$SPID\n";
- print $fd "ECODE=\$?\n";
- print $fd "echo \$ECODE > $screenCall.exit\n";
- print $fd "exit \$ECODE\n";
- $fd -> close();
- }
- #==========================================
- # yum
- #------------------------------------------
- if ($manager eq "yum") {
- my @yum = @{$this->{yum_chroot}};
- #==========================================
- # Create screen call file
- #------------------------------------------
- $kiwi -> info ("Removing packages...");
- print $fd "function clean { kill \$SPID;";
- print $fd "while kill -0 \$SPID &>/dev/null; do sleep 1;";
- print $fd "if [ \"\$c\" = 5 ];then kill \$SPID;break;fi;";
- print $fd "c=\$((\$c+1));done;\n";
- print $fd "while kill -0 \$SPID &>/dev/null; do sleep 1;done\n";
- print $fd "echo 1 > $screenCall.exit; exit 1; }\n";
- print $fd "trap clean INT TERM\n";
- print $fd "@kchroot @yum remove @removePackages &\n";
+ print $fd "@kchroot rpm -e @removeOpts \$final &\n";
print $fd "SPID=\$!;wait \$SPID\n";
print $fd "ECODE=\$?\n";
print $fd "echo \$ECODE > $screenCall.exit\n";
+ print $fd "@kchroot umount /proc"."\n";
+ #print $fd "@kchroot /bin/bash\n";
print $fd "exit \$ECODE\n";
$fd -> close();
}
@@ -1895,15 +1873,6 @@
if ($this -> setupInstallPackages()) {
push (@packs,$manager);
}
- #==========================================
- # Setup baselibs
- #------------------------------------------
- $kiwi -> info ("Setting up bootstrap baselibs...");
- if (! $this -> rpmLibs()) {
- $kiwi -> failed();
- return;
- }
- $kiwi -> done();
$kiwi -> info ("Initializing image system on:
$root...");
#==========================================
# Create screen call file
@@ -1989,15 +1958,6 @@
if ($this -> setupInstallPackages()) {
push (@packs,$manager);
}
- #==========================================
- # Setup baselibs
- #------------------------------------------
- $kiwi -> info ("Setting up bootstrap baselibs...");
- if (! $this -> rpmLibs()) {
- $kiwi -> failed();
- return;
- }
- $kiwi -> done();
$kiwi -> info ("Initializing image system on:
$root...");
#==========================================
# check input list for pattern names
@@ -2133,15 +2093,6 @@
my $ensconce_args = "-i $imagename";
if (! $chroot) {
#==========================================
- # Setup baselibs
- #------------------------------------------
- $kiwi -> info ("Setting up bootstrap baselibs...");
- if (! $this -> rpmLibs()) {
- $kiwi -> failed();
- return;
- }
- $kiwi -> done();
- #==========================================
# Ensconce options
#------------------------------------------
$ensconce_args .= " -b";
@@ -2177,15 +2128,6 @@
if ($this -> setupInstallPackages()) {
push (@packs,$manager);
}
- #==========================================
- # Setup baselibs
- #------------------------------------------
- $kiwi -> info ("Setting up bootstrap baselibs...");
- if (! $this -> rpmLibs()) {
- $kiwi -> failed();
- return;
- }
- $kiwi -> done();
$kiwi -> info ("Initializing image system on:
$root...");
#==========================================
# check input list for group names
@@ -2302,10 +2244,10 @@
return;
}
#==========================================
- # cleanup baselibs
+ # setup baselibs
#------------------------------------------
if (! $chroot) {
- $this -> rpmLibs ("clean");
+ $this -> rpmLibs();
}
return $this;
}
@@ -2596,12 +2538,12 @@
return $this;
}
#==========================================
- # run a query on the database
+ # try to initialize rpm database
#------------------------------------------
- $data = qxx ("@kchroot /bin/rpm -q --whatprovides /bin &>/dev/null");
+ $data = qxx ("@kchroot /bin/rpm --initdb &>/dev/null");
$code = $? >> 8;
#==========================================
- # try to rebuild DB on failed query
+ # try to rebuild DB on failed init
#------------------------------------------
if ($code != 0) {
$kiwi -> info ('Rebuild RPM package db...');
@@ -2626,73 +2568,15 @@
#------------------------------------------
sub rpmLibs {
# ...
- # provide required libraries in order to make
- # rpm work correctly.
+ # try to fix rpm version incompatibility
# ---
my $this = shift;
- my $clean = shift;
- my $kiwi = $this->{kiwi};
- my $root = $this->{root};
- my $result = $this->{baselibs};
my @kchroot= @{$this->{kchroot}};
- my @result;
#==========================================
# cleanup baselibs
#------------------------------------------
- if ($clean) {
- if (! $result) {
- # no baselibs stored/copied...
- return $this;
- }
- $this -> cleanupRPMDatabase();
- @result = @{$result};
- my %dirlist = ();
- foreach my $l (@result) {
- my $dir = dirname ($l); $dirlist{$dir} = $dir;
- qxx ("@kchroot rpm -qf /$l &>/dev/null");
- my $code = $? >> 8;
- if ($code != 0) {
- $kiwi -> loginfo ("Cleaning baselib: $l\n");
- qxx ("rm -f $root/$l 2>&1");
- } elsif (-f "$root/$l.rpmnew") {
- $kiwi -> loginfo ("Restore rpmnew basefile:
$l\n");
- qxx ("mv $root/$l.rpmnew $root/$l");
- }
- }
- foreach my $dir (keys %dirlist) {
- qxx ("rmdir $dir 2>&1");
- }
- qxx ("@kchroot ldconfig 2>&1");
- return $this;
- }
- #==========================================
- # setup baselibs
- #------------------------------------------
- my @libs = (
- '/lib/libnsl*',
- '/lib/libnss_compat*',
- '/lib/libnss_files*',
- '/lib64/libnsl*',
- '/lib64/libnss_compat*',
- '/lib64/libnss_files*',
- '/sbin/ldconfig'
- );
- foreach my $item (@libs) {
- foreach my $l (glob ($item)) {
- if (($l) && (-f $l)) {
- $l =~ s/^\///;
- push @result,$l;
- }
- }
- }
- if (! @result) {
- return;
- }
- foreach my $l (@result) {
- my $dir = dirname ($l);
- qxx ("mkdir -p $root/$dir && cp /$l $root/$l 2>&1");
- }
- $this -> {baselibs} = \@result;
+ $this -> cleanupRPMDatabase();
+ qxx ("@kchroot ldconfig 2>&1");
return $this;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/modules/KIWIXMLValidator.pm
new/kiwi/modules/KIWIXMLValidator.pm
--- old/kiwi/modules/KIWIXMLValidator.pm 2012-03-02 16:26:37.000000000
+0100
+++ new/kiwi/modules/KIWIXMLValidator.pm 2012-03-09 14:57:07.000000000
+0100
@@ -497,7 +497,7 @@
return 1;
}
for my $pkgs (@pkgsNodes) {
- if ($pkgs != $defPackSection) {
+ if ("$pkgs" ne "$defPackSection") {
my $patternType = $pkgs -> getAttribute( 'patternType'
);
if ($patternType && $patternType ne $defPatternTypeVal)
{
my $kiwi = $this->{kiwi};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-12.1/config.xml
new/kiwi/system/boot/ix86/netboot/suse-12.1/config.xml
--- old/kiwi/system/boot/ix86/netboot/suse-12.1/config.xml 2012-03-02
16:26:37.000000000 +0100
+++ new/kiwi/system/boot/ix86/netboot/suse-12.1/config.xml 2012-03-09
14:57:07.000000000 +0100
@@ -39,6 +39,7 @@
<file name="drivers/gpu/drm/nouveau/nouveau.ko"/>
<file name="drivers/gpu/drm/radeon/radeon.ko"/>
<file name="drivers/hid/*"/>
+ <file name="drivers/hv/*"/>
<file name="drivers/ide/*"/>
<file name="drivers/input/keyboard/*"/>
<file name="drivers/input/mouse/*"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml
new/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml
--- old/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml 2012-03-02
16:26:37.000000000 +0100
+++ new/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml 2012-03-09
14:57:07.000000000 +0100
@@ -41,6 +41,7 @@
<file name="drivers/char/lp.ko"/>
<file name="drivers/gpu/drm/i915/i915.ko"/>
<file name="drivers/hid/*"/>
+ <file name="drivers/hv/*"/>
<file name="drivers/ide/*"/>
<file name="drivers/md/*"/>
<file name="drivers/message/fusion/*"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml
new/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml
--- old/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml 2012-03-02
16:26:37.000000000 +0100
+++ new/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml 2012-03-09
14:57:07.000000000 +0100
@@ -41,6 +41,7 @@
<file name="drivers/char/lp.ko"/>
<file name="drivers/gpu/drm/i915/i915.ko"/>
<file name="drivers/hid/*"/>
+ <file name="drivers/hv/*"/>
<file name="drivers/ide/*"/>
<file name="drivers/md/*"/>
<file name="drivers/message/fusion/*"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-12.1/config.xml
new/kiwi/system/boot/ix86/oemboot/suse-12.1/config.xml
--- old/kiwi/system/boot/ix86/oemboot/suse-12.1/config.xml 2012-03-02
16:26:37.000000000 +0100
+++ new/kiwi/system/boot/ix86/oemboot/suse-12.1/config.xml 2012-03-09
14:57:07.000000000 +0100
@@ -39,6 +39,7 @@
<file name="drivers/gpu/drm/nouveau/nouveau.ko"/>
<file name="drivers/gpu/drm/radeon/radeon.ko"/>
<file name="drivers/hid/*"/>
+ <file name="drivers/hv/*"/>
<file name="drivers/hwmon/*"/>
<file name="drivers/ide/*"/>
<file name="drivers/input/keyboard/*"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-SLED11/config.xml
new/kiwi/system/boot/ix86/oemboot/suse-SLED11/config.xml
--- old/kiwi/system/boot/ix86/oemboot/suse-SLED11/config.xml 2012-03-02
16:26:37.000000000 +0100
+++ new/kiwi/system/boot/ix86/oemboot/suse-SLED11/config.xml 2012-03-09
14:57:07.000000000 +0100
@@ -37,6 +37,7 @@
<file name="drivers/firmware/edd.ko"/>
<file name="drivers/gpu/drm/i915/i915.ko"/>
<file name="drivers/hid/*"/>
+ <file name="drivers/hv/*"/>
<file name="drivers/hwmon/*"/>
<file name="drivers/ide/*"/>
<file name="drivers/md/*"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-SLES11/config.xml
new/kiwi/system/boot/ix86/oemboot/suse-SLES11/config.xml
--- old/kiwi/system/boot/ix86/oemboot/suse-SLES11/config.xml 2012-03-02
16:26:37.000000000 +0100
+++ new/kiwi/system/boot/ix86/oemboot/suse-SLES11/config.xml 2012-03-09
14:57:07.000000000 +0100
@@ -37,6 +37,7 @@
<file name="drivers/firmware/edd.ko"/>
<file name="drivers/gpu/drm/i915/i915.ko"/>
<file name="drivers/hid/*"/>
+ <file name="drivers/hv/*"/>
<file name="drivers/hwmon/*"/>
<file name="drivers/ide/*"/>
<file name="drivers/md/*"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-12.1/config.xml
new/kiwi/system/boot/ix86/vmxboot/suse-12.1/config.xml
--- old/kiwi/system/boot/ix86/vmxboot/suse-12.1/config.xml 2012-03-02
16:26:37.000000000 +0100
+++ new/kiwi/system/boot/ix86/vmxboot/suse-12.1/config.xml 2012-03-09
14:57:07.000000000 +0100
@@ -32,10 +32,13 @@
<file name="drivers/gpu/drm/i915/i915.ko"/>
<file name="drivers/gpu/drm/nouveau/nouveau.ko"/>
<file name="drivers/gpu/drm/radeon/radeon.ko"/>
+ <file name="drivers/hid/*"/>
+ <file name="drivers/hv/*"/>
<file name="drivers/ide/*"/>
<file name="drivers/md/*"/>
<file name="drivers/message/fusion/*"/>
<file name="drivers/net/virtio_net.ko"/>
+ <file name="drivers/net/hyperv/hv_netvsc.ko"/>
<file name="drivers/scsi/*"/>
<file name="drivers/staging/hv/*"/>
<file name="drivers/virtio/*"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-SLED11/config.xml
new/kiwi/system/boot/ix86/vmxboot/suse-SLED11/config.xml
--- old/kiwi/system/boot/ix86/vmxboot/suse-SLED11/config.xml 2012-03-02
16:26:37.000000000 +0100
+++ new/kiwi/system/boot/ix86/vmxboot/suse-SLED11/config.xml 2012-03-09
14:57:07.000000000 +0100
@@ -30,10 +30,13 @@
<file name="drivers/char/agp/intel-agp.ko"/>
<file name="drivers/char/hw_random/virtio-rng.ko"/>
<file name="drivers/gpu/drm/i915/i915.ko"/>
+ <file name="drivers/hid/*"/>
+ <file name="drivers/hv/*"/>
<file name="drivers/ide/*"/>
<file name="drivers/md/*"/>
<file name="drivers/message/fusion/*"/>
<file name="drivers/net/virtio_net.ko"/>
+ <file name="drivers/net/hyperv/hv_netvsc.ko"/>
<file name="drivers/scsi/*"/>
<file name="drivers/staging/hv/*"/>
<file name="drivers/virtio/*"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-SLES11/config.xml
new/kiwi/system/boot/ix86/vmxboot/suse-SLES11/config.xml
--- old/kiwi/system/boot/ix86/vmxboot/suse-SLES11/config.xml 2012-03-02
16:26:37.000000000 +0100
+++ new/kiwi/system/boot/ix86/vmxboot/suse-SLES11/config.xml 2012-03-09
14:57:07.000000000 +0100
@@ -30,10 +30,13 @@
<file name="drivers/char/agp/intel-agp.ko"/>
<file name="drivers/char/hw_random/virtio-rng.ko"/>
<file name="drivers/gpu/drm/i915/i915.ko"/>
+ <file name="drivers/hid/*"/>
+ <file name="drivers/hv/*"/>
<file name="drivers/ide/*"/>
<file name="drivers/md/*"/>
<file name="drivers/message/fusion/*"/>
<file name="drivers/net/virtio_net.ko"/>
+ <file name="drivers/net/hyperv/hv_netvsc.ko"/>
<file name="drivers/scsi/*"/>
<file name="drivers/staging/hv/*"/>
<file name="drivers/virtio/*"/>
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
