From: Anas Nashif Date: Tue, 8 May 2012 21:21:44 +0000 (+0100) Subject: fixed path to spec when spec is given as package name X-Git-Tag: 2.0_alpha~48 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b03ee5138ea4f1e3cf382d51107d6927ce3b89fe;p=tools%2Fdepanneur.git fixed path to spec when spec is given as package name --- diff --git a/Makefile b/Makefile index 1ef2873..0c661cb 100644 --- a/Makefile +++ b/Makefile @@ -14,5 +14,6 @@ install: $(DESTDIR)$(bindir) install -m755 \ depanneur \ + check_unresolved \ $(DESTDIR)$(bindir) diff --git a/depanneur b/depanneur index 1a162f1..de61e6f 100755 --- a/depanneur +++ b/depanneur @@ -177,7 +177,7 @@ sub parse_packs { release => $release, deps => @buildrequires, subpacks => @subpacks, - filename => $spec + filename => $path_to_spec } } return %packs; @@ -319,7 +319,7 @@ if ($binarylist ne "" && -e $binarylist ) } if ( grep $_ eq $nb, @sp ) { push(@tobuild, $name); - $found =1 ; + $found = 1 ; last; } } @@ -528,11 +528,19 @@ while (1) { } if (system ("sudo BUILD_ROOT=$ENV{TIZEN_BUILD_ROOT}/local/scratch BUILD_DIR=\"$ENV{'VIRTUAL_ENV'}/usr/lib/build\" build --jobs 4 $clean_option --cachedir $ENV{TIZEN_BUILD_ROOT}/local/cache --dist $dist --configdir $ENV{TIZEN_BUILD_ROOT}/tools/dist-configs $repos $srpm_filename") == 0) { + system ("cp $scratchdir/home/abuild/rpmbuild/SRPMS/*.rpm $localrepo/$dist/src/SRPMS") == 0 or die "mv"; system ("cp $scratchdir/home/abuild/rpmbuild/RPMS/*/*.rpm $localrepo/$dist/$arch/RPMS") == 0 or die "mv"; my_mkdir "$localrepo/$dist/$arch/logs/$name-$version-$release"; system ("cp $scratchdir/.build.log $localrepo/$dist/$arch/logs/$name-$version-$release/log") == 0 or die "mv"; system ("cp $scratchdir/.srcfiles.cache $ENV{TIZEN_DEVEL_ROOT}/local/order/.repo.cache") == 0 or die "mv"; + + #my $pattern = "$scratchdir/home/abuild/rpmbuild/RPMS/*/*.rpm"; + #my @binaries = glob $pattern; + #foreach my $bin (@binaries) { + # my $x = Build::Rpm::query($bin); + #print Dumper($x); + #} $packages_built = 1; }