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

Rediified paco patch.

Browse source
This commit is contained in:
Manuel Canales Esparcia 2006-06-10 16:52:27 +00:00
parent eed75ecafa
commit 235f7e9c02
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
contrib/jhalfs-paco.patch
View file

@ -1,8 +1,8 @@
Index: LFS/master.sh Index: LFS/master.sh
=================================================================== ===================================================================
--- LFS/master.sh (revision 2752) --- LFS/master.sh (revision 2769)
+++ LFS/master.sh (working copy) +++ LFS/master.sh (working copy)
@@ -176,6 +176,11 @@ @@ -182,6 +182,11 @@
# Keep the script file name # Keep the script file name
this_script=`basename $file` 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 # We'll run the chroot commands differently than the others, so skip them in the
# dependencies and target creation. # dependencies and target creation.
case "${this_script}" in case "${this_script}" in
@@ -183,6 +188,18 @@ @@ -189,6 +194,18 @@
*stripping*) [[ "${STRIP}" = "0" ]] && continue ;; *stripping*) [[ "${STRIP}" = "0" ]] && continue ;;
esac esac
@ -33,7 +33,7 @@ Index: LFS/master.sh
# Grab the name of the target # Grab the name of the target
name=`echo ${this_script} | sed -e 's@[0-9]\{3\}-@@'` name=`echo ${this_script} | sed -e 's@[0-9]\{3\}-@@'`
@@ -236,7 +253,9 @@ @@ -242,7 +259,9 @@
# and not to use chroot. # and not to use chroot.
case "${this_script}" in case "${this_script}" in
*kernfs) wrt_run_as_root "${this_script}" "$file" ;; *kernfs) wrt_run_as_root "${this_script}" "$file" ;;
@ -44,7 +44,7 @@ Index: LFS/master.sh
esac esac
# Remove the build directory(ies) except if the package build fails. # Remove the build directory(ies) except if the package build fails.
@@ -256,6 +275,16 @@ @@ -262,6 +281,16 @@
PREV=${this_script}${N} PREV=${this_script}${N}
# Set system_build envar for iteration targets # Set system_build envar for iteration targets
system_build=$chapter6 system_build=$chapter6
@ -61,7 +61,7 @@ Index: LFS/master.sh
done # end for file in chapter06/* done # end for file in chapter06/*
} }
@@ -316,8 +345,18 @@ @@ -322,8 +351,18 @@
else else
wrt_run_as_chroot2 "$this_script" "$file" wrt_run_as_chroot2 "$this_script" "$file"
fi fi
@ -82,7 +82,7 @@ Index: LFS/master.sh
Index: LFS/lfs.xsl Index: LFS/lfs.xsl
=================================================================== ===================================================================
--- LFS/lfs.xsl (revision 2752) --- LFS/lfs.xsl (revision 2769)
+++ LFS/lfs.xsl (working copy) +++ LFS/lfs.xsl (working copy)
@@ -32,6 +32,9 @@ @@ -32,6 +32,9 @@
<!-- Locale settings --> <!-- Locale settings -->
@ -147,7 +147,7 @@ Index: common/paco-build-hlfs.sh
+make logme +make logme
Index: common/config Index: common/config
=================================================================== ===================================================================
--- common/config (revision 2752) --- common/config (revision 2769)
+++ common/config (working copy) +++ common/config (working copy)
@@ -84,6 +84,14 @@ @@ -84,6 +84,14 @@
#--- Run farce testing 0(no)/1(yes) #--- Run farce testing 0(no)/1(yes)
@ -176,7 +176,7 @@ Index: common/config
+LD_PRELOAD=/usr/lib/libpaco-log.so +LD_PRELOAD=/usr/lib/libpaco-log.so
Index: common/func_validate_configs.sh Index: common/func_validate_configs.sh
=================================================================== ===================================================================
--- common/func_validate_configs.sh (revision 2752) --- common/func_validate_configs.sh (revision 2769)
+++ common/func_validate_configs.sh (working copy) +++ common/func_validate_configs.sh (working copy)
@@ -84,9 +84,9 @@ @@ -84,9 +84,9 @@
inline_doc inline_doc
@ -432,7 +432,7 @@ Index: common/paco-build-lfs.sh
+make logme +make logme
Index: common/common-functions Index: common/common-functions
=================================================================== ===================================================================
--- common/common-functions (revision 2752) --- common/common-functions (revision 2769)
+++ common/common-functions (working copy) +++ common/common-functions (working copy)
@@ -65,6 +65,9 @@ @@ -65,6 +65,9 @@
in the configuration file has the proper packages and patches for the in the configuration file has the proper packages and patches for the
@ -444,7 +444,7 @@ Index: common/common-functions
${BOLD} -O, --optimize${OFF} ${BOLD} -O, --optimize${OFF}
Optimize [0-2] Optimize [0-2]
0 = no optimization 0 = no optimization
@@ -631,6 +634,7 @@ @@ -645,6 +648,7 @@
--stringparam lc_all $LC_ALL \ --stringparam lc_all $LC_ALL \
--stringparam keymap $KEYMAP \ --stringparam keymap $KEYMAP \
--stringparam grsecurity_host $GRSECURITY_HOST \ --stringparam grsecurity_host $GRSECURITY_HOST \
@ -452,7 +452,7 @@ Index: common/common-functions
-o ./${PROGNAME}-commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1 -o ./${PROGNAME}-commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1
;; ;;
lfs) lfs)
@@ -642,6 +646,7 @@ @@ -656,6 +660,7 @@
--stringparam timezone $TIMEZONE \ --stringparam timezone $TIMEZONE \
--stringparam page $PAGE \ --stringparam page $PAGE \
--stringparam lang $LANG \ --stringparam lang $LANG \
@ -462,7 +462,7 @@ Index: common/common-functions
*) exit 1 ;; *) exit 1 ;;
Index: HLFS/hlfs.xsl Index: HLFS/hlfs.xsl
=================================================================== ===================================================================
--- HLFS/hlfs.xsl (revision 2752) --- HLFS/hlfs.xsl (revision 2769)
+++ HLFS/hlfs.xsl (working copy) +++ HLFS/hlfs.xsl (working copy)
@@ -39,6 +39,9 @@ @@ -39,6 +39,9 @@
<xsl:param name="lang" select="C"/> <xsl:param name="lang" select="C"/>
@ -513,9 +513,9 @@ Index: HLFS/hlfs.xsl
<xsl:apply-templates/> <xsl:apply-templates/>
Index: HLFS/master.sh Index: HLFS/master.sh
=================================================================== ===================================================================
--- HLFS/master.sh (revision 2752) --- HLFS/master.sh (revision 2769)
+++ HLFS/master.sh (working copy) +++ HLFS/master.sh (working copy)
@@ -253,6 +253,11 @@ @@ -259,6 +259,11 @@
# Keep the script file name # Keep the script file name
this_script=`basename $file` this_script=`basename $file`
@ -527,7 +527,7 @@ Index: HLFS/master.sh
# Skip this script depending on jhalfs.conf flags set. # Skip this script depending on jhalfs.conf flags set.
case $this_script in case $this_script in
# We'll run the chroot commands differently than the others, so skip them in the # We'll run the chroot commands differently than the others, so skip them in the
@@ -262,6 +267,18 @@ @@ -268,6 +273,18 @@
*-stripping* ) [[ "$STRIP" = "0" ]] && continue ;; *-stripping* ) [[ "$STRIP" = "0" ]] && continue ;;
esac esac
@ -546,7 +546,7 @@ Index: HLFS/master.sh
# Grab the name of the target # Grab the name of the target
name=`echo $this_script | sed -e 's@[0-9]\{3\}-@@'` name=`echo $this_script | sed -e 's@[0-9]\{3\}-@@'`
@@ -342,7 +359,9 @@ @@ -348,7 +365,9 @@
wrt_run_as_root "${this_script}" "${file}" wrt_run_as_root "${this_script}" "${file}"
;; ;;
*) # The rest of Chapter06 *) # The rest of Chapter06
@ -556,7 +556,7 @@ Index: HLFS/master.sh
;; ;;
esac esac
# #
@@ -375,6 +394,16 @@ @@ -381,6 +400,16 @@
PREV=${this_script}${N} PREV=${this_script}${N}
# Set system_build envar for iteration targets # Set system_build envar for iteration targets
system_build=$chapter6 system_build=$chapter6
@ -573,7 +573,7 @@ Index: HLFS/master.sh
done # end for file in chapter06/* done # end for file in chapter06/*
} }
@@ -436,9 +465,20 @@ @@ -442,9 +471,20 @@
else # Initialize the log and run the script else # Initialize the log and run the script
wrt_run_as_chroot2 "${this_script}" "${file}" wrt_run_as_chroot2 "${this_script}" "${file}"
fi fi
@ -596,7 +596,7 @@ Index: HLFS/master.sh
Index: master.sh Index: master.sh
=================================================================== ===================================================================
--- master.sh (revision 2752) --- master.sh (revision 2769)
+++ master.sh (working copy) +++ master.sh (working copy)
@@ -148,6 +148,8 @@ @@ -148,6 +148,8 @@