Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2014-10-14 07:09:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-10-07 18:23:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2014-10-14 07:10:00.000000000 +0200 @@ -1,0 +2,67 @@ +Mon Oct 13 12:34:43 CEST 2014 - [email protected] + +- v7.01.8 released + +------------------------------------------------------------------- +Fri Oct 10 17:12:43 CEST 2014 - [email protected] + +- Compress Docker images using XZ + + This results in images requiring less disk space. + +------------------------------------------------------------------- +Fri Oct 10 15:11:01 CEST 2014 - [email protected] + +- Use -o loop for mounting read-write image + + Older systems (e.g RHEL 6) mount command is not able to detect + a loop mount and requires the -o loop option in order to work + +------------------------------------------------------------------- +Fri Oct 10 13:22:10 CEST 2014 - [email protected] + +- fix dependencies of s390 requires + + * zipl was never an own package, it is part of s390-tools + * syslinux does not exist on SLES 12 s390 + +------------------------------------------------------------------- +Fri Oct 10 13:18:50 CEST 2014 - [email protected] + +- Also support new appdata format + +------------------------------------------------------------------- +Wed Oct 8 10:43:09 CEST 2014 - [email protected] + +- Again Fixed use of zypper package cache + + Not only the addrepo command but also other ones seems to remove + the pkg-cache-dir if there is no associated repo available. Thus + the preserve and restore of the package cache happens now before + and after all zypper repo setup related commands are called + +------------------------------------------------------------------- +Tue Oct 7 17:11:08 CEST 2014 - [email protected] + +- v7.01.7 released + +------------------------------------------------------------------- +Tue Oct 7 17:06:51 CEST 2014 - [email protected] + +- Update dhclientImportInfo + + Allow the function to export DHCPSIADDR from the + dhcp-server-identifier information stored in the + lease file created by the dhclient call + +------------------------------------------------------------------- +Tue Oct 7 13:04:46 CEST 2014 - [email protected] + +- Make sure u-boot bootargs will be escaped (bnc #900007) + +------------------------------------------------------------------- +Mon Oct 6 22:05:26 CEST 2014 - [email protected] + +- Make kiwi --info thread safe + +------------------------------------------------------------------- @@ -127,0 +195,5 @@ + +------------------------------------------------------------------- +Mon Sep 29 15:22:24 CEST 2014 - [email protected] + +- Add support for EFI on aarch64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.trJgFg/_old 2014-10-14 07:10:01.000000000 +0200 +++ /var/tmp/diff_new_pack.trJgFg/_new 2014-10-14 07:10:01.000000000 +0200 @@ -26,7 +26,7 @@ Group: System/Management Url: http://github.com/openSUSE/kiwi Name: kiwi -Version: 7.01.6 +Version: 7.01.8 Release: 0 Provides: kiwi-image:lxc Provides: kiwi-image:tbz @@ -349,7 +349,7 @@ %endif %endif %ifarch s390 s390x -Requires: zipl +Requires: s390-tools %endif %ifarch %ix86 x86_64 %if 0%{?suse_version} < 1315 @@ -422,7 +422,7 @@ %endif %endif %ifarch s390 s390x -Requires: zipl +Requires: s390-tools %endif %ifarch %ix86 x86_64 %if 0%{?suse_version} < 1315 @@ -535,7 +535,7 @@ %endif %endif %ifarch s390 s390x -Requires: zipl +Requires: s390-tools %endif %ifarch %ix86 x86_64 %if 0%{?suse_version} < 1315 ++++++ 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-09-16 14:54:54.000000000 +0200 +++ new/kiwi/.revision 2014-09-16 14:54:54.000000000 +0200 @@ -1 +1 @@ -d89ede6b8b994af3070c32ddf61ad50a51fdd0e9 +ec656b4bc83bb9f137274fafdc5820f169174bd2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/distribution/kiwi-instsource-plugins-SLE-12/KIWIFinishEFIPlugin.pm new/kiwi/distribution/kiwi-instsource-plugins-SLE-12/KIWIFinishEFIPlugin.pm --- old/kiwi/distribution/kiwi-instsource-plugins-SLE-12/KIWIFinishEFIPlugin.pm 2014-09-15 16:02:49.000000000 +0200 +++ new/kiwi/distribution/kiwi-instsource-plugins-SLE-12/KIWIFinishEFIPlugin.pm 2014-10-06 16:18:16.000000000 +0200 @@ -98,7 +98,9 @@ my $firmware = $type->getFirmwareType(); if ($firmware eq "efi" || $firmware eq "uefi") { my $dir = $this->collect()->basesubdirs()->{$cd}; - my $efi = "$dir/boot/x86_64/efi"; + my $arch = KIWIQX::qxx ("uname -m"); + chomp $arch; + my $efi = "$dir/boot/$arch/efi"; $this->logMsg("I", "creating $efi"); $this -> callCmd("dd if=/dev/zero of=$efi bs=1M count=4"); $this -> callCmd("/usr/sbin/mkdosfs -n 'BOOT' $efi"); 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-09-26 08:12:53.000000000 +0200 +++ new/kiwi/modules/KIWIBoot.pm 2014-10-07 13:04:28.000000000 +0200 @@ -5243,10 +5243,8 @@ $kiwi -> error ("*** uboot: CD boot not supported ***"); $kiwi -> failed (); return; - } elsif (($topic=~ /^KIWI USB/)||($imgtype=~ /vmx|oem|split/)) { - print $FD "setenv bootargs $cmdline \${append}\n"; } else { - print $FD "setenv bootargs $cmdline \${append}\n" + print $FD "setenv bootargs \"$cmdline \${append}\"\n"; } $FD -> close(); $kiwi -> done(); 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-09-17 15:48:38.000000000 +0200 +++ new/kiwi/modules/KIWICollect.pm 2014-10-10 15:20:43.000000000 +0200 @@ -27,6 +27,7 @@ use File::Path; use Cwd 'abs_path'; use Data::Dumper; +use Digest::MD5 (); #========================================== # Dynamic Modules @@ -118,6 +119,9 @@ m_debug => undef, m_rmlists => undef, m_appdata => undef, + m_appdata_seen => undef, + m_appdata_base => undef, + m_appdata_type => undef, m_reportLog => {}, }; @@ -952,12 +956,27 @@ return; } $XML->seek(0, 0); + my $appdata = ''; while ( <$XML> ) { next if m,<\?xml,; - next if m,^\s*</?applications,; - $this->{m_appdata} .= $_; + if (m,<((applications|components)[^\>\n]*)>,s) { + if (!$this->{m_appdata_type} || + ($2 eq 'components' && + $this->{m_appdata_type} eq 'applications')) { + $this->{m_appdata_base} = $1; + $this->{m_appdata_type} = $2; + } + } + next if m,^\s*</?(?:applications|components),; + $appdata .= $_; } $XML -> close(); + my $appdata_md5 = Digest::MD5::md5_hex($appdata); + $this->{m_appdata_seen} ||= {}; + if (!$this->{m_appdata_seen}->{$appdata_md5}) { + $this->{m_appdata} .= $appdata; + $this->{m_appdata_seen}->{$appdata_md5} = 1; + } return; } @@ -1289,6 +1308,24 @@ } #========================================== +# writeAppdata +#------------------------------------------ +sub writeAppdata { + my $this = shift; + my $dir = shift; + $this->logMsg('I', "write appdata to $dir\n"); + my $XML = FileHandle -> new(); + my $appdata_type = $this->{m_appdata_type} || 'applications'; + my $appdata_base = $this->{m_appdata_base } || $appdata_type; + $XML -> open (">$dir/appdata.xml") or die("$dir/appdata.xml: $!\n"); + print $XML "<?xml version='1.0' ?>\n"; + print $XML "<$appdata_base>\n"; + print $XML $this->{m_appdata}; + print $XML "</$appdata_type>\n"; + $XML -> close (); +} + +#========================================== # collectPackages #------------------------------------------ sub collectPackages { @@ -1393,29 +1430,13 @@ } my $descrdir = $this->{m_proddata}->getInfo("DESCRDIR"); if ($descrdir && $this->{m_appdata}) { - my $dirbase = "$this->{m_basesubdir}->{1}"; - $this->logMsg('I', "write appdata to $dirbase/$descrdir\n"); - my $XML = FileHandle -> new(); - $XML -> open (">$dirbase/$descrdir/appdata.xml") or die "WHAT"; - print $XML "<?xml version='1.0' ?>\n"; - print $XML "<applications>\n"; - print $XML $this->{m_appdata}; - print $XML "</applications>\n"; - $XML -> close (); + $this->writeAppdata("$this->{m_basesubdir}->{1}/$descrdir"); } my $datadir = $this->{m_proddata}->getInfo("DATADIR"); if ( defined($this->{m_proddata}->getVar("CREATE_REPOMD")) && $this->{m_proddata}->getVar("CREATE_REPOMD") eq "true" && $this->{m_appdata}) { - my $dirbase = "$this->{m_basesubdir}->{1}"; - $this->logMsg('I', "write appdata to $dirbase/$datadir/repodata\n"); - my $XML = FileHandle -> new(); - $XML -> open (">$dirbase/$datadir/repodata/appdata.xml") or die "WHAT"; - print $XML "<?xml version='1.0' ?>\n"; - print $XML "<applications>\n"; - print $XML $this->{m_appdata}; - print $XML "</applications>\n"; - $XML -> close (); + $this->writeAppdata("$this->{m_basesubdir}->{1}/$datadir/repodata"); } my @packagelist = sort(keys(%{$this->{m_metaPacks}})); if($this->unpackMetapackages(@packagelist) != 0) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIContainerBuilder.pm new/kiwi/modules/KIWIContainerBuilder.pm --- old/kiwi/modules/KIWIContainerBuilder.pm 2014-09-15 16:02:54.000000000 +0200 +++ new/kiwi/modules/KIWIContainerBuilder.pm 2014-10-13 11:01:14.000000000 +0200 @@ -335,7 +335,7 @@ my $imgFlName = $globals -> generateBuildImageName( $xml, '-', $extension ); - $imgFlName .= '.tbz'; + $imgFlName .= '.tar.xz'; my $tar = $locator -> getExecPath('tar'); if (! $tar) { $kiwi -> failed(); @@ -360,7 +360,7 @@ return; } my $data = KIWIQX::qxx ( - "$tar -C $origin -cjf $baseBuildDir/$imgFlName @dirlist 2>&1" + "$tar -C $origin -cJf $baseBuildDir/$imgFlName @dirlist 2>&1" ); my $code = $? >> 8; if ($code != 0) { 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-10-06 11:15:38.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2014-10-13 12:34:37.000000000 +0200 @@ -1835,7 +1835,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "7.01.6"; + $data{Version} = "7.01.8"; $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/KIWIIsoLinux.pm new/kiwi/modules/KIWIIsoLinux.pm --- old/kiwi/modules/KIWIIsoLinux.pm 2014-09-15 16:02:54.000000000 +0200 +++ new/kiwi/modules/KIWIIsoLinux.pm 2014-10-06 16:18:16.000000000 +0200 @@ -141,6 +141,10 @@ $base{ppc64le}{boot} = "boot/ppc64le"; $base{ppc64le}{loader} = "undef"; $base{ppc64le}{efi} = "undef"; + # aarch64 + $base{aarch64}{boot} = "boot/aarch64"; + $base{aarch64}{loader} = "undef"; + $base{aarch64}{efi} = "boot/aarch64/efi"; #======================================= # 1) search for legacy boot #--------------------------------------- @@ -179,6 +183,9 @@ if ($arch eq "ia64") { push (@catalog, "ia64_efi"); } + if ($arch eq "aarch64") { + push (@catalog, "aarch64_efi"); + } } } #========================================== @@ -385,6 +392,23 @@ } #========================================== +# aarch64_efi +#------------------------------------------ +sub aarch64_efi { + my $this = shift; + my $arch = shift; + my %base = %{$this->{base}}; + my $para = $this -> {params}; + my $boot = $base{$arch}{boot}; + my $loader= $base{$arch}{efi}; + $para.= " -no-emul-boot"; + $para.= " -boot-load-size 1"; + $para.= " -b $loader"; + $this -> {params} = $para; + return $this; +} + +#========================================== # addBootLive #------------------------------------------ sub addBootLive { @@ -1269,8 +1293,10 @@ } my $arch = KIWIQX::qxx ("uname -m"); chomp $arch; - if ($arch ne 'x86_64') { + if ($arch =~ /i.86/) { $efi_arch = 'i386'; + } else { + $efi_arch = $arch; } my $efi_fat = "$source/boot/$efi_arch/efi"; if (-e $efi_fat) { 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-09-30 09:22:59.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2014-10-10 15:10:57.000000000 +0200 @@ -4716,6 +4716,10 @@ cat $lease | grep 'domain-name-servers'|\ awk '{print $3}'| tr -d ';' | tr ',' ' ' ) + export DHCPSIADDR=$( + cat $lease | grep 'dhcp-server-identifier'|\ + awk '{print $3}'| tr -d ';' | tr ',' ' ' + ) export DNS=$DNSSERVERS export DHCPCHADDR=$( ip link show $1| grep link | awk '{print $2}' @@ -6414,7 +6418,7 @@ target=/mnt/read-write fi mkdir -p /mnt-tmp - if ! mount ${loopf}-read-write /mnt-tmp;then + if ! mount -o loop ${loopf}-read-write /mnt-tmp;then systemException \ "Failed to mount read-write data file" \ "reboot" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIManagerZypper.pm new/kiwi/modules/KIWIManagerZypper.pm --- old/kiwi/modules/KIWIManagerZypper.pm 2014-10-01 17:25:20.000000000 +0200 +++ new/kiwi/modules/KIWIManagerZypper.pm 2014-10-08 10:42:43.000000000 +0200 @@ -298,6 +298,7 @@ #========================================== # Add/Update repos #------------------------------------------ + $this -> preserveRepoCache(); foreach my $alias (keys %{$source{$stype}}) { my @sopts = @{$source{$stype}{$alias}}; my @zopts = (); @@ -369,14 +370,8 @@ if (! $chroot) { if (! $repo_exists) { $kiwi -> info ("Adding bootstrap zypper service: $alias"); - KIWIQX::qxx( - "mv /var/cache/kiwi/packages /var/cache/kiwi/packs" - ); $data = KIWIQX::qxx ("@zypper --root \"$root\" $sadd 2>&1"); $code = $? >> 8; - KIWIQX::qxx( - "mv /var/cache/kiwi/packs /var/cache/kiwi/packages" - ); } else { $kiwi -> info ("Updating bootstrap zypper service: $alias"); $data = KIWIQX::qxx ( @@ -394,6 +389,7 @@ if ($code != 0) { $kiwi -> failed (); $kiwi -> error ("zypper: $data"); + $this -> restoreRepoCache(); return; } $kiwi -> done (); @@ -401,14 +397,8 @@ my @zypper= @{$this->{zypper_chroot}}; if (! $repo_exists) { $kiwi -> info ("Adding chroot zypper service: $alias"); - KIWIQX::qxx( - "mv /var/cache/kiwi/packages /var/cache/kiwi/packs" - ); $data = KIWIQX::qxx ("@kchroot @zypper $sadd 2>&1"); $code = $? >> 8; - KIWIQX::qxx( - "mv /var/cache/kiwi/packs /var/cache/kiwi/packages" - ); } else { $kiwi -> info ("Updating chroot zypper service: $alias"); $data = KIWIQX::qxx ( @@ -424,23 +414,19 @@ if ($code != 0) { $kiwi -> failed (); $kiwi -> error ("zypper: $data"); + $this -> restoreRepoCache(); return; } $kiwi -> done (); if (($source{$alias}{imgincl}) && (! -f $imgRepo)) { $kiwi -> info ("Adding $alias repo to image"); - KIWIQX::qxx( - "mv /var/cache/kiwi/packages /var/cache/kiwi/packs" - ); $sadd =~ s/--keep-packages//; $data = KIWIQX::qxx ("@kchroot zypper $sadd 2>&1"); $code = $? >> 8; - KIWIQX::qxx( - "mv /var/cache/kiwi/packs /var/cache/kiwi/packages" - ); if ($code != 0) { $kiwi -> failed (); $kiwi -> error ("zypper: $data"); + $this -> restoreRepoCache(); return; } if ( $prio ) { @@ -451,6 +437,7 @@ if ($code != 0) { $kiwi -> failed (); $kiwi -> error ("zypper: $data"); + $this -> restoreRepoCache(); return; } } @@ -471,16 +458,54 @@ if ($code != 0) { $kiwi -> failed (); $kiwi -> error ("zypper: $data"); + $this -> restoreRepoCache(); return; } $kiwi -> done (); } push (@channelList,$alias); } + $this -> restoreRepoCache(); $this->{channelList} = \@channelList; return $this; } +#========================================== +# restoreRepoCache +#------------------------------------------ +sub restoreRepoCache { + # ... + # activate preserved package cache for use + # with build repo setup + # + my $this = shift; + my $kiwi = $this->{kiwi}; + $kiwi -> loginfo("Restoring Zypper package cache"); + KIWIQX::qxx( + "mv /var/cache/kiwi/packs /var/cache/kiwi/packages &>/dev/null" + ); + return $this; +} + +#========================================== +# preserveRepoCache +#------------------------------------------ +sub preserveRepoCache { + # ... + # preserve repo cache which otherwise will be removed by + # zypper if no repo file is found. But this situation is + # normal for an image build process which setup and remove + # repos for building at runtime + # --- + my $this = shift; + my $kiwi = $this->{kiwi}; + $kiwi -> loginfo("Preserving Zypper package cache"); + KIWIQX::qxx( + "mv /var/cache/kiwi/packages /var/cache/kiwi/packs" + ); + return $this; +} + #========================================== # resetInstallationSource #------------------------------------------ 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-09-30 16:49:06.000000000 +0200 +++ new/kiwi/modules/KIWIXML.pm 2014-10-07 15:38:52.000000000 +0200 @@ -5800,6 +5800,7 @@ # check/create cache directory #------------------------------------------ my $sdir = "/var/tmp/kiwi/satsolver"; + my $sdir_orig = $sdir; if (! -d $sdir) { my $data = KIWIQX::qxx ("mkdir -m 777 -p $sdir 2>&1"); my $code = $? >> 8; @@ -5835,7 +5836,7 @@ #========================================== # download repo XML metadata #------------------------------------------ - my $repoMD = $sdir."/repomd.xml"; unlink $repoMD; + my $repoMD = $sdir."/repomd.xml-$$"; foreach my $md (keys %repoxml) { if (KIWIGlobals->instance()->downloadFile ($repo.$md,$repoMD)) { last if -e $repoMD; @@ -5935,6 +5936,18 @@ close $FD; } #========================================== + # create tmp cache for repo data download + #------------------------------------------ + $sdir = "/var/tmp/kiwi/satsolver/$$"; + my $data = KIWIQX::qxx ("mkdir -m 777 -p $sdir 2>&1"); + $code = $? >> 8; + if ($code != 0) { + $kiwi -> failed (); + $kiwi -> error ("--> Couldn't create tmp cache dir: $data"); + $kiwi -> failed (); + return; + } + #========================================== # download distro solvable(s) #------------------------------------------ my $foundDist = 0; @@ -6132,12 +6145,8 @@ #========================================== # cleanup cache dir #------------------------------------------ - KIWIQX::qxx ("rm -f $sdir/repomd.xml"); - KIWIQX::qxx ("rm -f $sdir/primary-*"); - KIWIQX::qxx ("rm -f $sdir/projectxml-*"); - KIWIQX::qxx ("rm -f $sdir/distxml-*"); - KIWIQX::qxx ("rm -f $sdir/packages-*"); - KIWIQX::qxx ("rm -f $sdir/*.pat*"); + KIWIQX::qxx ("rm -f $sdir_orig/repomd.xml-$$"); + KIWIQX::qxx ("rm -rf $sdir"); if (! $error) { $kiwi -> done(); return $index; 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-09-15 16:02:55.000000000 +0200 +++ new/kiwi/system/boot/s390/oemboot/suse-SLES12/config.xml 2014-10-10 15:20:43.000000000 +0200 @@ -124,7 +124,6 @@ <package name="squashfs"/> <package name="sysconfig"/> <package name="sysfsutils"/> - <package name="syslinux"/> <package name="tar"/> <package name="util-linux"/> <package name="xfsprogs"/> 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-09-15 16:02:55.000000000 +0200 +++ new/kiwi/system/boot/s390/vmxboot/suse-SLES12/config.xml 2014-10-10 15:20:43.000000000 +0200 @@ -124,7 +124,6 @@ <package name="squashfs"/> <package name="sysconfig"/> <package name="sysfsutils"/> - <package name="syslinux"/> <package name="tar"/> <package name="util-linux"/> <package name="xfsprogs"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/lib/Test/kiwiContainerBuilder.pm new/kiwi/tests/unit/lib/Test/kiwiContainerBuilder.pm --- old/kiwi/tests/unit/lib/Test/kiwiContainerBuilder.pm 2014-09-15 16:02:56.000000000 +0200 +++ new/kiwi/tests/unit/lib/Test/kiwiContainerBuilder.pm 2014-10-13 11:01:14.000000000 +0200 @@ -386,13 +386,13 @@ $this -> assert_not_null($res); my $expectedFl = 'lxc/container-test-lxc.'; my $arch = KIWIQX::qxx ("uname -m"); chomp ( $arch ); - $expectedFl .= $arch . '-1.0.0.tbz'; + $expectedFl .= $arch . '-1.0.0.tar.xz'; $this -> assert_file_exists($tmpDir . '/' . $expectedFl); my $CHILDWRITE; my $CHILDSTDO; my $CHILDSTDE; my $pid = open3 ( - $CHILDWRITE, $CHILDSTDO, $CHILDSTDE, "tar -tjvf $tmpDir/$expectedFl" + $CHILDWRITE, $CHILDSTDO, $CHILDSTDE, "tar -tJvf $tmpDir/$expectedFl" ); waitpid( $pid, 0 ); $status = $? >> 8; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
