Context Navigation

source: contrib/jhalfs-paco.patch@ ebf8265

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

Last change on this file since ebf8265 was 4795dfb, checked in by Manuel Canales Esparcia <manuel@…>, 19 years ago
Rediffied paco patch. This one need be revised and tested by Tor Olav.
Property mode set to `100644`
File size: 17.8 KB

Rev	Line
[059822c]	1	Index: LFS/master.sh
	2	===================================================================
[4795dfb]	3	--- LFS/master.sh (revision 2598)
[059822c]	4	+++ LFS/master.sh (working copy)
[4795dfb]	5	@@ -183,6 +183,16 @@
[6821737]	6	stripping) [[ "${STRIP}" = "0" ]] && continue ;;
	7	esac
	8
[4795dfb]	9	+ # Install paco as the first package in ch6, before installing
	10	+ # linux-libc-headers, except in iterartive builds
	11	+ if [[ -z "$N" ]]; then
	12	+ case $this_script in
	13	+ *linux-libc-headers)
	14	+ PACO_NUM=`echo $this_script \| sed -e 's/linux-libc-headers/a-paco/'`
	15	+ wrt_paco_inst "$PACO_NUM" ;;
	16	+ esac
	17	+ fi
[6821737]	18	+
[4795dfb]	19	# Grab the name of the target
	20	name=`echo ${this_script} \| sed -e 's@[0-9]\{3\}-@@'`
	21
	22	@@ -225,7 +235,9 @@
[059822c]	23	# and not to use chroot.
	24	case "${this_script}" in
	25	*kernfs) wrt_run_as_root "${this_script}" "$file" ;;
	26	- *) wrt_run_as_chroot1 "${this_script}" "$file" ;;
	27	+ *) wrt_paco_prep
	28	+ wrt_run_as_chroot1 "${this_script}" "$file"
	29	+ wrt_paco_log "$name" "$vrs" ;;
	30	esac
	31
	32	# Remove the build directory(ies) except if the package build fails.
[4795dfb]	33	@@ -245,6 +257,14 @@
	34	PREV=${this_script}${N}
	35	# Set system_build envar for iteration targets
	36	system_build=$chapter6
[059822c]	37	+
[6821737]	38	+ # Reinstalling paco after readsjusting the toolchain.
[059822c]	39	+ case "${this_script}" in
[6821737]	40	+ *readjusting)
	41	+ PACO_NUM=`echo ${this_script} \| sed -e 's/readjusting/x-paco/'`
	42	+ wrt_paco_inst "$PACO_NUM" ;;
[059822c]	43	+ esac
	44	+
	45	done # end for file in chapter06/*
	46	}
	47
[4795dfb]	48	@@ -306,6 +326,14 @@
[059822c]	49	wrt_run_as_chroot2 "$this_script" "$file"
	50	fi
	51	;;
	52	+ *kernel) wrt_paco_prep
	53	+ wrt_run_as_chroot2 "$this_script" "$file"
	54	+ wrt_paco_log "linux-kernel" "$vrs"
	55	+ ;;
	56	+ *bootscripts) wrt_paco_prep
	57	+ wrt_run_as_chroot2 "$this_script" "$file"
	58	+ wrt_paco_log "lfs-bootscripts" "$vrs"
	59	+ ;;
	60	*) wrt_run_as_chroot2 "$this_script" "$file"
	61	;;
	62	esac
	63	Index: LFS/lfs.xsl
	64	===================================================================
[4795dfb]	65	--- LFS/lfs.xsl (revision 2598)
[059822c]	66	+++ LFS/lfs.xsl (working copy)
	67	@@ -32,6 +32,9 @@
	68	<!-- Locale settings -->
	69	<xsl:param name="lang" select="en_CA"/>
	70
	71	+ <!-- Use paco? -->
	72	+ <xsl:param name="use_paco" select="1"/>
	73	+
	74	<xsl:template match="/">
	75	<xsl:apply-templates select="//sect1"/>
	76	</xsl:template>
	77	@@ -190,6 +193,33 @@
	78	<xsl:apply-templates/>
	79	<xsl:text> \|\| true </xsl:text>
	80	</xsl:when>
	81	+ <!-- paco begin -->
	82	+ <!-- General rule -->
	83	+ <xsl:when test="$use_paco != '0' and
	84	+ ancestor::chapter[@id != 'chapter-temporary-tools'] and
	85	+ contains(string(),'make') and
	86	+ contains(string(),'install')">
	87	+ <xsl:text>export LD_PRELOAD=/usr/lib/libpaco-log.so </xsl:text>
	88	+ <xsl:apply-templates/>
	89	+ <xsl:text> </xsl:text>
	90	+ </xsl:when>
	91	+ <!-- Linux-libc-headers -->
	92	+ <xsl:when test="$use_paco != '0' and
	93	+ ancestor::sect1[@id='ch-system-linux-libc-headers'] and
	94	+ contains(string(),'install ')">
	95	+ <xsl:text>export LD_PRELOAD=/usr/lib/libpaco-log.so </xsl:text>
	96	+ <xsl:apply-templates/>
	97	+ <xsl:text> </xsl:text>
	98	+ </xsl:when>
	99	+ <!-- Unset LD_PRELOAD before second make in Zlib -->
	100	+ <xsl:when test="$use_paco != '0' and
	101	+ ancestor::sect1[@id='ch-system-zlib'] and
	102	+ contains(string(),'make clean')">
	103	+ <xsl:text>unset LD_PRELOAD </xsl:text>
	104	+ <xsl:apply-templates/>
	105	+ <xsl:text> </xsl:text>
	106	+ </xsl:when>
	107	+ <!-- paco end -->
	108	<!-- The rest of commands -->
	109	<xsl:otherwise>
	110	<xsl:apply-templates/>
	111	Index: BLFS/master.sh
	112	===================================================================
[4795dfb]	113	--- BLFS/master.sh (revision 2598)
[059822c]	114	+++ BLFS/master.sh (working copy)
	115	@@ -79,6 +79,19 @@
	116	EOF
	117	) >> $MKFILE
	118
	119	+ if [[ $USE_PACO != 0 ]]; then
	120	+(
	121	+ cat << EOF
	122	+ @echo -e "\n\`date\`\n\nKB: \`du -sk --exclude=logs/* /\`\n" >logs/$this_script && \\
	123	+ source $JHALFSDIR/pacovars && \\
	124	+ rm -f $PACO_TMPFILE && \\
	125	+ $JHALFSDIR/${PROGNAME}-commands/$file >>logs/$this_script 2>&1 && \\
	126	+ echo -e "\n\`date\`\n\nKB: \`du -sk --exclude=logs/* /\`\n" >>logs/$this_script
	127	+EOF
	128	+) >> $MKFILE
	129	+ wrt_paco_log_blfs
	130	+
	131	+ else
	132	# Insert date and disk usage at the top of the log file, the script run
	133	# and date and disk usage again at the bottom of the log file.
	134	(
	135	Index: BLFS/blfs.xsl
	136	===================================================================
[4795dfb]	137	--- BLFS/blfs.xsl (revision 2598)
[059822c]	138	+++ BLFS/blfs.xsl (working copy)
	139	@@ -159,7 +159,7 @@
	140	<xsl:when test="@role = 'nodump'"/>
	141	<xsl:otherwise>
	142	<xsl:if test="@role = 'root'">
	143	- <xsl:text>sudo </xsl:text>
	144	+ <xsl:text>export LD_PRELOAD=/usr/lib/libpaco-log.so </xsl:text>
	145	</xsl:if>
	146	<xsl:apply-templates select="userinput" mode="screen"/>
	147	</xsl:otherwise>
	148	Index: common/config
	149	===================================================================
[4795dfb]	150	--- common/config (revision 2598)
[059822c]	151	+++ common/config (working copy)
[4795dfb]	152	@@ -75,6 +75,14 @@
	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
	159	+PACO_VERSION=1.10.4
	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
	167	@@ -87,3 +95,9 @@
	168
	169	#--- farce report log directory
	170	FARCELOGDIR=$LOGDIR/farce
	171	+
	172	+#--- Variables needed by paco
[059822c]	173	+PACO_INCLUDE=/
[4795dfb]	174	+PACO_EXCLUDE=/sys:/dev:/proc:/tmp:/usr/src:/usr/share/info/dir:/jhalfs
[059822c]	175	+PACO_TMPFILE=/tmp/paco.tmp
	176	+LD_PRELOAD=/usr/lib/libpaco-log.so
	177	Index: common/func_validate_configs.sh
	178	===================================================================
[4795dfb]	179	--- common/func_validate_configs.sh (revision 2598)
[059822c]	180	+++ common/func_validate_configs.sh (working copy)
[4795dfb]	181	@@ -84,10 +84,10 @@
[059822c]	182	inline_doc
	183
	184	# First internal variables, then the ones that change the book's flavour, and lastly system configuration variables
[3ab7be7]	185	- local -r blfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG DEPEND TEST"
[4795dfb]	186	- local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE MODEL GRSECURITY_HOST TEST REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG KEYMAP PAGE TIMEZONE LANG LC_ALL"
	187	- local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE METHOD ARCH TARGET TEST REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG KEYMAP VIMLANG PAGE TIMEZONE LANG"
	188	- local -r lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE TEST REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG VIMLANG PAGE TIMEZONE LANG"
	189	+ local -r blfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO HPKG DEPEND TEST"
	190	+ local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO HPKG RUNMAKE MODEL GRSECURITY_HOST TEST REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG KEYMAP PAGE TIMEZONE LANG LC_ALL"
	191	+ local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO HPKG RUNMAKE METHOD ARCH TARGET TEST REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG KEYMAP VIMLANG PAGE TIMEZONE LANG"
	192	+ local -r lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO HPKG RUNMAKE TEST REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG VIMLANG PAGE TIMEZONE LANG"
[059822c]	193
	194	local -r ERROR_MSG_pt1='The variable \"${L_arrow}${config_param}${R_arrow}\" value ${L_arrow}${BOLD}${!config_param}${R_arrow} is invalid,'
	195	local -r ERROR_MSG_pt2=' check the config file ${BOLD}${GREEN}\<$(echo $PROGNAME \| tr [a-z] [A-Z])/config\> or \<common/config\>${OFF}'
[4795dfb]	196	@@ -179,6 +179,7 @@
	197	# Validate general parameters..
	198	HPKG) validate_against_str "x0x x1x" ;;
	199	RUNMAKE) validate_against_str "x0x x1x" ;;
	200	+ USE_PACO) validate_against_str "x0x x1x" ;;
	201	REPORT) validate_against_str "x0x x1x"
	202	if [[ "${!config_param}" = "1" ]]; then
	203	if [[ `type -p bc` ]]; then
[059822c]	204	Index: common/paco-functions
	205	===================================================================
	206	--- common/paco-functions (revision 0)
	207	+++ common/paco-functions (revision 0)
[6821737]	208	@@ -0,0 +1,112 @@
[059822c]	209	+#!/bin/bash
	210	+
	211	+
	212	+#----------------------------#
	213	+wrt_paco_inst() { #
	214	+#----------------------------#
[d748b31]	215	+
	216	+# Not using Paco with uClibc, even if requested
	217	+if [ $PROGNAME = "hlfs" ]; then
	218	+ if [ $MODEL = "uclibc" ]; then
[6821737]	219	+ USE_PACO=0
[d748b31]	220	+ fi
	221	+fi
	222	+
	223	+if [ $USE_PACO != 0 ]; then
[6821737]	224	+ paco_script="$1"
	225	+ paco_file="chapter06/$paco_script"
	226	+ chapter6="$chapter6 $paco_script"
	227	+
	228	+ # Copy the paco build script to the correct directory and make it executable
	229	+ cp $JHALFSDIR/paco-build.sh $JHALFSDIR/${PROGNAME}-commands/$paco_file &&
	230	+ chmod +x $JHALFSDIR/${PROGNAME}-commands/$paco_file
[059822c]	231	+
	232	+ # Write target, dependency and unpack
[6821737]	233	+ wrt_target "$paco_script" "$PREV"
[059822c]	234	+ wrt_unpack2 "$PACO_FILE"
	235	+
	236	+ # Run the script
[6821737]	237	+ wrt_run_as_chroot1 "${paco_script}" "${paco_file}"
[059822c]	238	+
	239	+ # Clean up
[6821737]	240	+ wrt_remove_build_dirs "paco"
[059822c]	241	+ echo -e '\t@touch $@' >> $MKFILE.tmp
	242	+
	243	+ # Override the PREV variable
[6821737]	244	+ PREV="$paco_script"
[059822c]	245	+fi
	246	+}
	247	+
	248	+
	249	+#----------------------------------#
	250	+wrt_paco_prep() { # Export Paco variables
	251	+#----------------------------------# and remove tmpfile
[d748b31]	252	+
	253	+# Not using Paco with uClibc, even if requested
	254	+if [ $PROGNAME = "hlfs" ]; then
	255	+ if [ $MODEL = "uclibc" ]; then
[6821737]	256	+ USE_PACO=0
[d748b31]	257	+ fi
	258	+fi
	259	+
	260	+if [ $USE_PACO != 0 ] && [ "$vrs" != "" ]; then
[059822c]	261	+(
	262	+cat << EOF
	263	+ @echo "export PACO_INCLUDE=$PACO_INCLUDE" >> envars && \\
	264	+ echo "export PACO_EXCLUDE=\$(SRC):$JHALFSDIR:$PACO_EXCLUDE" >> envars && \\
	265	+ echo "export PACO_TMPFILE=$PACO_TMPFILE" >> envars && \\
	266	+ rm -f \$(MOUNT_PT)$PACO_TMPFILE
	267	+EOF
	268	+) >> $MKFILE.tmp
	269	+fi
	270	+}
	271	+
	272	+
	273	+#----------------------------------#
	274	+wrt_paco_log() { # If the tmpfile exist, then log the current package
	275	+#----------------------------------# and remove tempfile
[d748b31]	276	+local PACKAGE
	277	+
	278	+# Allow packages to be logged without version
	279	+if [[ $2 != "" ]] ; then
	280	+ PACKAGE="$1-$2";
	281	+else
	282	+ PACKAGE="$1"
	283	+fi
[059822c]	284	+
[d748b31]	285	+# Not using Paco with uClibc, even if requested
	286	+if [ $PROGNAME = "hlfs" ]; then
	287	+ if [ $MODEL = "uclibc" ]; then
[6821737]	288	+ USE_PACO=0
[059822c]	289	+ fi
[d748b31]	290	+fi
[059822c]	291	+
[d748b31]	292	+if [ $USE_PACO != 0 ] && [ "$vrs" != "" ]; then
[059822c]	293	+(
	294	+cat << EOF
	295	+ @if [ -e \$(MOUNT_PT)$PACO_TMPFILE ]; then \\
[4795dfb]	296	+ \$(CHROOT1) 'paco -lp+ $PACKAGE < $PACO_TMPFILE' && \\
[059822c]	297	+ rm -f \$(MOUNT_PT)$PACO_TMPFILE; \\
	298	+ fi;
	299	+EOF
	300	+) >> $MKFILE.tmp
	301	+fi
	302	+}
	303	+
	304	+
	305	+#----------------------------------#
	306	+wrt_paco_log_blfs() { # If the tmpfile exist, then log the current package
	307	+#----------------------------------# and remove tempfile
	308	+if [ $USE_PACO != 0 ] ; then
	309	+(
	310	+cat << EOF
	311	+ @PACKAGE=\`head -n1 /tmp/unpacked \| sed 's@^./@@;s@/.*@@'\` && \\
	312	+ if [ -e $PACO_TMPFILE ]; then \\
[d748b31]	313	+ paco -lp \$\$PACKAGE < $PACO_TMPFILE && \\
[059822c]	314	+ rm -f $PACO_TMPFILE; \\
	315	+ fi;
	316	+EOF
	317	+) >> $MKFILE
	318	+fi
	319	+}
	320	+
[6821737]	321	Index: common/paco-build.sh
	322	===================================================================
	323	--- common/paco-build.sh (revision 0)
	324	+++ common/paco-build.sh (revision 0)
	325	@@ -0,0 +1,9 @@
	326	+#!/bin/sh
	327	+set -e
	328	+
	329	+cd $PKGDIR
	330	+./configure --disable-gpaco \
	331	+ --sysconfdir=/etc &&
	332	+make &&
	333	+make install &&
	334	+make logme
[059822c]	335	Index: common/common-functions
	336	===================================================================
[4795dfb]	337	--- common/common-functions (revision 2598)
[059822c]	338	+++ common/common-functions (working copy)
[4795dfb]	339	@@ -59,6 +59,9 @@
[059822c]	340	in the configuration file has the proper packages and patches for the
	341	book version being processed.
	342
	343	+${BOLD} --no-paco${OFF}
	344	+ dissables paco logging feature.
	345	+
	346	${BOLD} -T, --testsuites N ${OFF}
	347	Run test suites [0-3]
	348	0 = none
[4795dfb]	349	@@ -630,6 +633,7 @@
[059822c]	350	--stringparam lc_all $LC_ALL \
	351	--stringparam keymap $KEYMAP \
	352	--stringparam grsecurity_host $GRSECURITY_HOST \
	353	+ --stringparam use_paco $USE_PACO \
	354	-o ./${PROGNAME}-commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1
	355	;;
	356	lfs)
[4795dfb]	357	@@ -641,6 +645,7 @@
[059822c]	358	--stringparam timezone $TIMEZONE \
	359	--stringparam page $PAGE \
	360	--stringparam lang $LANG \
	361	+ --stringparam use_paco $USE_PACO \
	362	-o ./${PROGNAME}-commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1
	363	;;
	364	blfs)
	365	Index: HLFS/hlfs.xsl
	366	===================================================================
[4795dfb]	367	--- HLFS/hlfs.xsl (revision 2598)
[059822c]	368	+++ HLFS/hlfs.xsl (working copy)
	369	@@ -39,6 +39,9 @@
	370	<xsl:param name="lang" select="en_CA"/>
	371	<xsl:param name="lc_all" select="en_CA"/>
	372
	373	+ <!-- Use paco? -->
	374	+ <xsl:param name="use_paco" select="1"/>
	375	+
	376	<xsl:template match="/">
	377	<xsl:apply-templates select="//sect1"/>
	378	</xsl:template>
	379	@@ -191,6 +194,10 @@
	380	<!-- Fixing bootscripts installation -->
	381	<xsl:when test="ancestor::sect1[@id='bootable-bootscripts'] and
	382	string() = 'make install'">
	383	+ <!-- inserting LD_PRELOAD before installing bootscripts -->
	384	+ <xsl:if test="$use_paco != '0' and $model != 'uclibc'">
	385	+ <xsl:text>export LD_PRELOAD=/usr/lib/libpaco-log.so </xsl:text>
	386	+ </xsl:if>
	387	<xsl:text>make install </xsl:text>
	388	<xsl:text>cd ../blfs-bootscripts-&blfs-bootscripts-version; </xsl:text>
	389	</xsl:when>
	390	@@ -248,6 +255,25 @@
	391	<xsl:apply-templates/>
	392	<xsl:text> \|\| true </xsl:text>
	393	</xsl:when>
	394	+ <!-- paco begin -->
	395	+ <!-- General rule -->
	396	+ <xsl:when test="$use_paco != '0' and $model != 'uclibc' and
	397	+ ancestor::chapter[@id != 'chapter-temporary-tools'] and
	398	+ contains(string(),'make') and
	399	+ contains(string(),'install')">
	400	+ <xsl:text>export LD_PRELOAD=/usr/lib/libpaco-log.so </xsl:text>
	401	+ <xsl:apply-templates/>
	402	+ <xsl:text> </xsl:text>
	403	+ </xsl:when>
	404	+ <!-- Linux-libc-headers -->
	405	+ <xsl:when test="$use_paco != '0' and $model != 'uclibc' and
	406	+ ancestor::sect1[@id='ch-system-linux-libc-headers'] and
	407	+ contains(string(),'install ')">
	408	+ <xsl:text>export LD_PRELOAD=/usr/lib/libpaco-log.so </xsl:text>
	409	+ <xsl:apply-templates/>
	410	+ <xsl:text> </xsl:text>
	411	+ </xsl:when>
	412	+ <!-- paco end -->
	413	<!-- The rest of commands -->
	414	<xsl:otherwise>
	415	<xsl:apply-templates/>
	416	Index: HLFS/master.sh
	417	===================================================================
[4795dfb]	418	--- HLFS/master.sh (revision 2598)
[059822c]	419	+++ HLFS/master.sh (working copy)
[4795dfb]	420	@@ -342,6 +342,16 @@
	421	-stripping ) [[ "$STRIP" = "0" ]] && continue ;;
[6821737]	422	esac
	423
[4795dfb]	424	+ # Install paco as the first package in ch6, before installing
	425	+ # linux-libc-headers, except in iterartive builds
	426	+ if [[ -z "$N" ]]; then
	427	+ case $this_script in
	428	+ *linux-libc-headers)
	429	+ PACO_NUM=`echo $this_script \| sed -e 's/linux-libc-headers/a-paco/'`
	430	+ wrt_paco_inst "$PACO_NUM" ;;
	431	+ esac
	432	+ fi
[6821737]	433	+
[4795dfb]	434	# Grab the name of the target
	435	name=`echo $this_script \| sed -e 's@[0-9]\{3\}-@@'`
	436
	437	@@ -411,7 +421,9 @@
[059822c]	438	wrt_run_as_root "${this_script}" "${file}"
	439	;;
	440	*) # The rest of Chapter06
	441	+ wrt_paco_prep
	442	wrt_run_as_chroot1 "${this_script}" "${file}"
	443	+ wrt_paco_log "$name" "$vrs"
	444	;;
	445	esac
	446	#
[4795dfb]	447	@@ -444,6 +456,14 @@
	448	PREV=${this_script}${N}
	449	# Set system_build envar for iteration targets
	450	system_build=$chapter6
[059822c]	451	+
[6821737]	452	+ # Reinstall paco after the toolchain has been readjusted.
[059822c]	453	+ case "${this_script}" in
[6821737]	454	+ *readjusting)
	455	+ PACO_NUM=`echo $this_script \| sed -e 's/readjusting/x-paco/'`
	456	+ wrt_paco_inst "$PACO_NUM" ;;
[059822c]	457	+ esac
	458	+
	459	done # end for file in chapter06/*
	460
	461	}
[4795dfb]	462	@@ -506,6 +526,15 @@
[059822c]	463	wrt_run_as_chroot2 "${this_script}" "${file}"
	464	fi
	465	;;
	466	+ *kernel) wrt_paco_prep
	467	+ wrt_run_as_chroot2 "$this_script" "$file"
	468	+ version=`grep "^linux-version" $JHALFSDIR/packages \| sed -e 's/.* //' -e 's/"//g'`
	469	+ wrt_paco_log "linux-kernel" "$version"
	470	+ ;;
	471	+ *bootscripts) wrt_paco_prep
	472	+ wrt_run_as_chroot2 "$this_script" "$file"
	473	+ wrt_paco_log "hlfs-bootscripts"
	474	+ ;;
	475	*) # All other scripts
	476	wrt_run_as_chroot2 "${this_script}" "${file}"
	477	;;
[d748b31]	478	Index: master.sh
	479	===================================================================
[4795dfb]	480	--- master.sh (revision 2598)
[d748b31]	481	+++ master.sh (working copy)
[4795dfb]	482	@@ -70,6 +70,11 @@
[d748b31]	483	source $MODULE
	484	[[ $? > 0 ]] && echo "$MODULE did not load.." && exit 2
	485	[[ $VERBOSITY > 0 ]] && echo "OK"
	486	+# Load paco-functions
	487	+[[ $VERBOSITY > 0 ]] && echo -n "Loading paco module..."
	488	+source $COMMON_DIR/paco-functions
	489	+[[ $? > 0 ]] && echo "$COMMON_DIR/paco-functions did not load.." && exit 2
	490	+[[ $VERBOSITY > 0 ]] && echo "OK"
	491	#
	492	[[ $VERBOSITY > 0 ]] && echo "---------------${nl_}"
	493
[4795dfb]	494	@@ -152,6 +157,8 @@
[d748b31]	495
	496	--help \| -h ) usage \| more && exit ;;
	497
	498	+ --no-paco ) USE_PACO=0 ;;
	499	+
	500	--testsuites \| -T )
	501	test $# = 1 && eval "$exit_missing_arg"
	502	shift
[4795dfb]	503	@@ -480,6 +487,15 @@
[d748b31]	504
	505	if [[ "$PWD" != "$JHALFSDIR" ]]; then
	506	cp $COMMON_DIR/makefile-functions $JHALFSDIR/
	507	+ if [[ $USE_PACO != "0" ]] ; then
	508	+ if [[ $PROGNAME != "blfs" ]]; then
	509	+ cp $COMMON_DIR/paco-build.sh $JHALFSDIR/
	510	+ else
	511	+ echo -e "export PACO_INCLUDE=$PACO_INCLUDE" > $JHALFSDIR/pacovars
	512	+ echo -e "export PACO_EXCLUDE=~/sources:$JHALFSDIR:$PACO_EXCLUDE" >> $JHALFSDIR/pacovars
	513	+ echo -e "export PACO_TMPFILE=$PACO_TMPFILE" >> $JHALFSDIR/pacovars
	514	+ fi
	515	+ fi
[4795dfb]	516	if [[ "$COMPARE" != "0" ]] ; then
	517	mkdir -p $JHALFSDIR/extras
	518	cp extras/* $JHALFSDIR/extras

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

Download in other formats: