diff --git a/README.PACO b/README.PACO
index e537fa8..65bb56e 100644
--- a/README.PACO
+++ b/README.PACO
@@ -12,6 +12,10 @@
This patch will enable the paco pacKAGE oRGANIZER to be used with jhalfs.
At the moment only the LFS and HLFS-glibc parts are supported.
+NEWS:
+ Preliminary support for CLFS is ready. It's not fully tested, so if you
+discover any bugs please notify the patch author. Also, Paco may or may not work
+on your specific architecture. Check the Paco homepage for details.
##### QUICK START #####
@@ -19,10 +23,10 @@ At the moment only the LFS and HLFS-glibc parts are supported.
(patch -Np0 -i contrib/jhalfs-paco.patch)
2. Edit the configuration files to your preferences.
- (common/config and LFS/config or HLFS/config)
+ (common/config and LFS/config or HLFS/config or CLFS/config)
3. Run the wanted script.
- (Only ./lfs or ./hlfs --model glibc if you want to use paco)
+ (Only ./lfs or ./clfs or ./hlfs --model glibc if you want to use paco)
4. Run make.
@@ -69,14 +73,18 @@ http://lists.sourceforge.net/lists/listinfo/paco-general
##### TODO #####
+- Bughunting/testing CLFS part
- Support for HLFS-uClibc
-- Support for CLFS
- Support for BLFS (when it's ready)
- Spread the Word
##### HISTORY #####
+2006-08-02
+- Preliminary support for CLFS done
+- Some code cleanup
+
2006-07-30
-- Automatical download of Paco source package
+- Automatical download of Paco source package done
- Updated patch to support new HLFS layout
diff --git a/contrib/jhalfs-paco.patch b/contrib/jhalfs-paco.patch
index 178041f..4568779 100644
--- a/contrib/jhalfs-paco.patch
+++ b/contrib/jhalfs-paco.patch
@@ -1,6 +1,6 @@
Index: LFS/master.sh
===================================================================
---- LFS/master.sh (revision 2885)
+--- LFS/master.sh (revision 2906)
+++ LFS/master.sh (working copy)
@@ -173,6 +173,11 @@
# Keep the script file name
@@ -36,7 +36,7 @@ Index: LFS/master.sh
@@ -232,7 +249,9 @@
# and not to use chroot.
case "${this_script}" in
- *kernfs) wrt_run_as_root "${this_script}" "$file" ;;
+ *kernfs) wrt_RunAsRoot "${this_script}" "$file" ;;
- *) wrt_run_as_chroot1 "${this_script}" "$file" ;;
+ *) wrt_paco_prep
+ wrt_run_as_chroot1 "${this_script}" "$file"
@@ -79,7 +79,7 @@ Index: LFS/master.sh
Index: LFS/lfs.xsl
===================================================================
---- LFS/lfs.xsl (revision 2885)
+--- LFS/lfs.xsl (revision 2906)
+++ LFS/lfs.xsl (working copy)
@@ -39,6 +39,9 @@
@@ -127,7 +127,7 @@ Index: LFS/lfs.xsl
Index: CLFS/master.sh
===================================================================
---- CLFS/master.sh (revision 2885)
+--- CLFS/master.sh (revision 2906)
+++ CLFS/master.sh (working copy)
@@ -495,6 +495,11 @@
# Keep the script file name
@@ -313,7 +313,7 @@ Index: CLFS/master.sh
# Housekeeping...remove any build directory(ies) except if the package build fails.
Index: CLFS/clfs.xsl
===================================================================
---- CLFS/clfs.xsl (revision 2885)
+--- CLFS/clfs.xsl (revision 2906)
+++ CLFS/clfs.xsl (working copy)
@@ -45,6 +45,9 @@
@@ -370,7 +370,7 @@ Index: common/paco-build-hlfs.sh
+make logme
Index: common/config
===================================================================
---- common/config (revision 2885)
+--- common/config (revision 2906)
+++ common/config (working copy)
@@ -91,6 +91,23 @@
#--- Run farce testing 0(no)/1(yes)
@@ -408,18 +408,18 @@ Index: common/config
+LD_PRELOAD=/usr/lib/libpaco-log.so
Index: common/func_validate_configs.sh
===================================================================
---- common/func_validate_configs.sh (revision 2885)
+--- common/func_validate_configs.sh (revision 2906)
+++ common/func_validate_configs.sh (working copy)
@@ -84,9 +84,9 @@
inline_doc
# First internal variables, then the ones that change the book's flavour, and lastly system configuration variables
-- 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"
-- 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"
-- 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"
-+ 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"
-+ 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"
-+ 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"
+- 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"
+- 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"
+- 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"
++ 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"
++ 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"
++ 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"
local -r ERROR_MSG_pt1='The variable \"${L_arrow}${config_param}${R_arrow}\" value ${L_arrow}${BOLD}${!config_param}${R_arrow} is invalid,'
local -r ERROR_MSG_pt2=' check the config file ${BOLD}${GREEN}\<$(echo $PROGNAME | tr [a-z] [A-Z])/config\> or \${OFF}'
@@ -779,7 +779,7 @@ Index: common/paco-build-clfs.sh
+make logme
Index: common/common-functions
===================================================================
---- common/common-functions (revision 2885)
+--- common/common-functions (revision 2906)
+++ common/common-functions (working copy)
@@ -69,6 +69,9 @@
in the configuration file has the proper packages and patches for the
@@ -791,7 +791,7 @@ Index: common/common-functions
${BOLD} -O, --optimize${OFF}
Optimize [0-2]
0 = no optimization
-@@ -720,6 +723,7 @@
+@@ -683,6 +686,7 @@
--stringparam page $PAGE \
--stringparam lang $LANG \
--stringparam keymap $KEYMAP \
@@ -799,7 +799,7 @@ Index: common/common-functions
-o ./${PROGNAME}-commands/ $XSL $BOOK/$ARCH-index.xml >>$LOGDIR/$LOG 2>&1
;;
hlfs)
-@@ -735,6 +739,7 @@
+@@ -698,6 +702,7 @@
--stringparam lc_all $LC_ALL \
--stringparam keymap $KEYMAP \
--stringparam grsecurity_host $GRSECURITY_HOST \
@@ -807,7 +807,7 @@ Index: common/common-functions
-o ./${PROGNAME}-commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1
;;
lfs)
-@@ -747,6 +752,7 @@
+@@ -710,6 +715,7 @@
--stringparam timezone $TIMEZONE \
--stringparam page $PAGE \
--stringparam lang $LANG \
@@ -815,7 +815,7 @@ Index: common/common-functions
-o ./${PROGNAME}-commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1
;;
*) exit 1 ;;
-@@ -813,6 +819,9 @@
+@@ -776,6 +782,9 @@
# Generate URLs file
create_urls
@@ -827,7 +827,7 @@ Index: common/common-functions
IFS=$saveIFS # Restore the system defaults
Index: HLFS/hlfs.xsl
===================================================================
---- HLFS/hlfs.xsl (revision 2885)
+--- HLFS/hlfs.xsl (revision 2906)
+++ HLFS/hlfs.xsl (working copy)
@@ -46,6 +46,9 @@
@@ -878,9 +878,9 @@ Index: HLFS/hlfs.xsl
Index: HLFS/master.sh
===================================================================
---- HLFS/master.sh (revision 2885)
+--- HLFS/master.sh (revision 2906)
+++ HLFS/master.sh (working copy)
-@@ -92,7 +92,9 @@
+@@ -40,7 +40,9 @@
EOF
) >> $MKFILE.tmp
[[ "$TEST" != "0" ]] && wrt_test_log2 "${this_script}"
@@ -890,7 +890,7 @@ Index: HLFS/master.sh
;;
*)
-@@ -324,6 +326,11 @@
+@@ -272,6 +274,11 @@
# Keep the script file name
this_script=`basename $file`
@@ -902,7 +902,7 @@ Index: HLFS/master.sh
# Skip this script depending on jhalfs.conf flags set.
case $this_script in
# We'll run the chroot commands differently than the others, so skip them in the
-@@ -333,6 +340,18 @@
+@@ -281,6 +288,18 @@
*-stripping* ) [[ "$STRIP" = "0" ]] && continue ;;
esac
@@ -921,8 +921,8 @@ Index: HLFS/master.sh
# Grab the name of the target
name=`echo $this_script | sed -e 's@[0-9]\{3\}-@@'`
-@@ -398,7 +417,9 @@
- wrt_RunAsRoot "hlfs" "${this_script}" "${file}"
+@@ -346,7 +365,9 @@
+ wrt_RunAsRoot "${this_script}" "${file}"
;;
*) # The rest of Chapter06
+ wrt_paco_prep
@@ -931,7 +931,7 @@ Index: HLFS/master.sh
;;
esac
#
-@@ -418,6 +439,16 @@
+@@ -366,6 +387,16 @@
PREV=${this_script}${N}
# Set system_build envar for iteration targets
system_build=$chapter6
@@ -948,7 +948,7 @@ Index: HLFS/master.sh
done # end for file in chapter06/*
}
-@@ -476,9 +507,19 @@
+@@ -424,9 +455,19 @@
else # Initialize the log and run the script
wrt_run_as_chroot2 "${this_script}" "${file}"
fi
@@ -970,7 +970,7 @@ Index: HLFS/master.sh
Index: master.sh
===================================================================
---- master.sh (revision 2885)
+--- master.sh (revision 2906)
+++ master.sh (working copy)
@@ -149,6 +149,8 @@