Also pass arch and buildflavor when creating the containerinfo

Otherwise the tags will not be there or not match the container.
openSUSE · Jun 13, 2018 · 1fd7c9f · 1fd7c9f
1 parent 4be1109
commit 1fd7c9f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/Build/Kiwi.pm b/Build/Kiwi.pm
@@ -451,11 +451,16 @@ sub show {
 }
 
 sub showcontainerinfo {
-  my $disturl;
+  my ($disturl, $arch, $buildflavor);
   (undef, $disturl) = splice(@ARGV, 0, 2) if @ARGV > 2 && $ARGV[0] eq '--disturl';
+  (undef, $arch) = splice(@ARGV, 0, 2) if @ARGV > 2 && $ARGV[0] eq '--arch';
+  (undef, $buildflavor) = splice(@ARGV, 0, 2) if @ARGV > 2 && $ARGV[0] eq '--buildflavor';
   my ($fn, $image) = @ARGV;
   local $urlmapper = sub { return $_[0] };
-  my $d = parse({}, $fn);
+  my $cf = {};
+  $cf->{'arch'} = $arch if defined $arch;
+  $cf->{'buildflavor'} = $buildflavor if defined $buildflavor;
+  my $d = parse($cf, $fn);
   die("$d->{'error'}\n") if $d->{'error'};
   $image =~ s/.*\/// if defined $image;
   my $release;

diff --git a/build-recipe-kiwi b/build-recipe-kiwi
@@ -616,7 +616,7 @@ postprocess_kiwi_containers() {
     disturlarg=()
     test -n "$DISTURL" && disturlarg=("--disturl" "$DISTURL")
     for r in $BUILD_ROOT/$TOPDIR/KIWI/*.tar ; do
-	test -e "$r" && perl -I$BUILD_DIR -MBuild::Kiwi -e Build::Kiwi::showcontainerinfo -- "${disturlarg[@]}" $BUILD_ROOT/$TOPDIR/SOURCES/$RECIPEFILE "$r" > "${r%.tar}.containerinfo"
+	test -e "$r" && perl -I$BUILD_DIR -MBuild::Kiwi -e Build::Kiwi::showcontainerinfo -- "${disturlarg[@]}" --arch "${BUILD_ARCH%%:*}" --buildflavor "$BUILD_FLAVOR" $BUILD_ROOT/$TOPDIR/SOURCES/$RECIPEFILE "$r" > "${r%.tar}.containerinfo"
     done
 }