Date: Thu, 27 Jul 2006 15:34:00 +0200 From: Simon 'corecode' Schubert <corecode@fs.ei.tum.de> To: "M. Warner Losh" <imp@bsdimp.com> 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 Message-ID: <44C8C0C8.4090906@fs.ei.tum.de> In-Reply-To: <20060725.113631.58461185.imp@bsdimp.com> References: <200607241340.00106.jhb@freebsd.org> <20060725034147.GB68567@dragon.NUXI.org> <200607251229.17862.jhb@freebsd.org> <20060725.113631.58461185.imp@bsdimp.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] 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 with modifying files and taking them off the vendor branch? Situation 1: the vendor sources don't include the feature that is implemented in the local changes. -> The file needs to stay off the vendor branch. Situation 2: the vendor sources integrated the modifications and these sources and the local (off-vendor-branch) sources are the same. -> just put 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: have patches somewhere else and apply them automatically during the build process (we have a bsd.patch.mk for that. just set SRCS+= file1.c.patch file2.c.patch) Not sure if you are referencing this, of course cheers simon -- Serve - BSD +++ RENT this banner advert +++ ASCII Ribbon /"\ Work - Mac +++ space for low €€€ NOW!1 +++ Campaign \ / Party Enjoy Relax | http://dragonflybsd.org Against HTML \ Dude 2c 2 the max ! http://golden-apple.biz Mail + News / \ [-- Attachment #2 --] -----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-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?44C8C0C8.4090906>