Changeset 7d2638a


Ignore:
Timestamp:
08/08/2006 06:01:04 PM (18 years ago)
Author:
Manuel Canales Esparcia <manuel@…>
Branches:
1.0
Children:
ae0172b
Parents:
9357c13
Message:

Rediffied 1.0 branch paco patch.

Files:
2 edited

Legend:

Unmodified
Added
Removed

  • README.PACO

    r9357c13 r7d2638a  
    1313At the moment only the LFS and HLFS-glibc parts are supported.
    1414
     15NEWS:
     16  Preliminary support for CLFS is ready. It's not fully tested, so if you
     17discover any bugs please notify the patch author. Also, Paco may or may not work
     18on your specific architecture. Check the Paco homepage for details.
    1519
    1620##### QUICK START #####
    … …  
    2024
    21252. Edit the configuration files to your preferences.
    22    (common/config and LFS/config or HLFS/config)
     26   (common/config and LFS/config or HLFS/config or CLFS/config)
    2327
    24283. Run the wanted script.
    25    (Only ./lfs or ./hlfs --model glibc if you want to use paco)
     29   (Only ./lfs or ./clfs or ./hlfs --model glibc if you want to use paco)
    2630
    27314. Run make.
    … …  
    7074##### TODO #####
    7175
     76- Bughunting/testing CLFS part
    7277- Support for HLFS-uClibc
    73 - Support for CLFS
    7478- Support for BLFS (when it's ready)
    7579- Spread the Word
    … …  
    7882##### HISTORY #####
    7983
     842006-08-02
     85- Preliminary support for CLFS done
     86- Some code cleanup
     87
    80882006-07-30
    81 - Automatical download of Paco source package
     89- Automatical download of Paco source package done
    8290- Updated patch to support new HLFS layout

  • contrib/jhalfs-paco.patch

    r9357c13 r7d2638a  
    11Index: LFS/master.sh
    22===================================================================
    3 --- LFS/master.sh       (revision 2885)
     3--- LFS/master.sh       (revision 2906)
    44+++ LFS/master.sh       (working copy)
    55@@ -173,6 +173,11 @@
    … …  
    3737     # and not to use chroot.
    3838     case "${this_script}" in
    39        *kernfs)  wrt_run_as_root    "${this_script}" "$file" ;;
     39       *kernfs)  wrt_RunAsRoot    "${this_script}" "$file" ;;
    4040-      *)        wrt_run_as_chroot1 "${this_script}" "$file" ;;
    4141+      *)        wrt_paco_prep
    … …  
    8080Index: LFS/lfs.xsl
    8181===================================================================
    82 --- LFS/lfs.xsl (revision 2885)
     82--- LFS/lfs.xsl (revision 2906)
    8383+++ LFS/lfs.xsl (working copy)
    8484@@ -39,6 +39,9 @@
    … …  
    128128Index: CLFS/master.sh
    129129===================================================================
    130 --- CLFS/master.sh      (revision 2885)
     130--- CLFS/master.sh      (revision 2906)
    131131+++ CLFS/master.sh      (working copy)
    132132@@ -495,6 +495,11 @@
    … …  
    314314Index: CLFS/clfs.xsl
    315315===================================================================
    316 --- CLFS/clfs.xsl       (revision 2885)
     316--- CLFS/clfs.xsl       (revision 2906)
    317317+++ CLFS/clfs.xsl       (working copy)
    318318@@ -45,6 +45,9 @@
    … …  
    371371Index: common/config
    372372===================================================================
    373 --- common/config       (revision 2885)
     373--- common/config       (revision 2906)
    374374+++ common/config       (working copy)
    375375@@ -91,6 +91,23 @@
    … …  
    409409Index: common/func_validate_configs.sh
    410410===================================================================
    411 --- common/func_validate_configs.sh     (revision 2885)
     411--- common/func_validate_configs.sh     (revision 2906)
    412412+++ common/func_validate_configs.sh     (working copy)
    413413@@ -84,9 +84,9 @@
    … …  
    415415 
    416416   # 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  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"
    420 +  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"
    421 +  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"
    422 +  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   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"
     420+  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"
     421+  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"
     422+  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"
    423423 
    424424   local -r ERROR_MSG_pt1='The variable \"${L_arrow}${config_param}${R_arrow}\" value ${L_arrow}${BOLD}${!config_param}${R_arrow} is invalid,'
    … …  
    780780Index: common/common-functions
    781781===================================================================
    782 --- common/common-functions     (revision 2885)
     782--- common/common-functions     (revision 2906)
    783783+++ common/common-functions     (working copy)
    784784@@ -69,6 +69,9 @@
    … …  
    792792         Optimize [0-2]
    793793           0 = no optimization
    794 @@ -720,6 +723,7 @@
     794@@ -683,6 +686,7 @@
    795795                  --stringparam page $PAGE \
    796796                  --stringparam lang $LANG \
    … …  
    800800       ;;
    801801     hlfs)
    802 @@ -735,6 +739,7 @@
     802@@ -698,6 +702,7 @@
    803803                  --stringparam lc_all $LC_ALL \
    804804                  --stringparam keymap $KEYMAP \
    … …  
    808808       ;;
    809809     lfs)
    810 @@ -747,6 +752,7 @@
     810@@ -710,6 +715,7 @@
    811811                  --stringparam timezone $TIMEZONE \
    812812                  --stringparam page $PAGE \
    … …  
    816816       ;;
    817817     *) exit 1 ;;
    818 @@ -813,6 +819,9 @@
     818@@ -776,6 +782,9 @@
    819819     # Generate URLs file
    820820   create_urls
    … …  
    828828Index: HLFS/hlfs.xsl
    829829===================================================================
    830 --- HLFS/hlfs.xsl       (revision 2885)
     830--- HLFS/hlfs.xsl       (revision 2906)
    831831+++ HLFS/hlfs.xsl       (working copy)
    832832@@ -46,6 +46,9 @@
    … …  
    879879Index: HLFS/master.sh
    880880===================================================================
    881 --- HLFS/master.sh      (revision 2885)
     881--- HLFS/master.sh      (revision 2906)
    882882+++ HLFS/master.sh      (working copy)
    883 @@ -92,7 +92,9 @@
     883@@ -40,7 +40,9 @@
    884884 EOF
    885885 ) >> $MKFILE.tmp
    … …  
    891891 
    892892     *)
    893 @@ -324,6 +326,11 @@
     893@@ -272,6 +274,11 @@
    894894     # Keep the script file name
    895895     this_script=`basename $file`
    … …  
    903903     case $this_script in
    904904         # We'll run the chroot commands differently than the others, so skip them in the
    905 @@ -333,6 +340,18 @@
     905@@ -281,6 +288,18 @@
    906906       *-stripping* )  [[ "$STRIP" = "0" ]] && continue ;;
    907907     esac
    … …  
    922922     name=`echo $this_script | sed -e 's@[0-9]\{3\}-@@'`
    923923 
    924 @@ -398,7 +417,9 @@
    925          wrt_RunAsRoot "hlfs" "${this_script}" "${file}"
     924@@ -346,7 +365,9 @@
     925         wrt_RunAsRoot "${this_script}" "${file}"
    926926         ;;
    927927       *)   # The rest of Chapter06
    … …  
    932932     esac
    933933     #
    934 @@ -418,6 +439,16 @@
     934@@ -366,6 +387,16 @@
    935935     PREV=${this_script}${N}
    936936     # Set system_build envar for iteration targets
    … …  
    949949 
    950950 }
    951 @@ -476,9 +507,19 @@
     951@@ -424,9 +455,19 @@
    952952         else  # Initialize the log and run the script
    953953           wrt_run_as_chroot2 "${this_script}" "${file}"
    … …  
    971971Index: master.sh
    972972===================================================================
    973 --- master.sh   (revision 2885)
     973--- master.sh   (revision 2906)
    974974+++ master.sh   (working copy)
    975975@@ -149,6 +149,8 @@
Note: See TracChangeset for help on using the changeset viewer.