From 10a2dec2f64fc0d0cdd612b950133c9da8b9086e Mon Sep 17 00:00:00 2001 From: "yang.zhang" Date: Tue, 8 Mar 2016 13:50:26 +0800 Subject: [PATCH] adapt to new build Change-Id: Ie022d738c8247747e5821250f4aadacda39c4cdb --- depanneur | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/depanneur b/depanneur index cef9459..1efc736 100755 --- 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 "; } -- 2.34.1