Changeset 5573313

Timestamp:

03/11/2012 04:37:10 PM (12 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

ablfs

Children:

688117a

Parents:

81cd513

Message:

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)

Files:

• BLFS/Makefile (modified) (2 diffs)
• common/libs/func_install_blfs (modified) (1 diff)

BLFS/Makefile

@@ -12 +12 @@
 endif
 
+# Known behavior
 LANG=C
 LC_ALL=C
+
+# The right-hand side is updated by jhalfs
 TRACKING_DIR = tracking-dir
 TOPDIR=$(shell pwd)
@@ -63 +66 @@
 
 # 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

common/libs/func_install_blfs

@@ -32 +32 @@
 # 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