From e36ddbe18a4cb3ffa0a7e8156951df9185d157bd Mon Sep 17 00:00:00 2001 From: SoonKyu Park Date: Thu, 18 Aug 2016 17:11:05 +0900 Subject: [PATCH] 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 --- Build.pm | 2 ++ build-vm | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/Build.pm b/Build.pm index f058ede..532faa1 100644 --- 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 01070d9..f9a5ffc 100644 --- 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 -- 2.34.1