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: Fabio Porcedda <fabio.porcedda@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabio Porcedda
2014-10-22 18:20:10 +02:00
committed by Peter Korsgaard
parent bcb835b042
commit 1586ce3a3d
17 changed files with 29 additions and 27 deletions

View File

@@ -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))

View File

@@ -154,11 +154,11 @@ LINUX_POST_DOWNLOAD_HOOKS += LINUX_DOWNLOAD_PATCHES
define LINUX_APPLY_PATCHES
for p in $(LINUX_PATCHES) ; do \
if echo $$p | grep -q -E "^ftp://|^http://" ; then \
support/scripts/apply-patches.sh $(@D) $(DL_DIR) `basename $$p` ; \
$(APPLY_PATCHES) $(@D) $(DL_DIR) `basename $$p` ; \
elif test -d $$p ; then \
support/scripts/apply-patches.sh $(@D) $$p linux-\*.patch ; \
$(APPLY_PATCHES) $(@D) $$p linux-\*.patch ; \
else \
support/scripts/apply-patches.sh $(@D) `dirname $$p` `basename $$p` ; \
$(APPLY_PATCHES) $(@D) `dirname $$p` `basename $$p` ; \
fi \
done
endef