Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 23 Jan 2012 14:13:49 -0500
From:      Maxim Khitrov <max@mxcrypt.com>
To:        Matthew Seaman <m.seaman@infracaninophile.co.uk>
Cc:        freebsd-questions@freebsd.org
Subject:   Re: Applying local patches after updating FreeBSD source
Message-ID:  <CAJcQMWdskC0kMw28Q%2BYTL8TJSOWOt5iwTFQviH-xPXbo2g-WBQ@mail.gmail.com>
In-Reply-To: <4F1DA620.4040207@infracaninophile.co.uk>
References:  <CAJcQMWeYb8joYx7tPCcCqDEhXAKmzucNpHjO5YNrAxTN_jze3w@mail.gmail.com> <4F1DA620.4040207@infracaninophile.co.uk>

next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, Jan 23, 2012 at 1:25 PM, Matthew Seaman
<m.seaman@infracaninophile.co.uk> wrote:
> On 23/01/2012 18:03, Maxim Khitrov wrote:
>> Hi all,
>>
>> When I need to apply a custom patch to a port, I can set EXTRA_PATCHES
>> make variable in /usr/local/etc/ports.conf (when using portconf), and
>> the patch will be automatically applied whenever that port is built.
>> Is there equivalent functionality for building FreeBSD world and
>> kernel?
>>
>> When I run 'make update' in /usr/src, csup overwrites all local
>> changes. There is a LOCAL_PATCHES variable, but it seems to apply only
>> to 'make release'.
>>
>> If possible, I would like to avoid writing custom scripts for updating
>> and building world, because at some point I will forget to use the
>> script and build everything without the patches. How can I preserve
>> the current behavior of running 'make update && make buildworld
>> buildkernel' while automatically applying custom patches in between?
>
> Check the system sources out of svn?
>
> This way, you can apply your patches and the result is automatically
> merged when you update the sources by 'svn up' -- unless there has been
> a conflicting commit to the same file, when you may be required to
> intervene manually.

I don't have subversion installed on any of my servers and that's a
dependency that I would prefer to do without.

Are there any changes I could make to /etc/make.conf that would allow
me to execute an arbitrary command after the 'update' task is
finished?

- Max



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAJcQMWdskC0kMw28Q%2BYTL8TJSOWOt5iwTFQviH-xPXbo2g-WBQ>