cvs commit: src/share/mk bsd.cpu.mk

Thu Jul 27 13:34:14 UTC 2006

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   / \

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 252 bytes
Desc: OpenPGP digital signature
Url : http://lists.freebsd.org/pipermail/cvs-src/attachments/20060727/4dc1764c/signature.pgp