Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2015-02-22 17:25:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi (Old) and /work/SRC/openSUSE:Factory/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2015-02-10 20:20:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2015-02-22 17:25:13.000000000 +0100 @@ -1,0 +2,43 @@ +Thu Feb 12 11:01:59 CET 2015 - [email protected] + +- v7.02.26 released + +------------------------------------------------------------------- +Wed Feb 11 17:54:17 CET 2015 - [email protected] + +- Make sure cleanupRPMDatabase is called correctly + + The function also has to be called if there are packages + to delete in the queue and not only if there are packages + to install in the queue + +------------------------------------------------------------------- +Wed Feb 11 17:32:15 CET 2015 - [email protected] + +- Explicitly add kbd package to boot images + +------------------------------------------------------------------- +Wed Feb 11 17:12:55 CET 2015 - [email protected] + +- Make sure the default console font is setup + + While kiwi runs fbiterm the default console font is not + properly restored when the session ends. In order to enter + the system with a correctly initialized console font + kiwi actively calls setfont with the default8x16 font. + This is related to (bnc #879994) + +------------------------------------------------------------------- +Wed Feb 11 15:06:15 CET 2015 - [email protected] + +- Remove obsolete 12.2 templates + +------------------------------------------------------------------- +Tue Feb 10 12:19:58 CET 2015 - [email protected] + +- Move the vhdfixed tag to 64K offset. + + The tag specification calls for moving the tag from a 16K offset to a 64K + offset to avoid conflicting with the GPT. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.bdf2ve/_old 2015-02-22 17:25:15.000000000 +0100 +++ /var/tmp/diff_new_pack.bdf2ve/_new 2015-02-22 17:25:15.000000000 +0100 @@ -26,7 +26,7 @@ Group: System/Management Url: http://github.com/openSUSE/kiwi Name: kiwi -Version: 7.02.25 +Version: 7.02.26 Release: 0 Provides: kiwi-image:lxc Provides: kiwi-image:tbz ++++++ kiwi-docu.tar.bz2 ++++++ ++++++ 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 2014-12-19 08:24:00.000000000 +0100 +++ new/kiwi/.revision 2014-12-15 14:32:44.000000000 +0100 @@ -1 +1 @@ -859dc050fac040e3b3bb7fdb3ea81af4fc4bd02a +18a16424da55c8ecd8c1f047b45c248cf2a240d7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/metadata/KIWIConfig.xml new/kiwi/metadata/KIWIConfig.xml --- old/kiwi/metadata/KIWIConfig.xml 2014-12-03 22:03:57.000000000 +0100 +++ new/kiwi/metadata/KIWIConfig.xml 2015-02-11 17:02:34.000000000 +0100 @@ -26,6 +26,7 @@ locations except for the ones listed here --> <strip type="tools"> + <file name="setfont"/> <file name="lvmetad"/> <file name="loadkeys"/> <file name="klogconsole"/> 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 2015-02-09 11:43:23.000000000 +0100 +++ new/kiwi/modules/KIWIGlobals.pm 2015-02-12 11:01:54.000000000 +0100 @@ -1837,7 +1837,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "7.02.25"; + $data{Version} = "7.02.26"; $data{Publisher} = "SUSE LINUX GmbH"; $data{Preparer} = "KIWI - http://opensuse.github.com/kiwi";; $data{ConfigName} = "config.xml"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIImageFormat.pm new/kiwi/modules/KIWIImageFormat.pm --- old/kiwi/modules/KIWIImageFormat.pm 2014-12-19 08:24:00.000000000 +0100 +++ new/kiwi/modules/KIWIImageFormat.pm 2015-02-11 16:59:10.000000000 +0100 @@ -1293,13 +1293,13 @@ # /.../ # Azure service uses a tag injected into the disk # image to identify the OS. The tag is 512B long, - # starting with a GUID, and is placed at a 16K offset + # starting with a GUID, and is placed at a 64K offset # from the start of the disk image. # # +------------------------------+ # | jump | GUID(16B)000... | # +------------------------------| - # | 16K offset | TAG (512B) | + # | 64K offset | TAG (512B) | # +------------+-----------------+ # # Fixed-format VHD @@ -1340,10 +1340,10 @@ return; } #========================================== - # seek to 16k offset and zero out 512 byte + # seek to 64k offset and zero out 512 byte #------------------------------------------ sysread ($null_fh,$buffer, 512); close ($null_fh); - seek $FD,16384,0; + seek $FD,65536,0; $done = syswrite ($FD,$buffer); if ((! $done) || ($done != 512)) { $kiwi -> failed (); @@ -1358,9 +1358,9 @@ return; } #========================================== - # seek back to 16k offset + # seek back to 64k offset #------------------------------------------ - seek $FD,16384,0; + seek $FD,65536,0; #========================================== # write 16 bytes GUID #------------------------------------------ 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 2015-01-30 21:18:58.000000000 +0100 +++ new/kiwi/modules/KIWILinuxRC.sh 2015-02-11 17:10:01.000000000 +0100 @@ -22,6 +22,7 @@ export ELOG_FILE=/var/log/boot.kiwi export TRANSFER_ERRORS_FILE=/tmp/transfer.errors export UFONT=/usr/share/fbiterm/fonts/b16.pcf.gz +export CONSOLE_FONT=/usr/share/kbd/consolefonts/default8x16.gz export HYBRID_PERSISTENT_FS=btrfs export HYBRID_PERSISTENT_OPTS="" export HYBRID_PERSISTENT_ID=83 @@ -7787,6 +7788,10 @@ local reboot=no local option=${kernel_cmdline[@]} #====================================== + # Set active console to default font + #-------------------------------------- + setupConsoleFont + #====================================== # check for init kernel option #-------------------------------------- if [ -z "$init" ];then @@ -10345,6 +10350,12 @@ fi } #====================================== +# setupConsoleFont +#-------------------------------------- +function setupConsoleFont { + setfont $CONSOLE_FONT +} +#====================================== # setupConsole #-------------------------------------- function setupConsole { 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 2014-11-12 20:53:42.000000000 +0100 +++ new/kiwi/modules/KIWIManager.pm 2015-02-11 18:06:51.000000000 +0100 @@ -314,6 +314,34 @@ } #========================================== +# setupDeletePackages +#------------------------------------------ +sub setupDeletePackages { + # ... + # create the delete packages list from the information + # of the package types delete. Store the result in the + # object pointer + # --- + my $this = shift; + my $kiwi = $this->{kiwi}; + my $xml = $this->{xml}; + #========================================== + # check cached result + #------------------------------------------ + if (defined $this->{delete_packlist}) { + return @{$this->{delete_packlist}}; + } + my @delete_packs; + my $deletePacks = $xml -> getPackagesToDelete(); + for my $package (@{$deletePacks}) { + my $name = $package -> getName(); + push @delete_packs,$name; + } + $this->{delete_packlist} = \@delete_packs; + return @delete_packs; +} + +#========================================== # setupInstallPackages #------------------------------------------ sub setupInstallPackages { @@ -651,13 +679,14 @@ # ... # try to fix rpm version incompatibility # --- - my $this = shift; - my @kchroot = @{$this->{kchroot}}; - my @packlist = $this -> setupInstallPackages(); + my $this = shift; + my @kchroot = @{$this->{kchroot}}; + my @packlist = $this -> setupInstallPackages(); + my @deletelist = $this -> setupDeletePackages(); #========================================== # cleanup baselibs #------------------------------------------ - if (@packlist) { + if ((@packlist) || (@deletelist)) { if (! $this -> cleanupRPMDatabase()) { return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/armv7l/oemboot/suse-12.3/config.xml new/kiwi/system/boot/armv7l/oemboot/suse-12.3/config.xml --- old/kiwi/system/boot/armv7l/oemboot/suse-12.3/config.xml 2014-08-01 21:00:47.000000000 +0200 +++ new/kiwi/system/boot/armv7l/oemboot/suse-12.3/config.xml 2015-02-11 17:29:51.000000000 +0100 @@ -79,6 +79,7 @@ <source path="obs://openSUSE:/Factory:/ARM/standard"/> </repository> <packages type="bootstrap"> + <package name="kbd"/> <package name="atftp"/> <package name="bc"/> <package name="bind-libs"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/armv7l/oemboot/suse-13.1/config.xml new/kiwi/system/boot/armv7l/oemboot/suse-13.1/config.xml --- old/kiwi/system/boot/armv7l/oemboot/suse-13.1/config.xml 2014-08-01 21:00:47.000000000 +0200 +++ new/kiwi/system/boot/armv7l/oemboot/suse-13.1/config.xml 2015-02-11 17:29:51.000000000 +0100 @@ -79,6 +79,7 @@ <source path="obs://openSUSE:/Factory:/ARM/standard"/> </repository> <packages type="bootstrap"> + <package name="kbd"/> <package name="atftp"/> <package name="bc"/> <package name="bind-libs"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/armv7l/oemboot/suse-13.2/config.xml new/kiwi/system/boot/armv7l/oemboot/suse-13.2/config.xml --- old/kiwi/system/boot/armv7l/oemboot/suse-13.2/config.xml 2014-08-09 18:58:58.000000000 +0200 +++ new/kiwi/system/boot/armv7l/oemboot/suse-13.2/config.xml 2015-02-11 17:29:51.000000000 +0100 @@ -80,6 +80,7 @@ <source path="obs://openSUSE:/Factory:/ARM/standard"/> </repository> <packages type="bootstrap"> + <package name="kbd"/> <package name="atftp"/> <package name="bc"/> <package name="bind-libs"/> 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 2014-11-25 17:19:48.000000000 +0100 +++ new/kiwi/system/boot/ix86/isoboot/rhel-06.0/config.xml 2015-02-11 17:31:44.000000000 +0100 @@ -71,6 +71,7 @@ </packages> <packages type="image" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="basesystem"/> <package name="filesystem"/> </packages> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/rhel-07.0/config.xml new/kiwi/system/boot/ix86/isoboot/rhel-07.0/config.xml --- old/kiwi/system/boot/ix86/isoboot/rhel-07.0/config.xml 2014-11-25 17:19:51.000000000 +0100 +++ new/kiwi/system/boot/ix86/isoboot/rhel-07.0/config.xml 2015-02-11 17:31:42.000000000 +0100 @@ -78,6 +78,7 @@ </packages> <packages type="image" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="basesystem"/> <package name="filesystem"/> </packages> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-12.3/config.xml new/kiwi/system/boot/ix86/isoboot/suse-12.3/config.xml --- old/kiwi/system/boot/ix86/isoboot/suse-12.3/config.xml 2014-11-25 17:19:50.000000000 +0100 +++ new/kiwi/system/boot/ix86/isoboot/suse-12.3/config.xml 2015-02-11 17:31:45.000000000 +0100 @@ -100,6 +100,7 @@ </packages> <packages type="image" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="adaptec-firmware"/> <package name="btrfsprogs"/> <package name="bind-libs"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-13.1/config.xml new/kiwi/system/boot/ix86/isoboot/suse-13.1/config.xml --- old/kiwi/system/boot/ix86/isoboot/suse-13.1/config.xml 2014-11-25 17:19:48.000000000 +0100 +++ new/kiwi/system/boot/ix86/isoboot/suse-13.1/config.xml 2015-02-11 17:31:43.000000000 +0100 @@ -101,6 +101,7 @@ </packages> <packages type="image" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="adaptec-firmware"/> <package name="btrfsprogs"/> <package name="bind-libs"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-13.2/config.xml new/kiwi/system/boot/ix86/isoboot/suse-13.2/config.xml --- old/kiwi/system/boot/ix86/isoboot/suse-13.2/config.xml 2014-11-25 17:19:51.000000000 +0100 +++ new/kiwi/system/boot/ix86/isoboot/suse-13.2/config.xml 2015-02-11 17:31:44.000000000 +0100 @@ -100,6 +100,7 @@ </packages> <packages type="image" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="adaptec-firmware"/> <package name="btrfsprogs"/> <package name="bind-libs"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-SLED11/config.xml new/kiwi/system/boot/ix86/isoboot/suse-SLED11/config.xml --- old/kiwi/system/boot/ix86/isoboot/suse-SLED11/config.xml 2014-11-25 17:19:52.000000000 +0100 +++ new/kiwi/system/boot/ix86/isoboot/suse-SLED11/config.xml 2015-02-11 17:31:41.000000000 +0100 @@ -89,6 +89,7 @@ </packages> <packages type="bootstrap" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="bind-libs"/> <package name="bind-utils"/> <package name="bootsplash"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-SLED12/config.xml new/kiwi/system/boot/ix86/isoboot/suse-SLED12/config.xml --- old/kiwi/system/boot/ix86/isoboot/suse-SLED12/config.xml 2014-11-25 17:19:49.000000000 +0100 +++ new/kiwi/system/boot/ix86/isoboot/suse-SLED12/config.xml 2015-02-11 17:31:45.000000000 +0100 @@ -94,6 +94,7 @@ </packages> <packages type="image" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="adaptec-firmware"/> <package name="btrfsprogs"/> <package name="bind-libs"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-SLES11/config.xml new/kiwi/system/boot/ix86/isoboot/suse-SLES11/config.xml --- old/kiwi/system/boot/ix86/isoboot/suse-SLES11/config.xml 2014-11-25 17:19:52.000000000 +0100 +++ new/kiwi/system/boot/ix86/isoboot/suse-SLES11/config.xml 2015-02-11 17:31:43.000000000 +0100 @@ -89,6 +89,7 @@ </packages> <packages type="bootstrap" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="adaptec-firmware"/> <package name="bind-libs"/> <package name="bind-utils"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-SLES12/config.xml new/kiwi/system/boot/ix86/isoboot/suse-SLES12/config.xml --- old/kiwi/system/boot/ix86/isoboot/suse-SLES12/config.xml 2014-11-25 17:19:50.000000000 +0100 +++ new/kiwi/system/boot/ix86/isoboot/suse-SLES12/config.xml 2015-02-11 17:31:42.000000000 +0100 @@ -94,6 +94,7 @@ </packages> <packages type="image" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="adaptec-firmware"/> <package name="btrfsprogs"/> <package name="bind-libs"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-12.3/config.xml new/kiwi/system/boot/ix86/netboot/suse-12.3/config.xml --- old/kiwi/system/boot/ix86/netboot/suse-12.3/config.xml 2014-11-25 17:20:00.000000000 +0100 +++ new/kiwi/system/boot/ix86/netboot/suse-12.3/config.xml 2015-02-11 17:31:31.000000000 +0100 @@ -202,6 +202,7 @@ </packages> <packages type="image" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="atftp"/> <package name="bc"/> <package name="busybox"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-13.1/config.xml new/kiwi/system/boot/ix86/netboot/suse-13.1/config.xml --- old/kiwi/system/boot/ix86/netboot/suse-13.1/config.xml 2014-11-25 17:19:58.000000000 +0100 +++ new/kiwi/system/boot/ix86/netboot/suse-13.1/config.xml 2015-02-11 17:31:29.000000000 +0100 @@ -203,6 +203,7 @@ </packages> <packages type="image" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="atftp"/> <package name="bc"/> <package name="busybox"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-13.2/config.xml new/kiwi/system/boot/ix86/netboot/suse-13.2/config.xml --- old/kiwi/system/boot/ix86/netboot/suse-13.2/config.xml 2014-11-25 17:20:00.000000000 +0100 +++ new/kiwi/system/boot/ix86/netboot/suse-13.2/config.xml 2015-02-11 17:31:30.000000000 +0100 @@ -200,6 +200,7 @@ </packages> <packages type="image" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="atftp"/> <package name="bc"/> <package name="busybox"/> 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 2014-11-25 17:20:01.000000000 +0100 +++ new/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml 2015-02-11 17:31:28.000000000 +0100 @@ -214,6 +214,7 @@ </packages> <packages type="bootstrap" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="dialog"/> <package name="fbiterm"/> <package name="filesystem"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-SLED12/config.xml new/kiwi/system/boot/ix86/netboot/suse-SLED12/config.xml --- old/kiwi/system/boot/ix86/netboot/suse-SLED12/config.xml 2014-11-25 17:19:59.000000000 +0100 +++ new/kiwi/system/boot/ix86/netboot/suse-SLED12/config.xml 2015-02-11 17:31:30.000000000 +0100 @@ -193,6 +193,7 @@ </packages> <packages type="image" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="atftp"/> <package name="bc"/> <package name="busybox"/> 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 2014-11-25 17:20:01.000000000 +0100 +++ new/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml 2015-02-11 17:31:29.000000000 +0100 @@ -220,6 +220,7 @@ </packages> <packages type="bootstrap" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="dialog"/> <package name="fbiterm"/> <package name="filesystem"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-SLES12/config.xml new/kiwi/system/boot/ix86/netboot/suse-SLES12/config.xml --- old/kiwi/system/boot/ix86/netboot/suse-SLES12/config.xml 2014-11-25 17:19:59.000000000 +0100 +++ new/kiwi/system/boot/ix86/netboot/suse-SLES12/config.xml 2015-02-11 17:31:28.000000000 +0100 @@ -193,6 +193,7 @@ </packages> <packages type="image" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="atftp"/> <package name="bc"/> <package name="busybox"/> 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 2014-11-25 17:19:43.000000000 +0100 +++ new/kiwi/system/boot/ix86/oemboot/rhel-06.0/config.xml 2015-02-11 17:31:35.000000000 +0100 @@ -72,6 +72,7 @@ </packages> <packages type="image" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="filesystem"/> <package name="basesystem"/> </packages> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/rhel-07.0/config.xml new/kiwi/system/boot/ix86/oemboot/rhel-07.0/config.xml --- old/kiwi/system/boot/ix86/oemboot/rhel-07.0/config.xml 2014-11-25 17:19:46.000000000 +0100 +++ new/kiwi/system/boot/ix86/oemboot/rhel-07.0/config.xml 2015-02-11 17:31:32.000000000 +0100 @@ -84,6 +84,7 @@ </packages> <packages type="image" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="filesystem"/> <package name="basesystem"/> </packages> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-12.3/config.xml new/kiwi/system/boot/ix86/oemboot/suse-12.3/config.xml --- old/kiwi/system/boot/ix86/oemboot/suse-12.3/config.xml 2014-11-25 17:19:45.000000000 +0100 +++ new/kiwi/system/boot/ix86/oemboot/suse-12.3/config.xml 2015-02-11 17:31:36.000000000 +0100 @@ -112,6 +112,7 @@ </packages> <packages type="image" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="adaptec-firmware"/> <package name="atftp"/> <package name="bc"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-13.1/config.xml new/kiwi/system/boot/ix86/oemboot/suse-13.1/config.xml --- old/kiwi/system/boot/ix86/oemboot/suse-13.1/config.xml 2014-11-25 17:19:43.000000000 +0100 +++ new/kiwi/system/boot/ix86/oemboot/suse-13.1/config.xml 2015-02-11 17:31:33.000000000 +0100 @@ -112,6 +112,7 @@ </packages> <packages type="image" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="gptfdisk"/> <package name="adaptec-firmware"/> <package name="atftp"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-13.2/config.xml new/kiwi/system/boot/ix86/oemboot/suse-13.2/config.xml --- old/kiwi/system/boot/ix86/oemboot/suse-13.2/config.xml 2014-11-25 17:19:46.000000000 +0100 +++ new/kiwi/system/boot/ix86/oemboot/suse-13.2/config.xml 2015-02-11 17:31:34.000000000 +0100 @@ -114,6 +114,7 @@ </packages> <packages type="image" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="gptfdisk"/> <package name="adaptec-firmware"/> <package name="atftp"/> 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 2014-11-25 17:19:47.000000000 +0100 +++ new/kiwi/system/boot/ix86/oemboot/suse-SLED11/config.xml 2015-02-11 17:31:31.000000000 +0100 @@ -102,6 +102,7 @@ <package name="kernel-rt-base"/> </packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="bc"/> <package name="bind-libs"/> <package name="bind-utils"/> @@ -143,6 +144,7 @@ </packages> <packages type="bootstrap" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="diffutils"/> <package name="filesystem"/> <package name="glibc"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-SLED12/config.xml new/kiwi/system/boot/ix86/oemboot/suse-SLED12/config.xml --- old/kiwi/system/boot/ix86/oemboot/suse-SLED12/config.xml 2014-11-25 17:19:44.000000000 +0100 +++ new/kiwi/system/boot/ix86/oemboot/suse-SLED12/config.xml 2015-02-11 17:31:35.000000000 +0100 @@ -105,6 +105,7 @@ </packages> <packages type="image" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="gptfdisk"/> <package name="adaptec-firmware"/> <package name="atftp"/> 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 2014-11-25 17:19:47.000000000 +0100 +++ new/kiwi/system/boot/ix86/oemboot/suse-SLES11/config.xml 2015-02-11 17:31:34.000000000 +0100 @@ -105,6 +105,7 @@ <package name="kernel-rt-base"/> </packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="adaptec-firmware"/> <package name="atftp"/> <package name="bc"/> @@ -153,6 +154,7 @@ </packages> <packages type="bootstrap" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="diffutils"/> <package name="filesystem"/> <package name="glibc"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-SLES12/config.xml new/kiwi/system/boot/ix86/oemboot/suse-SLES12/config.xml --- old/kiwi/system/boot/ix86/oemboot/suse-SLES12/config.xml 2014-11-25 17:19:45.000000000 +0100 +++ new/kiwi/system/boot/ix86/oemboot/suse-SLES12/config.xml 2015-02-11 17:31:32.000000000 +0100 @@ -108,6 +108,7 @@ </packages> <packages type="image" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="gptfdisk"/> <package name="adaptec-firmware"/> <package name="atftp"/> 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 2014-11-25 17:19:54.000000000 +0100 +++ new/kiwi/system/boot/ix86/vmxboot/rhel-06.0/config.xml 2015-02-11 17:31:39.000000000 +0100 @@ -67,6 +67,7 @@ </packages> <packages type="image" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="filesystem"/> <package name="basesystem"/> </packages> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/rhel-07.0/config.xml new/kiwi/system/boot/ix86/vmxboot/rhel-07.0/config.xml --- old/kiwi/system/boot/ix86/vmxboot/rhel-07.0/config.xml 2014-11-25 17:19:56.000000000 +0100 +++ new/kiwi/system/boot/ix86/vmxboot/rhel-07.0/config.xml 2015-02-11 17:31:37.000000000 +0100 @@ -71,6 +71,7 @@ </packages> <packages type="image" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="filesystem"/> <package name="basesystem"/> </packages> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-12.3/config.xml new/kiwi/system/boot/ix86/vmxboot/suse-12.3/config.xml --- old/kiwi/system/boot/ix86/vmxboot/suse-12.3/config.xml 2014-11-25 17:19:55.000000000 +0100 +++ new/kiwi/system/boot/ix86/vmxboot/suse-12.3/config.xml 2015-02-11 17:31:40.000000000 +0100 @@ -99,6 +99,7 @@ </packages> <packages type="image" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="bind-libs"/> <package name="bind-utils"/> <package name="btrfsprogs"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-13.1/config.xml new/kiwi/system/boot/ix86/vmxboot/suse-13.1/config.xml --- old/kiwi/system/boot/ix86/vmxboot/suse-13.1/config.xml 2014-11-25 17:19:53.000000000 +0100 +++ new/kiwi/system/boot/ix86/vmxboot/suse-13.1/config.xml 2015-02-11 17:31:38.000000000 +0100 @@ -99,6 +99,7 @@ </packages> <packages type="image" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="bind-libs"/> <package name="bind-utils"/> <package name="btrfsprogs"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-13.2/config.xml new/kiwi/system/boot/ix86/vmxboot/suse-13.2/config.xml --- old/kiwi/system/boot/ix86/vmxboot/suse-13.2/config.xml 2014-11-25 17:19:56.000000000 +0100 +++ new/kiwi/system/boot/ix86/vmxboot/suse-13.2/config.xml 2015-02-11 17:31:39.000000000 +0100 @@ -101,6 +101,7 @@ </packages> <packages type="image" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="bind-libs"/> <package name="bind-utils"/> <package name="btrfsprogs"/> 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 2014-11-25 17:19:57.000000000 +0100 +++ new/kiwi/system/boot/ix86/vmxboot/suse-SLED11/config.xml 2015-02-11 17:31:36.000000000 +0100 @@ -91,6 +91,7 @@ <package name="kernel-ec2-base"/> </packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="bind-libs"/> <package name="bind-utils"/> <package name="bootsplash"/> @@ -121,6 +122,7 @@ </packages> <packages type="bootstrap" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="diffutils"/> <package name="filesystem"/> <package name="glibc"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-SLED12/config.xml new/kiwi/system/boot/ix86/vmxboot/suse-SLED12/config.xml --- old/kiwi/system/boot/ix86/vmxboot/suse-SLED12/config.xml 2014-11-25 17:19:54.000000000 +0100 +++ new/kiwi/system/boot/ix86/vmxboot/suse-SLED12/config.xml 2015-02-11 17:31:40.000000000 +0100 @@ -92,6 +92,7 @@ </packages> <packages type="image" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="bind-libs"/> <package name="bind-utils"/> <package name="btrfsprogs"/> 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 2014-11-25 17:19:57.000000000 +0100 +++ new/kiwi/system/boot/ix86/vmxboot/suse-SLES11/config.xml 2015-02-11 17:31:38.000000000 +0100 @@ -94,6 +94,7 @@ <package name="kernel-ec2-base"/> </packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="bind-libs"/> <package name="bind-utils"/> <package name="bootsplash"/> @@ -127,6 +128,7 @@ </packages> <packages type="bootstrap" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="diffutils"/> <package name="filesystem"/> <package name="glibc"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-SLES12/config.xml new/kiwi/system/boot/ix86/vmxboot/suse-SLES12/config.xml --- old/kiwi/system/boot/ix86/vmxboot/suse-SLES12/config.xml 2014-11-25 17:19:55.000000000 +0100 +++ new/kiwi/system/boot/ix86/vmxboot/suse-SLES12/config.xml 2015-02-11 17:31:37.000000000 +0100 @@ -95,6 +95,7 @@ </packages> <packages type="image" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="bind-libs"/> <package name="bind-utils"/> <package name="btrfsprogs"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/netboot/suse-SLES11/config.xml new/kiwi/system/boot/ppc/netboot/suse-SLES11/config.xml --- old/kiwi/system/boot/ppc/netboot/suse-SLES11/config.xml 2014-08-01 21:00:47.000000000 +0200 +++ new/kiwi/system/boot/ppc/netboot/suse-SLES11/config.xml 2015-02-11 17:29:51.000000000 +0100 @@ -191,6 +191,7 @@ </packages> <packages type="image" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="dialog"/> <package name="fbiterm"/> <package name="filesystem"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/netboot/suse-SLES12/config.xml new/kiwi/system/boot/ppc/netboot/suse-SLES12/config.xml --- old/kiwi/system/boot/ppc/netboot/suse-SLES12/config.xml 2014-08-09 18:58:58.000000000 +0200 +++ new/kiwi/system/boot/ppc/netboot/suse-SLES12/config.xml 2015-02-11 17:29:51.000000000 +0100 @@ -109,6 +109,7 @@ <package name="xfsprogs"/> </packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="atftp"/> <package name="bc"/> <package name="busybox"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/oemboot/suse-SLES11/config.xml new/kiwi/system/boot/ppc/oemboot/suse-SLES11/config.xml --- old/kiwi/system/boot/ppc/oemboot/suse-SLES11/config.xml 2014-08-01 21:00:47.000000000 +0200 +++ new/kiwi/system/boot/ppc/oemboot/suse-SLES11/config.xml 2015-02-11 17:29:51.000000000 +0100 @@ -113,6 +113,7 @@ </packages> <packages type="image" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="diffutils"/> <package name="filesystem"/> <package name="glibc"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/oemboot/suse-SLES12/config.xml new/kiwi/system/boot/ppc/oemboot/suse-SLES12/config.xml --- old/kiwi/system/boot/ppc/oemboot/suse-SLES12/config.xml 2014-08-09 18:58:58.000000000 +0200 +++ new/kiwi/system/boot/ppc/oemboot/suse-SLES12/config.xml 2015-02-11 17:29:51.000000000 +0100 @@ -85,6 +85,7 @@ </packages> <packages type="image" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="atftp"/> <package name="bc"/> <package name="bind-libs"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/vmxboot/suse-SLES11/config.xml new/kiwi/system/boot/ppc/vmxboot/suse-SLES11/config.xml --- old/kiwi/system/boot/ppc/vmxboot/suse-SLES11/config.xml 2014-08-01 21:00:47.000000000 +0200 +++ new/kiwi/system/boot/ppc/vmxboot/suse-SLES11/config.xml 2015-02-11 17:29:51.000000000 +0100 @@ -97,6 +97,7 @@ </packages> <packages type="image" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="diffutils"/> <package name="filesystem"/> <package name="glibc"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/vmxboot/suse-SLES12/config.xml new/kiwi/system/boot/ppc/vmxboot/suse-SLES12/config.xml --- old/kiwi/system/boot/ppc/vmxboot/suse-SLES12/config.xml 2014-08-09 18:58:58.000000000 +0200 +++ new/kiwi/system/boot/ppc/vmxboot/suse-SLES12/config.xml 2015-02-11 17:29:51.000000000 +0100 @@ -85,6 +85,7 @@ </packages> <packages type="image" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="atftp"/> <package name="bc"/> <package name="bind-libs"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/netboot/suse-SLES11/config.xml new/kiwi/system/boot/s390/netboot/suse-SLES11/config.xml --- old/kiwi/system/boot/s390/netboot/suse-SLES11/config.xml 2014-08-01 21:00:47.000000000 +0200 +++ new/kiwi/system/boot/s390/netboot/suse-SLES11/config.xml 2015-02-11 17:29:51.000000000 +0100 @@ -105,6 +105,7 @@ </packages> <packages type="image" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="dialog"/> <package name="fbiterm"/> <package name="filesystem"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/netboot/suse-SLES12/config.xml new/kiwi/system/boot/s390/netboot/suse-SLES12/config.xml --- old/kiwi/system/boot/s390/netboot/suse-SLES12/config.xml 2014-08-09 18:58:58.000000000 +0200 +++ new/kiwi/system/boot/s390/netboot/suse-SLES12/config.xml 2015-02-11 17:29:51.000000000 +0100 @@ -109,6 +109,7 @@ </packages> <packages type="image" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="atftp"/> <package name="bc"/> <package name="busybox"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/oemboot/suse-SLES11/config.xml new/kiwi/system/boot/s390/oemboot/suse-SLES11/config.xml --- old/kiwi/system/boot/s390/oemboot/suse-SLES11/config.xml 2014-08-01 21:00:47.000000000 +0200 +++ new/kiwi/system/boot/s390/oemboot/suse-SLES11/config.xml 2015-02-11 17:29:51.000000000 +0100 @@ -102,6 +102,7 @@ </packages> <packages type="image" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="diffutils"/> <package name="filesystem"/> <package name="glibc"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/oemboot/suse-SLES12/config.xml new/kiwi/system/boot/s390/oemboot/suse-SLES12/config.xml --- old/kiwi/system/boot/s390/oemboot/suse-SLES12/config.xml 2014-10-20 08:29:10.000000000 +0200 +++ new/kiwi/system/boot/s390/oemboot/suse-SLES12/config.xml 2015-02-11 17:29:51.000000000 +0100 @@ -86,6 +86,7 @@ </packages> <packages type="image" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="adaptec-firmware"/> <package name="atftp"/> <package name="bc"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/vmxboot/suse-SLES11/config.xml new/kiwi/system/boot/s390/vmxboot/suse-SLES11/config.xml --- old/kiwi/system/boot/s390/vmxboot/suse-SLES11/config.xml 2014-08-01 21:00:47.000000000 +0200 +++ new/kiwi/system/boot/s390/vmxboot/suse-SLES11/config.xml 2015-02-11 17:29:51.000000000 +0100 @@ -86,6 +86,7 @@ </packages> <packages type="image" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="diffutils"/> <package name="filesystem"/> <package name="glibc"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/vmxboot/suse-SLES12/config.xml new/kiwi/system/boot/s390/vmxboot/suse-SLES12/config.xml --- old/kiwi/system/boot/s390/vmxboot/suse-SLES12/config.xml 2014-10-20 08:29:10.000000000 +0200 +++ new/kiwi/system/boot/s390/vmxboot/suse-SLES12/config.xml 2015-02-11 17:29:51.000000000 +0100 @@ -86,6 +86,7 @@ </packages> <packages type="image" profiles="custom"><!-- empty custom section to allow bootincluding custom kernel --></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="adaptec-firmware"/> <package name="atftp"/> <package name="bc"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/armv7l/suse-12.2-JeOS/README new/kiwi/template/armv7l/suse-12.2-JeOS/README --- old/kiwi/template/armv7l/suse-12.2-JeOS/README 2014-07-31 23:12:46.000000000 +0200 +++ new/kiwi/template/armv7l/suse-12.2-JeOS/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -Build instructions for local build -================================== -* call kiwi: - kiwi --build suse-12.2-JeOS --set-repo /path/to/12.2/repo \ - -d /tmp/myimage diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/armv7l/suse-12.2-JeOS/config.sh new/kiwi/template/armv7l/suse-12.2-JeOS/config.sh --- old/kiwi/template/armv7l/suse-12.2-JeOS/config.sh 2014-02-05 20:54:28.000000000 +0100 +++ new/kiwi/template/armv7l/suse-12.2-JeOS/config.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,87 +0,0 @@ -#!/bin/bash -#================ -# FILE : config.sh -#---------------- -# PROJECT : OpenSuSE KIWI Image System -# COPYRIGHT : (c) 2006 SUSE LINUX Products GmbH. All rights reserved -# : -# AUTHOR : Marcus Schaefer <[email protected]> -# : -# BELONGS TO : Operating System images -# : -# DESCRIPTION : configuration script for SUSE based -# : operating systems -# : -# : -# STATUS : BETA -#---------------- -#====================================== -# Functions... -#-------------------------------------- -test -f /.kconfig && . /.kconfig -test -f /.profile && . /.profile - -#====================================== -# Greeting... -#-------------------------------------- -echo "Configure image: [$kiwi_iname]..." - -#====================================== -# Mount system filesystems -#-------------------------------------- -baseMount - -#====================================== -# Setup baseproduct link -#-------------------------------------- -suseSetupProduct - -#====================================== -# Add missing gpg keys to rpm -#-------------------------------------- -suseImportBuildKey - -#====================================== -# Activate services -#-------------------------------------- -suseInsertService sshd -suseInsertService boot.device-mapper -suseRemoveService avahi-dnsconfd -suseRemoveService avahi-daemon - -#========================================== -# remove package docs -#------------------------------------------ -rm -rf /usr/share/doc/packages/* -rm -rf /usr/share/doc/manual/* -rm -rf /opt/kde* - -#====================================== -# only basic version of vim is -# installed; no syntax highlighting -#-------------------------------------- -sed -i -e's/^syntax on/" syntax on/' /etc/vimrc - -#====================================== -# SuSEconfig -#-------------------------------------- -suseConfig - -#====================================== -# Add Factory repo -#-------------------------------------- -baseRepo="http://download.opensuse.org/repositories/openSUSE:/Factory:/ARM/standard"; -baseName="suse-factory" -zypper ar $baseRepo $baseName - -#====================================== -# Remove yast if not in use -#-------------------------------------- -suseRemoveYaST - -#====================================== -# Umount kernel filesystems -#-------------------------------------- -baseCleanMount - -exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/armv7l/suse-12.2-JeOS/config.xml new/kiwi/template/armv7l/suse-12.2-JeOS/config.xml --- old/kiwi/template/armv7l/suse-12.2-JeOS/config.xml 2014-08-01 21:00:47.000000000 +0200 +++ new/kiwi/template/armv7l/suse-12.2-JeOS/config.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,112 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<image schemaversion="6.1" name="LimeJeOS-12.2"> - <description type="system"> - <author>Marcus Schäfer</author> - <contact>[email protected]</contact> - <specification> - 12.2 JeOS image for arm (panda/beagle/efika) boards - </specification> - </description> - <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"/> - <version>1.12.2</version> - <packagemanager>zypper</packagemanager> - <locale>en_US</locale> - <keytable>us.map.gz</keytable> - <timezone>Europe/Berlin</timezone> - <hwclock>utc</hwclock> - <rpm-excludedocs>true</rpm-excludedocs> - <bootsplash-theme>openSUSE</bootsplash-theme> - <bootloader-theme>openSUSE</bootloader-theme> - </preferences> - <preferences profiles="pandaFlavour"> - <type image="oem" filesystem="ext3" boot="oemboot/suse-12.2" bootloader="uboot" kernelcmdline="console=ttyO2 vram=16M" editbootconfig="uboot-image-setup" editbootinstall="uboot-image-install"> - <systemdisk/> - <oemconfig> - <oem-swapsize>500</oem-swapsize> - <oem-swap>true</oem-swap> - </oemconfig> - </type> - </preferences> - <preferences profiles="efikaFlavour"> - <type image="oem" filesystem="ext3" boot="oemboot/suse-12.2" bootloader="uboot" kernelcmdline="console=ttymxc0,115200 vram=16M" editbootconfig="uboot-image-setup" editbootinstall="uboot-image-install"> - <systemdisk/> - <oemconfig> - <oem-swapsize>500</oem-swapsize> - <oem-swap>true</oem-swap> - </oemconfig> - </type> - </preferences> - <preferences profiles="beagleFlavour"> - <type image="oem" filesystem="ext3" boot="oemboot/suse-12.2" bootloader="uboot" kernelcmdline="console=ttyO2 vram=16M" editbootconfig="uboot-image-setup" editbootinstall="uboot-image-install"> - <systemdisk/> - <oemconfig> - <oem-swapsize>500</oem-swapsize> - <oem-swap>true</oem-swap> - </oemconfig> - </type> - </preferences> - <users group="root"> - <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/> - </users> - <repository type="rpm-md"> - <source path="obs://openSUSE:/12.2:/ARM/standard"/> - </repository> - <packages type="bootstrap" profiles="pandaFlavour"> - <package name="kernel-omap2plus" bootinclude="true"/> - <package name="u-boot-omap4panda" bootinclude="true"/> - </packages> - <packages type="bootstrap" profiles="efikaFlavour"> - <package name="kernel-imx51" bootinclude="true"/> - </packages> - <packages type="bootstrap" profiles="beagleFlavour"> - <package name="kernel-omap2plus" bootinclude="true"/> - <package name="u-boot-omap3beagle" bootinclude="true"/> - <package name="x-loader-omap3beagle" bootinclude="true"/> - </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"/> - <package name="lvm2"/> - <package name="filesystem"/> - <package name="glibc-locale"/> - <package name="cracklib-dict-full"/> - <package name="module-init-tools"/> - <package name="kbd"/> - <package name="aaa_base"/> - <package name="hwinfo"/> - <package name="procps"/> - <package name="sysconfig"/> - <package name="pwdutils"/> - <package name="openssh"/> - <package name="dhcpcd"/> - <package name="insserv"/> - <package name="polkit"/> - <package name="netcfg"/> - <package name="rpcbind"/> - <package name="mkinitrd"/> - <package name="rpm"/> - <package name="rsyslog"/> - <package name="systemd-sysvinit"/> - <package name="u-boot-tools"/> - <package name="less"/> - <package name="zypper"/> -<!-- custom hook scripts for uboot --> - <archive name="uboot-setup.tgz" bootinclude="true"/> - </packages> -</image> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/armv7l/suse-12.2-JeOS/root/etc/motd new/kiwi/template/armv7l/suse-12.2-JeOS/root/etc/motd --- old/kiwi/template/armv7l/suse-12.2-JeOS/root/etc/motd 2014-08-01 21:00:47.000000000 +0200 +++ new/kiwi/template/armv7l/suse-12.2-JeOS/root/etc/motd 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -This is the Lime-JeOS 12.1 SuSE Linux System. -To upgrade your system call: - - zypper refresh - zypper install -t product openSUSE-12.1 - -Have a lot of fun... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/armv7l/suse-12.2-JeOS/root/etc/securetty new/kiwi/template/armv7l/suse-12.2-JeOS/root/etc/securetty --- old/kiwi/template/armv7l/suse-12.2-JeOS/root/etc/securetty 2012-05-31 21:23:56.000000000 +0200 +++ new/kiwi/template/armv7l/suse-12.2-JeOS/root/etc/securetty 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -# -# This file contains the device names of tty lines (one per line, -# without leading /dev/) on which root is allowed to login. -# -tty1 -tty2 -tty3 -tty4 -tty5 -tty6 -ttyO2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/armv7l/suse-12.2-JeOS/root/etc/sysconfig/network/ifcfg-eth0 new/kiwi/template/armv7l/suse-12.2-JeOS/root/etc/sysconfig/network/ifcfg-eth0 --- old/kiwi/template/armv7l/suse-12.2-JeOS/root/etc/sysconfig/network/ifcfg-eth0 2012-05-31 21:23:56.000000000 +0200 +++ new/kiwi/template/armv7l/suse-12.2-JeOS/root/etc/sysconfig/network/ifcfg-eth0 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -BOOTPROTO='dhcp' -MTU='' -REMOTE_IPADDR='' -STARTMODE='onboot' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/armv7l/suse-12.2-JeOS/suse-12.2-JeOS.kiwi new/kiwi/template/armv7l/suse-12.2-JeOS/suse-12.2-JeOS.kiwi --- old/kiwi/template/armv7l/suse-12.2-JeOS/suse-12.2-JeOS.kiwi 2015-02-22 17:25:21.000000000 +0100 +++ new/kiwi/template/armv7l/suse-12.2-JeOS/suse-12.2-JeOS.kiwi 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to config.xml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/armv7l/suse-12.2-JeOS/uboot-image-install new/kiwi/template/armv7l/suse-12.2-JeOS/uboot-image-install --- old/kiwi/template/armv7l/suse-12.2-JeOS/uboot-image-install 2014-08-01 21:00:47.000000000 +0200 +++ new/kiwi/template/armv7l/suse-12.2-JeOS/uboot-image-install 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -#!/bin/bash - -set -x - -diskname=$1 - -#========================================== -# install MLO as raw -#------------------------------------------ -if [ -f "boot/MLO" ];then - opt="count=1 seek=1 conv=notrunc" - if ! dd if=boot/MLO of=$diskname bs=128k $opt; then - echo "Couldn't install MLO on $diskname" - exit 1 - fi - # /.../ - # To avoid any issues when parted leaves x86 boot code - # in the MBR we better clear that part of the image - # ---- - dd if=/dev/zero of=$diskname bs=440 count=1 conv=notrunc -fi - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/armv7l/suse-12.2-JeOS/uboot-image-setup new/kiwi/template/armv7l/suse-12.2-JeOS/uboot-image-setup --- old/kiwi/template/armv7l/suse-12.2-JeOS/uboot-image-setup 2014-08-01 21:00:47.000000000 +0200 +++ new/kiwi/template/armv7l/suse-12.2-JeOS/uboot-image-setup 1970-01-01 01:00:00.000000000 +0100 @@ -1,32 +0,0 @@ -#!/bin/bash - -set -x - -bootfs=$1 - -file=boot/boot.script - -echo 'printenv kerneladdr || setenv kerneladdr ${kernel_addr_r}' >> $file -echo 'printenv ramdiskaddr|| setenv ramdiskaddr ${ramdisk_addr_r}' >> $file -echo -n 'setenv bootcmd "' >> $file -if [[ $bootfs =~ fat ]];then - echo -n 'fatload mmc 0:1 ${kerneladdr} boot/linux.vmx; ' >> $file - echo -n 'fatload mmc 0:1 ${ramdiskaddr} boot/initrd.uboot; ' >> $file -else - echo -n 'ext2load mmc 0:1 ${kerneladdr} boot/linux.vmx; ' >> $file - echo -n 'ext2load mmc 0:1 ${ramdiskaddr} boot/initrd.uboot; ' >> $file -fi -echo 'bootm ${kerneladdr} ${ramdiskaddr}";' >> $file -echo 'boot' >> $file - -#========================================== -# Create machine readable uboot format -#------------------------------------------ -mkopts="-A arm -O linux -a 0 -e 0 -T script -C none"; -inputf="boot/boot.script"; -result="boot/boot.scr"; -if ! mkimage $mkopts -n 'Boot-Script' -d $inputf $result;then - echo "Failed to create uboot script image" - exit 1 -fi - Files old/kiwi/template/armv7l/suse-12.2-JeOS/uboot-setup.tgz and new/kiwi/template/armv7l/suse-12.2-JeOS/uboot-setup.tgz differ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
