Changeset 2639f65
- Timestamp:
- 11/11/2006 12:09:42 AM (17 years ago)
- Branches:
- 2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk
- Children:
- 837797e
- Parents:
- ee21f67
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
Config.in
ree21f67 r2639f65 17 17 bool "Cross-Compiled Linux From Scratch (Version 2)" 18 18 19 #config BOOK_CLFS320 #bool "Cross-Compiled Linux From Scratch (Embedded Systems)"19 config BOOK_CLFS3 20 bool "Cross-Compiled Linux From Scratch (Embedded Systems)" 21 21 22 22 config BOOK_HLFS … … 32 32 default "clfs" if BOOK_CLFS 33 33 default "clfs2" if BOOK_CLFS2 34 #default "clfs3" if BOOK_CLFS334 default "clfs3" if BOOK_CLFS3 35 35 default "hlfs" if BOOK_HLFS 36 36 default "blfs" if BOOK_BLFS … … 84 84 prompt "Target architecture" 85 85 default ARCH_X86 86 depends BOOK_CLFS || BOOK_CLFS2 86 depends BOOK_CLFS || BOOK_CLFS2 || BOOK_CLFS3 87 87 help 88 88 #-- Choose a base architecture … … 92 92 93 93 config ARCH_MIPS 94 bool "mips" if !BOOK_CLFS2 94 bool "mips" if !BOOK_CLFS2 || !BOOK_CLFS3 95 95 96 96 config ARCH_PPC 97 bool "ppc" if !BOOK_CLFS2 97 bool "ppc" if !BOOK_CLFS2 || !BOOK_CLFS3 98 98 99 99 config ARCH_SPARC 100 bool "sparc" if !BOOK_CLFS2 100 bool "sparc" if !BOOK_CLFS2 || !BOOK_CLFS3 101 101 102 102 config ARCH_ALPHA 103 bool "alpha" if !BOOK_CLFS2 103 bool "alpha" if !BOOK_CLFS2 || !BOOK_CLFS3 104 104 105 105 config ARCH_ARM 106 bool "arm" if !BOOK_CLFS 106 bool "arm" if !BOOK_CLFS || !BOOK_CLFS3 107 107 endchoice 108 108 109 109 choice 110 110 prompt "Library" 111 depends (BOOK_CLFS || BOOK_CLFS2 )111 depends (BOOK_CLFS || BOOK_CLFS2 || BOOK_CLFS3 ) 112 112 default DATA_32 if !ARCH_ALPHA 113 113 default DATA_64 if ARCH_ALPHA … … 117 117 118 118 config DATA_64 119 bool "64-bit" if !ARCH_PPC && !ARCH_ARM && !( BOOK_CLFS2&& ARCH_X86)119 bool "64-bit" if !ARCH_PPC && !ARCH_ARM && !((BOOK_CLFS2 || BOOK_CLFS3) && ARCH_X86) 120 120 121 121 config DATA_MULTI 122 bool "multilib" if !ARCH_ALPHA && !ARCH_ARM && !( BOOK_CLFS2&& ARCH_X86)122 bool "multilib" if !ARCH_ALPHA && !ARCH_ARM && !((BOOK_CLFS2 || BOOK_CLFS3) && ARCH_X86) 123 123 endchoice 124 124 125 125 choice 126 126 prompt "Target" 127 depends (BOOK_CLFS || BOOK_CLFS2 ) && ((ARCH_X86 && DATA_32) || ARCH_MIPS)127 depends (BOOK_CLFS || BOOK_CLFS2 || BOOK_CLFS3) && ((ARCH_X86 && DATA_32) || ARCH_MIPS) 128 128 129 129 config PROC_i486 … … 145 145 config TARGET 146 146 string 147 depends DATA_32 147 depends DATA_32 && BOOK_CLFS3 148 default "i486-pc-linux-uclibc" if ARCH_X86 && PROC_i486 149 default "i586-pc-linux-uclibc" if ARCH_X86 && PROC_i586 150 default "i686-pc-linux-uclibc" if ARCH_X86 && PROC_i686 151 152 153 config TARGET 154 string 155 depends DATA_32 && !BOOK_CLFS3 148 156 default "i486-pc-linux-gnu" if ARCH_X86 && PROC_i486 149 157 default "i586-pc-linux-gnu" if ARCH_X86 && PROC_i586 … … 442 450 string 443 451 default "lfs" if BOOK_LFS 444 default "clfs" if BOOK_CLFS || BOOK_CLFS2 452 default "clfs" if BOOK_CLFS || BOOK_CLFS2 || BOOK_CLFS3 445 453 default "hlfs" if BOOK_HLFS 446 454 -
common/common-functions
ree21f67 r2639f65 76 76 clfs ) MOUNT_ENV="CLFS" ;; 77 77 clfs2 ) MOUNT_ENV="CLFS" ;; 78 clfs3 ) MOUNT_ENV="CLFS" ;; 78 79 hlfs ) MOUNT_ENV="HLFS" ;; 79 80 *) echo "undefined progname $PROGNAME"; exit 1 ;; … … 458 459 clfs) svn_root="cross-lfs" ;; 459 460 clfs2) svn_root="cross-lfs" ;; 461 clfs3) svn_root="cross-lfs" ;; 460 462 *) echo "BOOK not defined in function <get_book>" 461 463 exit 1 ;; … … 473 475 cd $JHALFSDIR 474 476 case $PROGNAME in 475 clfs | clfs2 )477 clfs | clfs2 | clfs3 ) 476 478 VERSION=$(xmllint --noent $BOOK/prologue/$ARCH/bookinfo.xml 2>/dev/null | grep subtitle | sed -e 's/^.*ion //' -e 's/<\/.*//') ;; 477 479 *) … … 545 547 -o ./${PROGNAME}-commands/ $XSL $BOOK/$ARCH-index.xml >>$LOGDIR/$LOG 2>&1 546 548 ;; 549 550 clfs3) 551 echo -n " ${L_arrow}${BOLD}$ARCH${R_arrow} target architecture" 552 xsltproc --nonet \ 553 --xinclude \ 554 --stringparam vim-lang $VIMLANG \ 555 --stringparam timezone $TIMEZONE \ 556 --stringparam page $PAGE \ 557 --stringparam lang $LANG \ 558 -o ./${PROGNAME}-commands/ $XSL $BOOK/$ARCH-index.xml >>$LOGDIR/$LOG 2>&1 559 ;; 560 547 561 hlfs) 548 562 echo -n " ${L_arrow}${BOLD}$MODEL${R_arrow} HLFS libc implementation" … … 571 585 -o ./${PROGNAME}-commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1 572 586 ;; 573 *) exit 1 ;; 587 *) echo -n " ${L_arrow}${BOLD}${PROGNAME}${R_arrow} book invalid, terminate build" 588 exit 1 ;; 574 589 esac 575 590 … … 597 612 echo -n "Creating <${PROGNAME}> list of tarball names for $BOOK $ARCH" 598 613 case ${PROGNAME} in 599 clfs | clfs2 )614 clfs | clfs2 | clfs3 ) 600 615 xsltproc --nonet --xinclude -o pkg_tarball_list packages.xsl \ 601 616 $BOOK/materials/${ARCH}-chapter.xml >>$LOGDIR/$LOG 2>&1 … … 779 794 echo " ...OK" 780 795 ;; 796 clfs3) 797 echo -n "Creating CLFS3 <${ARCH}> specific URLs file" 798 xsltproc --nonet --xinclude \ 799 --stringparam server $SERVER \ 800 -o $BUILDDIR/sources/urls.lst urls.xsl \ 801 $BOOK/materials/$ARCH-chapter.xml >>$LOGDIR/$LOG 2>&1 802 echo " ...OK" 803 ;; 781 804 hlfs) 782 805 echo -n "Creating HLFS <${MODEL}> specific URLs file" -
common/func_validate_configs.sh
ree21f67 r2639f65 24 24 local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE METHOD ARCH TARGET TARGET32 TEST BOMB_TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG GETKERNEL VIMLANG PAGE TIMEZONE LANG LUSER LGROUP BLFS_TOOL REBUILD_MAKEFILE" 25 25 local -r clfs2_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE ARCH TARGET OPTIMIZE REPORT STRIP FSTAB CONFIG GETKERNEL VIMLANG PAGE TIMEZONE LANG LUSER LGROUP BLFS_TOOL REBUILD_MAKEFILE" 26 local -r clfs3_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE ARCH TARGET OPTIMIZE REPORT STRIP FSTAB CONFIG GETKERNEL VIMLANG PAGE TIMEZONE LANG LUSER LGROUP BLFS_TOOL REBUILD_MAKEFILE" 26 27 local -r lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE TEST BOMB_TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG GETKERNEL VIMLANG PAGE TIMEZONE LANG LUSER LGROUP BLFS_TOOL CUSTOM_TOOLS REBUILD_MAKEFILE" 27 28 local -r blfs_PARAM_LIST="BRANCH_ID BLFS_ROOT BLFS_XML TRACKING_DIR" -
jhalfs
ree21f67 r2639f65 118 118 case $PROGNAME in 119 119 clfs2 ) TREE=branches/clfs-2.0/BOOK ;; 120 clfs3 ) TREE=branches/clfs-3.0/BOOK ;; 120 121 *) TREE=trunk/BOOK ;; 121 122 esac … … 135 136 TREE=tags/${BRANCH_ID}/BOOK 136 137 ;; 137 clfs | clfs2 )138 clfs | clfs2 | clfs3) 138 139 LFSVRS=${BRANCH_ID} 139 140 TREE=tags/${BRANCH_ID} … … 429 430 if [[ "$REBUILD_MAKEFILE" = "y" ]] ; then 430 431 case $PROGNAME in 431 clfs | clfs2 )432 clfs | clfs2 | clfs3 ) 432 433 VERSION=$(xmllint --noent $JHALFSDIR/$BOOK/prologue/$ARCH/bookinfo.xml 2>/dev/null | grep subtitle | sed -e 's/^.*ion //' -e 's/<\/.*//') ;; 433 434 *)
Note:
See TracChangeset
for help on using the changeset viewer.