From owner-freebsd-questions@FreeBSD.ORG Mon Jan 23 18:25:49 2012 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D7D101065672 for ; Mon, 23 Jan 2012 18:25:49 +0000 (UTC) (envelope-from m.seaman@infracaninophile.co.uk) Received: from smtp.infracaninophile.co.uk (smtp6.infracaninophile.co.uk [IPv6:2001:8b0:151:1:3cd3:cd67:fafa:3d78]) by mx1.freebsd.org (Postfix) with ESMTP id 64E8C8FC20 for ; Mon, 23 Jan 2012 18:25:49 +0000 (UTC) Received: from seedling.black-earth.co.uk (seedling.black-earth.co.uk [IPv6:2001:8b0:151:1:fa1e:dfff:feda:c0bb]) (authenticated bits=0) by smtp.infracaninophile.co.uk (8.14.5/8.14.5) with ESMTP id q0NIPjeP010750 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO) for ; Mon, 23 Jan 2012 18:25:45 GMT (envelope-from m.seaman@infracaninophile.co.uk) X-DKIM: OpenDKIM Filter v2.4.2 smtp.infracaninophile.co.uk q0NIPjeP010750 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=infracaninophile.co.uk; s=201001-infracaninophile; t=1327343145; bh=0U2t9viPAr+SKALcCXVUjdO7c//XASvQtmrN2S43ou8=; h=Message-ID:Date:From:MIME-Version:To:Subject:References: In-Reply-To:Content-Type:Cc; b=QqUJ5e68Fshj4LHnSfymOgZr3Q6PBMrwhgDGTCvY4j5p49E/AhgZVzk8NMgyrW65m lfVgwSji11Yhln2jnOsl6qpGLnadSOTZUV5ByhupnV3pQJZozuoK7OU/Eb3t2oYypT CGJpP31JpIzzkcNYlSDxJtHnOMyFlddp8f+SDkl0= Message-ID: <4F1DA620.4040207@infracaninophile.co.uk> Date: Mon, 23 Jan 2012 18:25:36 +0000 From: Matthew Seaman User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:9.0) Gecko/20111222 Thunderbird/9.0.1 MIME-Version: 1.0 To: freebsd-questions@freebsd.org References: In-Reply-To: X-Enigmail-Version: 1.3.4 OpenPGP: id=60AE908C Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig303616463F4D261D525AECAB" X-Virus-Scanned: clamav-milter 0.97.3 at lucid-nonsense.infracaninophile.co.uk X-Virus-Status: Clean X-Spam-Status: No, score=-2.7 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on lucid-nonsense.infracaninophile.co.uk Subject: Re: Applying local patches after updating FreeBSD source X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Jan 2012 18:25:50 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig303616463F4D261D525AECAB Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 23/01/2012 18:03, Maxim Khitrov wrote: > Hi all, >=20 > 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? >=20 > 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'. >=20 > 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. Cheers, Matthew --=20 Dr Matthew J Seaman MA, D.Phil. 7 Priory Courtyard Flat 3 PGP: http://www.infracaninophile.co.uk/pgpkey Ramsgate JID: matthew@infracaninophile.co.uk Kent, CT11 9PW --------------enig303616463F4D261D525AECAB Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0.16 (Darwin) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk8dpigACgkQ8Mjk52CukIyjjQCffSsx9hpB7U66IPaJZWWlc3Bf Uq8AoJBAX6bCdhKvLPQ6aDrNFGXdzwGf =mjq7 -----END PGP SIGNATURE----- --------------enig303616463F4D261D525AECAB--