zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rediffied paco patch.

Browse source
This commit is contained in:
Manuel Canales Esparcia 2006-06-23 18:39:04 +00:00
parent dd29d02eb8
commit a2c9b41661
2 changed files with 26 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.PACO
View file

@ -5,6 +5,10 @@
###########################################
WARNING: AT THIS MOMENT THE PACO PATCH IS BROKEN
================================================
##### NOTES #####
Patch author: Tor Olav Stava (t-ol-sta@online.no)

44
contrib/jhalfs-paco.patch
View file

@ -1,8 +1,8 @@
Index: LFS/master.sh
===================================================================
--- LFS/master.sh (revision 2769)
--- LFS/master.sh (revision 2804)
+++ LFS/master.sh (working copy)
@@ -182,6 +182,11 @@
@@ -176,6 +176,11 @@
# Keep the script file name
this_script=`basename $file`
@ -14,7 +14,7 @@ Index: LFS/master.sh
# We'll run the chroot commands differently than the others, so skip them in the
# dependencies and target creation.
case "${this_script}" in
@@ -189,6 +194,18 @@
@@ -183,6 +188,18 @@
*stripping*) [[ "${STRIP}" = "0" ]] && continue ;;
esac
@ -33,7 +33,7 @@ Index: LFS/master.sh
# Grab the name of the target
name=`echo ${this_script} | sed -e 's@[0-9]\{3\}-@@'`
@@ -242,7 +259,9 @@
@@ -235,7 +252,9 @@
# and not to use chroot.
case "${this_script}" in
*kernfs) wrt_run_as_root "${this_script}" "$file" ;;
@ -44,7 +44,7 @@ Index: LFS/master.sh
esac
# Remove the build directory(ies) except if the package build fails.
@@ -262,6 +281,16 @@
@@ -255,6 +274,16 @@
PREV=${this_script}${N}
# Set system_build envar for iteration targets
system_build=$chapter6
@ -61,7 +61,7 @@ Index: LFS/master.sh
done # end for file in chapter06/*
}
@@ -322,8 +351,18 @@
@@ -315,8 +344,18 @@
else
wrt_run_as_chroot2 "$this_script" "$file"
fi
@ -82,7 +82,7 @@ Index: LFS/master.sh
Index: LFS/lfs.xsl
===================================================================
--- LFS/lfs.xsl (revision 2769)
--- LFS/lfs.xsl (revision 2804)
+++ LFS/lfs.xsl (working copy)
@@ -32,6 +32,9 @@
<!-- Locale settings -->
@ -147,9 +147,9 @@ Index: common/paco-build-hlfs.sh
+make logme
Index: common/config
===================================================================
--- common/config (revision 2769)
--- common/config (revision 2804)
+++ common/config (working copy)
@@ -84,6 +84,14 @@
@@ -86,6 +86,14 @@
#--- Run farce testing 0(no)/1(yes)
RUN_FARCE=0
@ -164,7 +164,7 @@ Index: common/config
#==== INTERNAL VARIABLES ====
# Don't edit it unless you know what you are doing
@@ -101,3 +109,9 @@
@@ -103,3 +111,9 @@
#--- farce report log directory
FARCELOGDIR=$LOGDIR/farce
@ -176,7 +176,7 @@ Index: common/config
+LD_PRELOAD=/usr/lib/libpaco-log.so
Index: common/func_validate_configs.sh
===================================================================
--- common/func_validate_configs.sh (revision 2769)
--- common/func_validate_configs.sh (revision 2804)
+++ common/func_validate_configs.sh (working copy)
@@ -84,9 +84,9 @@
inline_doc
@ -432,7 +432,7 @@ Index: common/paco-build-lfs.sh
+make logme
Index: common/common-functions
===================================================================
--- common/common-functions (revision 2769)
--- common/common-functions (revision 2804)
+++ common/common-functions (working copy)
@@ -65,6 +65,9 @@
in the configuration file has the proper packages and patches for the
@ -444,7 +444,7 @@ Index: common/common-functions
${BOLD} -O, --optimize${OFF}
Optimize [0-2]
0 = no optimization
@@ -645,6 +648,7 @@
@@ -658,6 +661,7 @@
--stringparam lc_all $LC_ALL \
--stringparam keymap $KEYMAP \
--stringparam grsecurity_host $GRSECURITY_HOST \
@ -452,7 +452,7 @@ Index: common/common-functions
-o ./${PROGNAME}-commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1
;;
lfs)
@@ -656,6 +660,7 @@
@@ -669,6 +673,7 @@
--stringparam timezone $TIMEZONE \
--stringparam page $PAGE \
--stringparam lang $LANG \
@ -462,7 +462,7 @@ Index: common/common-functions
*) exit 1 ;;
Index: HLFS/hlfs.xsl
===================================================================
--- HLFS/hlfs.xsl (revision 2769)
--- HLFS/hlfs.xsl (revision 2804)
+++ HLFS/hlfs.xsl (working copy)
@@ -39,6 +39,9 @@
<xsl:param name="lang" select="C"/>
@ -513,9 +513,9 @@ Index: HLFS/hlfs.xsl
<xsl:apply-templates/>
Index: HLFS/master.sh
===================================================================
--- HLFS/master.sh (revision 2769)
--- HLFS/master.sh (revision 2804)
+++ HLFS/master.sh (working copy)
@@ -259,6 +259,11 @@
@@ -250,6 +250,11 @@
# Keep the script file name
this_script=`basename $file`
@ -527,7 +527,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
@@ -268,6 +273,18 @@
@@ -259,6 +264,18 @@
*-stripping* ) [[ "$STRIP" = "0" ]] && continue ;;
esac
@ -546,7 +546,7 @@ Index: HLFS/master.sh
# Grab the name of the target
name=`echo $this_script | sed -e 's@[0-9]\{3\}-@@'`
@@ -348,7 +365,9 @@
@@ -334,7 +351,9 @@
wrt_run_as_root "${this_script}" "${file}"
;;
*) # The rest of Chapter06
@ -556,7 +556,7 @@ Index: HLFS/master.sh
;;
esac
#
@@ -381,6 +400,16 @@
@@ -367,6 +386,16 @@
PREV=${this_script}${N}
# Set system_build envar for iteration targets
system_build=$chapter6
@ -573,7 +573,7 @@ Index: HLFS/master.sh
done # end for file in chapter06/*
}
@@ -442,9 +471,20 @@
@@ -426,9 +455,20 @@
else # Initialize the log and run the script
wrt_run_as_chroot2 "${this_script}" "${file}"
fi
@ -596,7 +596,7 @@ Index: HLFS/master.sh
Index: master.sh
===================================================================
--- master.sh (revision 2769)
--- master.sh (revision 2804)
+++ master.sh (working copy)
@@ -148,6 +148,8 @@