Changeset 4ed4a32

Timestamp:

05/01/2021 07:22:06 AM (3 years ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

ablfs-more, legacy, trunk

Children:

2ac2fc5

Parents:

b3825c3

Message:

Allow using any branch/tag in BLFS Makefile

Still WIP because of the *_TREE names

File:

• BLFS/Makefile (modified) (2 diffs)

BLFS/Makefile

@@ -57 +57 @@
 endef
 
+# Git locations and branches
 LFS-GIT = git://git.linuxfromscratch.org/lfs.git
+LFS-BRANCH = trunk
 GIT = git://git.linuxfromscratch.org/blfs.git
+BLFS-BRANCH = trunk
 
 ALLXML := $(filter-out $(RENDERTMP)/%, \
@@ -179 +182 @@
 all: update $(BOOK_XML)
 
+# If in detached head state, "git pull" returns an error, so switch back to
+# trunk before updating, and switch back to the branch/tag afterwards
 update: $(BLFS_XML) $(LFS_XML)
         @echo Updating the book sources
-        $(Q)cd $(LFS_XML) && git pull
-        $(Q)cd $(BLFS_XML) && git pull
+        $(Q)cd $(LFS_XML) && \
+        if [ $(LFS-BRANCH) != trunk ]; then git switch -; fi && \
+        git pull && \
+        git checkout $(LFS-BRANCH)
+        $(Q)cd $(BLFS_XML) && \
+        if [ $(BLFS-BRANCH) != trunk ]; then git switch -; fi && \
+        git pull && \
+        git checkout $(BLFS-BRANCH)
 
 $(LFS_XML):
         @echo Getting the LFS book sources...
         $(Q)git clone $(LFS-GIT) $@
+        if [ $(LFS-BRANCH) != trunk ]; then \
+            cd $@ && \
+            git checkout $(LFS-BRANCH); \
+        fi
 
 $(BLFS_XML):
         @echo Getting the BLFS book sources...
         $(Q)git clone $(GIT) $@
+        if [ $(BLFS-BRANCH) != trunk ]; then \
+            cd $@ && \
+            git checkout $(BLFS-BRANCH); \
+        fi
 
 # Clean up