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

Add comments to BLFS/Makefile

Browse source 
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)
This commit is contained in:
Pierre Labastie 2012-03-11 16:37:10 +00:00
parent 81cd513e46
commit 55733136b6
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
BLFS/Makefile
View file

@ -11,8 +11,11 @@ else
Q = @ Q = @
endif endif
# Known behavior
LANG=C LANG=C
LC_ALL=C LC_ALL=C
# The right-hand side is updated by jhalfs
TRACKING_DIR = tracking-dir TRACKING_DIR = tracking-dir
TOPDIR=$(shell pwd) TOPDIR=$(shell pwd)
BLFS_XML = $(TOPDIR)/blfs-xml BLFS_XML = $(TOPDIR)/blfs-xml
@ -62,13 +65,14 @@ $(PACK_LIST): $(XSLDIR)/gen_pkg_list.xsl $(XSLDIR)/specialCases.xsl $(TRACKFILE)
$(Q)rm $@.tmp $(Q)rm $@.tmp
# Beware of the echo '$(INITIAL_TRACK)' command below: # Beware of the echo '$(INITIAL_TRACK)' command below:
# if default shell is bash, needs echo -e # if shell is bash or sh linked to bash, needs echo -e
# if default shell is sh : echo is enough # if shell is dash or sh linked to dash: echo is enough
# Don't ask me why # Don't ask me why
# So use /bin/echo (needs -e)
$(TRACKFILE): $(TRACKING_DIR) $(TRACKFILE): $(TRACKING_DIR)
$(Q)if ! [ -f $@ ]; then \ $(Q)if ! [ -f $@ ]; then \
echo Initializing $(TRACKFILE) && \ echo Initializing $(TRACKFILE) && \
echo '$(INITIAL_TRACK)' > $@ && \ /bin/echo -e echo '$(INITIAL_TRACK)' > $@ && \
$(MAKE) $(PACK_LIST); \ $(MAKE) $(PACK_LIST); \
fi fi
@for track in $(TRACKING_DIR)/*-*; do \ @for track in $(TRACKING_DIR)/*-*; do \

2
common/libs/func_install_blfs
View file

@ -31,7 +31,7 @@ sudo make -j1 -C $BUILDDIR$BLFS_ROOT TRACKING_DIR=$BUILDDIR$TRACKING_DIR \
# 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:
sed -i s@$BUILDDIR@@ $BUILDDIR$TRACKING_DIR/instpkg.xml sudo sed -i s@$BUILDDIR@@ $BUILDDIR$TRACKING_DIR/instpkg.xml
# Manually build a 'configuration' file # Manually build a 'configuration' file
if [ "$DEP_LIBXML" = y ]; then if [ "$DEP_LIBXML" = y ]; then