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

BLFS tools: do not needlessly validate book

Browse source 
With the current Makefile, git-version.sh is run unconditionally,
so that the bok is validated each time, even if there is no
text change. Change this to only validate if there is a text change
(the previous behavior), and run git-version.sh just before validation.
This commit is contained in:
Pierre Labastie 2021-11-09 21:11:58 +01:00
parent e25788e846
commit f756851d45
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
BLFS/Makefile
View file

@ -147,7 +147,11 @@ ifneq ($(REV),$(REV1))
$(BLFS_FULL): FORCE $(BLFS_FULL): FORCE
$(LFS_FULL): FORCE $(LFS_FULL): FORCE
endif endif
$(LFS_FULL): $(LFS_XML) $(LFS_XML)/general.ent $(ALLXMLLFS) $(ALLXSLLFS) lfs-version $(LFS_FULL): $(LFS_XML) $(LFS_XML)/general.ent $(ALLXMLLFS) $(ALLXSLLFS)
$(Q)cd $(LFS_XML) && if [ -x git-version.sh ] ; then \
echo "Processing LFS version..."; \
./git-version.sh $(REV); \
fi
@echo "Processing LFS bootscripts..." @echo "Processing LFS bootscripts..."
$(Q)cd $(LFS_XML) && bash process-scripts.sh $(Q)cd $(LFS_XML) && bash process-scripts.sh
$(Q)[ -d $(LFSTMP) ] || mkdir -p $(LFSTMP) $(Q)[ -d $(LFSTMP) ] || mkdir -p $(LFSTMP)
@ -164,7 +168,11 @@ $(LFS_FULL): $(LFS_XML) $(LFS_XML)/general.ent $(ALLXMLLFS) $(ALLXSLLFS) lfs-ver
$(Q)cd $(LFS_XML) && ./aux-file-data.sh $@ $(Q)cd $(LFS_XML) && ./aux-file-data.sh $@
$(Q)echo $(REV) > $(REVFILE) $(Q)echo $(REV) > $(REVFILE)
$(BLFS_FULL): $(BLFS_XML) $(BLFS_XML)/general.ent $(ALLXML) $(ALLXSL) version $(BLFS_FULL): $(BLFS_XML) $(BLFS_XML)/general.ent $(ALLXML) $(ALLXSL)
$(Q)cd $(BLFS_XML) && if [ -x git-version.sh ] ; then \
echo "Processing BLFS version..."; \
./git-version.sh $(REV); \
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)..."
$(Q)xsltproc --nonet --xinclude \ $(Q)xsltproc --nonet --xinclude \
@ -208,17 +216,6 @@ $(BLFS_XML):
git checkout $(BLFS-BRANCH); \ git checkout $(BLFS-BRANCH); \
fi fi
# Generate BLFS version from git:
version:
$(Q)cd $(BLFS_XML) && if [ -x git-version.sh ] ; then \
./git-version.sh $(REV); \
fi
lfs-version:
$(Q)cd $(LFS_XML) && if [ -x git-version.sh ] ; then \
./git-version.sh $(REV); \
fi
# Clean up # Clean up
clean: clean: