cvs commit: src/release Makefile

[Ruslan Ermilov]

On Thu, Jan 15, 2004 at 07:59:35PM +0900, Makoto Matsushita wrote:
> 
> ru> It's possible to have a RELENG_4 box (with RELENG_4 /usr/src and
> ru> /usr/obj matching the running version), and build a release
> ru> snapshot of HEAD.
> 
> Hmm, I've just got what you meant, sorry.  How about this patch?:
> 
> Index: Makefile
> ===================================================================
> RCS file: /home/ncvs/src/release/Makefile,v
> retrieving revision 1.829
> diff -u -r1.829 Makefile
> --- Makefile	15 Jan 2004 10:17:43 -0000	1.829
> +++ Makefile	15 Jan 2004 10:57:54 -0000
> @@ -459,7 +459,11 @@
>  	# NB: these may fail if the host is running w/o devfs
>  	echo "umount /dev >/dev/null 2>&1 || true" >> ${_MK}
>  	echo "mount -t devfs devfs /dev >/dev/null 2>&1 || true"	>> ${_MK}
> -	echo "/etc/rc.d/ldconfig start"		>> ${_MK}
> +	echo "if [ -f /etc/rc.d/ldconfig ]; then" >> ${_MK}
> 
-x would be better.

> +	echo "  /etc/rc.d/ldconfig start"	>> ${_MK}
> +	echo "else"				>> ${_MK}
> +	echo "  ldconfig /lib /usr/lib /usr/local/lib" >> ${_MK}
> 
Add ``|| true''.  The /lib may not exist, and while it's only
a warning in the current version of ldconfig(8), you cannot
be sure that the exit status will always be 0.

> +	echo "fi"				>> ${_MK}
>  	echo "if [ ! -f /tmp/.world_done ]; then" >> ${_MK}
>  	echo "	cd /usr/src"			>> ${_MK}
>  	echo "	${CROSSMAKE} ${WORLD_FLAGS} -DNOCLEAN buildworld && \\" >> ${_MK}
> 
Otherwise looks OK.

> Or simply backout the delta that introduced to use a rcng script?
> 
Um, why?  This shouldn't stop the progress.  ;)


Cheers,
-- 
Ruslan Ermilov
FreeBSD committer
ru at FreeBSD.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/cvs-src/attachments/20040115/62e0d456/attachment.bin