Hello community,
here is the log from the commit of package kiwi for openSUSE:Factory checked in
at 2012-04-23 09:15:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-04-17
07:45:40.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2012-04-23
09:15:16.000000000 +0200
@@ -1,0 +2,93 @@
+Fri Apr 20 11:07:12 CEST 2012 - m...@suse.de
+
+- v5.02.24 released
+
+-------------------------------------------------------------------
+Thu Apr 19 13:36:16 CEST 2012 - m...@suse.de
+
+- take package section type into account when processing
+ bootincluded packages. This means packages added as bootincluded
+ into the e.g image section gets added to the image section
+ in the boot image too. If the target description doesn't
+ provide the section the package will be added to the default
+ bootstrap section as before
+
+-------------------------------------------------------------------
+Thu Apr 19 11:15:44 CEST 2012 - m...@suse.de
+
+- remove db4 package from the delete list in the RHEL
+ boot image descriptions
+
+-------------------------------------------------------------------
+Thu Apr 19 11:14:51 CEST 2012 - m...@suse.de
+
+- fixed rpm package database rebuild check for RHEL/yum
+ this reverts commit: c3e4ac88562074d87cad21e96cfe3d6dde976e48
+
+-------------------------------------------------------------------
+Thu Apr 19 09:36:05 CEST 2012 - m...@suse.de
+
+- moved yum priority installation from the RHEL boot- into the
+ system image template and make it a bootincluded package.
+ That's because there are name differences like yum-priority
+ and yum-plugin-priority
+
+-------------------------------------------------------------------
+Thu Apr 19 09:01:51 CEST 2012 - m...@suse.de
+
+- fixed rebuild of package database when yum is used
+
+-------------------------------------------------------------------
+Wed Apr 18 17:43:54 CEST 2012 - m...@suse.de
+
+- arm: adapt JeOS description for beagle and fixed building in emulated
environment
+
+-------------------------------------------------------------------
+Tue Apr 17 16:53:21 CEST 2012 - m...@suse.de
+
+- really fixed boot.script setup according to (bnc #757489)
+
+-------------------------------------------------------------------
+Tue Apr 17 15:55:30 CEST 2012 - m...@suse.de
+
+- arm: On other systems which supports a boot menu we add
+ the linux kernel and initrd with its file names. But on
+ arm systems there can only be one kernel because uboot
+ doesn't support a menu. Thus perl-bootloader also doesn't
+ support updating the uboot configuration and that's the
+ reason why we use the links created by mkinitrd to point
+ to the kernel and initrd in order to support kernel
+ updates (bnc #757489)
+
+-------------------------------------------------------------------
+Mon Apr 16 15:21:42 CEST 2012 - m...@suse.de
+
+- s390: fixed recreateVTOCTable() to wait until the volume
+ group has settled before deactivating it in a LVM setup
+
+-------------------------------------------------------------------
+Mon Apr 16 14:25:55 CEST 2012 - m...@suse.de
+
+- removed obsolete error console information
+
+-------------------------------------------------------------------
+Mon Apr 16 12:42:54 CEST 2012 - m...@suse.de
+
+- kiwi creates a link with filesystem extension pointing to
+ the root filesystem image when created. The function
+ compressImage creates a .gz version of that root filesystem
+ image and therefore break the link. This fix enhances
+ compressImage() in a way that it receives the filesystem
+ information in order to repair the link
+
+-------------------------------------------------------------------
+Mon Apr 16 11:49:51 CEST 2012 - m...@suse.de
+
+- added oem type to s390 JeOS image description
+
+-------------------------------------------------------------------
+Mon Apr 16 11:41:03 CEST 2012 - m...@suse.de
+
+- update s390 SLE repo in JeOS template
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.iNohOc/_old 2012-04-23 09:15:17.000000000 +0200
+++ /var/tmp/diff_new_pack.iNohOc/_new 2012-04-23 09:15:17.000000000 +0200
@@ -22,7 +22,7 @@
Summary: OpenSuSE - KIWI Image System
License: GPL-2.0
Group: System/Management
-Version: 5.02.23
+Version: 5.02.24
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-04-16 10:34:41.000000000 +0200
+++ new/kiwi/.revision 2012-04-20 13:43:32.000000000 +0200
@@ -1 +1 @@
-4bbb0941600b205a7d11bab3599e1641bbd85fd4
+9026edecdc726157659543b374e5dedf27015fad
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-04-16 10:34:46.000000000 +0200
+++ new/kiwi/modules/KIWIGlobals.pm 2012-04-20 13:43:37.000000000 +0200
@@ -42,7 +42,7 @@
# Globals (generic)
#------------------------------------------
my %data;
- $data{Version} = "5.02.23";
+ $data{Version} = "5.02.24";
$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/KIWIImage.pm
new/kiwi/modules/KIWIImage.pm
--- old/kiwi/modules/KIWIImage.pm 2012-04-16 10:34:46.000000000 +0200
+++ new/kiwi/modules/KIWIImage.pm 2012-04-20 13:43:37.000000000 +0200
@@ -184,11 +184,16 @@
my %repos;
my %strip;
my %strip_default;
- my @plist;
- my @alist;
- my @falistImage;
- my @fplistImage;
- my @fplistDelete;
+ my @bootstrap_plist;
+ my @image_plist;
+ my @bootstrap_alist;
+ my @image_alist;
+ my @bootstrap_falistImage;
+ my @image_falistImage;
+ my @bootstrap_fplistImage;
+ my @image_fplistImage;
+ my @bootstrap_fplistDelete;
+ my @image_fplistDelete;
my @driverList;
my %fixedBootInclude;
my @node;
@@ -317,37 +322,67 @@
next;
}
my $type = $element -> getAttribute ("type");
- if (($type eq "image") || ($type eq "bootstrap")) {
- push (@plist,$element->getElementsByTagName
("package"));
- push (@alist,$element->getElementsByTagName
("archive"));
+ if ($type eq "bootstrap") {
+ push (@bootstrap_plist,$element->getElementsByTagName
("package"));
+ push (@bootstrap_alist,$element->getElementsByTagName
("archive"));
}
+ if ($type eq "image") {
+ push (@image_plist,$element->getElementsByTagName
("package"));
+ push (@image_alist,$element->getElementsByTagName
("archive"));
+ }
+
}
- foreach my $element (@plist) {
+ foreach my $element (@bootstrap_plist) {
my $package = $element -> getAttribute ("name");
my $bootinc = $element -> getAttribute ("bootinclude");
my $bootdel = $element -> getAttribute ("bootdelete");
my $include = 0;
if ((defined $bootinc) && ("$bootinc" eq "true")) {
- push (@fplistImage,$package);
+ push (@bootstrap_fplistImage,$package);
$include++;
}
if ((defined $bootdel) && ("$bootdel" eq "true")) {
- push (@fplistDelete,$package);
+ push (@bootstrap_fplistDelete,$package);
$include--;
}
$fixedBootInclude{$package} = $include;
}
- foreach my $element (@alist) {
+ foreach my $element (@image_plist) {
+ my $package = $element -> getAttribute ("name");
+ my $bootinc = $element -> getAttribute ("bootinclude");
+ my $bootdel = $element -> getAttribute ("bootdelete");
+ my $include = 0;
+ if ((defined $bootinc) && ("$bootinc" eq "true")) {
+ push (@image_fplistImage,$package);
+ $include++;
+ }
+ if ((defined $bootdel) && ("$bootdel" eq "true")) {
+ push (@image_fplistDelete,$package);
+ $include--;
+ }
+ $fixedBootInclude{$package} = $include;
+ }
+ foreach my $element (@bootstrap_alist) {
+ my $archive = $element -> getAttribute ("name");
+ my $bootinc = $element -> getAttribute ("bootinclude");
+ if ((defined $bootinc) && ("$bootinc" eq "true")) {
+ push (@bootstrap_falistImage,$archive);
+ }
+ }
+ foreach my $element (@image_alist) {
my $archive = $element -> getAttribute ("name");
my $bootinc = $element -> getAttribute ("bootinclude");
if ((defined $bootinc) && ("$bootinc" eq "true")) {
- push (@falistImage,$archive);
+ push (@image_falistImage,$archive);
}
}
- $changeset{"fixedBootInclude"} = \%fixedBootInclude;
- $changeset{"falistImage"} = \@falistImage;
- $changeset{"fplistImage"} = \@fplistImage;
- $changeset{"fplistDelete"} = \@fplistDelete;
+ $changeset{"fixedBootInclude"} = \%fixedBootInclude;
+ $changeset{"bootstrap_falistImage"} = \@bootstrap_falistImage;
+ $changeset{"image_falistImage"} = \@image_falistImage;
+ $changeset{"bootstrap_fplistImage"} = \@bootstrap_fplistImage;
+ $changeset{"image_fplistImage"} = \@image_fplistImage;
+ $changeset{"bootstrap_fplistDelete"} = \@bootstrap_fplistDelete;
+ $changeset{"image_fplistDelete"} = \@image_fplistDelete;
#==========================================
# Store OEM data
#------------------------------------------
@@ -899,7 +934,7 @@
# Compress image using gzip
#------------------------------------------
if (($type{compressed}) && ($type{compressed} eq 'true')) {
- if (! $this -> compressImage ($name)) {
+ if (! $this -> compressImage ($name,'squashfs')) {
return;
}
}
@@ -1597,7 +1632,7 @@
#==========================================
# compress RW extend
#------------------------------------------
- if (! $this -> compressImage ($namerw)) {
+ if (! $this -> compressImage ($namerw,'ext2')) {
return;
}
}
@@ -3198,7 +3233,13 @@
#------------------------------------------
if (! defined $nozip) {
if (($type{compressed}) && ($type{compressed} eq 'true')) {
- if (! $this -> compressImage ($name)) {
+ my $rootfs;
+ if ($type{filesystem}) {
+ $rootfs = $type{filesystem};
+ } else {
+ $rootfs = $type{type};
+ }
+ if (! $this -> compressImage ($name,$rootfs)) {
return;
}
}
@@ -4070,9 +4111,10 @@
# compressImage
#------------------------------------------
sub compressImage {
- my $this = shift;
- my $name = shift;
- my $kiwi = $this->{kiwi};
+ my $this = shift;
+ my $name = shift;
+ my $fstype = shift;
+ my $kiwi = $this->{kiwi};
#==========================================
# Compress image using gzip
#------------------------------------------
@@ -4087,6 +4129,14 @@
}
$kiwi -> done();
$this -> updateMD5File ("$this->{imageDest}/$name.gz");
+ #==========================================
+ # Relink filesystem link to comp image file
+ #------------------------------------------
+ my $fslink = $this->{imageDest}."/".$name.".".$fstype;
+ if (-l $fslink) {
+ qxx ("rm -f $fslink 2>&1");
+ qxx ("ln -vs $this->{imageDest}/$name.gz $fslink 2>&1");
+ }
return $name;
}
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-04-16 10:34:46.000000000 +0200
+++ new/kiwi/modules/KIWILinuxRC.sh 2012-04-20 13:43:37.000000000 +0200
@@ -278,7 +278,6 @@
Echo "$1"
case "$what" in
"reboot")
- Echo "rebootException: error consoles at Alt-F3/F4"
Echo "rebootException: reboot in 120 sec..."; sleep 120
/sbin/reboot -f -i >$nuldev
;;
@@ -1462,8 +1461,23 @@
if test -z "$i";then
continue
fi
- kernel=`echo $i | cut -f1 -d:`
- initrd=`echo $i | cut -f2 -d:`
+ # /.../
+ # On other systems which supports a boot menu we add
+ # the linux kernel and initrd with its file names
+ # like this:
+ #
+ # kernel=`echo $i | cut -f1 -d:`
+ # initrd=`echo $i | cut -f2 -d:`
+ #
+ # But on arm systems there can only be one kernel because
+ # uboot doesn't support a menu. Thus perl-bootloader also
+ # doesn't support updating the uboot configuration and
+ # that's the reason why we use the links created by
+ # mkinitrd to point to the kernel and initrd in order
+ # to support kernel updates
+ # ----
+ kernel=uImage
+ initrd=initrd
echo "setenv ramdisk $initrd" > $conf
echo "setenv kernel $kernel" >> $conf
echo "setenv initrd_high \"0xffffffff\"" >> $conf
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-04-16 10:34:41.000000000 +0200
+++ new/kiwi/modules/KIWIManager.pm 2012-04-20 13:43:37.000000000 +0200
@@ -998,6 +998,10 @@
return;
}
$kiwi -> done();
+ } else {
+ $kiwi -> info ('Rebuild RPM package db...');
+ $data = qxx ("@kchroot /bin/rpm --rebuilddb");
+ $kiwi -> done();
}
}
$this->{channelList} = \@channelList;
@@ -2535,10 +2539,10 @@
# cleanupRPMDatabase
#------------------------------------------
sub cleanupRPMDatabase {
- my $this = shift;
- my $kiwi = $this->{kiwi};
- my @kchroot= @{$this->{kchroot}};
- my $root = $this->{root};
+ my $this = shift;
+ my $kiwi = $this->{kiwi};
+ my @kchroot = @{$this->{kchroot}};
+ my $root = $this->{root};
my $data;
my $code;
#==========================================
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 2012-04-16 10:34:46.000000000 +0200
+++ new/kiwi/modules/KIWIXML.pm 2012-04-20 13:43:37.000000000 +0200
@@ -4741,35 +4741,39 @@
#==========================================
# 4) merge/update packages
#------------------------------------------
- if (@{$changeset->{fplistImage}}) {
- $kiwi -> info ("Updating package(s):\n");
- my $fixedBootInclude = $changeset->{fixedBootInclude};
- my @fplistImage = @{$changeset->{fplistImage}};
- my @fplistDelete = @{$changeset->{fplistDelete}};
- foreach my $p (@fplistImage) {
- $kiwi -> info ("--> $p\n");
- }
- $this -> addPackages (
- "image",$fixedBootInclude,$packageNodeList,@fplistImage
- );
- if (@fplistDelete) {
+ foreach my $section (("image","bootstrap")) {
+ if (@{$changeset->{$section."_fplistImage"}}) {
+ $kiwi -> info ("Updating package(s) [$section]:\n");
+ my $fixedBootInclude = $changeset->{fixedBootInclude};
+ my @fplistImage =
@{$changeset->{$section."_fplistImage"}};
+ my @fplistDelete =
@{$changeset->{$section."_fplistDelete"}};
+ foreach my $p (@fplistImage) {
+ $kiwi -> info ("--> $p\n");
+ }
$this -> addPackages (
- "delete",undef,$packageNodeList,@fplistDelete
+
$section,$fixedBootInclude,$packageNodeList,@fplistImage
);
+ if (@fplistDelete) {
+ $this -> addPackages (
+
"delete",undef,$packageNodeList,@fplistDelete
+ );
+ }
}
}
#==========================================
# 5) merge/update archives
#------------------------------------------
- if (@{$changeset->{falistImage}}) {
- $kiwi -> info ("Updating archive(s):\n");
- my @falistImage = @{$changeset->{falistImage}};
- foreach my $p (@falistImage) {
- $kiwi -> info ("--> $p\n");
+ foreach my $section (("image","bootstrap")) {
+ if (@{$changeset->{$section."_falistImage"}}) {
+ $kiwi -> info ("Updating archive(s) [$section]:\n");
+ my @falistImage =
@{$changeset->{$section."_falistImage"}};
+ foreach my $p (@falistImage) {
+ $kiwi -> info ("--> $p\n");
+ }
+ $this -> addArchives (
+
$section,"bootinclude",$packageNodeList,@falistImage
+ );
}
- $this -> addArchives (
- "image","bootinclude",$packageNodeList,@falistImage
- );
}
#==========================================
# 6) merge/update machine attribs in type
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/rhel-05.4/config.xml
new/kiwi/system/boot/ix86/isoboot/rhel-05.4/config.xml
--- old/kiwi/system/boot/ix86/isoboot/rhel-05.4/config.xml 2012-04-16
10:34:41.000000000 +0200
+++ new/kiwi/system/boot/ix86/isoboot/rhel-05.4/config.xml 2012-04-20
13:43:37.000000000 +0200
@@ -105,7 +105,6 @@
<package name="cpio"/>
<package name="cracklib-dicts"/>
<package name="cyrus-sasl"/>
- <package name="db4"/>
<package name="dbus-glib"/>
<package name="diffutils"/>
<package name="expat"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/rhel-06.0/config.xml
new/kiwi/system/boot/ix86/isoboot/rhel-06.0/config.xml
--- old/kiwi/system/boot/ix86/isoboot/rhel-06.0/config.xml 2012-04-16
10:34:41.000000000 +0200
+++ new/kiwi/system/boot/ix86/isoboot/rhel-06.0/config.xml 2012-04-20
13:43:37.000000000 +0200
@@ -71,7 +71,6 @@
<packages type="bootstrap">
<package name="basesystem"/>
<package name="filesystem"/>
- <package name="yum-plugin-priorities"/>
</packages>
<packages type="image">
<package name="bind-libs"/>
@@ -108,7 +107,6 @@
<package name="cpio"/>
<package name="cracklib-dicts"/>
<package name="cyrus-sasl"/>
- <package name="db4"/>
<package name="dbus-glib"/>
<package name="diffutils"/>
<package name="expat"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/rhel-06.0/config.xml
new/kiwi/system/boot/ix86/oemboot/rhel-06.0/config.xml
--- old/kiwi/system/boot/ix86/oemboot/rhel-06.0/config.xml 2012-04-16
10:34:41.000000000 +0200
+++ new/kiwi/system/boot/ix86/oemboot/rhel-06.0/config.xml 2012-04-20
13:43:37.000000000 +0200
@@ -72,7 +72,6 @@
<packages type="bootstrap">
<package name="filesystem"/>
<package name="basesystem"/>
- <package name="yum-priorities"/>
</packages>
<packages type="image">
<package name="psmisc"/>
@@ -111,7 +110,6 @@
<package name="binutils"/>
<package name="cpio"/>
<package name="cyrus-sasl"/>
- <package name="db4"/>
<package name="dbus-glib"/>
<package name="diffutils"/>
<package name="expat"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/rhel-05.4/config.xml
new/kiwi/system/boot/ix86/vmxboot/rhel-05.4/config.xml
--- old/kiwi/system/boot/ix86/vmxboot/rhel-05.4/config.xml 2012-04-16
10:34:41.000000000 +0200
+++ new/kiwi/system/boot/ix86/vmxboot/rhel-05.4/config.xml 2012-04-20
13:43:37.000000000 +0200
@@ -102,7 +102,6 @@
<package name="cpio"/>
<package name="cracklib-dicts"/>
<package name="cyrus-sasl"/>
- <package name="db4"/>
<package name="dbus-glib"/>
<package name="diffutils"/>
<package name="expat"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/rhel-06.0/config.xml
new/kiwi/system/boot/ix86/vmxboot/rhel-06.0/config.xml
--- old/kiwi/system/boot/ix86/vmxboot/rhel-06.0/config.xml 2012-04-16
10:34:41.000000000 +0200
+++ new/kiwi/system/boot/ix86/vmxboot/rhel-06.0/config.xml 2012-04-20
13:43:37.000000000 +0200
@@ -67,7 +67,6 @@
<packages type="bootstrap">
<package name="filesystem"/>
<package name="basesystem"/>
- <package name="yum-priorities"/>
</packages>
<packages type="image">
<package name="psmisc"/>
@@ -104,7 +103,6 @@
<package name="binutils"/>
<package name="cpio"/>
<package name="cyrus-sasl"/>
- <package name="db4"/>
<package name="dbus-glib"/>
<package name="diffutils"/>
<package name="expat"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/s390/oemboot/suse-repart
new/kiwi/system/boot/s390/oemboot/suse-repart
--- old/kiwi/system/boot/s390/oemboot/suse-repart 2012-04-16
10:34:41.000000000 +0200
+++ new/kiwi/system/boot/s390/oemboot/suse-repart 2012-04-20
13:43:37.000000000 +0200
@@ -593,6 +593,10 @@
Echo "Recreate VTOC table [ $imageDiskDevice ]"
if [ ! -z "$haveLVM" ];then
#======================================
+ # wait until volume group has settled
+ #--------------------------------------
+ sleep 2
+ #======================================
# close open device mappings
#--------------------------------------
if [ "$haveLuks" = "yes" ];then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/template/armv7l/suse-Factory-JeOS/config.xml
new/kiwi/template/armv7l/suse-Factory-JeOS/config.xml
--- old/kiwi/template/armv7l/suse-Factory-JeOS/config.xml 2012-04-16
10:34:41.000000000 +0200
+++ new/kiwi/template/armv7l/suse-Factory-JeOS/config.xml 2012-04-20
13:43:37.000000000 +0200
@@ -11,6 +11,7 @@
<profiles>
<profile name="pandaFlavour" description="Kernel/Tools setup
for panda boards" import="true"/>
<profile name="efikaFlavour" description="Kernel/Tools setup
for efika boards"/>
+ <profile name="beagleFlavour" description="Kernel/Tools setup
for beagle boards"/>
</profiles>
<preferences>
<type image="tbz" primary="true"/>
@@ -24,10 +25,7 @@
<boot-theme>openSUSE</boot-theme>
</preferences>
<preferences profiles="pandaFlavour">
- <type image="vmx" filesystem="ext3" boot="vmxboot/suse-Factory"
bootloader="uboot" bootkernel="omap4panda" kernelcmdline="kiwistderr=/dev/ttyO2
console=ttyO2 ethaddr=f2:9e:1a:ca:d9:99 vram=16M">
- <systemdisk/>
- </type>
- <type image="oem" filesystem="ext3" boot="oemboot/suse-Factory"
bootloader="uboot" bootkernel="omap4panda" kernelcmdline="kiwistderr=/dev/ttyO2
console=ttyO2 ethaddr=f2:9e:1a:ca:d9:99 vram=16M">
+ <type image="oem" filesystem="ext3" boot="oemboot/suse-Factory"
bootloader="uboot" bootkernel="omap4panda" kernelcmdline="console=ttyO2
vram=16M">
<systemdisk/>
<oemconfig>
<oem-swapsize>500</oem-swapsize>
@@ -35,10 +33,15 @@
</type>
</preferences>
<preferences profiles="efikaFlavour">
- <type image="vmx" filesystem="ext3" boot="vmxboot/suse-Factory"
bootloader="uboot" bootkernel="imx51" kernelcmdline="kiwistderr=/dev/ttymxc0
console=ttymxc0,115200 vram=16M">
+ <type image="oem" filesystem="ext3" boot="oemboot/suse-Factory"
bootloader="uboot" bootkernel="imx51" kernelcmdline="console=ttymxc0,115200
vram=16M">
<systemdisk/>
+ <oemconfig>
+ <oem-swapsize>500</oem-swapsize>
+ </oemconfig>
</type>
- <type image="oem" filesystem="ext3" boot="oemboot/suse-Factory"
bootloader="uboot" bootkernel="imx51" kernelcmdline="kiwistderr=/dev/ttymxc0
console=ttymxc0,115200 vram=16M">
+ </preferences>
+ <preferences profiles="beagleFlavour">
+ <type image="oem" filesystem="ext3" boot="oemboot/suse-Factory"
bootloader="uboot" bootkernel="omap3beagle" kernelcmdline="console=ttyO2
vram=16M">
<systemdisk/>
<oemconfig>
<oem-swapsize>500</oem-swapsize>
@@ -58,7 +61,20 @@
<packages type="bootstrap" profiles="efikaFlavour">
<package name="kernel-imx51"/>
</packages>
+ <packages type="bootstrap" profiles="beagleFlavour">
+ <package name="kernel-omap2plus"/>
+ <package name="u-boot-omap3beagle"/>
+ <package name="x-loader-omap3beagle"/>
+ </packages>
+<!-- don't remove qemu binfmt helpers from initrd -->
+ <strip type="tools">
+ <file name="qemu-arm-binfmt"/>
+ <file name="qemu-arm"/>
+ </strip>
<packages type="bootstrap">
+<!-- for building in emulated environment -->
+ <package name="qemu-linux-user-arm" bootinclude="true"/>
+<!-- standard packages -->
<package name="ifplugd"/>
<package name="iputils"/>
<package name="vim"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/template/ix86/rhel-06.0-JeOS/config.xml
new/kiwi/template/ix86/rhel-06.0-JeOS/config.xml
--- old/kiwi/template/ix86/rhel-06.0-JeOS/config.xml 2012-04-16
10:34:41.000000000 +0200
+++ new/kiwi/template/ix86/rhel-06.0-JeOS/config.xml 2012-04-20
13:43:37.000000000 +0200
@@ -97,6 +97,7 @@
<rhelGroup name="Console internet tools"/>
<package name="gfxboot-branding-upstream" bootinclude="true"
bootdelete="true"/>
<package name="redhat-logos" bootinclude="true"
bootdelete="true"/>
+ <package name="yum-priorities" bootinclude="true"/>
</packages>
<packages type="bootstrap">
<package name="filesystem"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/template/s390/suse-SLE11-JeOS/config.xml
new/kiwi/template/s390/suse-SLE11-JeOS/config.xml
--- old/kiwi/template/s390/suse-SLE11-JeOS/config.xml 2012-04-16
10:34:41.000000000 +0200
+++ new/kiwi/template/s390/suse-SLE11-JeOS/config.xml 2012-04-20
13:43:37.000000000 +0200
@@ -16,13 +16,19 @@
<timezone>Europe/Berlin</timezone>
<hwclock>utc</hwclock>
<type image="vmx" filesystem="ext3" boot="vmxboot/suse-SLES11"
bootloader="zipl" primary="true"/>
+ <type image="oem" filesystem="ext3" boot="oemboot/suse-SLES11"
bootloader="zipl">
+ <systemdisk/>
+ <oemconfig>
+ <oem-swapsize>512</oem-swapsize>
+ </oemconfig>
+ </type>
<type image="pxe" filesystem="ext3" boot="netboot/suse-SLES11"
bootloader="zipl"/>
</preferences>
<users group="root">
<user pwd="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root"
name="root"/>
</users>
<repository type="yast2">
- <source
path="http://download.suse.de/install/SLP/SLES-11-SP1-GM/%arch/DVD1/"/>
+ <source
path="http://download.suse.de/install/SLP/SLES-11-SP2-GM/%arch/DVD1/"/>
</repository>
<repository type="yast2">
<source
path="http://download.suse.de/install/SLP/SLE-11-SP2-SDK-LATEST/%arch/DVD1"/>
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
