diff options
| author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2018-10-04 17:57:01 +0300 |
|---|---|---|
| committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2018-10-19 15:18:13 +0300 |
| commit | 98ac27dcb33e3c5b6f1137d300ca29827b532604 (patch) | |
| tree | 462a713a6bed922fa27fcfb360f145e9614537ed | |
| parent | 17cb68e9fb8a1fcb830c0895b3bd9fab91d4b66c (diff) | |
| download | abuild-98ac27dcb33e3c5b6f1137d300ca29827b532604.tar.bz2 abuild-98ac27dcb33e3c5b6f1137d300ca29827b532604.tar.xz | |
abuild: rootbld: pass recursive options
| -rw-r--r-- | abuild.in | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -1755,7 +1755,7 @@ do_fakeroot() { check_fakeroot() { cd "$startdir" [ -n "$FAKEROOT" ] && msg "Entering fakeroot..." - do_fakeroot "$abuild_path" $color_opt $keep_build check + do_fakeroot "$abuild_path" $recursive_opts check } # build and package in fakeroot @@ -1763,7 +1763,7 @@ rootpkg() { cd "$startdir" rm -rf "$pkgdir" [ -n "$FAKEROOT" ] && msg "Entering fakeroot..." - do_fakeroot "$abuild_path" $color_opt $keep_build \ + do_fakeroot "$abuild_path" $recursive_opts \ package \ prepare_subpackages \ prepare_language_packs \ @@ -2215,7 +2215,7 @@ rootbld() { --hostname "build-$buildhost-$CARCH" \ --chdir "$startdir" \ --setenv PATH /bin:/usr/bin:/sbin:/usr/sbin \ - /usr/bin/abuild $force rootbld_actions + /usr/bin/abuild $force $recursive_opts rootbld_actions update_abuildrepo_index cleanup $CLEANUP } @@ -2519,6 +2519,8 @@ while getopts "AcdD:fFhkKimnp:P:qrRs:uv" opt; do done shift $(( $OPTIND - 1 )) +recursive_opts="$color_opt $keep_build" + # check so we are not root if [ $(id -u) -eq 0 ] && [ -z "$FAKEROOTKEY" ]; then [ -z "$forceroot" ] && die "Do not run abuild as root" |