[jhalfs] 02/02: Use only CHROOT1 in LFS/master.sh

This is an automated email from the git hooks/post-receive script.

git pushed a commit to branch trunk
in repository jhalfs.

commit 20051e00f774aa1089832cba4ad8c94877865652
Author: Pierre Labastie <[email protected]>
AuthorDate: Sat Feb 5 18:48:32 2022 +0100

    Use only CHROOT1 in LFS/master.sh
    
    There is only one chroot command in newer LFS, and using the first one
    with previous versions does not hurt.
---
 LFS/master.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/LFS/master.sh b/LFS/master.sh
index e382af5..59b8b82 100644
--- a/LFS/master.sh
+++ b/LFS/master.sh
@@ -376,13 +376,13 @@ mk_CHROOT: mk_SUDO
 
 mk_BOOT: mk_CHROOT
 	@\$(call echo_CHROOT_request)
-	@( sudo \$(CHROOT2) -c "cd \$(SCRIPT_ROOT) && make BREAKPOINT=\$(BREAKPOINT) BOOT")
+	@( sudo \$(CHROOT1) -c "cd \$(SCRIPT_ROOT) && make BREAKPOINT=\$(BREAKPOINT) BOOT")
 	@touch \$@
 
 mk_BLFS_TOOL: create-sbu_du-report
 	@if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
 	  \$(call sh_echo_PHASE,Building BLFS_TOOL); \\
-	  (sudo \$(CHROOT2) -c "make -C $BLFS_ROOT/work"); \\
+	  (sudo \$(CHROOT1) -c "make -C $BLFS_ROOT/work"); \\
 	fi;
 	@touch \$@
 
@@ -390,7 +390,7 @@ mk_CUSTOM_TOOLS: mk_BLFS_TOOL
 	@if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\
 	  \$(call sh_echo_PHASE,Building CUSTOM_TOOLS); \\
 	  sudo mkdir -p ${BUILDDIR}${TRACKING_DIR}; \\
-	  (sudo \$(CHROOT2) -c "cd \$(SCRIPT_ROOT) && make BREAKPOINT=\$(BREAKPOINT) CUSTOM_TOOLS"); \\
+	  (sudo \$(CHROOT1) -c "cd \$(SCRIPT_ROOT) && make BREAKPOINT=\$(BREAKPOINT) CUSTOM_TOOLS"); \\
 	fi;
 	@touch \$@
 
@@ -417,7 +417,7 @@ chroot1: devices
 	\$(MAKE) teardown
 
 chroot: devices
-	sudo \$(CHROOT2)
+	sudo \$(CHROOT1)
 	\$(MAKE) teardown
 
 SETUP:        $SETUP_TGT

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

-- 
http://lists.linuxfromscratch.org/sympa/info/alfs-discuss
Unsubscribe: See the above information page