From 897416cb4ba0271a2a449977ff12eff705af2694 Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Sat, 21 Sep 2013 09:30:03 +0000 Subject: [PATCH] Update Config.in for use with CLFS: -Add pure 64 bit PowerPC target -Write GIT instead of SVN when using CLFS --- Config.in | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/Config.in b/Config.in index 7939166..8f577b9 100644 --- a/Config.in +++ b/Config.in @@ -44,12 +44,20 @@ menu "--- BOOK Settings" #--- Book version 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 bool "Working Copy" depends on !BOOK_BLFS @@ -59,7 +67,7 @@ menu "--- BOOK Settings" config BRANCH 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 config BRANCH_ID @@ -135,7 +143,7 @@ menu "--- BOOK Settings" bool "32-bit" config DATA_64 - bool "64-bit" if !ARCH_PPC + bool "64-bit" config DATA_MULTI bool "multilib" if !(BOOK_CLFS3 && ARCH_MIPS ) @@ -250,8 +258,8 @@ menu "--- BOOK Settings" default "mips64el-unknown-linux-uclibc" if BOOK_CLFS3 && PROC_mipsel && DATA_64 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 default "sparc64-unknown-linux-gnu" if ARCH_SPARC && (DATA_64 || DATA_MULTI) @@ -311,6 +319,7 @@ menu "--- BOOK Settings" 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 default "sparc64" if ARCH_SPARC && DATA_MULTI