Context Navigation

source: contrib/jhalfs-paco.patch@ 6921b21

1.0

Last change on this file since 6921b21 was 6921b21, checked in by Manuel Canales Esparcia <manuel@…>, 18 years ago
Updated paco patch from upstream, adapted to 1.0 branch.
Property mode set to `100644`
File size: 34.5 KB

Rev	Line
[059822c]	1	Index: LFS/master.sh
	2	===================================================================
[6921b21]	3	--- LFS/master.sh (revision 2862)
[059822c]	4	+++ LFS/master.sh (working copy)
[6921b21]	5	@@ -173,6 +173,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
[6921b21]	17	@@ -180,6 +185,18 @@
[6821737]	18	stripping) [[ "${STRIP}" = "0" ]] && continue ;;
	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
[6921b21]	36	@@ -232,7 +249,9 @@
[059822c]	37	# and not to use chroot.
	38	case "${this_script}" in
	39	*kernfs) wrt_run_as_root "${this_script}" "$file" ;;
	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.
[6921b21]	47	@@ -252,6 +271,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
[6921b21]	64	@@ -312,8 +341,18 @@
[b9ec725]	65	else
[059822c]	66	wrt_run_as_chroot2 "$this_script" "$file"
	67	fi
[b9ec725]	68	+ wrt_paco_log "lfs-sysconf"
[059822c]	69	;;
	70	+ *kernel) wrt_paco_prep
	71	+ wrt_run_as_chroot2 "$this_script" "$file"
[2b88404]	72	+ wrt_paco_log "$pkg_tarball"
[059822c]	73	+ ;;
	74	+ *bootscripts) wrt_paco_prep
	75	+ wrt_run_as_chroot2 "$this_script" "$file"
[2b88404]	76	+ wrt_paco_log "$pkg_tarball"
[059822c]	77	+ ;;
	78	*) wrt_run_as_chroot2 "$this_script" "$file"
[b9ec725]	79	+ wrt_paco_log "lfs-sysconf"
[059822c]	80	;;
	81	esac
[b9ec725]	82
[059822c]	83	Index: LFS/lfs.xsl
	84	===================================================================
[6921b21]	85	--- LFS/lfs.xsl (revision 2862)
[059822c]	86	+++ LFS/lfs.xsl (working copy)
	87	@@ -32,6 +32,9 @@
	88	<!-- Locale settings -->
[c665386]	89	<xsl:param name="lang" select="C"/>
[059822c]	90
	91	+ <!-- Use paco? -->
	92	+ <xsl:param name="use_paco" select="1"/>
	93	+
	94	<xsl:template match="/">
	95	<xsl:apply-templates select="//sect1"/>
	96	</xsl:template>
[6921b21]	97	@@ -206,6 +209,33 @@
[059822c]	98	<xsl:apply-templates/>
	99	<xsl:text> \|\| true </xsl:text>
	100	</xsl:when>
	101	+ <!-- paco begin -->
	102	+ <!-- General rule -->
	103	+ <xsl:when test="$use_paco != '0' and
	104	+ ancestor::chapter[@id != 'chapter-temporary-tools'] and
	105	+ contains(string(),'make') and
	106	+ contains(string(),'install')">
	107	+ <xsl:text>export LD_PRELOAD=/usr/lib/libpaco-log.so </xsl:text>
	108	+ <xsl:apply-templates/>
	109	+ <xsl:text> </xsl:text>
	110	+ </xsl:when>
	111	+ <!-- Linux-libc-headers -->
	112	+ <xsl:when test="$use_paco != '0' and
	113	+ ancestor::sect1[@id='ch-system-linux-libc-headers'] and
	114	+ contains(string(),'install ')">
	115	+ <xsl:text>export LD_PRELOAD=/usr/lib/libpaco-log.so </xsl:text>
	116	+ <xsl:apply-templates/>
	117	+ <xsl:text> </xsl:text>
	118	+ </xsl:when>
	119	+ <!-- Unset LD_PRELOAD before second make in Zlib -->
	120	+ <xsl:when test="$use_paco != '0' and
	121	+ ancestor::sect1[@id='ch-system-zlib'] and
	122	+ contains(string(),'make clean')">
	123	+ <xsl:text>unset LD_PRELOAD </xsl:text>
	124	+ <xsl:apply-templates/>
	125	+ <xsl:text> </xsl:text>
	126	+ </xsl:when>
	127	+ <!-- paco end -->
	128	<!-- The rest of commands -->
	129	<xsl:otherwise>
	130	<xsl:apply-templates/>
[799b0d1]	131	Index: common/paco-build-hlfs.sh
	132	===================================================================
	133	--- common/paco-build-hlfs.sh (revision 0)
	134	+++ common/paco-build-hlfs.sh (revision 0)
[b9ec725]	135	@@ -0,0 +1,12 @@
[799b0d1]	136	+#!/bin/sh
	137	+set -e
	138	+
	139	+cd $PKGDIR
[b9ec725]	140	+./configure --sysconfdir=/etc \
	141	+ --enable-scripts \
[799b0d1]	142	+ --disable-gpaco \
[b9ec725]	143	+ --disable-static \
	144	+ --with-pic &&
[799b0d1]	145	+make &&
	146	+make install &&
	147	+make logme
[059822c]	148	Index: common/config
	149	===================================================================
[6921b21]	150	--- common/config (revision 2862)
[059822c]	151	+++ common/config (working copy)
[a2c9b41]	152	@@ -86,6 +86,14 @@
[4795dfb]	153	#--- Run farce testing 0(no)/1(yes)
	154	RUN_FARCE=0
[d748b31]	155
[059822c]	156	+#==== PACO VARIABLES ====
[4795dfb]	157	+#--- Use paco? 0(no)/1(yes)
[059822c]	158	+USE_PACO=1
[6921b21]	159	+PACO_VERSION=1.10.10
[059822c]	160	+
	161	+#--- Name of the Paco source package
	162	+PACO_FILE=paco-$PACO_VERSION.tar.*
	163	+
[4795dfb]	164	#==== INTERNAL VARIABLES ====
	165	# Don't edit it unless you know what you are doing
	166
[a2c9b41]	167	@@ -103,3 +111,9 @@
[4795dfb]	168
	169	#--- farce report log directory
	170	FARCELOGDIR=$LOGDIR/farce
	171	+
	172	+#--- Variables needed by paco
[059822c]	173	+PACO_INCLUDE=/
[41dfd7c]	174	+PACO_EXCLUDE=/${SCRIPT_ROOT}
[059822c]	175	+PACO_TMPFILE=/tmp/paco.tmp
	176	+LD_PRELOAD=/usr/lib/libpaco-log.so
	177	Index: common/func_validate_configs.sh
	178	===================================================================
[6921b21]	179	--- common/func_validate_configs.sh (revision 2862)
[059822c]	180	+++ common/func_validate_configs.sh (working copy)
[8230977]	181	@@ -84,9 +84,9 @@
[059822c]	182	inline_doc
	183
	184	# First internal variables, then the ones that change the book's flavour, and lastly system configuration variables
[f358747]	185	- local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE MODEL GRSECURITY_HOST TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG GETKERNEL KEYMAP PAGE TIMEZONE LANG LC_ALL"
	186	- local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE METHOD ARCH TARGET TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG GETKERNEL KEYMAP VIMLANG PAGE TIMEZONE LANG"
	187	- local -r lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG GETKERNEL VIMLANG PAGE TIMEZONE LANG"
	188	+ local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO GETPKG RUNMAKE MODEL GRSECURITY_HOST TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG GETKERNEL KEYMAP PAGE TIMEZONE LANG LC_ALL"
	189	+ local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO GETPKG RUNMAKE METHOD ARCH TARGET TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG GETKERNEL KEYMAP VIMLANG PAGE TIMEZONE LANG"
	190	+ local -r lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO GETPKG RUNMAKE TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG GETKERNEL VIMLANG PAGE TIMEZONE LANG"
[059822c]	191
	192	local -r ERROR_MSG_pt1='The variable \"${L_arrow}${config_param}${R_arrow}\" value ${L_arrow}${BOLD}${!config_param}${R_arrow} is invalid,'
	193	local -r ERROR_MSG_pt2=' check the config file ${BOLD}${GREEN}\<$(echo $PROGNAME \| tr [a-z] [A-Z])/config\> or \<common/config\>${OFF}'
[f358747]	194	@@ -176,6 +176,7 @@
	195	[[ "$GETPKG" = "1" ]] && validate_against_str "x0x x1x"
	196	fi ;;
[4795dfb]	197	RUNMAKE) validate_against_str "x0x x1x" ;;
	198	+ USE_PACO) validate_against_str "x0x x1x" ;;
	199	REPORT) validate_against_str "x0x x1x"
	200	if [[ "${!config_param}" = "1" ]]; then
	201	if [[ `type -p bc` ]]; then
[059822c]	202	Index: common/paco-functions
	203	===================================================================
	204	--- common/paco-functions (revision 0)
	205	+++ common/paco-functions (revision 0)
[2b88404]	206	@@ -0,0 +1,209 @@
[059822c]	207	+#!/bin/bash
	208	+
	209	+#----------------------------#
	210	+wrt_paco_inst() { #
	211	+#----------------------------#
[d748b31]	212	+
	213	+# Not using Paco with uClibc, even if requested
	214	+if [ $PROGNAME = "hlfs" ]; then
	215	+ if [ $MODEL = "uclibc" ]; then
[6821737]	216	+ USE_PACO=0
[d748b31]	217	+ fi
	218	+fi
	219	+
	220	+if [ $USE_PACO != 0 ]; then
[6821737]	221	+ paco_script="$1"
	222	+ paco_file="chapter06/$paco_script"
	223	+ chapter6="$chapter6 $paco_script"
	224	+
	225	+ # Copy the paco build script to the correct directory and make it executable
[799b0d1]	226	+ cp $JHALFSDIR/paco-build-$PROGNAME.sh $JHALFSDIR/${PROGNAME}-commands/$paco_file &&
[6821737]	227	+ chmod +x $JHALFSDIR/${PROGNAME}-commands/$paco_file
[059822c]	228	+
	229	+ # Write target, dependency and unpack
[6821737]	230	+ wrt_target "$paco_script" "$PREV"
[059822c]	231	+ wrt_unpack2 "$PACO_FILE"
	232	+
	233	+ # Run the script
[6821737]	234	+ wrt_run_as_chroot1 "${paco_script}" "${paco_file}"
[059822c]	235	+
	236	+ # Clean up
[6821737]	237	+ wrt_remove_build_dirs "paco"
[2b88404]	238	+ wrt_touch
[059822c]	239	+
	240	+ # Override the PREV variable
[6821737]	241	+ PREV="$paco_script"
[059822c]	242	+fi
	243	+}
	244	+
	245	+
	246	+#----------------------------------#
	247	+wrt_paco_prep() { # Export Paco variables
	248	+#----------------------------------# and remove tmpfile
[d748b31]	249	+
	250	+# Not using Paco with uClibc, even if requested
	251	+if [ $PROGNAME = "hlfs" ]; then
	252	+ if [ $MODEL = "uclibc" ]; then
[6821737]	253	+ USE_PACO=0
[d748b31]	254	+ fi
	255	+fi
	256	+
[b9ec725]	257	+check_log_package
	258	+
	259	+if [ $USE_PACO != 0 ] && [ $LOG_PACKAGE != 0 ]; then
[059822c]	260	+(
	261	+cat << EOF
	262	+ @echo "export PACO_INCLUDE=$PACO_INCLUDE" >> envars && \\
[b9ec725]	263	+ echo "export PACO_EXCLUDE=\$(SRC):$PACO_EXCLUDE" >> envars && \\
[059822c]	264	+ echo "export PACO_TMPFILE=$PACO_TMPFILE" >> envars && \\
	265	+ rm -f \$(MOUNT_PT)$PACO_TMPFILE
	266	+EOF
	267	+) >> $MKFILE.tmp
	268	+fi
	269	+}
	270	+
	271	+
	272	+#----------------------------------#
	273	+wrt_paco_log() { # If the tmpfile exist, then log the current package
	274	+#----------------------------------# and remove tempfile
[d748b31]	275	+local PACKAGE
	276	+
[2b88404]	277	+PACKAGE=`echo $1 \| sed -e 's/.tar.*//'`
[059822c]	278	+
[d748b31]	279	+# Not using Paco with uClibc, even if requested
	280	+if [ $PROGNAME = "hlfs" ]; then
	281	+ if [ $MODEL = "uclibc" ]; then
[6821737]	282	+ USE_PACO=0
[059822c]	283	+ fi
[d748b31]	284	+fi
[059822c]	285	+
[b9ec725]	286	+check_log_package
	287	+
	288	+if [ $USE_PACO != 0 ]; then
	289	+ if [ $LOG_PACKAGE != 0 ]; then
[059822c]	290	+(
	291	+cat << EOF
	292	+ @if [ -e \$(MOUNT_PT)$PACO_TMPFILE ]; then \\
[4795dfb]	293	+ \$(CHROOT1) 'paco -lp+ $PACKAGE < $PACO_TMPFILE' && \\
[059822c]	294	+ rm -f \$(MOUNT_PT)$PACO_TMPFILE; \\
	295	+ fi;
	296	+EOF
	297	+) >> $MKFILE.tmp
[b9ec725]	298	+ fi
	299	+ wrt_paco_add_log
[059822c]	300	+fi
[b9ec725]	301	+}
[059822c]	302	+
[b9ec725]	303	+
	304	+#----------------------------------#
	305	+wrt_paco_add_log() { #
	306	+#----------------------------------#
	307	+# Some packages create files using bash redirection, which the LD_PRELOAD lib don't notice
	308	+# These rules will add the missing files to the proper logs.
	309	+# Most of these is not needed for HLFS, but they do no harm.
	310	+if [ $USE_PACO != 0 ]; then
	311	+ case $this_script in
	312	+ *glibc)
	313	+ echo -e "\t@\$(CHROOT1) 'find /lib -type l \| paco -lp+ $PACKAGE'" >> $MKFILE.tmp
	314	+ echo -e "\t@\$(CHROOT1) 'find /etc/{nsswitch.conf,ld.so.conf} \| paco -lp+ $PACKAGE'" >> $MKFILE.tmp
	315	+ ;;
	316	+ *ncurses)
	317	+ LIBS="/usr/lib/{libcurses.so,libncurses.so,libform.so,libpanel.so,libmenu.so}"
	318	+ echo -e "\t@\$(CHROOT1) 'find $LIBS \| paco -lp+ $PACKAGE'" >> $MKFILE.tmp
	319	+ ;;
	320	+ *bash)
	321	+ echo -e "\t@\$(CHROOT1) 'echo /bin/sh \| paco -lp+ $PACKAGE'" >> $MKFILE.tmp
	322	+ ;;
	323	+ *flex)
	324	+ echo -e "\t@\$(CHROOT1) 'echo /usr/bin/lex \| paco -lp+ $PACKAGE'" >> $MKFILE.tmp
	325	+ ;;
	326	+ *shadow)
	327	+ echo -e "\t@\$(CHROOT1) 'echo /etc/login.defs \| paco -lp+ $PACKAGE'" >> $MKFILE.tmp
	328	+ ;;
	329	+ *hotplug)
	330	+ echo -e "\t@\$(CHROOT1) 'echo /var/log/hotplug \| paco -lp+ $PACKAGE'" >> $MKFILE.tmp
	331	+ echo -e "\t@\$(CHROOT1) 'echo /var/run/usb \| paco -lp+ $PACKAGE'" >> $MKFILE.tmp
	332	+ ;;
	333	+ *sysklogd)
	334	+ echo -e "\t@\$(CHROOT1) 'echo /etc/syslog.conf \| paco -lp+ $PACKAGE'" >> $MKFILE.tmp
	335	+ ;;
	336	+ *sysvinit)
	337	+ echo -e "\t@\$(CHROOT1) 'echo /etc/inittab \| paco -lp+ $PACKAGE'" >> $MKFILE.tmp
	338	+ ;;
	339	+ *udev)
	340	+ echo -e "\t@\$(CHROOT1) 'find /lib/udev/devices \| paco -lp+ $PACKAGE'" >> $MKFILE.tmp
	341	+ echo -e "\t@\$(CHROOT1) 'echo /lib/firmware \| paco -lp+ $PACKAGE'" >> $MKFILE.tmp
	342	+ echo -e "\t@\$(CHROOT1) 'find /etc/udev/rules.d -type f \| paco -lp+ $PACKAGE'" >> $MKFILE.tmp
	343	+ ;;
	344	+ *util-linux)
	345	+ echo -e "\t@\$(CHROOT1) 'echo /var/lib/hwclock \| paco -lp+ $PACKAGE'" >> $MKFILE.tmp
	346	+ echo -e "\t@\$(CHROOT1) 'echo /etc/nologin.txt \| paco -lp+ $PACKAGE'" >> $MKFILE.tmp
	347	+ ;;
	348	+ *vim)
	349	+ echo -e "\t@\$(CHROOT1) 'echo /etc/vimrc \| paco -lp+ $PACKAGE'" >> $MKFILE.tmp
	350	+ ;;
	351	+ # Rules below here will log configuration files created in LFS and HLFS
	352	+ # They will end up in a log named {h}lfs-sysconf
	353	+ *setclock)
	354	+ echo -e "\t@\$(CHROOT2) 'echo /etc/sysconfig/clock \| paco -lp+ $PACKAGE'" >> $MKFILE.tmp
	355	+ ;;
	356	+ *inputrc)
	357	+ echo -e "\t@\$(CHROOT2) 'echo /etc/inputrc \| paco -lp+ $PACKAGE'" >> $MKFILE.tmp
	358	+ ;;
	359	+ *profile)
	360	+ echo -e "\t@\$(CHROOT2) 'echo /etc/profile \| paco -lp+ $PACKAGE'" >> $MKFILE.tmp
	361	+ ;;
	362	+ *hostname)
	363	+ echo -e "\t@\$(CHROOT2) 'echo /etc/sysconfig/network \| paco -lp+ $PACKAGE'" >> $MKFILE.tmp
	364	+ ;;
	365	+ *localnet)
	366	+ echo -e "\t@\$(CHROOT2) 'echo /etc/sysconfig/network \| paco -lp+ $PACKAGE'" >> $MKFILE.tmp
	367	+ ;;
	368	+ *hosts)
	369	+ echo -e "\t@\$(CHROOT2) 'echo /etc/hosts \| paco -lp+ $PACKAGE'" >> $MKFILE.tmp
	370	+ ;;
	371	+ *network)
	372	+ echo -e "\t@\$(CHROOT2) 'echo /etc/sysconfig/network-devices/ifconfig.eth0/ipv4 \| paco -lp+ $PACKAGE'" >> $MKFILE.tmp
	373	+ echo -e "\t@\$(CHROOT2) 'echo /etc/resolv.conf \| paco -lp+ $PACKAGE'" >> $MKFILE.tmp
	374	+ ;;
	375	+ *fstab)
	376	+ echo -e "\t@\$(CHROOT2) 'echo /etc/fstab \| paco -lp+ $PACKAGE'" >> $MKFILE.tmp
	377	+ ;;
	378	+ *theend) # LFS
	379	+ echo -e "\t@\$(CHROOT2) 'echo /etc/$PROGNAME-release \| paco -lp+ $PACKAGE'" >> $MKFILE.tmp
	380	+ ;;
	381	+ *finished) # HLFS
	382	+ echo -e "\t@\$(CHROOT2) 'echo /etc/$PROGNAME-release \| paco -lp+ $PACKAGE'" >> $MKFILE.tmp
	383	+ ;;
	384	+ esac
[059822c]	385	+fi
	386	+}
[b9ec725]	387	+
	388	+
	389	+#----------------------------------#
	390	+check_log_package() { #
	391	+#----------------------------------#
	392	+# Maybe don't need this function, but it will avoid writing some
	393	+# unnecessary paco commands in the Makefile.
	394	+
	395	+case $this_script in
[2b88404]	396	+ *changingowner) LOG_PACKAGE=0 ;;
[b9ec725]	397	+ *creatingdirs) LOG_PACKAGE=0 ;;
	398	+ *createfiles) LOG_PACKAGE=0 ;;
[2b88404]	399	+ *pwdgroup) LOG_PACKAGE=0 ;;
	400	+ *devices) LOG_PACKAGE=0 ;;
[b9ec725]	401	+ *strippingagain) LOG_PACKAGE=0 ;;
	402	+ *readjusting) LOG_PACKAGE=0 ;;
	403	+ *setclock) LOG_PACKAGE=0 ;;
	404	+ *inputrc) LOG_PACKAGE=0 ;;
	405	+ *profile) LOG_PACKAGE=0 ;;
	406	+ *hostname) LOG_PACKAGE=0 ;;
	407	+ *localnet) LOG_PACKAGE=0 ;;
	408	+ *hosts) LOG_PACKAGE=0 ;;
	409	+ *network) LOG_PACKAGE=0 ;;
	410	+ *fstab) LOG_PACKAGE=0 ;;
	411	+ *theend) LOG_PACKAGE=0 ;;
	412	+ *finished) LOG_PACKAGE=0 ;;
	413	+ *) LOG_PACKAGE=1 ;;
	414	+esac
	415	+}
[799b0d1]	416	Index: common/paco-build-lfs.sh
[6821737]	417	===================================================================
[799b0d1]	418	--- common/paco-build-lfs.sh (revision 0)
	419	+++ common/paco-build-lfs.sh (revision 0)
[b9ec725]	420	@@ -0,0 +1,10 @@
[6821737]	421	+#!/bin/sh
	422	+set -e
	423	+
	424	+cd $PKGDIR
[b9ec725]	425	+./configure --sysconfdir=/etc \
	426	+ --enable-scripts \
	427	+ --disable-gpaco &&
[6821737]	428	+make &&
	429	+make install &&
	430	+make logme
[059822c]	431	Index: common/common-functions
	432	===================================================================
[6921b21]	433	--- common/common-functions (revision 2862)
[059822c]	434	+++ common/common-functions (working copy)
[a708b15]	435	@@ -69,6 +69,9 @@
[059822c]	436	in the configuration file has the proper packages and patches for the
	437	book version being processed.
	438
	439	+${BOLD} --no-paco${OFF}
	440	+ dissables paco logging feature.
	441	+
[f3ae556]	442	${BOLD} -O, --optimize${OFF}
	443	Optimize [0-2]
	444	0 = no optimization
[a708b15]	445	@@ -733,6 +736,7 @@
[059822c]	446	--stringparam lc_all $LC_ALL \
	447	--stringparam keymap $KEYMAP \
	448	--stringparam grsecurity_host $GRSECURITY_HOST \
	449	+ --stringparam use_paco $USE_PACO \
	450	-o ./${PROGNAME}-commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1
	451	;;
	452	lfs)
[a708b15]	453	@@ -744,6 +748,7 @@
[059822c]	454	--stringparam timezone $TIMEZONE \
	455	--stringparam page $PAGE \
	456	--stringparam lang $LANG \
	457	+ --stringparam use_paco $USE_PACO \
	458	-o ./${PROGNAME}-commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1
	459	;;
[8230977]	460	*) exit 1 ;;
[059822c]	461	Index: HLFS/hlfs.xsl
	462	===================================================================
[6921b21]	463	--- HLFS/hlfs.xsl (revision 2862)
[059822c]	464	+++ HLFS/hlfs.xsl (working copy)
	465	@@ -39,6 +39,9 @@
[c665386]	466	<xsl:param name="lang" select="C"/>
	467	<xsl:param name="lc_all" select="C"/>
[059822c]	468
	469	+ <!-- Use paco? -->
	470	+ <xsl:param name="use_paco" select="1"/>
	471	+
	472	<xsl:template match="/">
	473	<xsl:apply-templates select="//sect1"/>
	474	</xsl:template>
[6921b21]	475	@@ -177,6 +180,10 @@
[059822c]	476	<!-- Fixing bootscripts installation -->
	477	<xsl:when test="ancestor::sect1[@id='bootable-bootscripts'] and
	478	string() = 'make install'">
	479	+ <!-- inserting LD_PRELOAD before installing bootscripts -->
	480	+ <xsl:if test="$use_paco != '0' and $model != 'uclibc'">
	481	+ <xsl:text>export LD_PRELOAD=/usr/lib/libpaco-log.so </xsl:text>
	482	+ </xsl:if>
	483	<xsl:text>make install </xsl:text>
	484	<xsl:text>cd ../blfs-bootscripts-&blfs-bootscripts-version; </xsl:text>
	485	</xsl:when>
[6921b21]	486	@@ -237,6 +244,27 @@
[059822c]	487	<xsl:apply-templates/>
	488	<xsl:text> \|\| true </xsl:text>
	489	</xsl:when>
[6921b21]	490	+
[059822c]	491	+ <!-- paco begin -->
	492	+ <!-- General rule -->
	493	+ <xsl:when test="$use_paco != '0' and $model != 'uclibc' and
	494	+ ancestor::chapter[@id != 'chapter-temporary-tools'] and
	495	+ contains(string(),'make') and
	496	+ contains(string(),'install')">
	497	+ <xsl:text>export LD_PRELOAD=/usr/lib/libpaco-log.so </xsl:text>
[6921b21]	498	+ <xsl:apply-templates/>
[059822c]	499	+ <xsl:text> </xsl:text>
	500	+ </xsl:when>
	501	+ <!-- Linux-libc-headers -->
	502	+ <xsl:when test="$use_paco != '0' and $model != 'uclibc' and
[6921b21]	503	+ ancestor::sect1[@id='ch-system-linux-headers'] and
[059822c]	504	+ contains(string(),'install ')">
	505	+ <xsl:text>export LD_PRELOAD=/usr/lib/libpaco-log.so </xsl:text>
[6921b21]	506	+ <xsl:apply-templates/>
[059822c]	507	+ <xsl:text> </xsl:text>
	508	+ </xsl:when>
	509	+ <!-- paco end -->
[6921b21]	510	+
[059822c]	511	<!-- The rest of commands -->
	512	<xsl:otherwise>
	513	<xsl:apply-templates/>
	514	Index: HLFS/master.sh
	515	===================================================================
[6921b21]	516	--- HLFS/master.sh (revision 2862)
[059822c]	517	+++ HLFS/master.sh (working copy)
[6921b21]	518	@@ -76,7 +76,9 @@
	519	@echo "export PKGDIR=\$(SRC)" > envars
	520	EOF
	521	) >> $MKFILE.tmp
	522	+ wrt_paco_prep
	523	wrt_run_as_chroot1 "$toolchain" "$this_script"
	524	+ wrt_paco_log "`echo $toolchain \| sed -e 's@[0-9]\{3\}-@@'`"
	525	;;
	526
	527	*)
	528	@@ -310,6 +312,11 @@
[8230977]	529	# Keep the script file name
	530	this_script=`basename $file`
	531
	532	+ # If this script is *-paco, then skip it
	533	+ case $this_script in
	534	+ *paco ) continue ;;
	535	+ esac
	536	+
	537	# Skip this script depending on jhalfs.conf flags set.
	538	case $this_script in
	539	# We'll run the chroot commands differently than the others, so skip them in the
[6921b21]	540	@@ -319,6 +326,18 @@
[4795dfb]	541	-stripping ) [[ "$STRIP" = "0" ]] && continue ;;
[6821737]	542	esac
	543
[4795dfb]	544	+ # Install paco as the first package in ch6, before installing
	545	+ # linux-libc-headers, except in iterartive builds
	546	+ if [[ -z "$N" ]]; then
	547	+ case $this_script in
[6921b21]	548	+ *linux-headers)
[799b0d1]	549	+ TMP_SCRIPT="$this_script"
[6921b21]	550	+ this_script=`echo $this_script \| sed -e 's/linux-headers/a-paco/'`
[799b0d1]	551	+ wrt_paco_inst "$this_script"
	552	+ this_script="$TMP_SCRIPT" ;;
[4795dfb]	553	+ esac
	554	+ fi
[6821737]	555	+
[4795dfb]	556	# Grab the name of the target
	557	name=`echo $this_script \| sed -e 's@[0-9]\{3\}-@@'`
	558
[6921b21]	559	@@ -385,7 +404,9 @@
	560	wrt_RunAsRoot "hlfs" "${this_script}" "${file}"
[059822c]	561	;;
	562	*) # The rest of Chapter06
	563	+ wrt_paco_prep
	564	wrt_run_as_chroot1 "${this_script}" "${file}"
[2b88404]	565	+ wrt_paco_log "$pkg_tarball"
[059822c]	566	;;
	567	esac
	568	#
[6921b21]	569	@@ -405,6 +426,16 @@
[4795dfb]	570	PREV=${this_script}${N}
	571	# Set system_build envar for iteration targets
	572	system_build=$chapter6
[059822c]	573	+
[6821737]	574	+ # Reinstall paco after the toolchain has been readjusted.
[059822c]	575	+ case "${this_script}" in
[6821737]	576	+ *readjusting)
[799b0d1]	577	+ TMP_SCRIPT="$this_script"
	578	+ this_script=`echo $this_script \| sed -e 's/readjusting/x-paco/'`
	579	+ wrt_paco_inst "$this_script"
	580	+ this_script="$TMP_SCRIPT" ;;
[059822c]	581	+ esac
	582	+
	583	done # end for file in chapter06/*
	584
	585	}
[6921b21]	586	@@ -463,9 +494,19 @@
[b9ec725]	587	else # Initialize the log and run the script
[059822c]	588	wrt_run_as_chroot2 "${this_script}" "${file}"
	589	fi
[b9ec725]	590	+ wrt_paco_log "hlfs-sysconf"
[059822c]	591	;;
	592	+ *kernel) wrt_paco_prep
	593	+ wrt_run_as_chroot2 "$this_script" "$file"
[2b88404]	594	+ wrt_paco_log "$(get_package_tarball_name "linux")"
[059822c]	595	+ ;;
	596	+ *bootscripts) wrt_paco_prep
	597	+ wrt_run_as_chroot2 "$this_script" "$file"
[2b88404]	598	+ wrt_paco_log "$(get_package_tarball_name "lfs-bootscripts")"
[059822c]	599	+ ;;
	600	*) # All other scripts
	601	wrt_run_as_chroot2 "${this_script}" "${file}"
[b9ec725]	602	+ wrt_paco_log "hlfs-sysconf"
[059822c]	603	;;
[b9ec725]	604	esac
	605
[6921b21]	606	Index: contrib/jhalfs-paco.patch
	607	===================================================================
	608	--- contrib/jhalfs-paco.patch (revision 2862)
	609	+++ contrib/jhalfs-paco.patch (working copy)
	610	@@ -1,8 +1,8 @@
	611	Index: LFS/master.sh
	612	===================================================================
	613	---- LFS/master.sh (revision 2829)
	614	+--- LFS/master.sh (revision 2861)
	615	+++ LFS/master.sh (working copy)
	616	-@@ -176,6 +176,11 @@
	617	+@@ -173,6 +173,11 @@
	618	# Keep the script file name
	619	this_script=`basename $file`
	620
	621	@@ -14,7 +14,7 @@
	622	# We'll run the chroot commands differently than the others, so skip them in the
	623	# dependencies and target creation.
	624	case "${this_script}" in
	625	-@@ -183,6 +188,18 @@
	626	+@@ -180,6 +185,18 @@
	627	stripping) [[ "${STRIP}" = "0" ]] && continue ;;
	628	esac
	629
	630	@@ -33,7 +33,7 @@
	631	# Grab the name of the target
	632	name=`echo ${this_script} \| sed -e 's@[0-9]\{3\}-@@'`
	633
	634	-@@ -235,7 +252,9 @@
	635	+@@ -232,7 +249,9 @@
	636	# and not to use chroot.
	637	case "${this_script}" in
	638	*kernfs) wrt_run_as_root "${this_script}" "$file" ;;
	639	@@ -44,7 +44,7 @@
	640	esac
	641
	642	# Remove the build directory(ies) except if the package build fails.
	643	-@@ -255,6 +274,16 @@
	644	+@@ -252,6 +271,16 @@
	645	PREV=${this_script}${N}
	646	# Set system_build envar for iteration targets
	647	system_build=$chapter6
	648	@@ -61,7 +61,7 @@
	649	done # end for file in chapter06/*
	650	}
	651
	652	-@@ -315,8 +344,18 @@
	653	+@@ -312,8 +341,18 @@
	654	else
	655	wrt_run_as_chroot2 "$this_script" "$file"
	656	fi
	657	@@ -82,7 +82,7 @@
	658
	659	Index: LFS/lfs.xsl
	660	===================================================================
	661	---- LFS/lfs.xsl (revision 2829)
	662	+--- LFS/lfs.xsl (revision 2861)
	663	+++ LFS/lfs.xsl (working copy)
	664	@@ -32,6 +32,9 @@
	665	<!-- Locale settings -->
	666	@@ -94,7 +94,7 @@
	667	<xsl:template match="/">
	668	<xsl:apply-templates select="//sect1"/>
	669	</xsl:template>
	670	-@@ -200,6 +203,33 @@
	671	+@@ -206,6 +209,33 @@
	672	<xsl:apply-templates/>
	673	<xsl:text> \|\| true </xsl:text>
	674	</xsl:when>
	675	@@ -147,7 +147,7 @@
	676	+make logme
	677	Index: common/config
	678	===================================================================
	679	---- common/config (revision 2829)
	680	+--- common/config (revision 2861)
	681	+++ common/config (working copy)
	682	@@ -86,6 +86,14 @@
	683	#--- Run farce testing 0(no)/1(yes)
	684	@@ -156,7 +156,7 @@
	685	+#==== PACO VARIABLES ====
	686	+#--- Use paco? 0(no)/1(yes)
	687	+USE_PACO=1
	688	-+PACO_VERSION=1.10.8
	689	++PACO_VERSION=1.10.10
	690	+
	691	+#--- Name of the Paco source package
	692	+PACO_FILE=paco-$PACO_VERSION.tar.*
	693	@@ -176,22 +176,24 @@
	694	+LD_PRELOAD=/usr/lib/libpaco-log.so
	695	Index: common/func_validate_configs.sh
	696	===================================================================
	697	---- common/func_validate_configs.sh (revision 2829)
	698	+--- common/func_validate_configs.sh (revision 2861)
	699	+++ common/func_validate_configs.sh (working copy)
	700	-@@ -84,9 +84,9 @@
	701	+@@ -86,10 +86,10 @@
	702	inline_doc
	703
	704	# First internal variables, then the ones that change the book's flavour, and lastly system configuration variables
	705	-- local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE MODEL GRSECURITY_HOST TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG GETKERNEL KEYMAP PAGE TIMEZONE LANG LC_ALL"
	706	-- local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE METHOD ARCH TARGET TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG GETKERNEL KEYMAP VIMLANG PAGE TIMEZONE LANG"
	707	-- local -r lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG GETKERNEL VIMLANG PAGE TIMEZONE LANG"
	708	-+ local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO GETPKG RUNMAKE MODEL GRSECURITY_HOST TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG GETKERNEL KEYMAP PAGE TIMEZONE LANG LC_ALL"
	709	-+ local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO GETPKG RUNMAKE METHOD ARCH TARGET TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG GETKERNEL KEYMAP VIMLANG PAGE TIMEZONE LANG"
	710	-+ local -r lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO GETPKG RUNMAKE TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG GETKERNEL VIMLANG PAGE TIMEZONE LANG"
	711	+- local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE MODEL GRSECURITY_HOST TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG GETKERNEL KEYMAP PAGE TIMEZONE LANG LC_ALL"
	712	+- local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE METHOD ARCH TARGET TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG GETKERNEL KEYMAP VIMLANG PAGE TIMEZONE LANG"
	713	+- local -r clfs2_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE ARCH TARGET OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG GETKERNEL KEYMAP VIMLANG PAGE TIMEZONE LANG"
	714	+- local -r lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG GETKERNEL VIMLANG PAGE TIMEZONE LANG"
	715	++ local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO GETPKG RUNMAKE MODEL GRSECURITY_HOST TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG GETKERNEL KEYMAP PAGE TIMEZONE LANG LC_ALL"
	716	++ local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO GETPKG RUNMAKE METHOD ARCH TARGET TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG GETKERNEL KEYMAP VIMLANG PAGE TIMEZONE LANG"
	717	++ local -r clfs2_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO GETPKG RUNMAKE ARCH TARGET OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG GETKERNEL KEYMAP VIMLANG PAGE TIMEZONE LANG"
	718	++ local -r lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO GETPKG RUNMAKE TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG GETKERNEL VIMLANG PAGE TIMEZONE LANG"
	719
	720	local -r ERROR_MSG_pt1='The variable \"${L_arrow}${config_param}${R_arrow}\" value ${L_arrow}${BOLD}${!config_param}${R_arrow} is invalid,'
	721	local -r ERROR_MSG_pt2=' check the config file ${BOLD}${GREEN}\<$(echo $PROGNAME \| tr [a-z] [A-Z])/config\> or \<common/config\>${OFF}'
	722	-@@ -176,6 +176,7 @@
	723	+@@ -179,6 +179,7 @@
	724	[[ "$GETPKG" = "1" ]] && validate_against_str "x0x x1x"
	725	fi ;;
	726	RUNMAKE) validate_against_str "x0x x1x" ;;
	727	@@ -430,7 +432,7 @@
	728	+make logme
	729	Index: common/common-functions
	730	===================================================================
	731	---- common/common-functions (revision 2829)
	732	+--- common/common-functions (revision 2861)
	733	+++ common/common-functions (working copy)
	734	@@ -69,6 +69,9 @@
	735	in the configuration file has the proper packages and patches for the
	736	@@ -442,7 +444,7 @@
	737	${BOLD} -O, --optimize${OFF}
	738	Optimize [0-2]
	739	0 = no optimization
	740	-@@ -733,6 +736,7 @@
	741	+@@ -759,6 +762,7 @@
	742	--stringparam lc_all $LC_ALL \
	743	--stringparam keymap $KEYMAP \
	744	--stringparam grsecurity_host $GRSECURITY_HOST \
	745	@@ -450,7 +452,7 @@
	746	-o ./${PROGNAME}-commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1
	747	;;
	748	lfs)
	749	-@@ -744,6 +748,7 @@
	750	+@@ -770,6 +774,7 @@
	751	--stringparam timezone $TIMEZONE \
	752	--stringparam page $PAGE \
	753	--stringparam lang $LANG \
	754	@@ -460,7 +462,7 @@
	755	*) exit 1 ;;
	756	Index: HLFS/hlfs.xsl
	757	===================================================================
	758	---- HLFS/hlfs.xsl (revision 2829)
	759	+--- HLFS/hlfs.xsl (revision 2861)
	760	+++ HLFS/hlfs.xsl (working copy)
	761	@@ -39,6 +39,9 @@
	762	<xsl:param name="lang" select="C"/>
	763	@@ -472,7 +474,7 @@
	764	<xsl:template match="/">
	765	<xsl:apply-templates select="//sect1"/>
	766	</xsl:template>
	767	-@@ -191,6 +194,10 @@
	768	+@@ -177,6 +180,10 @@
	769	<!-- Fixing bootscripts installation -->
	770	<xsl:when test="ancestor::sect1[@id='bootable-bootscripts'] and
	771	string() = 'make install'">
	772	@@ -483,10 +485,11 @@
	773	<xsl:text>make install </xsl:text>
	774	<xsl:text>cd ../blfs-bootscripts-&blfs-bootscripts-version; </xsl:text>
	775	</xsl:when>
	776	-@@ -257,6 +264,25 @@
	777	+@@ -237,6 +244,27 @@
	778	<xsl:apply-templates/>
	779	<xsl:text> \|\| true </xsl:text>
	780	</xsl:when>
	781	++
	782	+ <!-- paco begin -->
	783	+ <!-- General rule -->
	784	+ <xsl:when test="$use_paco != '0' and $model != 'uclibc' and
	785	@@ -494,26 +497,37 @@
	786	+ contains(string(),'make') and
	787	+ contains(string(),'install')">
	788	+ <xsl:text>export LD_PRELOAD=/usr/lib/libpaco-log.so </xsl:text>
	789	-+ <xsl:apply-templates/>
	790	++ <xsl:apply-templates/>
	791	+ <xsl:text> </xsl:text>
	792	+ </xsl:when>
	793	+ <!-- Linux-libc-headers -->
	794	+ <xsl:when test="$use_paco != '0' and $model != 'uclibc' and
	795	-+ ancestor::sect1[@id='ch-system-linux-libc-headers'] and
	796	++ ancestor::sect1[@id='ch-system-linux-headers'] and
	797	+ contains(string(),'install ')">
	798	+ <xsl:text>export LD_PRELOAD=/usr/lib/libpaco-log.so </xsl:text>
	799	-+ <xsl:apply-templates/>
	800	++ <xsl:apply-templates/>
	801	+ <xsl:text> </xsl:text>
	802	+ </xsl:when>
	803	+ <!-- paco end -->
	804	++
	805	<!-- The rest of commands -->
	806	<xsl:otherwise>
	807	<xsl:apply-templates/>
	808	Index: HLFS/master.sh
	809	===================================================================
	810	---- HLFS/master.sh (revision 2829)
	811	+--- HLFS/master.sh (revision 2861)
	812	+++ HLFS/master.sh (working copy)
	813	-@@ -250,6 +250,11 @@
	814	+@@ -76,7 +76,9 @@
	815	+ @echo "export PKGDIR=\$(SRC)" > envars
	816	+ EOF
	817	+ ) >> $MKFILE.tmp
	818	++ wrt_paco_prep
	819	+ wrt_run_as_chroot1 "$toolchain" "$this_script"
	820	++ wrt_paco_log "`echo $toolchain \| sed -e 's@[0-9]\{3\}-@@'`"
	821	+ ;;
	822	+
	823	+ *)
	824	+@@ -310,6 +312,11 @@
	825	# Keep the script file name
	826	this_script=`basename $file`
	827
	828	@@ -525,7 +539,7 @@
	829	# Skip this script depending on jhalfs.conf flags set.
	830	case $this_script in
	831	# We'll run the chroot commands differently than the others, so skip them in the
	832	-@@ -259,6 +264,18 @@
	833	+@@ -319,6 +326,18 @@
	834	-stripping ) [[ "$STRIP" = "0" ]] && continue ;;
	835	esac
	836
	837	@@ -533,9 +547,9 @@
	838	+ # linux-libc-headers, except in iterartive builds
	839	+ if [[ -z "$N" ]]; then
	840	+ case $this_script in
	841	-+ *linux-libc-headers)
	842	++ *linux-headers)
	843	+ TMP_SCRIPT="$this_script"
	844	-+ this_script=`echo $this_script \| sed -e 's/linux-libc-headers/a-paco/'`
	845	++ this_script=`echo $this_script \| sed -e 's/linux-headers/a-paco/'`
	846	+ wrt_paco_inst "$this_script"
	847	+ this_script="$TMP_SCRIPT" ;;
	848	+ esac
	849	@@ -544,8 +558,8 @@
	850	# Grab the name of the target
	851	name=`echo $this_script \| sed -e 's@[0-9]\{3\}-@@'`
	852
	853	-@@ -334,7 +351,9 @@
	854	- wrt_run_as_root "${this_script}" "${file}"
	855	+@@ -385,7 +404,9 @@
	856	+ wrt_RunAsRoot "hlfs" "${this_script}" "${file}"
	857	;;
	858	*) # The rest of Chapter06
	859	+ wrt_paco_prep
	860	@@ -554,7 +568,7 @@
	861	;;
	862	esac
	863	#
	864	-@@ -367,6 +386,16 @@
	865	+@@ -405,6 +426,16 @@
	866	PREV=${this_script}${N}
	867	# Set system_build envar for iteration targets
	868	system_build=$chapter6
	869	@@ -571,7 +585,7 @@
	870	done # end for file in chapter06/*
	871
	872	}
	873	-@@ -426,9 +455,19 @@
	874	+@@ -463,9 +494,19 @@
	875	else # Initialize the log and run the script
	876	wrt_run_as_chroot2 "${this_script}" "${file}"
	877	fi
	878	@@ -593,7 +607,7 @@
	879
	880	Index: master.sh
	881	===================================================================
	882	---- master.sh (revision 2829)
	883	+--- master.sh (revision 2861)
	884	+++ master.sh (working copy)
	885	@@ -149,6 +149,8 @@
	886
	887	@@ -604,7 +618,7 @@
	888	--optimize \| -O )
	889	test $# = 1 && eval "$exit_missing_arg"
	890	shift
	891	-@@ -440,6 +442,14 @@
	892	+@@ -444,6 +446,14 @@
	893	[[ $VERBOSITY > 0 ]] && echo "OK"
	894	fi
	895	#
	896	@@ -619,7 +633,7 @@
	897	# optimize module
	898	if [[ "$OPTIMIZE" != "0" ]]; then
	899	[[ $VERBOSITY > 0 ]] && echo -n "Loading optimization module..."
	900	-@@ -486,6 +496,8 @@
	901	+@@ -490,6 +500,8 @@
	902	if [[ "$PWD" != "$JHALFSDIR" ]]; then
	903	cp $COMMON_DIR/{makefile-functions,progress_bar.sh} $JHALFSDIR/
	904	#
[d748b31]	905	Index: master.sh
	906	===================================================================
[6921b21]	907	--- master.sh (revision 2862)
[d748b31]	908	+++ master.sh (working copy)
[a708b15]	909	@@ -149,6 +149,8 @@
[d748b31]	910
	911	--help \| -h ) usage \| more && exit ;;
	912
	913	+ --no-paco ) USE_PACO=0 ;;
	914	+
[f3ae556]	915	--optimize \| -O )
[d748b31]	916	test $# = 1 && eval "$exit_missing_arg"
	917	shift
[a708b15]	918	@@ -440,6 +442,14 @@
[d29584b]	919	[[ $VERBOSITY > 0 ]] && echo "OK"
	920	fi
[f3ae556]	921	#
[d29584b]	922	+# paco module
	923	+if [[ "$USE_PACO" = "1" ]]; then
	924	+ [[ $VERBOSITY > 0 ]] && echo -n "Loading paco module..."
	925	+ source $COMMON_DIR/paco-functions
	926	+ [[ $? > 0 ]] && echo "$COMMON_DIR/paco-functions did not load.." && exit 2
	927	+ [[ $VERBOSITY > 0 ]] && echo "OK"
	928	+fi
	929	+#
[f3ae556]	930	# optimize module
	931	if [[ "$OPTIMIZE" != "0" ]]; then
	932	[[ $VERBOSITY > 0 ]] && echo -n "Loading optimization module..."
[a708b15]	933	@@ -486,6 +496,8 @@
[d748b31]	934	if [[ "$PWD" != "$JHALFSDIR" ]]; then
[b9ec725]	935	cp $COMMON_DIR/{makefile-functions,progress_bar.sh} $JHALFSDIR/
[c665386]	936	#
[8230977]	937	+ [[ $USE_PACO != "0" ]] && cp $COMMON_DIR/paco-build-$PROGNAME.sh $JHALFSDIR/
	938	+ #
[f3ae556]	939	[[ "$OPTIMIZE" != "0" ]] && cp optimize/opt_override $JHALFSDIR/
[c665386]	940	#
[4795dfb]	941	if [[ "$COMPARE" != "0" ]] ; then

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

Download in other formats: