Feature : create new 'rpmbuildstage:' option on OBS.

    Use : add 'rpmbuildstage: bb' option at the OBS Project config.
    Modify : build -> send BUILD_RPM_BUILD_STAGE option to VM build.data
             build.pm -> precheck the rpmbuildstage: option.
    Related package: bs_worker of the obs-server package.

Change-Id: Ia6c7daa590081ef90368b3748556543e3f495e91

diff --git a/Build.pm b/Build.pm
index f058ede17faa90b838827f77f0bd857010378c85..532faa147a4534af86e5134218be067594cb6eea 100644 (file)
--- a/Build.pm
+++ b/Build.pm
@@ -327,6 +327,8 @@ sub read_config {
       } else {
        push @{$config->{'constraint'}}, $l;
       }
+    } elsif ($l0 eq 'rpmbuildstage:') { # use the rpmbuild --stage option
+      $config->{'rpmbuildstage'} = $l[0];
     } elsif ($l0 !~ /^[#%]/) {
       warn("unknown keyword in config: $l0\n");
     }

diff --git a/build-vm b/build-vm
index 01070d984c98adc55a8cfd4a91c8b342822efda6..f9a5ffce430bdf1bd5115ef74099e3bb062d8fc4 100644 (file)
--- a/build-vm
+++ b/build-vm
@@ -686,6 +686,10 @@ vm_first_stage() {
     echo "BUILDENGINE='$BUILDENGINE'" >> $BUILD_ROOT/.build/build.data
     echo "CCACHE='$CCACHE'" >> $BUILD_ROOT/.build/build.data
     echo "ABUILD_TARGET='$ABUILD_TARGET'" >> $BUILD_ROOT/.build/build.data
+    # use the rpmbuild --stage option  689
+    if [ ! -z $BUILD_RPM_BUILD_STAGE ]; then   690
+        echo "BUILD_RPM_BUILD_STAGE='-$BUILD_RPM_BUILD_STAGE'" >> $BUILD_ROOT/.build/build.data        691
+    fi
     # fallback time for broken hosts
     date '+@%s' > $BUILD_ROOT/.build/.date
     # we're done with the root file system, unmount