diff options
| author | Yonghee Han <onstudy@samsung.com> | 2017-04-03 13:50:12 +0900 |
|---|---|---|
| committer | Yonghee Han <onstudy@samsung.com> | 2017-04-03 20:35:32 +0900 |
| commit | b6e1a2cb3b07a263e2cf270f35893f46cb5c0e2b (patch) | |
| tree | ee947a16fe577803c8161e490550439e861d6d3b | |
| parent | 5e86f63fe845ed8d19c3f7247b8efc57e93bf749 (diff) | |
| download | build-b6e1a2cb3b07a263e2cf270f35893f46cb5c0e2b.tar.gz build-b6e1a2cb3b07a263e2cf270f35893f46cb5c0e2b.tar.bz2 build-b6e1a2cb3b07a263e2cf270f35893f46cb5c0e2b.zip | |
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: I0c7199f0f9eeda835755e854e764eb871d558b6e
| -rw-r--r-- | build-vm | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -686,9 +686,13 @@ 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 + # use the rpmbuild --stage option + if [ ! -z $BUILD_RPM_BUILD_STAGE ]; then + if [[ "$BUILD_RPM_BUILD_STAGE" =~ ^- ]]; then + echo "BUILD_RPM_BUILD_STAGE='$BUILD_RPM_BUILD_STAGE'" >> $BUILD_ROOT/.build/build.data + else + echo "BUILD_RPM_BUILD_STAGE='-$BUILD_RPM_BUILD_STAGE'" >> $BUILD_ROOT/.build/build.data + fi fi # fallback time for broken hosts date '+@%s' > $BUILD_ROOT/.build/.date |