Add support for custom package patches
PATCH v2 1/1 Add support for custom package patches
From: Simon Dawson <[email protected]>
Add a configuration item to allow a space-separated list of directories to be specified, from which custom package patches will be applied.
---
v2: Incorporate improvements suggested by Arnout Vandecappelle, and
fix handling of the case where the new configuration item is not set
Config.in | 7 +++++++ package/pkg-generic.mk | 28 ++++++++++++++++------------ 2 files changed, 23 insertions(+), 12 deletions(-)
Config.in +7 -0
@@ -415,6 +415,13 @@ config BR2_PACKAGE_OVERRIDE_FILE as the source directory for a particular package. See the Buildroot documentation for more details on this feature. +config BR2_EXTRA_PACKAGE_PATCH_DIRS + string "extra package patch directories" + help + You may specify a space-separated list of directories containing + extra package patches. Note that any extra patches for a package + will be applied AFTER the Buildroot patch set for the package. + endmenu source "toolchain/Config.in"
package/pkg-generic.mk +16 -12
@@ -69,6 +69,20 @@ else @true # Nothing to do to source a local package endif +# Apply package patches from the specified directory +define pkg-apply-patch-directory + if test -d $(1); then \ + if test "$(wildcard $(1)/$(NAMEVER)*.patch*)"; then \ + support/scripts/apply-patches.sh $(@D) $(1) $(NAMEVER)\*.patch $(NAMEVER)\*.patch.$(ARCH) || exit 1; \ + else \ + support/scripts/apply-patches.sh $(@D) $(1) $(RAWNAME)\*.patch $(RAWNAME)\*.patch.$(ARCH) || exit 1; \ + if test -d $(1)/$(NAMEVER); then \ + support/scripts/apply-patches.sh $(@D) $(1)/$(NAMEVER) \*.patch \*.patch.$(ARCH) || exit 1; \ + fi; \ + fi; \ + fi; +endef + # Patch # # The RAWNAME variable is the lowercased package name, which allows to
@@ -79,18 +93,8 @@ $(BUILD_DIR)/%/.stamp_patched: @$(call MESSAGE,"Patching $($(PKG)_DIR_PREFIX)/$(RAWNAME)") $(foreach hook,$($(PKG)_PRE_PATCH_HOOKS),$(call $(hook))$(sep)) $(if $($(PKG)_PATCH),support/scripts/apply-patches.sh $(@D) $(DL_DIR) $($(PKG)_PATCH)) - $(Q)( \ - if test -d $($(PKG)_DIR_PREFIX)/$(RAWNAME); then \ - if test "$(wildcard $($(PKG)_DIR_PREFIX)/$(RAWNAME)/$(NAMEVER)*.patch*)"; then \ - support/scripts/apply-patches.sh $(@D) $($(PKG)_DIR_PREFIX)/$(RAWNAME) $(NAMEVER)\*.patch $(NAMEVER)\*.patch.$(ARCH) || exit 1; \ - else \ - support/scripts/apply-patches.sh $(@D) $($(PKG)_DIR_PREFIX)/$(RAWNAME) $(RAWNAME)\*.patch $(RAWNAME)\*.patch.$(ARCH) || exit 1; \ - if test -d $($(PKG)_DIR_PREFIX)/$(RAWNAME)/$(NAMEVER); then \ - support/scripts/apply-patches.sh $(@D) $($(PKG)_DIR_PREFIX)/$(RAWNAME)/$(NAMEVER) \*.patch \*.patch.$(ARCH) || exit 1; \ - fi; \ - fi; \ - fi; \ - ) + $(Q)($(call pkg-apply-patch-directory,$($(PKG)_DIR_PREFIX)/$(RAWNAME))) + $(if $(call qstrip,$(BR2_EXTRA_PACKAGE_PATCH_DIRS)),$(Q)($(foreach patchdir,$(call qstrip,$(BR2_EXTRA_PACKAGE_PATCH_DIRS)),$(call pkg-apply-patch-directory,$(patchdir))))) $(foreach hook,$($(PKG)_POST_PATCH_HOOKS),$(call $(hook))$(sep)) $(Q)touch $@
Signature · 1 line
1.7.10.4
PATCH v2 1/1 Add support for custom package patches
Hi Simon,
2012/10/31 <[email protected]>:
Quoted 23 lines
From: Simon Dawson <[email protected]>
Add a configuration item to allow a space-separated list of directories to be specified, from which custom package patches will be applied.
Signed-off-by Simon Dawson <[email protected]>---
v2: Incorporate improvements suggested by Arnout Vandecappelle, and
fix handling of the case where the new configuration item is not setConfig.in | 7 +++++++ package/pkg-generic.mk | 28 ++++++++++++++++------------ 2 files changed, 23 insertions(+), 12 deletions(-)Config.in +0
-0@@ -415,6 +415,13 @@ config BR2_PACKAGE_OVERRIDE_FILE as the source directory for a particular package. See the Buildroot documentation for more details on this feature.
Config.in config BR2_PACKAGE_OVERRIDE_FILE · line 426
Quoted 10 lines
Config.in +7
-0+config BR2_EXTRA_PACKAGE_PATCH_DIRS + string "extra package patch directories" + help + You may specify a space-separated list of directories containing + extra package patches. Note that any extra patches for a package + will be applied AFTER the Buildroot patch set for the package. + endmenu
It'd be great to have a section in the documentation about this feature.
Regards,
Signature · 1 line
Sam
PATCH v2 1/1 Add support for custom package patches
In reply to spdawson at gmail.compackage/pkg-generic.mk $(BUILD_DIR)/%/.stamp_patched: · line 97
Quoted 2 lines · spdawson at gmail.com
package/pkg-generic.mk +2
-0+ $(Q)($(call pkg-apply-patch-directory,$($(PKG)_DIR_PREFIX)/$(RAWNAME))) + $(if $(call qstrip,$(BR2_EXTRA_PACKAGE_PATCH_DIRS)),$(Q)($(foreach patchdir,$(call qstrip,$(BR2_EXTRA_PACKAGE_PATCH_DIRS)),$(call pkg-apply-patch-directory,$(patchdir)))))
I could be wrong, but I think this would also work:
$(foreach patchdir,$(call qstrip,$(BR2_EXTRA_PACKAGE_PATCH_DIRS)),$(Q)$(call pkg-apply-patch-directory,$(patchdir))$(sep)))
(and the semicolon at the end of pkg-apply-patch-directory is redundant then).
Alternatively, you could define:
PACKAGE_PATCH_DIRS = $($(PKG)_DIR_PREFIX)/$(RAWNAME) $(call qstrip,$(BR2_EXTRA_PACKAGE_PATCH_DIRS))
...
$(Q)$(foreach patchdir,$(PACKAGE_PATCH_DIRS),$(call pkg-apply-patch-directory,$(patchdir)))
Regards,
Arnout
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286540 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F