diff options
Diffstat (limited to 'scripts/build/binary_chroot')
| -rwxr-xr-x | scripts/build/binary_chroot | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/scripts/build/binary_chroot b/scripts/build/binary_chroot index 87986c0a7..fb7c7546a 100755 --- a/scripts/build/binary_chroot +++ b/scripts/build/binary_chroot @@ -43,7 +43,7 @@ if [ -f chroot/proc/version ] then if [ "${LB_USE_FAKEROOT}" != "true" ] then - ${LB_ROOT_COMMAND} umount chroot/proc + umount chroot/proc else rm -rf chroot/proc mkdir -p chroot/proc @@ -54,7 +54,7 @@ if [ -d chroot/sys/kernel ] then if [ "${LB_USE_FAKEROOT}" != "true" ] then - ${LB_ROOT_COMMAND} umount chroot/sys + umount chroot/sys else rm -rf chroot/sys mkdir -p chroot/sys @@ -81,20 +81,20 @@ fi Echo_message "This may take a while." # Removing old chroot -${LB_ROOT_COMMAND} rm -rf chroot/chroot -${LB_ROOT_COMMAND} rm -rf chroot.tmp +rm -rf chroot/chroot +rm -rf chroot.tmp # Copying new chroot if [ -d cache/bootstrap ] && [ "${LB_CHROOT_FILESYSTEM}" != "none" ] && [ "${LB_CHROOT_FILESYSTEM}" != "plain" ] then - ${LB_ROOT_COMMAND} mv chroot chroot.tmp - ${LB_ROOT_COMMAND} cp -a cache/bootstrap chroot - ${LB_ROOT_COMMAND} touch chroot/chroot.cache + mv chroot chroot.tmp + cp -a cache/bootstrap chroot + touch chroot/chroot.cache else - ${LB_ROOT_COMMAND} cp -a chroot chroot.tmp + cp -a chroot chroot.tmp fi -${LB_ROOT_COMMAND} mv chroot.tmp chroot/chroot +mv chroot.tmp chroot/chroot # Handling chroot excludes if [ -f config/rootfs/excludes ] && [ "${LB_CHROOT_FILESYSTEM}" != "squashfs" ] @@ -116,10 +116,5 @@ then esac fi -if [ -n "${LB_ROOT_COMMAND}" ] -then - ${LB_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot -fi - # Creating stage file Create_stagefile .build/binary_chroot |