Changeset 6c83a56

Timestamp:

09/21/2013 10:38:16 AM (11 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

ablfs

Children:

90bfb42e

Parents:

df08148

Message:

Merge trunk r3721,3722

Files:

• Config.in (modified) (5 diffs)
• LFS/master.sh (modified) (1 diff)
• common/libs/func_download_pkgs (modified) (1 diff)

Config.in

@@ -45 +45 @@
         choice
                 prompt  "Release"
-                default relSVN
+                default relSVN  if BOOK_LFS || BOOK_HLFS
+                default relGIT  if BOOK_CLFS || BOOK_CLFS2 || BOOK_CLFS3
                 config  relSVN
                         bool    "SVN"
+                        depends on BOOK_LFS || BOOK_HLFS
                         help
                                 #-- Current development version as in trunk
+
+                config  relGIT
+                        bool    "GIT"
+                        depends on BOOK_CLFS || BOOK_CLFS2 || BOOK_CLFS3
+                        help
+                                #-- Current development git master branch
 
                 config  WORKING_COPY
@@ -60 +68 @@
                         bool    "Branch or stable book" if !BOOK_CLFS2 && !BOOK_CLFS3
                         help
-                                #-- A supported SVN branch or stable released book
+                                #-- A supported SVN/GIT branch or stable released book
         endchoice
 
@@ -136 +144 @@
 
                 config  DATA_64
-                        bool    "64-bit"        if !ARCH_PPC
+                        bool    "64-bit"
 
                 config  DATA_MULTI
@@ -251 +259 @@
                 default "mips64-unknown-linux-uclibc"   if  BOOK_CLFS3 && PROC_mips   && DATA_64
 
-                default "powerpc-unknown-linux-gnu"     if  ARCH_PPC   && DATA_32
-                default "powerpc64-unknown-linux-gnu"   if  ARCH_PPC   && DATA_MULTI
+                default "powerpc-unknown-linux-gnu"     if  ARCH_PPC && DATA_32
+                default "powerpc64-unknown-linux-gnu"   if  ARCH_PPC && (DATA_MULTI || DATA-64)
 
                 default "sparc-unknown-linux-gnu"       if  ARCH_SPARC && DATA_32
@@ -312 +320 @@
                 default "ppc"           if ARCH_PPC   && DATA_32
                 default "ppc64"         if ARCH_PPC   && DATA_MULTI
+                default "ppc64-64"      if ARCH_PPC   && DATA_64
 
                 default "sparc"         if ARCH_SPARC && DATA_32

LFS/master.sh

@@ -79 +79 @@
 
     # If no testsuites are run, then TCL, Expect, DejaGNU and Check
-    # aren't needed.
+    # aren't needed (but building them does not hurt).
     # Fix also locales creation when running chapter05 testsuites (ugly)
     case "${this_script}" in
-      *tcl)       [[ "${TEST}" = "0" ]] && continue ;;
-      *expect)    [[ "${TEST}" = "0" ]] && continue ;;
-      *dejagnu)   [[ "${TEST}" = "0" ]] && continue ;;
-      *check)     [[ "${TEST}" = "0" ]] && continue ;;
+#      *tcl)       [[ "${TEST}" = "0" ]] && continue ;;
+#      *expect)    [[ "${TEST}" = "0" ]] && continue ;;
+#      *dejagnu)   [[ "${TEST}" = "0" ]] && continue ;;
+#      *check)     [[ "${TEST}" = "0" ]] && continue ;;
       *stripping) [[ "${STRIP}" = "n" ]] && continue ;;
       *glibc)     [[ "${TEST}" = "3" ]] && \

common/libs/func_download_pkgs

@@ -40 +40 @@
       # Skip some packages if they aren't needed
     case $line in
-      */check* | */tcl* | */expect* | */dejagnu* | */tree* | */gcc-testsuite* )
+      */tree* | */gcc-testsuite* ) #unneeded now?
             [[ "$TEST" = "0" ]] && continue
           ;;