Changeset f45af2c

Timestamp:

03/13/2022 07:53:39 PM (2 years ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

ablfs-more, trunk

Children:

9f89fae

Parents:

62206d6

git-author:

Pierre Labastie <pierre.labastie@…> (03/13/2022 07:50:38 PM)

git-committer:

Pierre Labastie <pierre.labastie@…> (03/13/2022 07:53:39 PM)

Message:

Config.in: simplify selection of book source

Use the variable COMMIT instead of BRANCH_ID.
Also fix various typos, CLFS/HLFS reference, help strings, etc.
For the moment, the selections for the BLFS tools are unchanged.

File:

• Config.in (modified) (8 diffs)

Config.in

@@ -58 +58 @@
     #--- Book version
     choice
-        prompt   "Release"
-        default   relGIT
-
-        config    relGIT
-            bool    "GIT"
-            help
-                Current development git trunk branch
+        prompt   "Book version"
+        default   BRANCH
+
+        config    BRANCH
+            bool    "Branch (default to trunk) or any commit"
+            help
+                A GIT branch, tag, or commit
 
         config    WORKING_COPY
@@ -70 +70 @@
             help
                 A local working copy
-
-        config    BRANCH
-            bool    "Branch or stable book"
-            help
-                A supported GIT branch or tag
     endchoice
 
-    config    BRANCH_ID
-        string    "Branch (preceded by \"branch-\"), stable Version, or tag"
-        default    "**EDIT ME**"
+    config    COMMIT
+        string    "Branch, tag, or any commit"
+        default    "trunk"
         depends on    BRANCH
         help
-            A list of valid branches and stable book IDs is available at
-            http://wiki.linuxfromscratch.org/alfs/wiki/SupportedBooks
-            
-            Enter "branch-XXX" for branch XXX, or just "YYY" for stable (or tag)
-            YYY version.
+            Enter a branch, a tag, or an abbreviated commit sha.
+            The tool will clone the LFS repository and checkout
+            that commit
 
     config    BOOK
@@ -257 +250 @@
         depends on BLFS_BRANCH
         help
-            A list of valid branches and stable book IDs is available at
-            http://wiki.linuxfromscratch.org/alfs/wiki/SupportedBooks.
+             Can be any branch, tag, or abbreviated (or not) commit sha.
     endif
     #--- End blfs-tool Support
@@ -331 +323 @@
         depends on LFS_BRANCH
         help
-            A list of valid branches and stable book IDs is available at
-            http://wiki.linuxfromscratch.org/alfs/wiki/SupportedBooks.
+            Any branch, tag or abbreviated (or not) commit sha.
     # End of BLFS parameters
 
@@ -365 +356 @@
             the new system.
             
-            Note that the user that will build the packages must
+            Note that the user who will build the packages must
             have read and write access to this directory.
 
@@ -374 +365 @@
 depends on !BOOK_BLFS
 
-    #--- {C,H,}LFS User Account
+    #--- LFS User Account
 
     config    LUSER
         string
-        default    "lfs"    if BOOK_LFS || BOOK_LFS_SYSD
+        default    "lfs"
 
     config    LGROUP
@@ -730 +721 @@
             help
               The default here is for a virtual interface in qemu. Private
-              networks have addresses in the range 10.x.x.x or 192.169.x.x.
+              networks have addresses in the range 10.x.x.x or 192.168.x.x.
               You have to know your network prefix. Then the last figure
               may be anything you like.
@@ -886 +877 @@
     config    REALSBU
         bool    "Build Binutls pass1 without optimization (Real SBU)"
-        depends on (BOOK_LFS || BOOK_LFS_SYSD) && OPT_2
+        depends on OPT_2
         default    n
         help