- Timestamp:
- 08/29/2006 07:36:53 PM (18 years ago)
- Branches:
- 2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk
- Children:
- 05d1b17
- Parents:
- fff1061
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
contrib/jhalfs-paco.patch
rfff1061 r029dbb7 1 1 Index: LFS/master.sh 2 2 =================================================================== 3 --- LFS/master.sh (revision 30 07)3 --- LFS/master.sh (revision 3089) 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 30 07)82 --- LFS/lfs.xsl (revision 3089) 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 30 07)130 --- CLFS/master.sh (revision 3089) 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 30 07)316 --- CLFS/clfs.xsl (revision 3089) 317 317 +++ CLFS/clfs.xsl (working copy) 318 318 @@ -45,6 +45,9 @@ … … 369 369 +make install && 370 370 +make logme 371 Index: common/config372 ===================================================================373 --- common/config (revision 3007)374 +++ common/config (working copy)375 @@ -91,6 +91,23 @@376 #--- Run farce testing n(no)/y(yes)377 RUN_FARCE=n378 379 +#==== PACO VARIABLES ====380 +#--- Use paco? n(no)/y(yes)381 +USE_PACO=y382 +PACO_VERSION=1.10.10383 +384 +#--- Name of the Paco source package385 +PACO_FILE=paco-$PACO_VERSION.tar.bz2 # (use .tar.gz if preferred)386 +387 +#--- Sourceforge mirror to use for Paco source download388 +# Europe: heanet, belnet, puzzle, surfnet, switch, kent389 +# North America: superb-east, superb-west, umn, easynews390 +# South America: ufpr391 +# Asia: nchc, jaist392 +# Australia: optusnet393 +PACO_MIRROR1=heanet394 +PACO_MIRROR2=kent395 +396 #==== INTERNAL VARIABLES ====397 # Don't edit it unless you know what you are doing398 399 @@ -108,3 +125,9 @@400 401 #--- farce report log directory402 FARCELOGDIR=$LOGDIR/farce403 +404 +#--- Variables needed by paco405 +PACO_INCLUDE=/406 +PACO_EXCLUDE=/${SCRIPT_ROOT}407 +PACO_TMPFILE=/tmp/paco.tmp408 +LD_PRELOAD=/usr/lib/libpaco-log.so409 371 Index: common/func_validate_configs.sh 410 372 =================================================================== 411 --- common/func_validate_configs.sh (revision 30 07)373 --- common/func_validate_configs.sh (revision 3089) 412 374 +++ common/func_validate_configs.sh (working copy) 413 @@ - 88,10 +88,10 @@375 @@ -20,10 +20,10 @@ 414 376 inline_doc 415 377 416 378 # 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 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 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" 420 + 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" 421 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" 422 - 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" 423 + 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" 424 local -r blfs_PARAM_LIST="BRANCH_ID BLFS_ROOT BLFS_XML" 425 426 local -r ERROR_MSG_pt1='The variable \"${L_arrow}${config_param}${R_arrow}\" value ${L_arrow}${BOLD}${!config_param}${R_arrow} is invalid,' 427 @@ -182,6 +182,7 @@ 428 [[ "$GETPKG" = "y" ]] && validate_against_str "xnx xyx" 429 fi ;; 430 RUNMAKE) validate_against_str "xnx xyx" ;; 431 + USE_PACO) validate_against_str "xnx xyx" ;; 432 REPORT) validate_against_str "xnx xyx" 433 if [[ "${!config_param}" = "y" ]]; then 434 if [[ `type -p bc` ]]; then 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 KEYMAP 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 KEYMAP 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 KEYMAP 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 KEYMAP 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 KEYMAP 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 KEYMAP 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 local -r blfs_PARAM_LIST="BRANCH_ID BLFS_ROOT BLFS_XML TRACKING_DIR" 388 389 local -r blfs_tool_PARAM_LIST="BLFS_BRANCH_ID BLFS_ROOT BLFS_XML TRACKING_DIR DEP_LIBXML DEP_LIBXSLT DEP_DBXSL DEP_LINKS DEP_SUDO DEP_WGET DEP_SVN DEP_GPM" 390 @@ -99,6 +99,7 @@ 391 case $config_param in 392 # Allways display this, if found in ${PROGNAME}_PARAM_LIST 393 GETPKG | \ 394 + USE_PACO | \ 395 RUNMAKE | \ 396 TEST | \ 397 OPTIMIZE | \ 435 398 Index: common/paco-functions 436 399 =================================================================== … … 798 761 Index: common/common-functions 799 762 =================================================================== 800 --- common/common-functions (revision 30 07)763 --- common/common-functions (revision 3089) 801 764 +++ common/common-functions (working copy) 802 @@ -69,6 +69,9 @@ 803 in the configuration file has the proper packages and patches for the 804 book version being processed. 805 806 +${BOLD} --no-paco${OFF} 807 + dissables paco logging feature. 808 + 809 ${BOLD} -O, --optimize${OFF} 810 Optimize [0-2] 811 0 = no optimization 812 @@ -706,6 +709,7 @@ 765 @@ -533,6 +533,7 @@ 813 766 --stringparam page $PAGE \ 814 767 --stringparam lang $LANG \ … … 818 771 ;; 819 772 820 @@ - 733,6 +737,7 @@773 @@ -560,6 +561,7 @@ 821 774 --stringparam lc_all $LC_ALL \ 822 775 --stringparam keymap $KEYMAP \ … … 826 779 ;; 827 780 lfs) 828 @@ - 745,6 +750,7 @@781 @@ -572,6 +574,7 @@ 829 782 --stringparam timezone $TIMEZONE \ 830 783 --stringparam page $PAGE \ … … 834 787 ;; 835 788 *) exit 1 ;; 836 @@ - 811,6 +817,9 @@789 @@ -656,6 +659,9 @@ 837 790 # Generate URLs file 838 791 create_urls … … 846 799 Index: HLFS/hlfs.xsl 847 800 =================================================================== 848 --- HLFS/hlfs.xsl (revision 30 07)801 --- HLFS/hlfs.xsl (revision 3089) 849 802 +++ HLFS/hlfs.xsl (working copy) 850 803 @@ -46,6 +46,9 @@ … … 897 850 Index: HLFS/master.sh 898 851 =================================================================== 899 --- HLFS/master.sh (revision 30 07)852 --- HLFS/master.sh (revision 3089) 900 853 +++ HLFS/master.sh (working copy) 901 854 @@ -47,7 +47,9 @@ … … 987 940 esac 988 941 989 Index: master.sh 990 =================================================================== 991 --- master.sh (revision 3007) 992 +++ master.sh (working copy) 993 @@ -71,6 +71,11 @@ 994 FARCELOGDIR=$LOGDIR/farce 995 XSL=$PROGNAME.xsl 996 PKG_LST=unpacked 997 + #--- PACO variables 998 + PACO_INCLUDE=/ 999 + PACO_EXCLUDE=/${SCRIPT_ROOT} 1000 + PACO_TMPFILE=/tmp/paco.tmp 1001 + LD_PRELOAD=/usr/lib/libpaco-log.so 1002 1003 case $PROGNAME in 1004 clfs2) LFSVRS=development; TREE=branches/clfs-2.0/BOOK ;; 1005 @@ -122,6 +127,7 @@ 1006 VIMLANG=${VIMLANG:-n} 1007 KEYMAP=${KEYMAP:=none} 1008 GRSECURITY_HOST=${GRSECURITY_HOST:-n} 1009 + USE_PACO=${USE_PACO:-n} 1010 1011 else 1012 # 1013 @@ -230,6 +236,8 @@ 1014 1015 --help | -h ) usage | more && exit ;; 1016 1017 + --no-paco ) USE_PACO=n ;; 1018 + 1019 --optimize | -O ) 1020 test $# = 1 && eval "$exit_missing_arg" 1021 shift 1022 @@ -468,6 +476,14 @@ 942 Index: jhalfs 943 =================================================================== 944 --- jhalfs (revision 3089) 945 +++ jhalfs (working copy) 946 @@ -112,6 +112,7 @@ 947 VIMLANG=${VIMLANG:-n} 948 KEYMAP=${KEYMAP:=none} 949 GRSECURITY_HOST=${GRSECURITY_HOST:-n} 950 +USE_PACO=${USE_PACO:-n} 951 952 # Book surces envars 953 BRANCH_ID=${BRANCH_ID:=development} 954 @@ -270,6 +271,14 @@ 1023 955 [[ $VERBOSITY > 0 ]] && echo "OK" 1024 956 fi … … 1035 967 if [[ "$OPTIMIZE" != "0" ]]; then 1036 968 [[ $VERBOSITY > 0 ]] && echo -n "Loading optimization module..." 1037 @@ - 514,6 +530,8 @@1038 if [[ "$PWD" != "$JHALFSDIR" ]]; then1039 1040 1041 + 1042 + 1043 1044 1045 969 @@ -315,6 +324,8 @@ 970 # 971 cp $COMMON_DIR/{makefile-functions,progress_bar.sh} $JHALFSDIR/ 972 # 973 +[[ $USE_PACO != "n" ]] && cp $COMMON_DIR/paco-build-$PROGNAME.sh $JHALFSDIR/ 974 +# 975 [[ "$OPTIMIZE" != "0" ]] && cp optimize/opt_override $JHALFSDIR/ 976 # 977 if [[ "$COMPARE" = "y" ]]; then 1046 978 Index: Config.in 1047 979 =================================================================== 1048 --- Config.in (revision 30 07)980 --- Config.in (revision 3089) 1049 981 +++ Config.in (working copy) 1050 @@ -655,6 +655,52 @@ 982 @@ -812,3 +812,72 @@ 983 1051 984 #--- End Advanced Features 1052 985 endmenu 1053 986 + 1054 987 +#--- PACO 1055 988 +config USE_PACO … … 1095 1028 + # Asia: nchc, jaist 1096 1029 + # Australia: optusnet 1030 + 1031 + #-- Internal Settings 1032 + menu "--- Internal Settings (WARNING: for paco developers only)" 1033 + depends USE_PACO 1034 + 1035 + config PACO_INCLUDE 1036 + string "Include dirs" 1037 + default "/" 1038 + 1039 + config PACO_EXCLUDE 1040 + string "Exclude dirs" 1041 + default "/${SCRIPT_ROOT}" 1042 + 1043 + config PACO_TMPFILE 1044 + string "Temp file" 1045 + default "/tmp/paco.tmp" 1046 + 1047 + config LD_PRELOAD 1048 + string "LD_PRELOAD" 1049 + default "/usr/lib/libpaco-log.so" 1050 + 1051 + #--- End Internal Settings 1052 + endmenu 1097 1053 +#--- End PACO 1098 1054 + 1099 +1100 # config CONFIG_BLFS_CMDS1101 # bool "Add BLFS packages to current build"1102 # default n
Note:
See TracChangeset
for help on using the changeset viewer.