Changeset 9b99ada for Config.in

Timestamp:

04/01/2022 08:26:17 AM (2 years ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

ablfs-more, trunk

Children:

924a237

Parents:

30a444a

Message:

Change variable names and logic for BLFS book

Only use BLFS_COMMIT instead of BLFS_BRANCH_ID, BLFS_TREE, BLFS_BOOK
Same for le LFS_BLFS variables

File:

• Config.in (modified) (4 diffs)

Config.in

@@ -217 +217 @@
 
         choice
-        prompt    "BLFS Release"
-        default    BLFS_GIT
-
-            config    BLFS_GIT
-            bool    "BLFS GIT"
-            help
-                Current development version as in trunk
+        prompt    "BLFS book version"
+        default    BLFS_BRANCH
+
+            config    BLFS_BRANCH
+            bool    "BLFS Branch (default trunk) or any commit"
+            help
+                Use a BLFS book downloaded from the git repository, and
+                checked out at any commit (branch/tag/sha).
 
             config    BLFS_WORKING_COPY
             bool    "BLFS working copy"
             help
-                A local working copy of the BLFS book.
-
-            config    BLFS_BRANCH
-            bool    "BLFS Branch or stable book"
-            help
-                A supported GIT branch or stable (tag) book release
+                Use a local working copy of the BLFS book.
         endchoice
 
@@ -243 +239 @@
             Full path to the BLFS book working copy
 
-        config    BLFS_BRANCH_ID
-        string    "BLFS Book Version (mandatory)"
-        default    "**EDIT ME**"
+        config    BLFS_COMMIT
+        string    "BLFS Book commit (branch/tag/sha)"
+        default   "trunk"
         depends on BLFS_BRANCH
         help
@@ -289 +285 @@
 
         choice
-        prompt    "LFS Release"
-        default    LFS_relGIT
+        prompt    "LFS book version"
+        default    LFS_BRANCH
         depends on    BOOK_BLFS
 
-            config    LFS_relGIT
-            bool     "LFS GIT"
-            help
-                Current development version as in trunk
+            config    LFS_BRANCH
+            bool     "LFS branch (default trunk) or any commit"
+            help
+                Use an LFS book downloaded from the git repository and
+                checked out at any commit (branch/tag/sha).
 
             config    LFS_WORKING_COPY
             bool     "LFS working copy"
             help
-                A local working copy of the LFS book.
-
-            config    LFS_BRANCH
-            bool     "LFS Branch or stable book"
-            help
-                A supported GIT branch or stable (tag) book release
+                Use a local working copy of the LFS book.
         endchoice
 
@@ -316 +308 @@
             Full path to the LFS book working copy"
 
-        config    BLFS_LFS_BRANCH_ID
-        string    "LFS Book Version (mandatory)"
-        default    "**EDIT ME**"
+        config    BLFS_LFS_COMMIT
+        string    "LFS Book Commit (mandatory)"
+        default   "trunk"
         depends on LFS_BRANCH
         help