From owner-cvs-all@FreeBSD.ORG Thu Jan 15 03:01:36 2004 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C0D8316A4D0; Thu, 15 Jan 2004 03:01:36 -0800 (PST) Received: from castle.jp.FreeBSD.org (castle.jp.FreeBSD.org [210.226.20.15]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6024D43D9E; Thu, 15 Jan 2004 03:00:42 -0800 (PST) (envelope-from matusita@jp.FreeBSD.org) Received: from localhost (localhost [::1]) ESMTP/inet6 id i0FAxbC56594; Thu, 15 Jan 2004 19:59:37 +0900 (JST) (envelope-from matusita@jp.FreeBSD.org) In-Reply-To: <20040115083715.GA79312@FreeBSD.org.ua> References: <20040114185923.GC73318@FreeBSD.org.ua> <20040115111124W.matusita@jp.FreeBSD.org> <20040115083715.GA79312@FreeBSD.org.ua> X-User-Agent: Mew/1.94.2 Emacs/21.3 X-FaceAnim: (-O_O-)(O_O- )(_O- )(O- )(- -)( -O)( -O_)( -O_O)(-O_O-) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Dispatcher: imput version 20030322(IM144) Lines: 32 From: Makoto Matsushita To: ru@FreeBSD.org Date: Thu, 15 Jan 2004 19:59:35 +0900 Message-Id: <20040115195935S.matusita@jp.FreeBSD.org> cc: matusita@jp.FreeBSD.org cc: cvs-src@FreeBSD.org cc: src-committers@FreeBSD.org cc: cvs-all@FreeBSD.org cc: nyan@FreeBSD.org Subject: Re: cvs commit: src/release Makefile X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Jan 2004 11:01:36 -0000 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} + echo " /etc/rc.d/ldconfig start" >> ${_MK} + echo "else" >> ${_MK} + echo " ldconfig /lib /usr/lib /usr/local/lib" >> ${_MK} + echo "fi" >> ${_MK} echo "if [ ! -f /tmp/.world_done ]; then" >> ${_MK} echo " cd /usr/src" >> ${_MK} echo " ${CROSSMAKE} ${WORLD_FLAGS} -DNOCLEAN buildworld && \\" >> ${_MK} Or simply backout the delta that introduced to use a rcng script? -- - Makoto `MAR' Matsushita