diff options
| author | Simon Dawson <spdawson@gmail.com> | 2013-03-17 23:13:47 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2013-03-19 23:10:49 +0100 |
| commit | 5538e4766201aa0c1c23721cfc99cbbde595964b (patch) | |
| tree | 27adb945477693e075b5b2eb4f6e1cc639eeaa69 /docs/manual/patch-policy.txt | |
| parent | 424d69bc9b48e08398fce3adafd0c5c94edc7281 (diff) | |
| download | buildroot-novena-5538e4766201aa0c1c23721cfc99cbbde595964b.tar.gz buildroot-novena-5538e4766201aa0c1c23721cfc99cbbde595964b.zip | |
rework patch model
At the Buildroot Developers Meeting (4-5 February 2013, in Brussels) a change
to the patch logic was discussed. See
http://elinux.org/Buildroot:DeveloperDaysFOSDEM2013
for details. In summary:
* For patches stored in the package directory, if
package/<pkg>/<version>/ does exist, apply package/<pkg>/<version>/*.patch,
otherwise, apply package/<pkg>/*.patch
* For patches stored in the global patches directory, if
$(GLOBAL_PATCH_DIR)/<pkg>/<version>/ does exist, apply
$(GLOBAL_PATCH_DIR)/<pkg>/<version>/*.patch, otherwise, apply
$(GLOBAL_PATCH_DIR)/<pkg>/*.patch
This patch adds the new BR2_GLOBAL_PATCH_DIR configuration item, and reworks
the generic package infrastructure to implement the new patch logic.
[Peter: fixup doc nits as pointed out by Thomas]
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'docs/manual/patch-policy.txt')
| -rw-r--r-- | docs/manual/patch-policy.txt | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/docs/manual/patch-policy.txt b/docs/manual/patch-policy.txt index 0f55b26dc..d2250ad0c 100644 --- a/docs/manual/patch-policy.txt +++ b/docs/manual/patch-policy.txt @@ -11,8 +11,9 @@ necessary to patch the source of the software to get it cross-built within Buildroot. Buildroot offers an infrastructure to automatically handle this during -the builds. It supports two ways of applying patch sets: downloaded patches -and patches supplied within buildroot. +the builds. It supports three ways of applying patch sets: downloaded patches, +patches supplied within buildroot and patches located in a user-defined +global patch directory. Providing patches ~~~~~~~~~~~~~~~~~ @@ -45,6 +46,13 @@ application order. reference in their filename. - The field +<number>+ in the patch file name refers to the 'apply order'. +Global patch directory +^^^^^^^^^^^^^^^^^^^^^^ + +The +BR2_GLOBAL_PATCH_DIR+ configuration file option can be +used to specify a directory containing global package patches. See +xref:packages-custom[] for details. + How patches are applied ~~~~~~~~~~~~~~~~~~~~~~~ @@ -57,7 +65,7 @@ How patches are applied tarballs are applied; . If there are some +*.patch+ files in the package directory or in the - a package subdirectory named +<packagename>-<packageversion>+, then: + a package subdirectory named +<packageversion>+, then: + * If a +series+ file exists in the package directory, then patches are applied according to the +series+ file; |