zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use only CHROOT1 in LFS/master.sh

Browse source 
There is only one chroot command in newer LFS, and using the first one
with previous versions does not hurt.
This commit is contained in:
Pierre Labastie 2022-02-05 18:48:32 +01:00
parent abadee36de
commit 20051e00f7
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
LFS/master.sh
View file

@ -376,13 +376,13 @@ mk_CHROOT: mk_SUDO
mk_BOOT: mk_CHROOT mk_BOOT: mk_CHROOT
@\$(call echo_CHROOT_request) @\$(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 \$@ @touch \$@
mk_BLFS_TOOL: create-sbu_du-report mk_BLFS_TOOL: create-sbu_du-report
@if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\ @if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
\$(call sh_echo_PHASE,Building BLFS_TOOL); \\ \$(call sh_echo_PHASE,Building BLFS_TOOL); \\
(sudo \$(CHROOT2) -c "make -C $BLFS_ROOT/work"); \\ (sudo \$(CHROOT1) -c "make -C $BLFS_ROOT/work"); \\
fi; fi;
@touch \$@ @touch \$@
@ -390,7 +390,7 @@ mk_CUSTOM_TOOLS: mk_BLFS_TOOL
@if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\ @if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\
\$(call sh_echo_PHASE,Building CUSTOM_TOOLS); \\ \$(call sh_echo_PHASE,Building CUSTOM_TOOLS); \\
sudo mkdir -p ${BUILDDIR}${TRACKING_DIR}; \\ 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; fi;
@touch \$@ @touch \$@
@ -417,7 +417,7 @@ chroot1: devices
\$(MAKE) teardown \$(MAKE) teardown
chroot: devices chroot: devices
sudo \$(CHROOT2) sudo \$(CHROOT1)
\$(MAKE) teardown \$(MAKE) teardown
SETUP: $SETUP_TGT SETUP: $SETUP_TGT