Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2015-01-21 21:56: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-12-23 11:50:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2015-01-21 21:56:32.000000000 +0100 @@ -1,0 +2,78 @@ +Fri Jan 16 11:35:48 CET 2015 - [email protected] + +- v7.02.21 released + +------------------------------------------------------------------- +Fri Jan 16 11:29:37 CET 2015 - [email protected] + +- v7.02.20 released + +------------------------------------------------------------------- +Fri Jan 16 10:04:10 CET 2015 - [email protected] + +- sha256sum generation: change cwd to tmpdir and only pass filename to $sha->addfile + + The full path passed to $sha->addfile is written into the .sha256 file, which results in + the file not 'really' usable for verification by users. Passing only the relative filename + works around this. + +------------------------------------------------------------------- +Wed Jan 14 15:44:33 CET 2015 - [email protected] + +- DB: rebuild documentation + +------------------------------------------------------------------- +Wed Jan 14 15:43:53 CET 2015 - [email protected] + +- DB: fixed LVM documentation + + with regards to btrfs subvolume support the docu + was unclear and not complete + +------------------------------------------------------------------- +Mon Jan 12 17:04:03 CET 2015 - [email protected] + +- Revert "Disable yum repos from centos-releases" + + This seems to break the repo handling completely + This reverts commit 4d48fd0b296343368d7bb76b97857d779ab13273. + +------------------------------------------------------------------- +Mon Jan 12 13:46:30 CET 2015 - [email protected] + +- Disable yum repos from centos-releases + +------------------------------------------------------------------- +Mon Jan 12 11:19:28 CET 2015 - [email protected] + +- v7.02.19 released + +------------------------------------------------------------------- +Mon Jan 12 11:13:38 CET 2015 - [email protected] + +- Fixed kiwi-find-boot-requires.sh build helper + + Added Adrian as the author of the script and put some comment + what this script does. Fixed error handling if boot config + file is missing for the checked arch/os (bnc #911231) + +------------------------------------------------------------------- +Mon Jan 12 11:01:12 CET 2015 - [email protected] + +- mediacheck: give the user 5s time to actually see the result (also helps openQA to catch it) - Failure waits for user input already + +------------------------------------------------------------------- +Mon Jan 12 10:49:12 CET 2015 - [email protected] + +- Fixed spec file for rhel and centos builds + + With regards to https://en.opensuse.org/openSUSE:Build_Service_cross_distribution_howto + the use of the dist macros has been fixed. In addition the setup of the correct templates + per distribution has been fixed for rhel6/7 and centos6 (bnc #911231) + +------------------------------------------------------------------- +Wed Jan 7 10:33:16 CET 2015 - [email protected] + +- fix debug package unique key handling. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.8ilJAj/_old 2015-01-21 21:56:33.000000000 +0100 +++ /var/tmp/diff_new_pack.8ilJAj/_new 2015-01-21 21:56:33.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kiwi # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ #perl_verion is not defined in centos/RHEL yet -%if 0%{?rhel_version} || 0%{?fedora} || 0%{?centos} +%if 0%{?rhel_version} || 0%{?centos_version} %define perl_version %(eval "`%{__perl} -V:version`"; echo $version) %endif @@ -26,7 +26,7 @@ Group: System/Management Url: http://github.com/openSUSE/kiwi Name: kiwi -Version: 7.02.18 +Version: 7.02.21 Release: 0 Provides: kiwi-image:lxc Provides: kiwi-image:tbz @@ -156,16 +156,16 @@ %endif %endif # RHEL -%if 0%{?rhel_version} -%define mysystems %(echo `VER=%{rhel_version} echo "rhel-0${VER:0:1}.${VER:1:2}"`) +%if 0%{?rhel_version} == 600 +%define mysystems rhel-06.0 %endif -# Fedora -%if 0%{?fedora} -%define mysystems %(echo `VER=%{fedora} echo "fedora-0${VER:0:1}.${VER:1:2}"`) +%if 0%{?rhel_version} == 700 +%define mysystems rhel-07.0 %endif # CentOS -%if 0%{?centos} -%define mysystems %(echo `VER=%{centos} echo "centos-0${VER:0:1}.${VER:1:2}"`) +%if 0%{?centos_version} == 600 +# use the rhel templates for CentOS 6 +%define mysystems rhel-06.0 %endif # find out about my arch name, could be done also via symlinks @@ -207,7 +207,7 @@ Requires: e2fsprogs Requires: kiwi = %{version} Requires: zypper -%if 0%{?rhel_version} || 0%{?fedora} || 0%{?centos} +%if 0%{?rhel_version} || 0%{?centos_version} Requires: squashfs-tools %endif %if 0%{?suse_version} @@ -287,7 +287,7 @@ License: GPL-2.0+ Group: System/Management PreReq: coreutils -%if 0%{?rhel_version} || 0%{?fedora} || 0%{?centos} +%if 0%{?rhel_version} || 0%{?centos_version} PreReq: shadow-utils %else %if 0%{?suse_version} > 1220 @@ -387,7 +387,7 @@ Requires: multipath-tools Requires: squashfs %endif -%if 0%{?rhel_version} || 0%{?fedora} || 0%{?centos} +%if 0%{?rhel_version} || 0%{?centos_version} Requires: device-mapper-multipath Requires: squashfs-tools %endif @@ -500,7 +500,7 @@ Requires: multipath-tools Requires: squashfs %endif -%if 0%{?rhel_version} || 0%{?fedora} || 0%{?centos} +%if 0%{?rhel_version} || 0%{?centos_version} Requires: device-mapper-multipath Requires: squashfs-tools %endif ++++++ kiwi-docu.tar.bz2 ++++++ ++++ 7713 lines of diff (skipped) ++++++ kiwi-find-boot-requires.sh ++++++ --- /var/tmp/diff_new_pack.8ilJAj/_old 2015-01-21 21:56:36.000000000 +0100 +++ /var/tmp/diff_new_pack.8ilJAj/_new 2015-01-21 21:56:36.000000000 +0100 @@ -1,4 +1,9 @@ #!/bin/bash +# Author: Adrian Schröter <[email protected]> +# +# This script creates the required package list from the kiwi +# boot image descriptions +# sourcearchive=$1 shift @@ -15,7 +20,10 @@ MISSING="1" for os in $oses; do file="kiwi/system/boot/$architecture/$boottype/$os/config.xml" - [ -e "$file" ] || echo "ERROR_NO_BOOT_CONFIG_FILE_FOUND" + if [ ! -e "$file" ];then + echo "ERROR_NO_${architecture}_${boottype}_${os}_BOOT_CONFIG_FILE_FOUND" + break + fi # my professional enterprise ready xml parser: while read line; do ++++++ 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 @@ -44551d702294ffe080bd8e7baf77e29a529dd3ac +af91f28bc8b65a2c0f0070ddd1c2cd9176f7f2bf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWICollect.pm new/kiwi/modules/KIWICollect.pm --- old/kiwi/modules/KIWICollect.pm 2014-12-04 20:35:08.000000000 +0100 +++ new/kiwi/modules/KIWICollect.pm 2015-01-09 15:52:18.000000000 +0100 @@ -992,7 +992,7 @@ }; } $this->{m_debugPacks}->{$packname}->{'requireVersionArch'}-> - { $packPointer->{'version'}."-".$packPointer->{'release'} } = 1; + { "$packPointer->{'version'}-$packPointer->{'release'}.$arch" } = 1; return; } 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-12-19 09:06:40.000000000 +0100 +++ new/kiwi/modules/KIWIGlobals.pm 2015-01-16 11:35:43.000000000 +0100 @@ -1846,7 +1846,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "7.02.18"; + $data{Version} = "7.02.21"; $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-12-10 09:15:49.000000000 +0100 +++ new/kiwi/modules/KIWILinuxRC.sh 2015-01-12 12:55:06.000000000 +0100 @@ -30,6 +30,7 @@ export bootLoaderOK=0 export enablePlymouth=1 export IFS_ORIG=$IFS +export MEDIACHECK_OK_TIMER=5 #====================================== # lookup @@ -4046,6 +4047,8 @@ "waitkey" else Echo "ISO check passed" + Echo "Press any key to continue (waiting $MEDIACHECK_OK_TIMER sec...)" + read -s -n 1 -t $MEDIACHECK_OK_TIMER 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-11-12 20:53:42.000000000 +0100 +++ new/kiwi/modules/KIWIResult.pm 2015-01-16 11:34:55.000000000 +0100 @@ -21,6 +21,7 @@ use warnings; use Config::IniFiles; use Digest::SHA qw(sha256); +use Cwd; #========================================== # KIWI Modules @@ -465,6 +466,8 @@ $kiwi -> failed (); return; } + my $orig_cwd = getcwd; + chdir $tmpdir; while (my $entry = readdir ($dh)) { next if $entry eq "." || $entry eq ".."; next if ! -f $entry; @@ -475,7 +478,7 @@ $kiwi -> failed (); return; } - $sha -> addfile ($tmpdir."/".$entry); + $sha -> addfile ($entry); my $digest = $sha -> hexdigest; my $fd = FileHandle -> new(); if (! $fd -> open (">$tmpdir/$entry.sha256")) { @@ -486,6 +489,7 @@ print $fd $digest."\n"; $fd -> close(); } + chdir $orig_cwd; closedir $dh; return $this; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
