adapt to new build

Change-Id: Ie022d738c8247747e5821250f4aadacda39c4cdb

diff --git a/depanneur b/depanneur
index cef9459505a6b6dd25575d36fa1e379080a1378b..1efc736115de7baf1c9c6a8d4430990beba213b3 100755 (executable)
--- a/depanneur
+++ b/depanneur
@@ -1609,9 +1609,6 @@ sub build_package {
         return -1;
     }
     push @args, "sudo /usr/bin/build";
-    if ($arch ne "i586" ) {
-        push @args, "--use-system-qemu";
-    }
     push @args, "--uid $zuid:$zgid";
     my $nprocessors = 2;
     if ($^O eq "linux") {
@@ -1619,7 +1616,7 @@ sub build_package {
     } else {
         warning("depanneur only support linux platform");
     }
-    my $target_arch=`$build_dir/getchangetarget --dist $dist --configdir $dist_configs --archpath $arch`;
+    my $target_arch=`$build_dir/queryconfig target --dist $dist --configdir $dist_configs --archpath $arch`;
     chomp $target_arch;
     if ($target_arch eq "") {
         push @args, "--target $arch";
@@ -1762,7 +1759,7 @@ sub build_package {
                 my_system ("cp $scratch/$rpmdirpath/*/*.rpm $rpm_repo_path");
             }
 
-            my_system("$build_dir/createrpmdeps $rpm_repo_path > $order_dir/.repo.cache.local ");
+            my_system("$build_dir/createdirdeps $rpm_repo_path > $order_dir/.repo.cache.local ");
             my_system("echo D: >> $order_dir/.repo.cache.local");
             # Merge local repo catch and remote repo cache
             my_system("cat $order_dir/.repo.cache.local $order_dir/.repo.cache.remote >$order_dir/.repo.cache");
@@ -2053,14 +2050,14 @@ info("retrieving repo metadata...");
 my $repos_setup = 1;
 my_system("> $order_dir/.repo.cache.local");
 if (-d "$rpm_repo_path") {
-    my_system("$build_dir/createrpmdeps $rpm_repo_path >> $order_dir/.repo.cache.local");
+    my_system("$build_dir/createdirdeps $rpm_repo_path >> $order_dir/.repo.cache.local");
     my_system("echo D: >> $order_dir/.repo.cache.local");
 }
 my_system("> $order_dir/.repo.cache.remote");
 foreach my $repo (@package_repos) {
     my $cmd = "";
     if ($repo =~ /^\// && ! -e "$repo/repodata/repomd.xml") {
-        $cmd = "$build_dir/createrpmdeps $repo >> $order_dir/.repo.cache.remote ";
+        $cmd = "$build_dir/createdirdeps $repo >> $order_dir/.repo.cache.remote ";
     } else {
         $cmd = "$build_dir/createrepomddeps --cachedir=$cache_dir $repo >> $order_dir/.repo.cache.remote ";
     }