Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2014-06-25 10:49:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-06-19 13:07:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2014-06-25 10:49:04.000000000 +0200 @@ -1,0 +2,72 @@ +Tue Jun 24 16:48:05 CEST 2014 - [email protected] + +- v5.06.121 released + +------------------------------------------------------------------- +Tue Jun 24 16:45:48 CEST 2014 - [email protected] + +- Fixed buildservice -requires meta package requirements + In SLE12 grub is obsoleted by sles-release thus no package + is allowed to require it + +------------------------------------------------------------------- +Tue Jun 24 16:17:46 CEST 2014 - [email protected] + +- v5.06.120 released + +------------------------------------------------------------------- +Mon Jun 23 18:34:23 CEST 2014 - [email protected] + +- Add suse-SLES11/suse-vagrant-box example + +------------------------------------------------------------------- +Mon Jun 23 17:30:21 CEST 2014 - [email protected] + +- Fixed solvable pattern metadata creation + The new pattern system allows to pass the option -X to the + libsolv *2solv tools. If this option is not passed no pattern + metadata is created in the solvable file. kiwi now checks if + the libsolv tools are capable of -X and passes the option + +------------------------------------------------------------------- +Mon Jun 23 10:50:25 CEST 2014 - [email protected] + +- v5.06.119 released + +------------------------------------------------------------------- +Sat Jun 21 23:51:01 CEST 2014 - [email protected] + +- Update bash completion file + * split into commands and options for commands + +------------------------------------------------------------------- +Fri Jun 20 14:41:15 CEST 2014 - [email protected] + +- Follow up implementation for sha256 hash creation + Use perl's Digest module instead of calling an external program + +------------------------------------------------------------------- +Fri Jun 20 12:06:50 CEST 2014 - [email protected] + +- Added creation of sha256 hash to product bundler + +------------------------------------------------------------------- +Fri Jun 20 12:00:18 CEST 2014 - [email protected] + +- Correctly duplex stdout to /dev/console + I still have the problem if we call e.g dialog in a new controlling + terminal using setctsid all subsequent messages are only shown on + this terminal even though the console might point to more devices + which were correctly duplexed before setting a controlling terminal + +------------------------------------------------------------------- +Wed Jun 18 21:42:18 CEST 2014 - [email protected] + +- Fixed building of firmware="ec2" image in combination with grub2 + The partition table type was set to gpt in this case but that + is not desired for ec2 cloud images. In addition the partition + setup was incomplete to allow successful installing of grub2 + without a bios_grub partition which was not created for ec2 + typed firmware images + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.JBVNs7/_old 2014-06-25 10:49:06.000000000 +0200 +++ /var/tmp/diff_new_pack.JBVNs7/_new 2014-06-25 10:49:06.000000000 +0200 @@ -26,7 +26,7 @@ Group: System/Management Url: http://github.com/openSUSE/kiwi Name: kiwi -Version: 5.06.118 +Version: 5.06.121 Release: 0 Provides: kiwi-schema = 6.1 # requirements to build packages @@ -325,9 +325,11 @@ %ifarch s390 s390x Requires: zipl %endif -%ifarch i586 x86_64 +%ifarch %ix86 x86_64 +%if 0%{?suse_version} < 1315 Requires: grub %endif +%endif Summary: KIWI - buildservice package requirements for isoboot License: GPL-2.0+ Group: System/Management @@ -390,7 +392,9 @@ Requires: zipl %endif %ifarch %ix86 x86_64 +%if 0%{?suse_version} < 1315 Requires: grub +%endif %if 0%{?suse_version} >= 1220 Requires: grub2 %ifarch x86_64 @@ -493,7 +497,9 @@ Requires: zipl %endif %ifarch %ix86 x86_64 +%if 0%{?suse_version} < 1315 Requires: grub +%endif %if 0%{?suse_version} >= 1220 Requires: grub2 %ifarch x86_64 ++++++ 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 2014-06-17 13:29:42.000000000 +0200 +++ new/kiwi/.revision 2014-06-17 13:29:42.000000000 +0200 @@ -1 +1 @@ -2586987d487a34852b4b1963896f94096ef2b807 +912a063c39aaa2f7f848b738a9a26ed492048777 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/editing/kiwi.sh new/kiwi/editing/kiwi.sh --- old/kiwi/editing/kiwi.sh 2014-05-23 14:09:40.000000000 +0200 +++ new/kiwi/editing/kiwi.sh 2014-06-23 10:51:43.000000000 +0200 @@ -1,50 +1,294 @@ # kiwi bash completion script _kiwi() { - local cur prev opts base - COMPREPLY=() - cur="${COMP_WORDS[COMP_CWORD]}" - prev="${COMP_WORDS[COMP_CWORD-1]}" + #======================================== + # Init completion + #---------------------------------------- + local cur prev opts + _get_comp_words_by_ref cur prev #======================================== - # Basic options we complete - #---------------------------------------- - local cmd=/usr/sbin/kiwi - for name in $(cat $cmd | grep -E "\".*?\".*=>");do - if [[ $name =~ ^\" ]];then - name=$(echo $name | tr -d "\"" |\ - cut -f1 -d\| | cut -f1 -d=) - opts="$opts --$name" - fi - done + # Current base mode + #---------------------------------------- + local cmd=$(echo $COMP_LINE | cut -f2 -d " " | tr -d -) + + #======================================== + # Items to complete + #---------------------------------------- + __kiwi_descriptions + __kiwi_types + + #======================================== + # Global options + #---------------------------------------- + opt_global=" + --logfile + --log-port + --debug + --yes + --nocolor + --version + --help + " + #======================================== + # Basic commands + #---------------------------------------- + opts="$opt_global + --bootcd + --bootusb + --bootvm + --build + --bundle-build + --clone + --convert + --create + --createhash + --createpassword + --info + --list + --installcd + --installstick + --installpxe + --prepare + --test-image + --check-config + --upgrade + --describe + --init-cache + --setup-splash + " + #======================================== + # Command specific options to complete + #---------------------------------------- + opt_bootcd=" + " + opt_bootusb=" + " + opt_bootvm=" + --bootvm-system + --bootvm-disksize + " + opt_build=" + --recycle-root + --force-bootstrap + --cache + --add-profile + --set-repo + --set-repotype + --set-repoalias + --set-repoprio + --add-repo + --add-repotype + --add-repoalias + --add-repoprio + --ignore-repos + --package-manager + --check-kernel + --destdir + --type + --strip + --prebuiltbootimage + --archive-image + --isocheck + --lvm + --fs-blocksize + --fs-journalsize + --fs-inodesize + --fs-inoderatio + --fs-max-mount-count + --fs-check-interval + --fat-storage + --partitioner + --check-kernel + --mbrid + --gzip-cmd + --disk-start-sector + --disk-sector-size + --disk-alignment + --add-package + --add-pattern + --del-package + --edit-bootconfig + --edit-bootinstall + --grub-chainload + --targetdevice + --targetstudio + " + opt_bundlebuild=" + --bundle-id + --destdir + " + opt_clone=" + " + opt_convert=" + --format + " + opt_create=" + --targetdevice + --targetstudio + --recycle-root + --force-bootstrap + --check-kernel + --destdir + --type + --strip + --prebuiltbootimage + --archive-image + --isocheck + --lvm + --fs-blocksize + --fs-journalsize + --fs-inodesize + --fs-inoderatio + --fs-max-mount-count + --fs-check-interval + --fat-storage + --partitioner + --check-kernel + --mbrid + --cache + --gzip-cmd + --disk-start-sector + --disk-sector-size + --disk-alignment + --add-profile + --edit-bootconfig + --edit-bootinstall + --grub-chainload + " + opt_createhash=" + " + opt_createpassword=" + " + opt_info=" + --select + --add-profile + --ignore-repos + --package-manager + --set-repo + --set-repotype + --set-repoalias + --set-repoprio + --add-repo + --add-repotype + --add-repoalias + --add-repoprio + " + opt_list=" + " + opt_installcd=" + --installcd-system + " + opt_installstick=" + --installstick-system + " + opt_installpxe=" + --installpxe-system + " + opt_prepare=" + --force-new-root + --root + --recycle-root + --force-bootstrap + --cache + --add-profile + --set-repo + --set-repotype + --set-repoalias + --set-repoprio + --add-repo + --add-repotype + --add-repoalias + --add-repoprio + --ignore-repos + --package-manager + --del-package + --add-package + --add-pattern + " + opt_testimage=" + --test-case + --type + " + opt_checkconfig=" + " + opt_upgrade=" + --add-package + --add-pattern + --del-package + " + opt_describe=" + " + opt_initcache=" + " + opt_setupsplash=" + " + eval cmd_options=\$opt_$cmd + if [ ! -z "$cmd_options" ];then + opts=$cmd_options + fi + #======================================== - # Complete arguments for basic options + # Command option parameters completion #---------------------------------------- case "${prev}" in - --build|--prepare) - local running - for name in /usr/share/kiwi/image/*;do - if [[ $name =~ boot ]];then - continue - fi - running="$running $(basename $name)" - done - COMPREPLY=( $(compgen -W "${running}" -- ${cur}) ) + --build|--prepare|--clone|--info|--test-image|--init-cache) + __comp_reply "$descriptions" + __warn_no_description return 0 ;; --type) - local schema=/usr/share/kiwi/modules/KIWISchema.rnc - local running=$(for i in $(cat $schema |\ - grep -A 3 "attribute image {");do echo $i;done|\ - grep ^\" | cut -f2 -d "\"") - COMPREPLY=( $(compgen -W "${running}" -- ${cur}) ) + __comp_reply "$types" return 0 ;; *) ;; esac - COMPREPLY=($(compgen -W "${opts}" -- ${cur})) + #======================================== + # Command option completion + #---------------------------------------- + __comp_reply "$opts" return 0 } +#======================================== +# kiwi_types +#---------------------------------------- +function __kiwi_types { + local schema=/usr/share/kiwi/modules/KIWISchema.rnc + types=$(for i in $(cat $schema |\ + grep -A 3 "attribute image {");do echo $i;done|\ + grep ^\" | cut -f2 -d "\"") +} + +#======================================== +# kiwi_descriptions +#---------------------------------------- +function __kiwi_descriptions { + local name + for name in /usr/share/kiwi/image/*;do + if [[ $name =~ boot ]];then + continue + fi + descriptions="$descriptions $(basename $name)" + done +} + +#======================================== +# warn_no_description +#---------------------------------------- +function __warn_no_description { + if [ -z "$descriptions" ]; then + echo -en "\n ==> no descriptions found\n$COMP_LINE" + fi +} + +#======================================== +# comp_reply +#---------------------------------------- +function __comp_reply { + word_list=$@ + COMPREPLY=($(compgen -W "$word_list" -- ${cur})) +} + complete -F _kiwi -o default kiwi 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 2014-06-10 11:52:04.000000000 +0200 +++ new/kiwi/modules/KIWIBoot.pm 2014-06-23 10:51:43.000000000 +0200 @@ -6155,8 +6155,7 @@ $kiwi -> loginfo ($status); return; } - if (($firmware eq "ec2") || - ($firmware eq "efi") || + if (($firmware eq "efi") || ($firmware eq "uefi") || (($firmware eq "vboot") && ($loader ne "berryboot")) ) { 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 2014-06-17 18:18:37.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2014-06-24 16:48:41.000000000 +0200 @@ -1493,7 +1493,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "5.06.118"; + $data{Version} = "5.06.121"; $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/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh --- old/kiwi/modules/KIWILinuxRC.sh 2014-06-16 15:45:46.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2014-06-23 10:51:43.000000000 +0200 @@ -525,12 +525,14 @@ set +x export ELOG_STOPPED=1 exec 2>$ELOG_EXCEPTION + exec 1>>$ELOG_EXCEPTION } #====================================== # errorLogContinue #-------------------------------------- function errorLogContinue { exec 2>>$ELOG_FILE + exec 1>>$ELOG_EXCEPTION export ELOG_STOPPED=0 set -x } @@ -586,6 +588,7 @@ #====================================== # Set kernel log level #-------------------------------------- + exec 1>>$ELOG_EXCEPTION if lookup klogconsole;then klogconsole -l 6 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIResult.pm new/kiwi/modules/KIWIResult.pm --- old/kiwi/modules/KIWIResult.pm 2014-06-05 10:40:15.000000000 +0200 +++ new/kiwi/modules/KIWIResult.pm 2014-06-23 10:51:43.000000000 +0200 @@ -20,6 +20,7 @@ use strict; use warnings; use Config::IniFiles; +use Digest::SHA qw(sha256); #========================================== # KIWI Modules @@ -319,7 +320,10 @@ #------------------------------------------ sub __bundleProduct { my $this = shift; - return $this -> __bundleExtension ('iso'); + if ($this -> __bundleExtension ('iso')) { + return $this -> __sign_with_sha256sum(); + } + return; } #========================================== @@ -419,6 +423,44 @@ return $this; } +#========================================== +# __sign_with_sha256sum +#------------------------------------------ +sub __sign_with_sha256sum { + my $this = shift; + my $kiwi = $this->{kiwi}; + my $tmpdir = $this->{tmpdir}; + my $dh; + if (! opendir($dh, $tmpdir)) { + $kiwi -> error ("Can't open directory: $tmpdir: $!"); + $kiwi -> failed (); + return; + } + while (my $entry = readdir ($dh)) { + next if $entry eq "." || $entry eq ".."; + next if ! -f $entry; + my $alg = 'sha256'; + my $sha = Digest::SHA->new($alg); + if (! $sha) { + $kiwi -> error ("Unsupported Digest::SHA algorithm: $alg"); + $kiwi -> failed (); + return; + } + $sha -> addfile ($tmpdir."/".$entry); + my $digest = $sha -> hexdigest; + my $fd = FileHandle -> new(); + if (! $fd -> open (">$tmpdir/$entry.sha256")) { + $kiwi -> error ("Can't open file $tmpdir/$entry.sha256: $!"); + $kiwi -> failed (); + return; + } + print $fd $digest."\n"; + $fd -> close(); + } + closedir $dh; + return $this; +} + #========================================== # Destructor #------------------------------------------ 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 2014-06-17 18:18:37.000000000 +0200 +++ new/kiwi/modules/KIWIXML.pm 2014-06-24 16:19:37.000000000 +0200 @@ -5759,6 +5759,7 @@ my $index = 0; my @index = (); my $error = 0; + my $satopt = ''; #========================================== # allow arch overwrite #------------------------------------------ @@ -5779,6 +5780,14 @@ return; } #========================================== + # check -X capability for sat tools + #------------------------------------------ + KIWIQX::qxx ("mergesolv -X &>/dev/null"); + my $code = $? >> 8; + if ($code == 0) { + $satopt = '-X'; + } + #========================================== # check/create cache directory #------------------------------------------ my $sdir = "/var/cache/kiwi/satsolver"; @@ -5935,7 +5944,7 @@ if (! $foundDist) { my $path = $repo; $path =~ s/dir:\/\///; my $data = KIWIQX::qxx ( - "rpms2solv $path/*.rpm > $sdir/primary-$count 2>&1" + "rpms2solv $satopt $path/*.rpm > $sdir/primary-$count 2>&1" ); my $code = $? >> 8; if ($code != 0) { @@ -6048,7 +6057,7 @@ } foreach my $cmd (@done) { my $data = KIWIQX::qxx ( - "$cmd | susetags2solv >> $destfile 2>/dev/null" + "$cmd | susetags2solv $satopt >> $destfile 2>/dev/null" ); my $code = $? >> 8; if ($code != 0) { @@ -6099,7 +6108,9 @@ $kiwi -> failed (); $error = 1; } else { - my $data = KIWIQX::qxx ("mergesolv $sdir/primary-* > $index"); + my $data = KIWIQX::qxx ( + "mergesolv $satopt $sdir/primary-* > $index" + ); my $code = $? >> 8; if ($code != 0) { $kiwi -> failed (); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
