Add not export source option
authory0169.zhang <y0169.zhang@samsung.com>
Sat, 11 Feb 2017 03:07:18 +0000 (12:07 +0900)
committeryang.zhang <y0169.zhang@samsung.com>
Tue, 7 Mar 2017 05:43:00 +0000 (13:43 +0800)
Change-Id: I31d227254aa5901451ee09114e0b93280e6bd8e3

depanneur

index 2f7c26f3e638833b7e5cf054fd5bb5e34341fcd9..9f2b9521874a21f550a8b1933c1b95a12ff644c1 100755 (executable)
--- a/depanneur
+++ b/depanneur
@@ -132,6 +132,7 @@ my $noinit = 0;         # don't check build root, just go into it and building
 my $keep_packs = 0;     # don't remove useless rpm packages from build root
 my $thread_export = 0;  # use thread when gbs export source code
 my $use_higher_deps = 0; # which repo provides higher version deps, use it
+my $not_export_source = 0; # do not export source
 my @defines;            # define extra macros for 'rpmbuild'
 my $arg_spec = "";      # spec file to be built this time
 my $start_time = "";    # build start time
@@ -217,6 +218,7 @@ GetOptions (
     "keep-packs" => \$keep_packs,
     "thread-export" => \$thread_export,
     "use-higher-deps" => \$use_higher_deps,
+    "not-export-source" => \$not_export_source,
     "define=s" => \@defines,
     "spec=s" => \$arg_spec,
     "clean-repos" => \$clean_repos,
@@ -1779,14 +1781,18 @@ sub build_package {
     my $spec_name = basename($to_build{$name}->{filename});
     my $pkg_path = "$build_root/local/sources/$dist/$name-$version-$release";
     my $srpm_filename = "";
-    my $not_ex;
+    my $not_ex = 0;
     if ( $style eq "git" && $incremental == 0 ) {
-        $not_ex = grep /^$name$/, @not_export;
-        if ($vmtype eq "kvm") {
-           $not_ex = 0;
-        }
-        if ($not_ex) {
-            $srpm_filename = $to_build{$name}->{filename};
+        if ($not_export_source == 1) {
+            $not_ex = grep /^$name$/, @not_export;
+            if ($vmtype eq "kvm") {
+               $not_ex = 0;
+            }
+            if ($not_ex) {
+                $srpm_filename = $to_build{$name}->{filename};
+            } else {
+                $srpm_filename = "$pkg_path/$spec_name";
+            }
         } else {
             $srpm_filename = "$pkg_path/$spec_name";
         }
@@ -2300,14 +2306,19 @@ if ($style eq 'git') {
        my $packs_queue = Thread::Queue->new();
        my $data_queue = Thread::Queue->new();
        foreach my $pack (@pre_packs) {
-                my $name = basename($pack->{"project_base_path"});
-                my $r = grep /^$name$/, @not_export;
-                if ($vmtype eq "kvm") {
-                  $r = 0;
-                }
-                if ($r) {
-                    info("skip export $name for accel...");
-                    push @packs, $pack;
+                if ($not_export_source == 1) {
+                    my $name = basename($pack->{"project_base_path"});
+                    my $r = grep /^$name$/, @not_export;
+                    if ($vmtype eq "kvm") {
+                      $r = 0;
+                    }
+                    if ($r) {
+                        info("skip export $name for accel...");
+                        push @packs, $pack;
+                    } else {
+                        info("package $name not support skip export source");
+                        $data_queue->enqueue($pack);
+                    }
                 } else {
                     $data_queue->enqueue($pack);
                 }