Context Navigation

source: contrib/jhalfs-paco.patch@ 9c1838b

2.3 2.3.x 2.4 ablfs ablfs-more legacy new_features trunk

Last change on this file since 9c1838b was d51e891, checked in by Manuel Canales Esparcia <manuel@…>, 18 years ago
Rediffied paco patch.
Property mode set to `100644`
File size: 33.6 KB

Rev	Line
[059822c]	1	Index: LFS/master.sh
	2	===================================================================
[d51e891]	3	--- LFS/master.sh (revision 3103)
[059822c]	4	+++ LFS/master.sh (working copy)
[7bf2fdd]	5	@@ -172,6 +172,11 @@
[8230977]	6	# Keep the script file name
	7	this_script=`basename $file`
	8
	9	+ # If $this_script corresponds to a paco script, then skip it
	10	+ case "${this_script}" in
	11	+ *paco) continue ;;
	12	+ esac
	13	+
	14	# We'll run the chroot commands differently than the others, so skip them in the
	15	# dependencies and target creation.
	16	case "${this_script}" in
[7bf2fdd]	17	@@ -179,6 +184,18 @@
	18	stripping) [[ "${STRIP}" = "n" ]] && continue ;;
[6821737]	19	esac
	20
[4795dfb]	21	+ # Install paco as the first package in ch6, before installing
	22	+ # linux-libc-headers, except in iterartive builds
	23	+ if [[ -z "$N" ]]; then
	24	+ case $this_script in
	25	+ *linux-libc-headers)
[799b0d1]	26	+ TMP_SCRIPT="$this_script"
	27	+ this_script=`echo $this_script \| sed -e 's/linux-libc-headers/a-paco/'`
	28	+ wrt_paco_inst "$this_script"
	29	+ this_script="$TMP_SCRIPT" ;;
[4795dfb]	30	+ esac
	31	+ fi
[6821737]	32	+
[4795dfb]	33	# Grab the name of the target
	34	name=`echo ${this_script} \| sed -e 's@[0-9]\{3\}-@@'`
	35
[7bf2fdd]	36	@@ -231,7 +248,9 @@
[059822c]	37	# and not to use chroot.
	38	case "${this_script}" in
[daa9b6c]	39	*kernfs) wrt_RunAsRoot "${this_script}" "$file" ;;
[059822c]	40	- *) wrt_run_as_chroot1 "${this_script}" "$file" ;;
	41	+ *) wrt_paco_prep
	42	+ wrt_run_as_chroot1 "${this_script}" "$file"
[2b88404]	43	+ wrt_paco_log "$pkg_tarball" ;;
[059822c]	44	esac
	45
	46	# Remove the build directory(ies) except if the package build fails.
[7bf2fdd]	47	@@ -251,6 +270,16 @@
[4795dfb]	48	PREV=${this_script}${N}
	49	# Set system_build envar for iteration targets
	50	system_build=$chapter6
[059822c]	51	+
[6821737]	52	+ # Reinstalling paco after readsjusting the toolchain.
[059822c]	53	+ case "${this_script}" in
[6821737]	54	+ *readjusting)
[799b0d1]	55	+ TMP_SCRIPT="$this_script"
	56	+ this_script=`echo ${this_script} \| sed -e 's/readjusting/x-paco/'`
	57	+ wrt_paco_inst "$this_script"
	58	+ this_script="$TMP_SCRIPT" ;;
[059822c]	59	+ esac
	60	+
	61	done # end for file in chapter06/*
	62	}
	63
[7bf2fdd]	64	@@ -311,8 +340,15 @@
[b9ec725]	65	else
[059822c]	66	wrt_run_as_chroot2 "$this_script" "$file"
	67	fi
[b9ec725]	68	+ wrt_paco_log "lfs-sysconf"
[059822c]	69	;;
[8b7357b]	70	+ kernel \| bootscripts )
	71	+ wrt_paco_prep
	72	+ wrt_run_as_chroot2 "$this_script" "$file"
	73	+ wrt_paco_log "$pkg_tarball"
[059822c]	74	+ ;;
	75	*) wrt_run_as_chroot2 "$this_script" "$file"
[b9ec725]	76	+ wrt_paco_log "lfs-sysconf"
[059822c]	77	;;
	78	esac
[b9ec725]	79
[059822c]	80	Index: LFS/lfs.xsl
	81	===================================================================
[d51e891]	82	--- LFS/lfs.xsl (revision 3103)
[059822c]	83	+++ LFS/lfs.xsl (working copy)
[963fdae]	84	@@ -39,6 +39,9 @@
[059822c]	85	<!-- Locale settings -->
[c665386]	86	<xsl:param name="lang" select="C"/>
[059822c]	87
	88	+ <!-- Use paco? -->
[7bf2fdd]	89	+ <xsl:param name="use_paco" select="y"/>
[059822c]	90	+
	91	<xsl:template match="/">
	92	<xsl:apply-templates select="//sect1"/>
	93	</xsl:template>
[7bf2fdd]	94	@@ -251,6 +254,33 @@
[059822c]	95	<xsl:apply-templates/>
	96	<xsl:text> \|\| true </xsl:text>
	97	</xsl:when>
	98	+ <!-- paco begin -->
	99	+ <!-- General rule -->
[7bf2fdd]	100	+ <xsl:when test="$use_paco != 'n' and
[059822c]	101	+ ancestor::chapter[@id != 'chapter-temporary-tools'] and
	102	+ contains(string(),'make') and
	103	+ contains(string(),'install')">
	104	+ <xsl:text>export LD_PRELOAD=/usr/lib/libpaco-log.so </xsl:text>
	105	+ <xsl:apply-templates/>
	106	+ <xsl:text> </xsl:text>
	107	+ </xsl:when>
	108	+ <!-- Linux-libc-headers -->
[7bf2fdd]	109	+ <xsl:when test="$use_paco != 'n' and
[059822c]	110	+ ancestor::sect1[@id='ch-system-linux-libc-headers'] and
	111	+ contains(string(),'install ')">
	112	+ <xsl:text>export LD_PRELOAD=/usr/lib/libpaco-log.so </xsl:text>
	113	+ <xsl:apply-templates/>
	114	+ <xsl:text> </xsl:text>
	115	+ </xsl:when>
	116	+ <!-- Unset LD_PRELOAD before second make in Zlib -->
[7bf2fdd]	117	+ <xsl:when test="$use_paco != 'n' and
[059822c]	118	+ ancestor::sect1[@id='ch-system-zlib'] and
	119	+ contains(string(),'make clean')">
	120	+ <xsl:text>unset LD_PRELOAD </xsl:text>
	121	+ <xsl:apply-templates/>
	122	+ <xsl:text> </xsl:text>
	123	+ </xsl:when>
	124	+ <!-- paco end -->
	125	<!-- The rest of commands -->
	126	<xsl:otherwise>
	127	<xsl:apply-templates/>
[8b7357b]	128	Index: CLFS/master.sh
	129	===================================================================
[d51e891]	130	--- CLFS/master.sh (revision 3103)
[8b7357b]	131	+++ CLFS/master.sh (working copy)
[7bf2fdd]	132	@@ -494,6 +494,11 @@
[8b7357b]	133	# Keep the script file name
	134	this_script=`basename $file`
	135
	136	+ # If $this_script corresponds to a paco script, then skip it
	137	+ case "${this_script}" in
	138	+ *paco) continue ;;
	139	+ esac
	140	+
	141	# Test if the stripping phase must be skipped.
	142	# Skip alsp temp-perl for iterative runs
	143	case $this_script in
[7bf2fdd]	144	@@ -501,6 +506,18 @@
[8b7357b]	145	temp-perl) [[ -n "$N" ]] && continue ;;
	146	esac
	147
	148	+ # Install paco as the first package in ch6, before installing
	149	+ # linux-libc-headers, except in iterartive builds
	150	+ if [[ -z "$N" ]]; then
	151	+ case $this_script in
	152	+ *linux-headers)
	153	+ TMP_SCRIPT="$this_script"
	154	+ this_script=`echo $this_script \| sed -e 's/linux-headers/a-paco/'`
	155	+ wrt_paco_inst "$this_script"
	156	+ this_script="$TMP_SCRIPT" ;;
	157	+ esac
	158	+ fi
	159	+
	160	# Grab the name of the target, strip id number, XXX-script
	161	name=`echo $this_script \| sed -e 's@[0-9]\{3\}-@@' \
	162	-e 's@temp-@@' \
[7bf2fdd]	163	@@ -553,7 +570,9 @@
[8b7357b]	164	[[ "$OPTIMIZE" != "0" ]] && wrt_optimize "$name" && wrt_makeflags "$name"
	165	fi
	166	#
	167	+ wrt_paco_prep
	168	wrt_run_as_chroot1 "${this_script}" "${file}"
	169	+ wrt_paco_log "$pkg_tarball"
	170	#
	171	[[ "$pkg_tarball" != "" ]] && wrt_remove_build_dirs "${name}"
	172	#
[7bf2fdd]	173	@@ -568,6 +587,16 @@
[8b7357b]	174	PREV=${this_script}${N}
	175	# Set system_build envar for iteration targets
	176	system_build=$basicsystem
	177	+
	178	+ # Reinstalling paco after readsjusting the toolchain.
	179	+ case "${this_script}" in
	180	+ *adjusting)
	181	+ TMP_SCRIPT="$this_script"
	182	+ this_script=`echo ${this_script} \| sed -e 's/adjusting/x-paco/'`
	183	+ wrt_paco_inst "$this_script"
	184	+ this_script="$TMP_SCRIPT" ;;
	185	+ esac
	186	+
	187	done # for file in final-system/* ...
	188	}
	189
[7bf2fdd]	190	@@ -604,6 +633,11 @@
[8b7357b]	191	# Keep the script file name
	192	this_script=`basename $file`
	193
	194	+ # If $this_script corresponds to a paco script, then skip it
	195	+ case "${this_script}" in
	196	+ *paco) continue ;;
	197	+ esac
	198	+
	199	# Test if the stripping phase must be skipped
	200	# Skip alsp temp-perl for iterative runs
	201	case $this_script in
[7bf2fdd]	202	@@ -611,6 +645,18 @@
[8b7357b]	203	temp-perl) [[ -n "$N" ]] && continue ;;
	204	esac
	205
	206	+ # Install paco as the first package in ch6, before installing
	207	+ # linux-libc-headers, except in iterartive builds
	208	+ if [[ -z "$N" ]]; then
	209	+ case $this_script in
	210	+ *linux-headers)
	211	+ TMP_SCRIPT="$this_script"
	212	+ this_script=`echo $this_script \| sed -e 's/linux-headers/a-paco/'`
	213	+ wrt_paco_inst "$this_script"
	214	+ this_script="$TMP_SCRIPT" ;;
	215	+ esac
	216	+ fi
	217	+
	218	# Grab the name of the target, strip id number, XXX-script
	219	name=`echo $this_script \| sed -e 's@[0-9]\{3\}-@@' \
	220	-e 's@temp-@@' \
[7bf2fdd]	221	@@ -665,7 +711,9 @@
[8b7357b]	222	[[ "$OPTIMIZE" != "0" ]] && wrt_optimize "$name" && wrt_makeflags "$name"
	223	fi
	224	#
	225	+ wrt_paco_prep
	226	wrt_run_as_root2 "${this_script}" "${file}"
	227	+ wrt_paco_log "$pkg_tarball"
	228	#
	229	[[ "$pkg_tarball" != "" ]] && wrt_remove_build_dirs2 "${name}"
	230	#
[7bf2fdd]	231	@@ -680,6 +728,16 @@
[8b7357b]	232	PREV=${this_script}${N}
	233	# Set system_build envar for iteration targets
	234	system_build=$basicsystem
	235	+
	236	+ # Reinstalling paco after readsjusting the toolchain.
	237	+ case "${this_script}" in
	238	+ *adjusting)
	239	+ TMP_SCRIPT="$this_script"
	240	+ this_script=`echo ${this_script} \| sed -e 's/adjusting/x-paco/'`
	241	+ wrt_paco_inst "$this_script"
	242	+ this_script="$TMP_SCRIPT" ;;
	243	+ esac
	244	+
	245	done # for file in final-system/* ...
	246	}
	247
[7bf2fdd]	248	@@ -728,7 +786,17 @@
[8b7357b]	249	#
	250	[[ "$pkg_tarball" != "" ]] && wrt_unpack2 "$pkg_tarball"
	251	#
	252	+ case $this_script in
	253	+ bootscripts \| *udev-rules )
	254	+ wrt_paco_prep ;;
	255	+ esac
	256	wrt_run_as_chroot1 "${this_script}" "${file}"
	257	+ case $this_script in
	258	+ bootscripts \| *udev-rules )
	259	+ wrt_paco_log "$pkg_tarball" ;;
	260	+ *)
	261	+ wrt_paco_log "clfs-sysconf" ;;
	262	+ esac
	263	#
	264	[[ "$pkg_tarball" != "" ]] && wrt_remove_build_dirs "${name}"
	265	#
[7bf2fdd]	266	@@ -790,7 +858,17 @@
[8b7357b]	267	#
	268	[[ "$pkg_tarball" != "" ]] && wrt_unpack3 "$pkg_tarball"
	269	#
	270	+ case $this_script in
	271	+ bootscripts \| *udev-rules )
	272	+ wrt_paco_prep ;;
	273	+ esac
	274	wrt_run_as_root2 "${this_script}" "${file}"
	275	+ case $this_script in
	276	+ bootscripts \| *udev-rules )
	277	+ wrt_paco_log "$pkg_tarball" ;;
	278	+ *)
	279	+ wrt_paco_log "clfs-sysconf" ;;
	280	+ esac
	281	#
	282	[[ "$pkg_tarball" != "" ]] && wrt_remove_build_dirs2 "${name}"
	283	#
[7bf2fdd]	284	@@ -862,8 +940,13 @@
[8b7357b]	285	else
	286	wrt_run_as_chroot1 "${this_script}" "${file}"
	287	fi
	288	+ wrt_paco_log "clfs-sysconf"
	289	;;
	290	- *) wrt_run_as_chroot1 "${this_script}" "${file}" ;;
	291	+ *kernel) wrt_paco_prep
	292	+ wrt_run_as_chroot1 "${this_script}" "${file}"
	293	+ wrt_paco_log "$pkg_tarball" ;;
	294	+ *) wrt_run_as_chroot1 "${this_script}" "${file}"
	295	+ wrt_paco_log "clfs-sysconf" ;;
	296	esac
	297	#
	298	# Housekeeping...remove any build directory(ies) except if the package build fails.
[7bf2fdd]	299	@@ -941,8 +1024,13 @@
[8b7357b]	300	else
	301	wrt_run_as_root2 "${this_script}" "${file}"
	302	fi
	303	+ wrt_paco_log "clfs-sysconf"
	304	;;
	305	- *) wrt_run_as_root2 "${this_script}" "${file}" ;;
	306	+ *kernel) wrt_paco_prep
	307	+ wrt_run_as_root2 "${this_script}" "${file}"
	308	+ wrt_paco_log "$pkg_tarball" ;;
	309	+ *) wrt_run_as_root2 "${this_script}" "${file}"
	310	+ wrt_paco_log "clfs-sysconf" ;;
	311	esac
	312	#
	313	# Housekeeping...remove any build directory(ies) except if the package build fails.
	314	Index: CLFS/clfs.xsl
	315	===================================================================
[d51e891]	316	--- CLFS/clfs.xsl (revision 3103)
[8b7357b]	317	+++ CLFS/clfs.xsl (working copy)
[d51e891]	318	@@ -42,6 +42,9 @@
[8b7357b]	319	<!-- Locale settings -->
	320	<xsl:param name="lang" select="C"/>
	321
	322	+ <!-- Use paco? -->
[7bf2fdd]	323	+ <xsl:param name="use_paco" select="y"/>
[8b7357b]	324	+
	325	<xsl:template match="/">
	326	<xsl:apply-templates select="//sect1"/>
	327	</xsl:template>
[d51e891]	328	@@ -103,6 +106,25 @@
[8b7357b]	329	<xsl:text>tar -xvf ../vim-&vim-version;-lang.* --strip-components=1 </xsl:text>
	330	</xsl:if>
	331	</xsl:if>
	332	+ <!-- paco begin -->
	333	+ <!-- General rule -->
[7bf2fdd]	334	+ <xsl:if test="$use_paco != 'n' and
[8b7357b]	335	+ @id='ch-scripts-bootscripts' or
	336	+ @id='ch-scripts-udev-rules' or
	337	+ @id='ch-bootable-kernel' or
	338	+ (../@id='chapter-building-system' and
	339	+ @id!='ch-system-temp-perl' and
	340	+ contains(string(),'make') and
	341	+ contains(string(),'install'))">
	342	+ <xsl:text>export LD_PRELOAD=/usr/lib/libpaco-log.so </xsl:text>
	343	+ </xsl:if>
	344	+ <!-- Linux headers -->
[7bf2fdd]	345	+ <xsl:if test="$use_paco != 'n' and
[8b7357b]	346	+ @id='ch-system-linux-headers' and
	347	+ contains(string(),'install')">
	348	+ <xsl:text>export LD_PRELOAD=/usr/lib/libpaco-log.so </xsl:text>
	349	+ </xsl:if>
	350	+ <!-- paco end -->
	351	<xsl:apply-templates select=".//para/userinput \| .//screen"/>
	352	<xsl:text>exit</xsl:text>
	353	</exsl:document>
[799b0d1]	354	Index: common/paco-build-hlfs.sh
	355	===================================================================
	356	--- common/paco-build-hlfs.sh (revision 0)
	357	+++ common/paco-build-hlfs.sh (revision 0)
[b9ec725]	358	@@ -0,0 +1,12 @@
[799b0d1]	359	+#!/bin/sh
	360	+set -e
	361	+
	362	+cd $PKGDIR
[b9ec725]	363	+./configure --sysconfdir=/etc \
	364	+ --enable-scripts \
[799b0d1]	365	+ --disable-gpaco \
[b9ec725]	366	+ --disable-static \
	367	+ --with-pic &&
[799b0d1]	368	+make &&
	369	+make install &&
	370	+make logme
[059822c]	371	Index: common/func_validate_configs.sh
	372	===================================================================
[d51e891]	373	--- common/func_validate_configs.sh (revision 3103)
[059822c]	374	+++ common/func_validate_configs.sh (working copy)
[029dbb7]	375	@@ -20,10 +20,10 @@
[059822c]	376	inline_doc
	377
	378	# First internal variables, then the ones that change the book's flavour, and lastly system configuration variables
[d51e891]	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 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 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 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 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 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 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"
[029dbb7]	387	local -r blfs_PARAM_LIST="BRANCH_ID BLFS_ROOT BLFS_XML TRACKING_DIR"
[059822c]	388
[029dbb7]	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 \| \
[059822c]	398	Index: common/paco-functions
	399	===================================================================
	400	--- common/paco-functions (revision 0)
	401	+++ common/paco-functions (revision 0)
[7bf2fdd]	402	@@ -0,0 +1,328 @@
[059822c]	403	+#!/bin/bash
	404	+
	405	+#----------------------------#
	406	+wrt_paco_inst() { #
	407	+#----------------------------#
[d748b31]	408	+
[8b7357b]	409	+local paco_script="$1"
	410	+
	411	+check_build_model
[d748b31]	412	+
[7bf2fdd]	413	+if [ $USE_PACO = "y" ]; then
	414	+ case $PROGNAME in
[8b7357b]	415	+ clfs )
	416	+ paco_file="final-system/$paco_script"
	417	+ basicsystem="$basicsystem $paco_script" ;;
	418	+ * )
	419	+ paco_file="chapter06/$paco_script"
	420	+ chapter6="$chapter6 $paco_script" ;;
	421	+ esac
[6821737]	422	+
	423	+ # Copy the paco build script to the correct directory and make it executable
[799b0d1]	424	+ cp $JHALFSDIR/paco-build-$PROGNAME.sh $JHALFSDIR/${PROGNAME}-commands/$paco_file &&
[6821737]	425	+ chmod +x $JHALFSDIR/${PROGNAME}-commands/$paco_file
[059822c]	426	+
	427	+ # Write target, dependency and unpack
[8b7357b]	428	+ if [ $CLFS_BOOT = 1 ]; then
	429	+ wrt_target_boot "$paco_script" "$PREV"
	430	+ wrt_unpack3 "$PACO_FILE"
	431	+ wrt_run_as_root2 "${paco_script}" "${paco_file}"
	432	+ wrt_remove_build_dirs2 "paco"
[7bf2fdd]	433	+ else
[8b7357b]	434	+ wrt_target "$paco_script" "$PREV"
	435	+ wrt_unpack2 "$PACO_FILE"
	436	+ wrt_run_as_chroot1 "${paco_script}" "${paco_file}"
	437	+ wrt_remove_build_dirs "paco"
	438	+ fi
[059822c]	439	+
[2b88404]	440	+ wrt_touch
[059822c]	441	+
	442	+ # Override the PREV variable
[6821737]	443	+ PREV="$paco_script"
[059822c]	444	+fi
	445	+}
	446	+
	447	+
	448	+#----------------------------------#
	449	+wrt_paco_prep() { # Export Paco variables
	450	+#----------------------------------# and remove tmpfile
[d748b31]	451	+
[8b7357b]	452	+local TMPFILEPATH
	453	+
	454	+check_build_model
[d748b31]	455	+
[b9ec725]	456	+check_log_package
	457	+
[7bf2fdd]	458	+if [ $USE_PACO = "y" ] && [ $LOG_PACKAGE != 0 ]; then
[8b7357b]	459	+ if [ $CLFS_BOOT = 1 ]; then
	460	+ TMPFILEPATH="$PACO_TMPFILE"
	461	+ else
	462	+ TMPFILEPATH="\$(MOUNT_PT)$PACO_TMPFILE"
	463	+ fi
[059822c]	464	+(
	465	+cat << EOF
	466	+ @echo "export PACO_INCLUDE=$PACO_INCLUDE" >> envars && \\
[b9ec725]	467	+ echo "export PACO_EXCLUDE=\$(SRC):$PACO_EXCLUDE" >> envars && \\
[059822c]	468	+ echo "export PACO_TMPFILE=$PACO_TMPFILE" >> envars && \\
[8b7357b]	469	+ rm -f $TMPFILEPATH
[059822c]	470	+EOF
	471	+) >> $MKFILE.tmp
	472	+fi
	473	+}
	474	+
	475	+
	476	+#----------------------------------#
	477	+wrt_paco_log() { # If the tmpfile exist, then log the current package
	478	+#----------------------------------# and remove tempfile
[d748b31]	479	+local PACKAGE
	480	+
[8b7357b]	481	+# Extract package name and version from the tarball name
[2b88404]	482	+PACKAGE=`echo $1 \| sed -e 's/.tar.*//'`
[059822c]	483	+
[8b7357b]	484	+check_build_model
[059822c]	485	+
[8b7357b]	486	+# Check if the package should be logged
[b9ec725]	487	+check_log_package
	488	+
[8b7357b]	489	+
[7bf2fdd]	490	+if [ $USE_PACO = "y" ]; then
[b9ec725]	491	+ if [ $LOG_PACKAGE != 0 ]; then
[8b7357b]	492	+ # Only use this if doing CLFS boot build
	493	+ if [ $CLFS_BOOT = 1 ]; then
	494	+(
	495	+cat << EOF
	496	+ @if [ -e $PACO_TMPFILE ]; then \\
	497	+ paco -lp+ $PACKAGE < $PACO_TMPFILE && \\
	498	+ rm -f $PACO_TMPFILE; \\
	499	+ fi;
	500	+EOF
	501	+) >> $MKFILE.tmp
	502	+ # All else should use these commands
	503	+ else
[059822c]	504	+(
	505	+cat << EOF
	506	+ @if [ -e \$(MOUNT_PT)$PACO_TMPFILE ]; then \\
[4795dfb]	507	+ \$(CHROOT1) 'paco -lp+ $PACKAGE < $PACO_TMPFILE' && \\
[059822c]	508	+ rm -f \$(MOUNT_PT)$PACO_TMPFILE; \\
	509	+ fi;
	510	+EOF
	511	+) >> $MKFILE.tmp
[8b7357b]	512	+ fi
[b9ec725]	513	+ fi
[8b7357b]	514	+ # Add missing files to the logs if needed
[b9ec725]	515	+ wrt_paco_add_log
[059822c]	516	+fi
[b9ec725]	517	+}
[059822c]	518	+
[b9ec725]	519	+
	520	+#----------------------------------#
[8b7357b]	521	+fnc_add_log() { #
	522	+#----------------------------------#
	523	+
	524	+MISSING_FILE=$1
	525	+
	526	+if [ $CLFS_BOOT = 1 ]; then
	527	+ echo -e "\t@$MISSING_FILE \| paco -lp+ $PACKAGE" >> $MKFILE.tmp
	528	+else
	529	+ echo -e "\t@\$(CHROOT1) '$MISSING_FILE \| paco -lp+ $PACKAGE'" >> $MKFILE.tmp
	530	+fi
	531	+}
	532	+
	533	+
	534	+#----------------------------------#
[b9ec725]	535	+wrt_paco_add_log() { #
	536	+#----------------------------------#
	537	+# Some packages create files using bash redirection, which the LD_PRELOAD lib don't notice
	538	+# These rules will add the missing files to the proper logs.
	539	+# Most of these is not needed for HLFS, but they do no harm.
[7bf2fdd]	540	+if [ $USE_PACO = "y" ]; then
[8b7357b]	541	+ case $this_script in
[7bf2fdd]	542	+ *e2fsprogs)
	543	+ fnc_add_log "echo /etc/mke2fs.conf"
	544	+ ;;
	545	+ *bootscripts)
	546	+ fnc_add_log "echo /etc/sysconfig/rc"
	547	+ fnc_add_log "echo /etc/sysconfig/createfiles"
	548	+ ;;
[b9ec725]	549	+ *glibc)
[8b7357b]	550	+ fnc_add_log "find /lib -type l"
[7bf2fdd]	551	+ fnc_add_log "echo /etc/{nsswitch.conf,ld.so.conf}"
[b9ec725]	552	+ ;;
	553	+ *ncurses)
[7bf2fdd]	554	+ fnc_add_log "echo /usr/lib/{libcurses.so,libncurses.so{,.5},libform.so,libpanel.so,libmenu.so}"
[b9ec725]	555	+ ;;
	556	+ *bash)
[8b7357b]	557	+ fnc_add_log "echo /bin/sh"
[b9ec725]	558	+ ;;
	559	+ *flex)
[8b7357b]	560	+ fnc_add_log "echo /usr/bin/lex"
[b9ec725]	561	+ ;;
	562	+ *shadow)
[8b7357b]	563	+ fnc_add_log "echo /etc/login.defs"
[7bf2fdd]	564	+ fnc_add_log "echo /etc/group"
[b9ec725]	565	+ ;;
	566	+ *hotplug)
[8b7357b]	567	+ fnc_add_log "echo /var/log/hotplug"
	568	+ fnc_add_log "echo /var/run/usb"
[b9ec725]	569	+ ;;
	570	+ *sysklogd)
[8b7357b]	571	+ fnc_add_log "echo /etc/syslog.conf"
[b9ec725]	572	+ ;;
	573	+ *sysvinit)
[8b7357b]	574	+ fnc_add_log "echo /etc/inittab"
[7bf2fdd]	575	+ fnc_add_log "echo /usr/bin/lastb"
	576	+ ;;
	577	+ *texinfo)
	578	+ fnc_add_log "echo /usr/share/info/dir"
[b9ec725]	579	+ ;;
	580	+ *udev)
[8b7357b]	581	+ fnc_add_log "find /lib/udev/devices"
	582	+ fnc_add_log "echo /lib/firmware"
	583	+ fnc_add_log "find /etc/udev/rules.d -type f"
[7bf2fdd]	584	+ fnc_add_log "echo /etc/udev/udev.conf"
	585	+ ;;
	586	+ *udev-rules)
	587	+ fnc_add_log "echo /lib/udev/devices/{null,console}"
[b9ec725]	588	+ ;;
	589	+ *util-linux)
[8b7357b]	590	+ fnc_add_log "echo /var/lib/hwclock"
	591	+ fnc_add_log "echo /etc/nologin.txt"
[b9ec725]	592	+ ;;
	593	+ *vim)
[8b7357b]	594	+ fnc_add_log "echo /etc/vimrc"
[b9ec725]	595	+ ;;
[8b7357b]	596	+ # Rules below here will log configuration files created in {C,H}LFS
	597	+ # They will end up in a log named {c,h}lfs-sysconf
[b9ec725]	598	+ *setclock)
[8b7357b]	599	+ fnc_add_log "echo /etc/sysconfig/clock"
[b9ec725]	600	+ ;;
	601	+ *inputrc)
[8b7357b]	602	+ fnc_add_log "echo /etc/inputrc"
[b9ec725]	603	+ ;;
	604	+ *profile)
[8b7357b]	605	+ fnc_add_log "echo /etc/profile"
[b9ec725]	606	+ ;;
	607	+ *hostname)
[8b7357b]	608	+ fnc_add_log "echo /etc/sysconfig/network"
[b9ec725]	609	+ ;;
	610	+ *localnet)
[8b7357b]	611	+ fnc_add_log "echo /etc/sysconfig/network"
[b9ec725]	612	+ ;;
	613	+ *hosts)
[8b7357b]	614	+ fnc_add_log "echo /etc/hosts"
[b9ec725]	615	+ ;;
	616	+ *network)
[8b7357b]	617	+ fnc_add_log "echo /etc/sysconfig/network-devices/ifconfig.eth0/ipv4"
	618	+ fnc_add_log "echo /etc/resolv.conf"
[b9ec725]	619	+ ;;
	620	+ *fstab)
[8b7357b]	621	+ fnc_add_log "echo /etc/fstab"
[b9ec725]	622	+ ;;
[7bf2fdd]	623	+ theend \| finished)
[8b7357b]	624	+ fnc_add_log "echo /etc/$PROGNAME-release"
[7bf2fdd]	625	+ fnc_add_log "echo /var/run/utmp"
	626	+ fnc_add_log "echo /var/log/btmp"
	627	+ fnc_add_log "echo /var/log/wtmp"
	628	+ fnc_add_log "echo /var/log/lastlog"
[b9ec725]	629	+ ;;
	630	+ esac
[059822c]	631	+fi
	632	+}
[b9ec725]	633	+
	634	+
	635	+#----------------------------------#
	636	+check_log_package() { #
	637	+#----------------------------------#
	638	+# Maybe don't need this function, but it will avoid writing some
	639	+# unnecessary paco commands in the Makefile.
	640	+
	641	+case $this_script in
[2b88404]	642	+ *changingowner) LOG_PACKAGE=0 ;;
[b9ec725]	643	+ *creatingdirs) LOG_PACKAGE=0 ;;
	644	+ *createfiles) LOG_PACKAGE=0 ;;
[2b88404]	645	+ *pwdgroup) LOG_PACKAGE=0 ;;
	646	+ *devices) LOG_PACKAGE=0 ;;
[8b7357b]	647	+ *stripping) LOG_PACKAGE=0 ;;
[b9ec725]	648	+ *strippingagain) LOG_PACKAGE=0 ;;
[8b7357b]	649	+ *adjusting) LOG_PACKAGE=0 ;;
	650	+ *temp-perl) LOG_PACKAGE=0 ;;
[b9ec725]	651	+ *readjusting) LOG_PACKAGE=0 ;;
	652	+ *setclock) LOG_PACKAGE=0 ;;
	653	+ *inputrc) LOG_PACKAGE=0 ;;
	654	+ *profile) LOG_PACKAGE=0 ;;
	655	+ *hostname) LOG_PACKAGE=0 ;;
	656	+ *localnet) LOG_PACKAGE=0 ;;
	657	+ *hosts) LOG_PACKAGE=0 ;;
	658	+ *network) LOG_PACKAGE=0 ;;
	659	+ *fstab) LOG_PACKAGE=0 ;;
	660	+ *theend) LOG_PACKAGE=0 ;;
	661	+ *finished) LOG_PACKAGE=0 ;;
	662	+ *) LOG_PACKAGE=1 ;;
	663	+esac
	664	+}
[8715be1]	665	+
	666	+#----------------------------------#
	667	+get_paco_src() { #
	668	+#----------------------------------#
	669	+# Download the paco sources
	670	+# We don't do any MD5SUM checking as of yet
	671	+# http://jaist.dl.sourceforge.net/sourceforge/paco/paco-1.10.10.tar.bz2
	672	+
	673	+local PACO_URL1="http://$PACO_MIRROR1.dl.sourceforge.net/sourceforge/paco/$PACO_FILE"
	674	+local PACO_URL2="http://$PACO_MIRROR2.dl.sourceforge.net/sourceforge/paco/$PACO_FILE"
	675	+
	676	+# Test if paco is to be used
[7bf2fdd]	677	+[[ ! "$USE_PACO" = "y" ]] && return
[8715be1]	678	+
	679	+# If the file exists in the archive copy it to the $BUILDDIR/sources dir.
	680	+if [ ! -z ${SRC_ARCHIVE} ] &&
	681	+ [ -d ${SRC_ARCHIVE} ] &&
	682	+ [ -f ${SRC_ARCHIVE}/$PACO_FILE ]; then
	683	+ cp ${SRC_ARCHIVE}/$PACO_FILE .
	684	+ echo "$PACO_FILE: -- copied from $SRC_ARCHIVE"
	685	+ fromARCHIVE=1
	686	+else
	687	+ echo "${BOLD}${YELLOW}$PACO_FILE: not found in ${SRC_ARCHIVE}${OFF}"
	688	+ fromARCHIVE=0
	689	+ # If the file does not exist yet in /sources download a fresh one
	690	+ if [ ! -f $PACO_FILE ] ; then
	691	+ if ! wget $PACO_URL1 && ! wget $PACO_URL2 ; then
	692	+ gs_wrt_message "$PACO_FILE not found in the SRC_ARCHIVE or on any server..SKIPPING"
	693	+ continue
	694	+ fi
	695	+ fi
	696	+fi
	697	+
	698	+# Copy the freshly downloaded file to the source archive.
	699	+if [ ! -z ${SRC_ARCHIVE} ] &&
	700	+ [ -d ${SRC_ARCHIVE} ] &&
	701	+ [ -w ${SRC_ARCHIVE} ] &&
	702	+ [ "$fromARCHIVE" = "0" ] ; then
	703	+ echo "Storing file:<$PACO_FILE> in the package archive"
	704	+ cp -f $PACO_FILE ${SRC_ARCHIVE}
	705	+fi
	706	+}
[8b7357b]	707	+
	708	+
	709	+#----------------------------------#
	710	+check_build_model() { #
	711	+#----------------------------------#
	712	+# Check what script we're running, and set some switches accordingly
	713	+
	714	+CLFS_BOOT=0
	715	+
	716	+case $PROGNAME in
	717	+ hlfs)
	718	+ # Not using Paco with uClibc, even if requested
	719	+ if [ "$MODEL" = "uclibc" ]; then
[7bf2fdd]	720	+ USE_PACO=n
[8b7357b]	721	+ fi
	722	+ ;;
	723	+ clfs)
	724	+ # CLFS boot method require it's own commands
	725	+ if [ "$METHOD" = "boot" ]; then
	726	+ CLFS_BOOT=1
	727	+ fi
	728	+ ;;
	729	+esac
	730	+}
[799b0d1]	731	Index: common/paco-build-lfs.sh
[6821737]	732	===================================================================
[799b0d1]	733	--- common/paco-build-lfs.sh (revision 0)
	734	+++ common/paco-build-lfs.sh (revision 0)
[b9ec725]	735	@@ -0,0 +1,10 @@
[6821737]	736	+#!/bin/sh
	737	+set -e
	738	+
	739	+cd $PKGDIR
[b9ec725]	740	+./configure --sysconfdir=/etc \
	741	+ --enable-scripts \
	742	+ --disable-gpaco &&
[6821737]	743	+make &&
	744	+make install &&
	745	+make logme
[8b7357b]	746	Index: common/paco-build-clfs.sh
	747	===================================================================
	748	--- common/paco-build-clfs.sh (revision 0)
	749	+++ common/paco-build-clfs.sh (revision 0)
	750	@@ -0,0 +1,10 @@
	751	+#!/bin/sh
	752	+set -e
	753	+
	754	+cd $PKGDIR
	755	+./configure --sysconfdir=/etc \
	756	+ --enable-scripts \
	757	+ --disable-gpaco &&
	758	+make &&
	759	+make install &&
	760	+make logme
[059822c]	761	Index: common/common-functions
	762	===================================================================
[d51e891]	763	--- common/common-functions (revision 3103)
[059822c]	764	+++ common/common-functions (working copy)
[d51e891]	765	@@ -532,6 +532,7 @@
	766	--stringparam timezone $TIMEZONE \
[8b7357b]	767	--stringparam page $PAGE \
	768	--stringparam lang $LANG \
	769	+ --stringparam use_paco $USE_PACO \
	770	-o ./${PROGNAME}-commands/ $XSL $BOOK/$ARCH-index.xml >>$LOGDIR/$LOG 2>&1
	771	;;
	772
[d51e891]	773	@@ -557,6 +558,7 @@
	774	--stringparam lang $LANG \
[059822c]	775	--stringparam lc_all $LC_ALL \
	776	--stringparam grsecurity_host $GRSECURITY_HOST \
	777	+ --stringparam use_paco $USE_PACO \
	778	-o ./${PROGNAME}-commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1
	779	;;
	780	lfs)
[d51e891]	781	@@ -569,6 +571,7 @@
[059822c]	782	--stringparam timezone $TIMEZONE \
	783	--stringparam page $PAGE \
	784	--stringparam lang $LANG \
	785	+ --stringparam use_paco $USE_PACO \
	786	-o ./${PROGNAME}-commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1
	787	;;
[8230977]	788	*) exit 1 ;;
[d51e891]	789	@@ -653,6 +656,9 @@
[8715be1]	790	# Generate URLs file
	791	create_urls
	792
	793	+ # If Paco is to be used, then download the sources
	794	+ get_paco_src
	795	+
	796	IFS=$'\x0A' # Modify the 'internal field separator' to break on 'LF' only
	797	for line in `cat urls.lst`; do
	798	IFS=$saveIFS # Restore the system defaults
[059822c]	799	Index: HLFS/hlfs.xsl
	800	===================================================================
[d51e891]	801	--- HLFS/hlfs.xsl (revision 3103)
[059822c]	802	+++ HLFS/hlfs.xsl (working copy)
[d51e891]	803	@@ -43,6 +43,9 @@
[c665386]	804	<xsl:param name="lang" select="C"/>
	805	<xsl:param name="lc_all" select="C"/>
[059822c]	806
	807	+ <!-- Use paco? -->
[7bf2fdd]	808	+ <xsl:param name="use_paco" select="y"/>
[059822c]	809	+
	810	<xsl:template match="/">
	811	<xsl:apply-templates select="//sect1"/>
	812	</xsl:template>
[d51e891]	813	@@ -193,6 +196,10 @@
[059822c]	814	<!-- Fixing bootscripts installation -->
	815	<xsl:when test="ancestor::sect1[@id='bootable-bootscripts'] and
	816	string() = 'make install'">
	817	+ <!-- inserting LD_PRELOAD before installing bootscripts -->
[7bf2fdd]	818	+ <xsl:if test="$use_paco != 'n' and $model != 'uclibc'">
[059822c]	819	+ <xsl:text>export LD_PRELOAD=/usr/lib/libpaco-log.so </xsl:text>
	820	+ </xsl:if>
	821	<xsl:text>make install </xsl:text>
	822	<xsl:text>cd ../blfs-bootscripts-&blfs-bootscripts-version; </xsl:text>
	823	</xsl:when>
[d51e891]	824	@@ -292,6 +299,25 @@
[059822c]	825	<xsl:apply-templates/>
	826	<xsl:text> \|\| true </xsl:text>
	827	</xsl:when>
	828	+ <!-- paco begin -->
	829	+ <!-- General rule -->
[7bf2fdd]	830	+ <xsl:when test="$use_paco != 'n' and $model != 'uclibc' and
[059822c]	831	+ ancestor::chapter[@id != 'chapter-temporary-tools'] and
	832	+ contains(string(),'make') and
	833	+ contains(string(),'install')">
	834	+ <xsl:text>export LD_PRELOAD=/usr/lib/libpaco-log.so </xsl:text>
[7bf2fdd]	835	+ <xsl:apply-templates/>
[059822c]	836	+ <xsl:text> </xsl:text>
	837	+ </xsl:when>
	838	+ <!-- Linux-libc-headers -->
[7bf2fdd]	839	+ <xsl:when test="$use_paco != 'n' and $model != 'uclibc' and
[9b09518]	840	+ ancestor::sect1[@id='ch-system-linux-headers'] and
[059822c]	841	+ contains(string(),'install ')">
	842	+ <xsl:text>export LD_PRELOAD=/usr/lib/libpaco-log.so </xsl:text>
[7bf2fdd]	843	+ <xsl:apply-templates/>
[059822c]	844	+ <xsl:text> </xsl:text>
	845	+ </xsl:when>
	846	+ <!-- paco end -->
	847	<!-- The rest of commands -->
	848	<xsl:otherwise>
	849	<xsl:apply-templates/>
	850	Index: HLFS/master.sh
	851	===================================================================
[d51e891]	852	--- HLFS/master.sh (revision 3103)
[059822c]	853	+++ HLFS/master.sh (working copy)
[7bf2fdd]	854	@@ -47,7 +47,9 @@
[9b09518]	855	EOF
	856	) >> $MKFILE.tmp
[963fdae]	857	[[ "$TEST" != "0" ]] && wrt_test_log2 "${this_script}"
[9b09518]	858	+ wrt_paco_prep
	859	wrt_run_as_chroot1 "$toolchain" "$this_script"
	860	+ wrt_paco_log "`echo $toolchain \| sed -e 's@[0-9]\{3\}-@@'`"
	861	;;
	862
	863	*)
[7bf2fdd]	864	@@ -281,6 +283,11 @@
[8230977]	865	# Keep the script file name
	866	this_script=`basename $file`
	867
	868	+ # If this script is *-paco, then skip it
	869	+ case $this_script in
	870	+ *paco ) continue ;;
	871	+ esac
	872	+
	873	# Skip this script depending on jhalfs.conf flags set.
	874	case $this_script in
	875	# We'll run the chroot commands differently than the others, so skip them in the
[7bf2fdd]	876	@@ -290,6 +297,18 @@
	877	-stripping ) [[ "$STRIP" = "n" ]] && continue ;;
[6821737]	878	esac
	879
[4795dfb]	880	+ # Install paco as the first package in ch6, before installing
	881	+ # linux-libc-headers, except in iterartive builds
	882	+ if [[ -z "$N" ]]; then
	883	+ case $this_script in
[9b09518]	884	+ *linux-headers)
[799b0d1]	885	+ TMP_SCRIPT="$this_script"
[9b09518]	886	+ this_script=`echo $this_script \| sed -e 's/linux-headers/a-paco/'`
[799b0d1]	887	+ wrt_paco_inst "$this_script"
	888	+ this_script="$TMP_SCRIPT" ;;
[4795dfb]	889	+ esac
	890	+ fi
[6821737]	891	+
[4795dfb]	892	# Grab the name of the target
	893	name=`echo $this_script \| sed -e 's@[0-9]\{3\}-@@'`
	894
[7bf2fdd]	895	@@ -355,7 +374,9 @@
[daa9b6c]	896	wrt_RunAsRoot "${this_script}" "${file}"
[059822c]	897	;;
	898	*) # The rest of Chapter06
	899	+ wrt_paco_prep
	900	wrt_run_as_chroot1 "${this_script}" "${file}"
[2b88404]	901	+ wrt_paco_log "$pkg_tarball"
[059822c]	902	;;
	903	esac
	904	#
[7bf2fdd]	905	@@ -375,6 +396,16 @@
[4795dfb]	906	PREV=${this_script}${N}
	907	# Set system_build envar for iteration targets
	908	system_build=$chapter6
[059822c]	909	+
[6821737]	910	+ # Reinstall paco after the toolchain has been readjusted.
[059822c]	911	+ case "${this_script}" in
[6821737]	912	+ *readjusting)
[799b0d1]	913	+ TMP_SCRIPT="$this_script"
	914	+ this_script=`echo $this_script \| sed -e 's/readjusting/x-paco/'`
	915	+ wrt_paco_inst "$this_script"
	916	+ this_script="$TMP_SCRIPT" ;;
[059822c]	917	+ esac
	918	+
	919	done # end for file in chapter06/*
	920
	921	}
[7bf2fdd]	922	@@ -433,9 +464,19 @@
[b9ec725]	923	else # Initialize the log and run the script
[059822c]	924	wrt_run_as_chroot2 "${this_script}" "${file}"
	925	fi
[b9ec725]	926	+ wrt_paco_log "hlfs-sysconf"
[059822c]	927	;;
	928	+ *kernel) wrt_paco_prep
	929	+ wrt_run_as_chroot2 "$this_script" "$file"
[2b88404]	930	+ wrt_paco_log "$(get_package_tarball_name "linux")"
[059822c]	931	+ ;;
	932	+ *bootscripts) wrt_paco_prep
	933	+ wrt_run_as_chroot2 "$this_script" "$file"
[2b88404]	934	+ wrt_paco_log "$(get_package_tarball_name "lfs-bootscripts")"
[059822c]	935	+ ;;
	936	*) # All other scripts
	937	wrt_run_as_chroot2 "${this_script}" "${file}"
[b9ec725]	938	+ wrt_paco_log "hlfs-sysconf"
[059822c]	939	;;
[b9ec725]	940	esac
	941
[029dbb7]	942	Index: jhalfs
[d748b31]	943	===================================================================
[d51e891]	944	--- jhalfs (revision 3103)
[029dbb7]	945	+++ jhalfs (working copy)
[d51e891]	946	@@ -111,6 +111,7 @@
	947	REPORT=${REPORT:=n}
[029dbb7]	948	VIMLANG=${VIMLANG:-n}
	949	GRSECURITY_HOST=${GRSECURITY_HOST:-n}
	950	+USE_PACO=${USE_PACO:-n}
[7bf2fdd]	951
[029dbb7]	952	# Book surces envars
	953	BRANCH_ID=${BRANCH_ID:=development}
[d51e891]	954	@@ -269,6 +270,14 @@
[d29584b]	955	[[ $VERBOSITY > 0 ]] && echo "OK"
	956	fi
[f3ae556]	957	#
[d29584b]	958	+# paco module
[7bf2fdd]	959	+if [[ "$USE_PACO" = "y" ]]; then
[d29584b]	960	+ [[ $VERBOSITY > 0 ]] && echo -n "Loading paco module..."
	961	+ source $COMMON_DIR/paco-functions
	962	+ [[ $? > 0 ]] && echo "$COMMON_DIR/paco-functions did not load.." && exit 2
	963	+ [[ $VERBOSITY > 0 ]] && echo "OK"
	964	+fi
	965	+#
[f3ae556]	966	# optimize module
	967	if [[ "$OPTIMIZE" != "0" ]]; then
	968	[[ $VERBOSITY > 0 ]] && echo -n "Loading optimization module..."
[d51e891]	969	@@ -314,6 +323,8 @@
[029dbb7]	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
[7bf2fdd]	978	Index: Config.in
	979	===================================================================
[d51e891]	980	--- Config.in (revision 3103)
[7bf2fdd]	981	+++ Config.in (working copy)
[d51e891]	982	@@ -786,3 +786,72 @@
[029dbb7]	983
[7bf2fdd]	984	#--- End Advanced Features
	985	endmenu
[029dbb7]	986	+
[7bf2fdd]	987	+#--- PACO
	988	+config USE_PACO
	989	+ bool "Use PACO"
	990	+ default n
	991	+ depends on !BOOK_BLFS && !BOOK_CLFS2 && !LIB_UCLIBC
	992	+
	993	+ config PACO_VERSION
	994	+ string "PACO package version"
	995	+ default "1.10.10"
	996	+ depends USE_PACO
	997	+
	998	+ config PACO_FILE
	999	+ string "PACO package full name"
	1000	+ default "paco-$PACO_VERSION.tar.bz2"
	1001	+ depends USE_PACO
	1002	+ help
	1003	+ #-- You can use .tar.gz if preferred
	1004	+
	1005	+ config PACO_MIRROR1
	1006	+ string "Sourceforge mirror 1"
	1007	+ default "heanet"
	1008	+ depends USE_PACO
	1009	+ help
	1010	+ #-- Sourceforge mirror to use for Paco source download
	1011	+ #
	1012	+ # Europe: heanet, belnet, puzzle, surfnet, switch, kent
	1013	+ # North America: superb-east, superb-west, umn, easynews
	1014	+ # South America: ufpr
	1015	+ # Asia: nchc, jaist
	1016	+ # Australia: optusnet
	1017	+
	1018	+ config PACO_MIRROR2
	1019	+ string "Sourceforge mirror 2"
	1020	+ default "kent"
	1021	+ depends USE_PACO
	1022	+ help
	1023	+ #-- Sourceforge mirror to use for Paco source download
	1024	+ #
	1025	+ # Europe: heanet, belnet, puzzle, surfnet, switch, kent
	1026	+ # North America: superb-east, superb-west, umn, easynews
	1027	+ # South America: ufpr
	1028	+ # Asia: nchc, jaist
	1029	+ # Australia: optusnet
	1030	+
[029dbb7]	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
	1053	+#--- End PACO
[7bf2fdd]	1054	+

Note: See TracBrowser for help on using the repository browser.

Download in other formats: