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

BLFS/Makefile:

Browse source 
-  Do not call make after inititalizing the tracking file
-  Remove the <package-version> file from tracking dir after using it
-  Fix a typo
This commit is contained in:
Pierre Labastie 2017-08-09 13:25:26 +00:00
parent 203a64ca76
commit e415656b9f
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
BLFS/Makefile
View file

@ -1,5 +1,5 @@
# From the Build Scripts Written By: Jim Gifford <lfs@jg555.com> # From the Build Scripts Written By: Jim Gifford <lfs@jg555.com>
# Modified By: Joe Ciccone <jciccone@linuxfromscratch.org # Modified By: Joe Ciccone <jciccone@linuxfromscratch.org>
# Additional changes: George Boudreau <georgeb@linuxfromscratch.org> # Additional changes: George Boudreau <georgeb@linuxfromscratch.org>
# Pierre Labastie <pierre.labastie at neuf.fr> # Pierre Labastie <pierre.labastie at neuf.fr>
@ -111,11 +111,10 @@ $(PACK_LIST): $(XSLDIR)/gen_pkg_list.xsl $(XSLDIR)/specialCases.xsl $(TRACKFILE)
$(TRACKFILE): $(TRACKING_DIR) $(TRACKFILE): $(TRACKING_DIR)
$(Q)if ! [ -f $@ ]; then \ $(Q)if ! [ -f $@ ]; then \
echo Initializing $(TRACKFILE) && \ echo Initializing $(TRACKFILE) && \
/bin/echo -e '$(INITIAL_TRACK)' > $@ && \ /bin/echo -e '$(INITIAL_TRACK)' > $@; \
$(MAKE) $(PACK_LIST); \
fi fi
$(Q)for track in $(TRACKING_DIR)/*-*; do \ $(Q)for track in $(TRACKING_DIR)/*-*; do \
if [ -f $$track ]; then \ if [ -f $$track ]; then \
pack=$$(echo $$track | sed 's@.*/\(.*\)-[0-9c].*@\1@') && \ pack=$$(echo $$track | sed 's@.*/\(.*\)-[0-9c].*@\1@') && \
version=$$(echo $$track | sed 's@.*-\([0-9c].*\)@\1@') && \ version=$$(echo $$track | sed 's@.*-\([0-9c].*\)@\1@') && \
xsltproc --stringparam packages $(PACK_LIST) \ xsltproc --stringparam packages $(PACK_LIST) \
@ -124,7 +123,8 @@ $(TRACKFILE): $(TRACKING_DIR)
-o track.tmp $(XSLDIR)/bump.xsl $@ && \ -o track.tmp $(XSLDIR)/bump.xsl $@ && \
sed -i 's@PACKDESC@$(TOPDIR)/packdesc.dtd@' track.tmp && \ sed -i 's@PACKDESC@$(TOPDIR)/packdesc.dtd@' track.tmp && \
xmllint --format --postvalid track.tmp > $@; \ xmllint --format --postvalid track.tmp > $@; \
fi; \ fi; \
rm -f $$track; \
done; \ done; \
rm -f track.tmp rm -f track.tmp