zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge trunk r3721,3722

Browse source
This commit is contained in:
Pierre Labastie 2013-09-21 10:38:16 +00:00
parent df08148a5b
commit 6c83a56f30
3 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Config.in
View file

@ -44,12 +44,20 @@ menu "--- BOOK Settings"
#--- Book version #--- Book version
choice choice
prompt "Release" prompt "Release"
default relSVN default relSVN if BOOK_LFS || BOOK_HLFS
default relGIT if BOOK_CLFS || BOOK_CLFS2 || BOOK_CLFS3
config relSVN config relSVN
bool "SVN" bool "SVN"
depends on BOOK_LFS || BOOK_HLFS
help help
#-- Current development version as in trunk #-- 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 config WORKING_COPY
bool "Working Copy" bool "Working Copy"
# depends on !BOOK_BLFS # depends on !BOOK_BLFS
@ -59,7 +67,7 @@ menu "--- BOOK Settings"
config BRANCH config BRANCH
bool "Branch or stable book" if !BOOK_CLFS2 && !BOOK_CLFS3 bool "Branch or stable book" if !BOOK_CLFS2 && !BOOK_CLFS3
help help
#-- A supported SVN branch or stable released book #-- A supported SVN/GIT branch or stable released book
endchoice endchoice
config BRANCH_ID config BRANCH_ID
@ -135,7 +143,7 @@ menu "--- BOOK Settings"
bool "32-bit" bool "32-bit"
config DATA_64 config DATA_64
bool "64-bit" if !ARCH_PPC bool "64-bit"
config DATA_MULTI config DATA_MULTI
bool "multilib" if !(BOOK_CLFS3 && ARCH_MIPS ) 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 "mips64el-unknown-linux-uclibc" if BOOK_CLFS3 && PROC_mipsel && DATA_64
default "mips64-unknown-linux-uclibc" if BOOK_CLFS3 && PROC_mips && 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 "powerpc-unknown-linux-gnu" if ARCH_PPC && DATA_32
default "powerpc64-unknown-linux-gnu" if ARCH_PPC && DATA_MULTI default "powerpc64-unknown-linux-gnu" if ARCH_PPC && (DATA_MULTI || DATA-64)
default "sparc-unknown-linux-gnu" if ARCH_SPARC && DATA_32 default "sparc-unknown-linux-gnu" if ARCH_SPARC && DATA_32
default "sparc64-unknown-linux-gnu" if ARCH_SPARC && (DATA_64 || DATA_MULTI) 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 "ppc" if ARCH_PPC && DATA_32
default "ppc64" if ARCH_PPC && DATA_MULTI default "ppc64" if ARCH_PPC && DATA_MULTI
default "ppc64-64" if ARCH_PPC && DATA_64
default "sparc" if ARCH_SPARC && DATA_32 default "sparc" if ARCH_SPARC && DATA_32
default "sparc64" if ARCH_SPARC && DATA_MULTI default "sparc64" if ARCH_SPARC && DATA_MULTI

10
LFS/master.sh
View file

@ -78,13 +78,13 @@ chapter5_Makefiles() {
this_script=`basename $file` this_script=`basename $file`
# If no testsuites are run, then TCL, Expect, DejaGNU and Check # 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) # Fix also locales creation when running chapter05 testsuites (ugly)
case "${this_script}" in case "${this_script}" in
*tcl) [[ "${TEST}" = "0" ]] && continue ;; # *tcl) [[ "${TEST}" = "0" ]] && continue ;;
*expect) [[ "${TEST}" = "0" ]] && continue ;; # *expect) [[ "${TEST}" = "0" ]] && continue ;;
*dejagnu) [[ "${TEST}" = "0" ]] && continue ;; # *dejagnu) [[ "${TEST}" = "0" ]] && continue ;;
*check) [[ "${TEST}" = "0" ]] && continue ;; # *check) [[ "${TEST}" = "0" ]] && continue ;;
*stripping) [[ "${STRIP}" = "n" ]] && continue ;; *stripping) [[ "${STRIP}" = "n" ]] && continue ;;
*glibc) [[ "${TEST}" = "3" ]] && \ *glibc) [[ "${TEST}" = "3" ]] && \
sed -i 's@/usr/lib/locale@/tools/lib/locale@' $file ;; sed -i 's@/usr/lib/locale@/tools/lib/locale@' $file ;;

2
common/libs/func_download_pkgs
View file

@ -39,7 +39,7 @@ get_sources() { # Download file, write name to MISSING_FILES.DMP if
# Skip some packages if they aren't needed # Skip some packages if they aren't needed
case $line in case $line in
*/check* | */tcl* | */expect* | */dejagnu* | */tree* | */gcc-testsuite* ) */tree* | */gcc-testsuite* ) #unneeded now?
[[ "$TEST" = "0" ]] && continue [[ "$TEST" = "0" ]] && continue
;; ;;
*/vim-*-lang* ) */vim-*-lang* )