Changeset daa9b6c
- Timestamp:
- 08/08/2006 05:52:49 PM (18 years ago)
- Branches:
- 2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk
- Children:
- a705708
- Parents:
- 6ad5a2f
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
contrib/jhalfs-paco.patch
r6ad5a2f rdaa9b6c 1 1 Index: LFS/master.sh 2 2 =================================================================== 3 --- LFS/master.sh (revision 2 884)3 --- LFS/master.sh (revision 2905) 4 4 +++ LFS/master.sh (working copy) 5 5 @@ -173,6 +173,11 @@ … … 37 37 # and not to use chroot. 38 38 case "${this_script}" in 39 *kernfs) wrt_ run_as_root "${this_script}" "$file" ;;39 *kernfs) wrt_RunAsRoot "${this_script}" "$file" ;; 40 40 - *) wrt_run_as_chroot1 "${this_script}" "$file" ;; 41 41 + *) wrt_paco_prep … … 80 80 Index: LFS/lfs.xsl 81 81 =================================================================== 82 --- LFS/lfs.xsl (revision 2 884)82 --- LFS/lfs.xsl (revision 2905) 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 2 884)130 --- CLFS/master.sh (revision 2905) 131 131 +++ CLFS/master.sh (working copy) 132 132 @@ -495,6 +495,11 @@ … … 314 314 Index: CLFS/clfs.xsl 315 315 =================================================================== 316 --- CLFS/clfs.xsl (revision 2 884)316 --- CLFS/clfs.xsl (revision 2905) 317 317 +++ CLFS/clfs.xsl (working copy) 318 318 @@ -45,6 +45,9 @@ … … 371 371 Index: common/config 372 372 =================================================================== 373 --- common/config (revision 2 884)373 --- common/config (revision 2905) 374 374 +++ common/config (working copy) 375 375 @@ -91,6 +91,23 @@ … … 409 409 Index: common/func_validate_configs.sh 410 410 =================================================================== 411 --- common/func_validate_configs.sh (revision 2 884)411 --- common/func_validate_configs.sh (revision 2905) 412 412 +++ common/func_validate_configs.sh (working copy) 413 413 @@ -86,10 +86,10 @@ … … 415 415 416 416 # First internal variables, then the ones that change the book's flavour, and lastly system configuration variables 417 - 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 KEYMAP PAGE TIMEZONE LANG LC_ALL "418 - local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE METHOD ARCH TARGET TEST BOMB_TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG GETKERNEL KEYMAP VIMLANG PAGE TIMEZONE LANG "419 - local -r clfs2_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE ARCH TARGET OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG GETKERNEL KEYMAP VIMLANG PAGE TIMEZONE LANG"420 - 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 "421 + 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 KEYMAP PAGE TIMEZONE LANG LC_ALL "422 + local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO GETPKG RUNMAKE METHOD ARCH TARGET TEST BOMB_TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG GETKERNEL KEYMAP VIMLANG PAGE TIMEZONE LANG "423 + local -r clfs2_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO GETPKG RUNMAKE ARCH TARGET OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG GETKERNEL KEYMAP VIMLANG PAGE TIMEZONE LANG"424 + 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 "417 - 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 KEYMAP PAGE TIMEZONE LANG LC_ALL LUSER LGROUP" 418 - local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE METHOD ARCH TARGET TEST BOMB_TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG GETKERNEL KEYMAP VIMLANG PAGE TIMEZONE LANG LUSER LGROUP" 419 - local -r clfs2_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE ARCH TARGET OPTIMIZE REPORT STRIP FSTAB CONFIG GETKERNEL KEYMAP VIMLANG PAGE TIMEZONE LANG LUSER LGROUP" 420 - 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" 421 + 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 KEYMAP PAGE TIMEZONE LANG LC_ALL LUSER LGROUP" 422 + local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO GETPKG RUNMAKE METHOD ARCH TARGET TEST BOMB_TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG GETKERNEL KEYMAP VIMLANG PAGE TIMEZONE LANG LUSER LGROUP" 423 + local -r clfs2_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE ARCH TARGET OPTIMIZE REPORT STRIP FSTAB CONFIG GETKERNEL KEYMAP VIMLANG PAGE TIMEZONE LANG LUSER LGROUP" 424 + 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" 425 425 426 426 local -r ERROR_MSG_pt1='The variable \"${L_arrow}${config_param}${R_arrow}\" value ${L_arrow}${BOLD}${!config_param}${R_arrow} is invalid,' … … 782 782 Index: common/common-functions 783 783 =================================================================== 784 --- common/common-functions (revision 2 884)784 --- common/common-functions (revision 2905) 785 785 +++ common/common-functions (working copy) 786 786 @@ -69,6 +69,9 @@ … … 794 794 Optimize [0-2] 795 795 0 = no optimization 796 @@ - 733,6 +736,7 @@796 @@ -696,6 +699,7 @@ 797 797 --stringparam page $PAGE \ 798 798 --stringparam lang $LANG \ … … 802 802 ;; 803 803 804 @@ -7 62,6 +766,7 @@804 @@ -723,6 +727,7 @@ 805 805 --stringparam lc_all $LC_ALL \ 806 806 --stringparam keymap $KEYMAP \ … … 810 810 ;; 811 811 lfs) 812 @@ -7 74,6 +779,7 @@812 @@ -735,6 +740,7 @@ 813 813 --stringparam timezone $TIMEZONE \ 814 814 --stringparam page $PAGE \ … … 818 818 ;; 819 819 *) exit 1 ;; 820 @@ -8 40,6 +846,9 @@820 @@ -801,6 +807,9 @@ 821 821 # Generate URLs file 822 822 create_urls … … 830 830 Index: HLFS/hlfs.xsl 831 831 =================================================================== 832 --- HLFS/hlfs.xsl (revision 2 884)832 --- HLFS/hlfs.xsl (revision 2905) 833 833 +++ HLFS/hlfs.xsl (working copy) 834 834 @@ -46,6 +46,9 @@ … … 881 881 Index: HLFS/master.sh 882 882 =================================================================== 883 --- HLFS/master.sh (revision 2 884)883 --- HLFS/master.sh (revision 2905) 884 884 +++ HLFS/master.sh (working copy) 885 @@ - 92,7 +92,9 @@885 @@ -40,7 +40,9 @@ 886 886 EOF 887 887 ) >> $MKFILE.tmp … … 893 893 894 894 *) 895 @@ - 324,6 +326,11 @@895 @@ -272,6 +274,11 @@ 896 896 # Keep the script file name 897 897 this_script=`basename $file` … … 905 905 case $this_script in 906 906 # We'll run the chroot commands differently than the others, so skip them in the 907 @@ - 333,6 +340,18 @@907 @@ -281,6 +288,18 @@ 908 908 *-stripping* ) [[ "$STRIP" = "0" ]] && continue ;; 909 909 esac … … 924 924 name=`echo $this_script | sed -e 's@[0-9]\{3\}-@@'` 925 925 926 @@ -3 98,7 +417,9 @@927 wrt_RunAsRoot " hlfs" "${this_script}" "${file}"926 @@ -346,7 +365,9 @@ 927 wrt_RunAsRoot "${this_script}" "${file}" 928 928 ;; 929 929 *) # The rest of Chapter06 … … 934 934 esac 935 935 # 936 @@ - 418,6 +439,16 @@936 @@ -366,6 +387,16 @@ 937 937 PREV=${this_script}${N} 938 938 # Set system_build envar for iteration targets … … 951 951 952 952 } 953 @@ -4 76,9 +507,19 @@953 @@ -424,9 +455,19 @@ 954 954 else # Initialize the log and run the script 955 955 wrt_run_as_chroot2 "${this_script}" "${file}" … … 973 973 Index: master.sh 974 974 =================================================================== 975 --- master.sh (revision 2 884)975 --- master.sh (revision 2905) 976 976 +++ master.sh (working copy) 977 977 @@ -149,6 +149,8 @@
Note:
See TracChangeset
for help on using the changeset viewer.