- Timestamp:
- 09/11/2006 06:56:42 PM (18 years ago)
- Branches:
- 2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk
- Children:
- 597d802
- Parents:
- f4caf9c
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
contrib/jhalfs-paco.patch
rf4caf9c rd51e891 1 1 Index: LFS/master.sh 2 2 =================================================================== 3 --- LFS/master.sh (revision 3 089)3 --- LFS/master.sh (revision 3103) 4 4 +++ LFS/master.sh (working copy) 5 5 @@ -172,6 +172,11 @@ … … 80 80 Index: LFS/lfs.xsl 81 81 =================================================================== 82 --- LFS/lfs.xsl (revision 3 089)82 --- LFS/lfs.xsl (revision 3103) 83 83 +++ LFS/lfs.xsl (working copy) 84 84 @@ -39,6 +39,9 @@ … … 128 128 Index: CLFS/master.sh 129 129 =================================================================== 130 --- CLFS/master.sh (revision 3 089)130 --- CLFS/master.sh (revision 3103) 131 131 +++ CLFS/master.sh (working copy) 132 132 @@ -494,6 +494,11 @@ … … 314 314 Index: CLFS/clfs.xsl 315 315 =================================================================== 316 --- CLFS/clfs.xsl (revision 3 089)316 --- CLFS/clfs.xsl (revision 3103) 317 317 +++ CLFS/clfs.xsl (working copy) 318 @@ -4 5,6 +45,9 @@318 @@ -42,6 +42,9 @@ 319 319 <!-- Locale settings --> 320 320 <xsl:param name="lang" select="C"/> … … 326 326 <xsl:apply-templates select="//sect1"/> 327 327 </xsl:template> 328 @@ -10 6,6 +109,25 @@328 @@ -103,6 +106,25 @@ 329 329 <xsl:text>tar -xvf ../vim-&vim-version;-lang.* --strip-components=1
</xsl:text> 330 330 </xsl:if> … … 371 371 Index: common/func_validate_configs.sh 372 372 =================================================================== 373 --- common/func_validate_configs.sh (revision 3 089)373 --- common/func_validate_configs.sh (revision 3103) 374 374 +++ common/func_validate_configs.sh (working copy) 375 375 @@ -20,10 +20,10 @@ … … 377 377 378 378 # First internal variables, then the ones that change the book's flavour, and lastly system configuration variables 379 - local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE MODEL GRSECURITY_HOST TEST BOMB_TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG GETKERNEL KEYMAPPAGE TIMEZONE LANG LC_ALL LUSER LGROUP BLFS_TOOL"380 - 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 KEYMAPVIMLANG PAGE TIMEZONE LANG LUSER LGROUP BLFS_TOOL"381 - local -r clfs2_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE ARCH TARGET OPTIMIZE REPORT STRIP FSTAB CONFIG GETKERNEL KEYMAPVIMLANG PAGE TIMEZONE LANG LUSER LGROUP BLFS_TOOL"382 - 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 383 + local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO GETPKG RUNMAKE MODEL GRSECURITY_HOST TEST BOMB_TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG GETKERNEL KEYMAPPAGE TIMEZONE LANG LC_ALL LUSER LGROUP BLFS_TOOL"384 + local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO GETPKG RUNMAKE METHOD ARCH TARGET TARGET32 TEST BOMB_TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG GETKERNEL KEYMAPVIMLANG PAGE TIMEZONE LANG LUSER LGROUP BLFS_TOOL"385 + local -r clfs2_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE ARCH TARGET OPTIMIZE REPORT STRIP FSTAB CONFIG GETKERNEL KEYMAPVIMLANG PAGE TIMEZONE LANG LUSER LGROUP BLFS_TOOL"386 + local -r lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO GETPKG RUNMAKE TEST BOMB_TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG GETKERNEL 379 - local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE MODEL GRSECURITY_HOST TEST BOMB_TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG GETKERNEL PAGE TIMEZONE LANG LC_ALL LUSER LGROUP BLFS_TOOL" 380 - 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" 381 - 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" 382 - 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" 383 + local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO GETPKG RUNMAKE MODEL GRSECURITY_HOST TEST BOMB_TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG GETKERNEL PAGE TIMEZONE LANG LC_ALL LUSER LGROUP BLFS_TOOL" 384 + local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO 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" 385 + 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" 386 + local -r lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO 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" 387 387 local -r blfs_PARAM_LIST="BRANCH_ID BLFS_ROOT BLFS_XML TRACKING_DIR" 388 388 … … 761 761 Index: common/common-functions 762 762 =================================================================== 763 --- common/common-functions (revision 3 089)763 --- common/common-functions (revision 3103) 764 764 +++ common/common-functions (working copy) 765 @@ -533,6 +533,7 @@ 765 @@ -532,6 +532,7 @@ 766 --stringparam timezone $TIMEZONE \ 766 767 --stringparam page $PAGE \ 767 768 --stringparam lang $LANG \ 768 --stringparam keymap $KEYMAP \769 769 + --stringparam use_paco $USE_PACO \ 770 770 -o ./${PROGNAME}-commands/ $XSL $BOOK/$ARCH-index.xml >>$LOGDIR/$LOG 2>&1 771 771 ;; 772 772 773 @@ -560,6 +561,7 @@ 773 @@ -557,6 +558,7 @@ 774 --stringparam lang $LANG \ 774 775 --stringparam lc_all $LC_ALL \ 775 --stringparam keymap $KEYMAP \776 776 --stringparam grsecurity_host $GRSECURITY_HOST \ 777 777 + --stringparam use_paco $USE_PACO \ … … 779 779 ;; 780 780 lfs) 781 @@ -5 72,6 +574,7 @@781 @@ -569,6 +571,7 @@ 782 782 --stringparam timezone $TIMEZONE \ 783 783 --stringparam page $PAGE \ … … 787 787 ;; 788 788 *) exit 1 ;; 789 @@ -65 6,6 +659,9 @@789 @@ -653,6 +656,9 @@ 790 790 # Generate URLs file 791 791 create_urls … … 799 799 Index: HLFS/hlfs.xsl 800 800 =================================================================== 801 --- HLFS/hlfs.xsl (revision 3 089)801 --- HLFS/hlfs.xsl (revision 3103) 802 802 +++ HLFS/hlfs.xsl (working copy) 803 @@ -4 6,6 +46,9 @@803 @@ -43,6 +43,9 @@ 804 804 <xsl:param name="lang" select="C"/> 805 805 <xsl:param name="lc_all" select="C"/> … … 811 811 <xsl:apply-templates select="//sect1"/> 812 812 </xsl:template> 813 @@ -19 6,6 +199,10 @@813 @@ -193,6 +196,10 @@ 814 814 <!-- Fixing bootscripts installation --> 815 815 <xsl:when test="ancestor::sect1[@id='bootable-bootscripts'] and … … 822 822 <xsl:text>cd ../blfs-bootscripts-&blfs-bootscripts-version;
</xsl:text> 823 823 </xsl:when> 824 @@ -29 6,6 +303,25 @@824 @@ -292,6 +299,25 @@ 825 825 <xsl:apply-templates/> 826 826 <xsl:text> || true
</xsl:text> … … 850 850 Index: HLFS/master.sh 851 851 =================================================================== 852 --- HLFS/master.sh (revision 3 089)852 --- HLFS/master.sh (revision 3103) 853 853 +++ HLFS/master.sh (working copy) 854 854 @@ -47,7 +47,9 @@ … … 942 942 Index: jhalfs 943 943 =================================================================== 944 --- jhalfs (revision 3 089)944 --- jhalfs (revision 3103) 945 945 +++ jhalfs (working copy) 946 @@ -112,6 +112,7 @@ 946 @@ -111,6 +111,7 @@ 947 REPORT=${REPORT:=n} 947 948 VIMLANG=${VIMLANG:-n} 948 KEYMAP=${KEYMAP:=none}949 949 GRSECURITY_HOST=${GRSECURITY_HOST:-n} 950 950 +USE_PACO=${USE_PACO:-n} … … 952 952 # Book surces envars 953 953 BRANCH_ID=${BRANCH_ID:=development} 954 @@ -2 70,6 +271,14 @@954 @@ -269,6 +270,14 @@ 955 955 [[ $VERBOSITY > 0 ]] && echo "OK" 956 956 fi … … 967 967 if [[ "$OPTIMIZE" != "0" ]]; then 968 968 [[ $VERBOSITY > 0 ]] && echo -n "Loading optimization module..." 969 @@ -31 5,6 +324,8 @@969 @@ -314,6 +323,8 @@ 970 970 # 971 971 cp $COMMON_DIR/{makefile-functions,progress_bar.sh} $JHALFSDIR/ … … 978 978 Index: Config.in 979 979 =================================================================== 980 --- Config.in (revision 3 089)980 --- Config.in (revision 3103) 981 981 +++ Config.in (working copy) 982 @@ - 812,3 +812,72 @@982 @@ -786,3 +786,72 @@ 983 983 984 984 #--- End Advanced Features
Note:
See TracChangeset
for help on using the changeset viewer.