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

Fix BLFS tool inclusion for CLFS:

Browse source 
-fix a typo in Makefile (8 spaces to tab...)
-fix permission problems (hopefully)
This commit is contained in:
Pierre Labastie 2013-11-06 20:55:27 +00:00
parent 298282525e
commit e18f80a34a
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
CLFS/master.sh
View file

@ -69,9 +69,9 @@ cat << EOF
echo "export CLFS_TARGET32=\"${TARGET32}\"" >> \$(LUSER_HOME)/.bashrc && \\ echo "export CLFS_TARGET32=\"${TARGET32}\"" >> \$(LUSER_HOME)/.bashrc && \\
echo "source $JHALFSDIR/envars" >> \$(LUSER_HOME)/.bashrc echo "source $JHALFSDIR/envars" >> \$(LUSER_HOME)/.bashrc
@chown \$(LUSER):\$(LGROUP) \$(LUSER_HOME)/.bashrc && \\ @chown \$(LUSER):\$(LGROUP) \$(LUSER_HOME)/.bashrc && \\
chmod a+wt \$(MOUNT_PT) && \\
touch envars && \\ touch envars && \\
chmod -R a+wt \$(MOUNT_PT) && \\ chown \$(LUSER):\$(LGROUP) envars
chown -R \$(LUSER) \$(MOUNT_PT)/\$(SCRIPT_ROOT)
@\$(call housekeeping) @\$(call housekeeping)
EOF EOF
) >> $MKFILE.tmp ) >> $MKFILE.tmp
@ -1056,11 +1056,11 @@ mk_FINAL:
@touch \$@ @touch \$@
mk_BLFS_TOOL: mk_FINAL mk_BLFS_TOOL: mk_FINAL
@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); \\
( make -C $BLFS_ROOT/work ); \\ ( make -C $BLFS_ROOT/work ); \\
fi; fi;
@touch \$@ @touch \$@
mk_CUSTOM_TOOLS: mk_BLFS_TOOL mk_CUSTOM_TOOLS: mk_BLFS_TOOL
@if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\ @if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\

5
common/libs/func_install_blfs
View file

@ -32,6 +32,11 @@ sed -i s@trunk/BOOK@$BLFS_TREE@ \
sudo make -j1 -C $BUILDDIR$BLFS_ROOT TRACKING_DIR=$BUILDDIR$TRACKING_DIR \ sudo make -j1 -C $BUILDDIR$BLFS_ROOT TRACKING_DIR=$BUILDDIR$TRACKING_DIR \
$BUILDDIR$BLFS_ROOT/packages.xml $BUILDDIR$BLFS_ROOT/packages.xml
# Now /var and /var/lib are owned by root. This is an issue when building
# CLFS with method=boot, because system dirs creation is made by user, who
# then cannot create /var/lock and the such.
sudo chown -R $LUSER $BUILDDIR/var
# Because the BLFS Makefile is supposed to be used in chroot (or booted) # Because the BLFS Makefile is supposed to be used in chroot (or booted)
# mode, the tracking file has wrong path for DTD. Change it: # mode, the tracking file has wrong path for DTD. Change it:
sudo sed -i s@$BUILDDIR@@ $BUILDDIR$TRACKING_DIR/instpkg.xml sudo sed -i s@$BUILDDIR@@ $BUILDDIR$TRACKING_DIR/instpkg.xml