Commit 0eba4759 authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

packages: apply custom patches using *.patch instead of <pkg>-*.patch 



Several packages have some logic to apply custom patches that existed
before the BR2_GLOBAL_PATCH_DIR mechanism: at91bootstrap,
at91bootstrap3, barebox, uboot and linux. Currently, the logic of
those packages to apply custom patches is to match
<package-name>-*.patch, which is not consistent with what we've done
for patches stored in the package directory, and for patches stored in
BR2_GLOBAL_PATCH_DIR: in such cases, we simply apply *.patch.

Therefore, for consistency reasons, this commit changes these packages
to also apply *.patch.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
parent ea8edb95

boot/at91bootstrap/at91bootstrap.mk

+1 −2
Original line number Diff line number Diff line
@@ -24,8 +24,7 @@ endef 


ifneq ($(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_CUSTOM_PATCH_DIR)),)

define AT91BOOTSTRAP_APPLY_CUSTOM_PATCHES

	$(APPLY_PATCHES) $(@D) $(BR2_TARGET_AT91BOOTSTRAP_CUSTOM_PATCH_DIR) \

		at91bootstrap-$(AT91BOOTSTRAP_VERSION)-\*.patch

	$(APPLY_PATCHES) $(@D) $(BR2_TARGET_AT91BOOTSTRAP_CUSTOM_PATCH_DIR) \*.patch

endef



AT91BOOTSTRAP_POST_PATCH_HOOKS += AT91BOOTSTRAP_APPLY_CUSTOM_PATCHES

boot/at91bootstrap3/at91bootstrap3.mk

+1 −2
Original line number Diff line number Diff line
@@ -21,8 +21,7 @@ AT91BOOTSTRAP3_MAKE_OPTS = CROSS_COMPILE=$(TARGET_CROSS) DESTDIR=$(BINARIES_DIR) 


ifneq ($(AT91BOOTSTRAP3_CUSTOM_PATCH_DIR),)

define AT91BOOTSTRAP3_APPLY_CUSTOM_PATCHES

	$(APPLY_PATCHES) $(@D) $(AT91BOOTSTRAP3_CUSTOM_PATCH_DIR) \

		at91bootstrap3-\*.patch

	$(APPLY_PATCHES) $(@D) $(AT91BOOTSTRAP3_CUSTOM_PATCH_DIR) \*.patch

endef



AT91BOOTSTRAP3_POST_PATCH_HOOKS += AT91BOOTSTRAP3_APPLY_CUSTOM_PATCHES

boot/barebox/barebox.mk

+2 −3
Original line number Diff line number Diff line
@@ -26,9 +26,8 @@ BAREBOX_LICENSE_FILES = COPYING 


ifneq ($(call qstrip,$(BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR)),)

define BAREBOX_APPLY_CUSTOM_PATCHES

	$(APPLY_PATCHES) $(@D) \

		$(BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR) \

		barebox-$(BAREBOX_VERSION)-\*.patch

	$(APPLY_PATCHES) $(@D)

		$(BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR) \*.patch

endef



BAREBOX_POST_PATCH_HOOKS += BAREBOX_APPLY_CUSTOM_PATCHES

boot/uboot/uboot.mk

+1 −2
Original line number Diff line number Diff line
@@ -91,8 +91,7 @@ UBOOT_POST_EXTRACT_HOOKS += UBOOT_COPY_OLD_LICENSE_FILE 


ifneq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR)),)

define UBOOT_APPLY_CUSTOM_PATCHES

	$(APPLY_PATCHES) $(@D) $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR) \

		uboot-\*.patch

	$(APPLY_PATCHES) $(@D) $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR) \*.patch

endef



UBOOT_POST_PATCH_HOOKS += UBOOT_APPLY_CUSTOM_PATCHES

linux/Config.in

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ config BR2_LINUX_KERNEL_PATCH 
	  A space-separated list of patches to apply to the

	  kernel. Each patch can be described as an URL, a local file

	  path, or a directory. In the case of a directory, all files

	  matching linux-*.patch in the directory will be applied.

	  matching *.patch in the directory will be applied.



#

# Configuration selection