r3600 - in jhalfs/branches/ablfs: BLFS common/libs

pierre at linuxfromscratch.org pierre at linuxfromscratch.org
Sun Mar 11 09:37:15 PDT 2012


Author: pierre
Date: 2012-03-11 10:37:10 -0600 (Sun, 11 Mar 2012)
New Revision: 3600

Modified:
   jhalfs/branches/ablfs/BLFS/Makefile
   jhalfs/branches/ablfs/common/libs/func_install_blfs
Log:
Add comments to BLFS/Makefile
Use /bin/echo to write the initial instpkg.xml. Hopefully, the behavior
of /bin/echo is independant on the shell
Add a sudo to a sed in finc_install_blfs (needed in some cases)

Modified: jhalfs/branches/ablfs/BLFS/Makefile
===================================================================
--- jhalfs/branches/ablfs/BLFS/Makefile	2012-03-09 20:27:22 UTC (rev 3599)
+++ jhalfs/branches/ablfs/BLFS/Makefile	2012-03-11 16:37:10 UTC (rev 3600)
@@ -11,8 +11,11 @@
   Q = @
 endif
 
+# Known behavior
 LANG=C
 LC_ALL=C
+
+# The right-hand side is updated by jhalfs
 TRACKING_DIR = tracking-dir
 TOPDIR=$(shell pwd)
 BLFS_XML = $(TOPDIR)/blfs-xml
@@ -62,13 +65,14 @@
 	$(Q)rm $@.tmp
 
 # Beware of the echo '$(INITIAL_TRACK)' command below:
-# if default shell is bash, needs echo -e
-# if default shell is sh : echo is enough
+# if shell is bash or sh linked to bash, needs echo -e
+# if shell is dash or sh linked to dash: echo is enough
 # Don't ask me why
+# So use /bin/echo (needs -e)
 $(TRACKFILE): $(TRACKING_DIR)
 	$(Q)if ! [ -f $@ ]; then \
 	echo Initializing $(TRACKFILE) && \
-	echo '$(INITIAL_TRACK)' > $@ && \
+	/bin/echo -e echo '$(INITIAL_TRACK)' > $@ && \
 	$(MAKE) $(PACK_LIST); \
 	fi
 	@for track in $(TRACKING_DIR)/*-*; do \

Modified: jhalfs/branches/ablfs/common/libs/func_install_blfs
===================================================================
--- jhalfs/branches/ablfs/common/libs/func_install_blfs	2012-03-09 20:27:22 UTC (rev 3599)
+++ jhalfs/branches/ablfs/common/libs/func_install_blfs	2012-03-11 16:37:10 UTC (rev 3600)
@@ -31,7 +31,7 @@
 
 # Because the BLFS Makefile is supposed to be used in chroot (or booted)
 # mode, the tracking file has wrong path for DTD. Change it:
-sed -i s@$BUILDDIR@@ $BUILDDIR$TRACKING_DIR/instpkg.xml
+sudo sed -i s@$BUILDDIR@@ $BUILDDIR$TRACKING_DIR/instpkg.xml
 
 # Manually build a 'configuration' file
 if [ "$DEP_LIBXML" = y ]; then




More information about the alfs-log mailing list