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

Revert changes to BLFS/Makefile

Browse source 
Changes to book's Makefile have been reverted too...
This commit is contained in:
Pierre Labastie 2023-01-25 13:17:12 +01:00
parent 5c8df43896
commit b39eb29be5
1 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
BLFS/Makefile
View file

@ -60,15 +60,10 @@ LFS-BRANCH = trunk
GIT = https://git.linuxfromscratch.org/blfs.git GIT = https://git.linuxfromscratch.org/blfs.git
BLFS-BRANCH = trunk BLFS-BRANCH = trunk
# Name of a file that is not tracked by git in BLFS_XML
# but has to be updated
PYHOSTED = general/prog/python-dependencies/pythonhosted.xml
ALLXML := $(filter-out $(RENDERTMP)/%, \ ALLXML := $(filter-out $(RENDERTMP)/%, \
$(filter-out $(BLFS_XML)/$(PYHOSTED), \
$(shell if [ -d $(BLFS_XML) ]; then \ $(shell if [ -d $(BLFS_XML) ]; then \
find $(BLFS_XML) -name \*.xml; \ find $(BLFS_XML) -name \*.xml; \
fi))) fi))
ALLXMLLFS:= $(filter-out $(LFSTMP)/%, \ ALLXMLLFS:= $(filter-out $(LFSTMP)/%, \
$(shell if [ -d $(LFS_XML) ]; then \ $(shell if [ -d $(LFS_XML) ]; then \
find $(LFS_XML) -name \*.xml; \ find $(LFS_XML) -name \*.xml; \
@ -176,11 +171,7 @@ $(LFS_FULL): $(LFS_XML) $(LFS_XML)/general.ent $(ALLXMLLFS) $(ALLXSLLFS)
$(BLFS_FULL): $(BLFS_XML) $(BLFS_XML)/general.ent $(ALLXML) $(ALLXSL) $(BLFS_FULL): $(BLFS_XML) $(BLFS_XML)/general.ent $(ALLXML) $(ALLXSL)
$(Q)cd $(BLFS_XML) && if [ -x git-version.sh ] ; then \ $(Q)cd $(BLFS_XML) && if [ -x git-version.sh ] ; then \
echo "Processing BLFS version..."; \ echo "Processing BLFS version..."; \
if grep -q PYHOSTED Makefile; then \
$(MAKE) -C $(BLFS_XML) REV=$(REV) $(PYHOSTED); \
else \
./git-version.sh $(REV); \ ./git-version.sh $(REV); \
fi; \
fi fi
$(Q)[ -d $(RENDERTMP) ] || mkdir -p $(RENDERTMP) $(Q)[ -d $(RENDERTMP) ] || mkdir -p $(RENDERTMP)
@echo "Adjusting BLFS for revision $(REV)..." @echo "Adjusting BLFS for revision $(REV)..."
@ -239,4 +230,4 @@ clean:
rm -rf $(TOPDIR)/dependencies $(TOPDIR)/book-html $(TOPDIR)/scripts rm -rf $(TOPDIR)/dependencies $(TOPDIR)/book-html $(TOPDIR)/scripts
FORCE: FORCE:
.PHONY: clean all update $(CONFIG_OUT) FORCE .PHONY: clean all update $(CONFIG_OUT) version FORCE