From owner-cvs-src@FreeBSD.ORG Thu Jul 27 13:34:13 2006 Return-Path: X-Original-To: cvs-src@freebsd.org Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EEA1516A4E0; Thu, 27 Jul 2006 13:34:13 +0000 (UTC) (envelope-from corecode@fs.ei.tum.de) Received: from stella.fs.ei.tum.de (stella.fs.ei.tum.de [129.187.54.7]) by mx1.FreeBSD.org (Postfix) with ESMTP id 574B743D60; Thu, 27 Jul 2006 13:34:07 +0000 (GMT) (envelope-from corecode@fs.ei.tum.de) Received: from localhost (localhost [127.0.0.1]) by localhost.fs.ei.tum.de (Postfix) with ESMTP id 33C188D2EF; Thu, 27 Jul 2006 15:34:06 +0200 (CEST) Received: from stella.fs.ei.tum.de ([127.0.0.1]) by localhost (stella [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 27851-04-2; Thu, 27 Jul 2006 15:34:05 +0200 (CEST) Received: from [84.155.226.213] (p549BE2D5.dip.t-dialin.net [84.155.226.213]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by stella.fs.ei.tum.de (Postfix) with ESMTP id E03898C3FD; Thu, 27 Jul 2006 15:34:04 +0200 (CEST) Message-ID: <44C8C0C8.4090906@fs.ei.tum.de> Date: Thu, 27 Jul 2006 15:34:00 +0200 From: Simon 'corecode' Schubert User-Agent: Mail/News 1.5.0.4 (X11/20060619) MIME-Version: 1.0 To: "M. Warner Losh" References: <200607241340.00106.jhb@freebsd.org> <20060725034147.GB68567@dragon.NUXI.org> <200607251229.17862.jhb@freebsd.org> <20060725.113631.58461185.imp@bsdimp.com> In-Reply-To: <20060725.113631.58461185.imp@bsdimp.com> X-Enigmail-Version: 0.94.0.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enigA7DE94CFEC53D6FA533A9C96" X-Virus-Scanned: by amavisd-new at fs.ei.tum.de Cc: obrien@freebsd.org, cvs-src@freebsd.org, src-committers@freebsd.org, cvs-all@freebsd.org, jhb@freebsd.org Subject: Re: cvs commit: src/share/mk bsd.cpu.mk X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 13:34:14 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enigA7DE94CFEC53D6FA533A9C96 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable M. Warner Losh wrote: > We need to find some way to accomplish having local changes in the > tree that doesn't screw new imports. Maybe I am missing something important here, but where is the problem wit= h modifying files and taking them off the vendor branch? Situation 1: the vendor sources don't include the feature that is implem= ented in the local changes. -> The file needs to stay off the vendor bra= nch. Situation 2: the vendor sources integrated the modifications and these s= ources and the local (off-vendor-branch) sources are the same. -> just p= ut the file on the vendor branch again (basically cvs admin -b1.1.1) another interim solution is the way we are handling it for DragonFly: ha= ve patches somewhere else and apply them automatically during the build p= rocess (we have a bsd.patch.mk for that. just set SRCS+=3D file1.c.patch= file2.c.patch) Not sure if you are referencing this, of course cheers simon --=20 Serve - BSD +++ RENT this banner advert +++ ASCII Ribbon /"\ Work - Mac +++ space for low =E2=82=AC=E2=82=AC=E2=82=AC NOW!1 +++= Campaign \ / Party Enjoy Relax | http://dragonflybsd.org Against HTML \ Dude 2c 2 the max ! http://golden-apple.biz Mail + News / \ --------------enigA7DE94CFEC53D6FA533A9C96 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.3 (DragonFly) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFEyMDLr5S+dk6z85oRAqKRAKDAhkVSA7sKfGwHmreq5wWuMBM0wQCgrVI9 A4/uT51xp0N+wAzTGxBVye0= =BIdY -----END PGP SIGNATURE----- --------------enigA7DE94CFEC53D6FA533A9C96--