Merge remote-tracking branch 'origin/devel'submit/trunk/20220727.093059submit/trunk/20220727.091059submit/trunk/20220718.130059submit/trunk/20220715.190059submit/trunk/20220713.083059submit/trunk/20220712.163059submit/trunk/20220712.132059submit/trunk/20220708.165359accepted/tizen/devbase/tools/20220718.002710

Change-Id: Ic0e6c2512b963f4c0c1a3abb89fd25eb322bdc2a

4 files changed, 41 insertions, 20 deletions

diff --git a/debian/changelog b/debian/changelog
index c8c66a3..e0f2dfa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+build (20160629-tizen20220705) unstable; urgency=high
+
+  * Update tizen version to tizen20220705
+  * Fix defect Build error dlog aarch64.
+
+ -- Wang Biao <biao716.wang@samsung.com>  Tue, 05 Jul 2022 09:30:00 +0800
+
 build (20160629-tizen20220421) unstable; urgency=high
 
   * update tizen version to tizen20220421
diff --git a/expanddeps b/expanddeps
index 5a8af47..511a3c5 100755
--- a/expanddeps
+++ b/expanddeps
@@ -122,7 +122,7 @@ if ($recipe && $recipe =~ /(^|\/)PKGBUILD$/) {
 # read dist if we can
 my $cf;
 if (defined($dist) && $dist ne '') {
-  $cf = Build::read_config_dist($dist, $archs[0], $configdir);
+  $cf = Build::read_config_dist($dist, $archs[0] || 'noarch', $configdir);
   $binarytype = $cf->{'binarytype'} if $cf->{'binarytype'} && $cf->{'binarytype'} ne 'UNDEFINED';
 }
 
@@ -162,7 +162,7 @@ if (!defined($dist) || $dist eq '') {
   print STDERR "Warning: distribution not specified, assuming '$dist' (see $configdir).\n";
 }
 
-$cf = Build::read_config_dist($dist, $archs[0], $configdir);
+$cf ||= Build::read_config_dist($dist, $archs[0] || 'noarch', $configdir);
 $cf->{'warnings'} = 1;
 
 my $dofileprovides = %{$cf->{'fileprovides'}};
@@ -205,20 +205,20 @@ while(<F>) {
     }
   } elsif (/^P:(.*?)-\d+\/\d+\/\d+: (.*)$/) {
     $pkgP = $2;
-	next if $prov{$1};
-	$prov{$1} = $2
+    next if $prov{$1};
+    $prov{$1} = $2;
   } elsif (/^R:(.*?)-\d+\/\d+\/\d+: (.*)$/) {
     $pkgR = $2;
-	next if $req{$1};
-	$req{$1} = $2;
+    next if $req{$1};
+    $req{$1} = $2;
   } elsif (/^C:(.*?)-\d+\/\d+\/\d+: (.*)$/) {
     $pkgC = $2;
-	next if $con{$1};
-	$con{$1} = $2;
+    next if $con{$1};
+    $con{$1} = $2;
   } elsif (/^O:(.*?)-\d+\/\d+\/\d+: (.*)$/) {
     $pkgO = $2;
-	next if $obs{$1};
-	$obs{$1} = $2;
+    next if $obs{$1};
+    $obs{$1} = $2;
   } elsif (/^r:(.*?)-\d+\/\d+\/\d+: (.*)$/) {
     $pkgr = $2;
   } elsif (/^s:(.*?)-\d+\/\d+\/\d+: (.*)$/) {
@@ -257,24 +257,32 @@ while(<F>) {
       delete $rec{$i};
       delete $con{$i};
       delete $obs{$i};
-	  delete $rec{$i};
-	  delete $sup{$i};
+      delete $rec{$i};
+      delete $sup{$i};
       $req{$i}  = $pkgR if defined $pkgR;
       $con{$i}  = $pkgC if defined $pkgC;
       $obs{$i}  = $pkgO if defined $pkgO;
-	  $rec{$i}  = $pkgr if defined $pkgr;
-	  $sup{$i}  = $pkgs if defined $pkgs;
+      $rec{$i}  = $pkgr if defined $pkgr;
+      $sup{$i}  = $pkgs if defined $pkgs;
     } else {
-	  next if $ids{$1};
-	  $ids{$1} = $2;
+       #also need to clean the below values.
+       undef $pkgF;
+       undef $pkgP;
+       undef $pkgR;
+       undef $pkgC;
+       undef $pkgO;
+       undef $pkgr;
+       undef $pkgs;
+       next if $ids{$1};
+       $ids{$1} = $2;
 	}
     undef $pkgF;
     undef $pkgP;
     undef $pkgR;
     undef $pkgC;
     undef $pkgO;
-	undef $pkgr;
-	undef $pkgs;
+    undef $pkgr;
+    undef $pkgs;
   } elsif ($_ eq 'D:') {
     %packs_done = %ids;
   }
diff --git a/packaging/build.changes b/packaging/build.changes
index a86ae5b..aa9312e 100644
--- a/packaging/build.changes
+++ b/packaging/build.changes
@@ -1,4 +1,10 @@
 --------------------------------------------------------------------
+Thu Jul 05 09:30:00 CST 2022 - biao716.wang@samsung.com
+
+- update tizen version to tizen20220705
+- Fix defect Build error dlog aarch64.
+
+--------------------------------------------------------------------
 Thu Apr 21 09:30:00 CST 2022 - biao716.wang@samsung.com
 
 - update tizen version to tizen20220421
diff --git a/packaging/build.spec b/packaging/build.spec
index dd933bf..302008c 100644
--- a/packaging/build.spec
+++ b/packaging/build.spec
@@ -72,7 +72,7 @@ Requires:       build-mkbaselibs
 %if 0%{?suse_version} > 1120 || 0%{?mdkversion}
 Recommends:     build-mkdrpms
 %endif
-Provides:   tizen-build = 20220421
+Provides:   tizen-build = 20220705
 %description
 This package provides a script for building RPMs for SUSE Linux in a
 chroot environment.
@@ -116,7 +116,7 @@ Group:          Development/Tools/Building
 Requires:       build
 BuildRequires:  gcc
 BuildRequires:  glibc-devel
-Provides:       tizen-build-initvm-%{initvm_arch} = 20220421
+Provides:       tizen-build-initvm-%{initvm_arch} = 20220705
 Obsoletes:      build-initvm
 %if 0%{?suse_version}
 BuildRequires:  glibc-devel-static