From owner-freebsd-current@FreeBSD.ORG Sun Jul 13 08:32:43 2003 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EDABE37B401; Sun, 13 Jul 2003 08:32:43 -0700 (PDT) Received: from kientzle.com (h-66-166-149-50.SNVACAID.covad.net [66.166.149.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id 389B843F75; Sun, 13 Jul 2003 08:32:42 -0700 (PDT) (envelope-from kientzle@acm.org) Received: from acm.org (ugly.x.kientzle.com [66.166.149.53]) by kientzle.com (8.12.9/8.12.9) with ESMTP id h6DFWAgY024633; Sun, 13 Jul 2003 08:32:11 -0700 (PDT) (envelope-from kientzle@acm.org) Message-ID: <3F117C26.7080100@acm.org> Date: Sun, 13 Jul 2003 08:35:02 -0700 From: Tim Kientzle User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.0.1) Gecko/20021005 X-Accept-Language: en-us, en MIME-Version: 1.0 To: Bruce Evans References: <20030712165749.GA14599@colocall.net> <3F104A71.7060906@acm.org> <3F105499.BC7768C0@mindspring.com> <3F10576E.3060904@acm.org> <20030713095642.B1771@gamplex.bde.org> <3F10B60C.3000106@acm.org> <20030713123229.A2435@gamplex.bde.org> Content-Type: multipart/mixed; boundary="------------000702050209080300050405" cc: jmallett@freebsd.org cc: freebsd-current@freebsd.org cc: Andrey Elperin Subject: Re: make release of CURRENT on 4.7 box X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: kientzle@acm.org List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jul 2003 15:32:44 -0000 This is a multi-part message in MIME format. --------------000702050209080300050405 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Bruce Evans wrote: > On Sat, 12 Jul 2003, Tim Kientzle wrote: >>In particular, newvers.sh is being run with the >>current directory being ${.OBJDIR}, and ${.OBJDIR} >>doesn't contain a Makefile, ... > > ... `make -V FOO' doesn't require a Makefile in -current. ... A-HA! >>I don't know the "right" way to fix this ... > > I think splitting it or making it exit after just setting variables > in the userland case is the right fix. ... I think you're right, but don't see a very simple way to make that work, especially given the surprising number of places that newvers.sh is used. However, the following one-line patch does work; it simply creates enough of a Makefile to silence make's warnings. Needs testing under -CURRENT, but I'm pretty confident it will work there as well. If someone could test this under -CURRENT and commit it, those of us doing 4.x->CURRENT cross-builds would greatly appreciate it. Tim --------------000702050209080300050405 Content-Type: text/plain; name="kientzle_include_Makefile.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="kientzle_include_Makefile.diff" Index: include/Makefile =================================================================== RCS file: /usr/cvs/FreeBSD-CVS/src/include/Makefile,v retrieving revision 1.204 diff -u -r1.204 Makefile --- include/Makefile 4 Jul 2003 19:54:06 -0000 1.204 +++ include/Makefile 13 Jul 2003 05:43:33 -0000 @@ -51,11 +51,17 @@ INCS+= osreldate.h +# The use of 'newvers.sh' here is kind of bogus, because +# it creates some additional files and does a few other odd +# things. The 'touch Makefile' here allows newvers.sh to +# run on 4.x, whose 'make' requires a Makefile for '-V KERN_IDENT' +# osreldate.h: ${.CURDIR}/../sys/conf/newvers.sh \ ${.CURDIR}/../sys/sys/param.h \ ${.CURDIR}/Makefile @${ECHO} creating osreldate.h from newvers.sh @setvar PARAMFILE ${.CURDIR}/../sys/sys/param.h; \ + echo default: > Makefile; \ . ${.CURDIR}/../sys/conf/newvers.sh; \ echo "$$COPYRIGHT" > osreldate.h; \ echo "#ifdef _KERNEL" >> osreldate.h; \ --------------000702050209080300050405--