Commit 1586ce3a authored by Fabio Porcedda's avatar Fabio Porcedda Committed by Peter Korsgaard
Browse files

apply-patches.sh: Use the "APPLY_PATCHES" variable to call the script 



To easy up adding optional parameters when calling the
"apply-patches.sh" add and use the "APPLY_PATCHES" variable to execute
the script.

Signed-off-by: default avatarFabio Porcedda <fabio.porcedda@gmail.com>
Reviewed-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent bcb835b0

boot/at91bootstrap/at91bootstrap.mk

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


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

define AT91BOOTSTRAP_APPLY_CUSTOM_PATCHES

	support/scripts/apply-patches.sh $(@D) $(BR2_TARGET_AT91BOOTSTRAP_CUSTOM_PATCH_DIR) \

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

		at91bootstrap-$(AT91BOOTSTRAP_VERSION)-\*.patch

endef

boot/at91bootstrap3/at91bootstrap3.mk

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


ifneq ($(AT91BOOTSTRAP3_CUSTOM_PATCH_DIR),)

define AT91BOOTSTRAP3_APPLY_CUSTOM_PATCHES

	support/scripts/apply-patches.sh $(@D) $(AT91BOOTSTRAP3_CUSTOM_PATCH_DIR) \

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

		at91bootstrap3-\*.patch

endef

boot/barebox/barebox.mk

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ BAREBOX_LICENSE_FILES = COPYING 


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

define BAREBOX_APPLY_CUSTOM_PATCHES

	support/scripts/apply-patches.sh $(@D) \

	$(APPLY_PATCHES) $(@D) \

		$(BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR) \

		barebox-$(BAREBOX_VERSION)-\*.patch

endef

boot/uboot/uboot.mk

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ UBOOT_POST_EXTRACT_HOOKS += UBOOT_COPY_OLD_LICENSE_FILE 


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

define UBOOT_APPLY_CUSTOM_PATCHES

	support/scripts/apply-patches.sh $(@D) $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR) \

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

		uboot-\*.patch

endef

linux/linux-ext-rtai.mk

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ ifeq ($(RTAI_PATCH),) 
define RTAI_PREPARE_KERNEL

	kver=`$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelversion` ; \

	if test -f $(RTAI_DIR)/base/arch/$(RTAI_ARCH)/patches/hal-linux-$${kver}-*patch ; then \

		support/scripts/apply-patches.sh $(LINUX_DIR) 		\

		$(APPLY_PATCHES) $(LINUX_DIR)		 		\

			$(RTAI_DIR)/base/arch/$(RTAI_ARCH)/patches/ 	\

			hal-linux-$${kver}-*patch ; \

	else \
@@ -35,7 +35,7 @@ define RTAI_PREPARE_KERNEL 
endef

else

define RTAI_PREPARE_KERNEL

	support/scripts/apply-patches.sh 	\

	$(APPLY_PATCHES) 			\

		$(LINUX_DIR)			\

		$(dir $(RTAI_PATCH))		\

		$(notdir $(RTAI_PATCH))