diff options
| author | Michael Schroeder <mls@suse.de> | 2014-03-19 13:30:03 +0100 |
|---|---|---|
| committer | Michael Schroeder <mls@suse.de> | 2014-03-19 13:30:03 +0100 |
| commit | 27a978fd3e3d2159278ecbe1a6800fe97d83c5b8 (patch) | |
| tree | 572d2564ac392d904e90b6f26fb6098813177fde /build-vm | |
| parent | ea1d5415c05ff1a3bf4b540b769eeb199ef81690 (diff) | |
refactor recipe handling
Diffstat (limited to 'build-vm')
| -rw-r--r-- | build-vm | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -542,7 +542,7 @@ vm_first_stage() { if test "$DO_INIT" = true ; then # do first stage of init_buildsystem rm -f $BUILD_ROOT/.build.success - set -- init_buildsystem --configdir "$CONFIG_DIR" --cachedir "$CACHE_DIR" --prepare "${definesnstuff[@]}" "${repos[@]}" $CLEAN_BUILD $USE_SYSTEM_QEMU $USEUSEDFORBUILD $RPMLIST "$MYSRCDIR/$SPECFILE" $ADDITIONAL_PACKS + set -- init_buildsystem --configdir "$CONFIG_DIR" --cachedir "$CACHE_DIR" --prepare "${definesnstuff[@]}" "${repos[@]}" $CLEAN_BUILD $USE_SYSTEM_QEMU $USEUSEDFORBUILD $RPMLIST "$MYSRCDIR/$RECIPEFILE" $ADDITIONAL_PACKS echo "$* ..." start_time=`date +%s` "$@" || cleanup_and_exit 1 @@ -574,7 +574,7 @@ vm_first_stage() { fi # put our config into .build/build.data Q="'\''" - echo "SPECFILE='${SPECFILE//"'"/$Q}'" > $BUILD_ROOT/.build/build.data + echo "RECIPEFILE='${RECIPEFILE//"'"/$Q}'" > $BUILD_ROOT/.build/build.data echo "BUILD_JOBS='${BUILD_JOBS//"'"/$Q}'" >> $BUILD_ROOT/.build/build.data echo "BUILD_ARCH='${BUILD_ARCH//"'"/$Q}'" >> $BUILD_ROOT/.build/build.data echo "BUILD_RPMS='${BUILD_RPMS//"'"/$Q}'" >> $BUILD_ROOT/.build/build.data |