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

BLFS: Fix Makefile so that it builds version.ent

Browse source
This commit is contained in:
Pierre Labastie 2021-05-01 13:51:19 +02:00
parent 605ea3628b
commit 34c47bef04
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
BLFS/Makefile
View file

@ -149,7 +149,7 @@ 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_FULL): $(LFS_XML) $(LFS_XML)/general.ent $(ALLXMLLFS) $(ALLXSLLFS) lfs-version
@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)
@ -166,7 +166,7 @@ $(LFS_FULL): $(LFS_XML) $(LFS_XML)/general.ent $(ALLXMLLFS) $(ALLXSLLFS)
$(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) $(BLFS_FULL): $(BLFS_XML) $(BLFS_XML)/general.ent $(ALLXML) $(ALLXSL) version
$(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 \
@ -210,6 +210,13 @@ $(BLFS_XML):
git checkout $(BLFS-BRANCH); \ git checkout $(BLFS-BRANCH); \
fi fi
# Generate BLFS version from git:
version:
$(Q)cd $(BLFS_XML) && ./git-version.sh
lfs-version:
$(Q)cd $(LFS_XML) && ./git-version.sh
# Clean up # Clean up
clean: clean:
@ -217,4 +224,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