jhalfs git · trunk

jhalfs LFS build automation (mirror)

lfs mirror bash · first commit 2005-09-11 · last commit 2024-02-13 (2 years ago) · synced 3 days ago · upstream: git.linuxfromscratch.org/jhalfs

Python 78.4% Shell 19.8% Makefile 1.8%

git clone https://git.christianimmanuel.de/mirrors-forks/jhalfs.gitwget https://git.christianimmanuel.de/mirrors-forks/jhalfs/archive/jhalfs.tar.gz

Adapt BLFS/Makefile to the new book layout

Pierre Labastie · 2023-01-20 09:05 · 5c8df438968a82a96456b861d7f6032cd3e156a8

With the change to python modules and the pythonhosted.xml file
becoming untracked, those changes allow creating/updating this
file.

 BLFS/Makefile | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/BLFS/Makefile b/BLFS/Makefile
index 5d4dcd0..d2e59ae 100644
--- a/BLFS/Makefile
+++ b/BLFS/Makefile
@@ -60,10 +60,15 @@ LFS-BRANCH = trunk
 GIT = https://git.linuxfromscratch.org/blfs.git
 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)/%, \
+            $(filter-out $(BLFS_XML)/$(PYHOSTED), \
               $(shell if [ -d $(BLFS_XML) ]; then \
                         find $(BLFS_XML) -name \*.xml; \
-                      fi))
+                      fi)))
 ALLXMLLFS:= $(filter-out $(LFSTMP)/%, \
               $(shell if [ -d $(LFS_XML) ]; then \
                         find $(LFS_XML) -name \*.xml; \
@@ -170,9 +175,13 @@ $(LFS_FULL): $(LFS_XML) $(LFS_XML)/general.ent $(ALLXMLLFS) $(ALLXSLLFS)
 
 $(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
+            echo "Processing BLFS version...";                \
+            if grep -q PYHOSTED Makefile; then                \
+               $(MAKE) -C $(BLFS_XML) REV=$(REV) $(PYHOSTED); \
+            else                                              \
+               ./git-version.sh $(REV);                       \
+            fi;                                               \
+        fi
 	$(Q)[ -d $(RENDERTMP) ] || mkdir -p $(RENDERTMP)
 	@echo "Adjusting BLFS for revision $(REV)..."
 	$(Q)xsltproc --nonet --xinclude                          \
@@ -230,4 +239,4 @@ clean:
 	rm -rf $(TOPDIR)/dependencies $(TOPDIR)/book-html $(TOPDIR)/scripts
 
 FORCE:
-.PHONY: clean all update $(CONFIG_OUT) version FORCE
+.PHONY: clean all update $(CONFIG_OUT) FORCE