From patchwork Wed Oct 22 16:20:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Porcedda X-Patchwork-Id: 402211 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 006BA140080 for ; Thu, 23 Oct 2014 03:20:25 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 2D18C959CD; Wed, 22 Oct 2014 16:20:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cuHAWUOP3Oli; Wed, 22 Oct 2014 16:20:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 64698959C5; Wed, 22 Oct 2014 16:20:23 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 2737D1C1081 for ; Wed, 22 Oct 2014 16:20:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 268DB915A0 for ; Wed, 22 Oct 2014 16:20:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id daLCSB2KH6Kw for ; Wed, 22 Oct 2014 16:20:20 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-la0-f49.google.com (mail-la0-f49.google.com [209.85.215.49]) by whitealder.osuosl.org (Postfix) with ESMTPS id BDE9991E0F for ; Wed, 22 Oct 2014 16:20:19 +0000 (UTC) Received: by mail-la0-f49.google.com with SMTP id q1so3169130lam.22 for ; Wed, 22 Oct 2014 09:20:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/qko5h+jQz2deA+MKPbySSKokDRqQj8K6jHq/aOw010=; b=FiN30yOMYBsPFjqVR8ris6LtmWB1xkezdT+jJ6sRykm/XVULkt6vMmMLQdRxh/dsTC T5UxMFW0BHfzLvAUNxBZN3ZK6CjKFyWB7avPsMhyVZ8qYXLLrCdYquUHX+qiCt43exet SHlh0JLqmgftbWzy8gWIZ5jeA+jyQB5BCbYH/s1lduTLvOFmcwLQW4CFthF/Nans84OY 9uHy+mCo0qWcR25/LTAa9c6mWYCN20YnSaSXrFgbhnQU4ch4cNM5BIA95KtgP83Vepuv HZeWay/6lGJILobPGz0S/vcFWJHeuscTNsVloP0jC2DEc2pMIKA9zoG7mNS0W2AB6uCc +zhQ== X-Received: by 10.112.89.8 with SMTP id bk8mr43243811lbb.30.1413994817602; Wed, 22 Oct 2014 09:20:17 -0700 (PDT) Received: from ld2077.tmt.telital.com ([213.205.6.118]) by mx.google.com with ESMTPSA id xe10sm5980786lbb.37.2014.10.22.09.20.15 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 22 Oct 2014 09:20:16 -0700 (PDT) From: Fabio Porcedda To: buildroot@uclibc.org Date: Wed, 22 Oct 2014 18:20:10 +0200 Message-Id: <1413994811-19452-2-git-send-email-fabio.porcedda@gmail.com> X-Mailer: git-send-email 2.1.1 In-Reply-To: <1413994811-19452-1-git-send-email-fabio.porcedda@gmail.com> References: <1413994811-19452-1-git-send-email-fabio.porcedda@gmail.com> Cc: Thomas Petazzoni , "Yann E. MORIN" Subject: [Buildroot] [PATCH 1/2] apply-patches.sh: Use the "APPLY_PATCHES" variable to call the script X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 Reviewed-by: "Yann E. MORIN" --- boot/at91bootstrap/at91bootstrap.mk | 2 +- boot/at91bootstrap3/at91bootstrap3.mk | 2 +- boot/barebox/barebox.mk | 2 +- boot/uboot/uboot.mk | 2 +- linux/linux-ext-rtai.mk | 4 ++-- linux/linux.mk | 6 +++--- package/Makefile.in | 2 ++ package/cvs/cvs.mk | 2 +- package/gcc/gcc.mk | 4 ++-- package/input-tools/input-tools.mk | 2 +- package/mii-diag/mii-diag.mk | 2 +- package/netcat-openbsd/netcat-openbsd.mk | 2 +- package/pkg-autotools.mk | 12 ++++++------ package/pkg-generic.mk | 6 +++--- package/setserial/setserial.mk | 2 +- package/sysvinit/sysvinit.mk | 2 +- package/thttpd/thttpd.mk | 2 +- 17 files changed, 29 insertions(+), 27 deletions(-) diff --git a/boot/at91bootstrap/at91bootstrap.mk b/boot/at91bootstrap/at91bootstrap.mk index d379580..e3f9dc0 100644 --- a/boot/at91bootstrap/at91bootstrap.mk +++ b/boot/at91bootstrap/at91bootstrap.mk @@ -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 diff --git a/boot/at91bootstrap3/at91bootstrap3.mk b/boot/at91bootstrap3/at91bootstrap3.mk index 91b6684..bc8d912 100644 --- a/boot/at91bootstrap3/at91bootstrap3.mk +++ b/boot/at91bootstrap3/at91bootstrap3.mk @@ -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 diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index 2cf4d15..0fb7cec 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -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 diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 0c6c96c..1f8818c 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -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 diff --git a/linux/linux-ext-rtai.mk b/linux/linux-ext-rtai.mk index dcfab49..bf998d5 100644 --- a/linux/linux-ext-rtai.mk +++ b/linux/linux-ext-rtai.mk @@ -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)) diff --git a/linux/linux.mk b/linux/linux.mk index 2b862ec..bce2853 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -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 diff --git a/package/Makefile.in b/package/Makefile.in index 02ddaa7..4a434ab 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -222,6 +222,8 @@ FLEX := $(shell which flex || type -p flex) BISON := $(shell which bison || type -p bison) SED := $(shell which sed || type -p sed) -i -e +APPLY_PATCHES = support/scripts/apply-patches.sh + HOST_CPPFLAGS = -I$(HOST_DIR)/usr/include HOST_CFLAGS ?= -O2 HOST_CFLAGS += $(HOST_CPPFLAGS) diff --git a/package/cvs/cvs.mk b/package/cvs/cvs.mk index f1a63c8..dfc935f 100644 --- a/package/cvs/cvs.mk +++ b/package/cvs/cvs.mk @@ -38,7 +38,7 @@ define CVS_DEBIAN_PATCHES do $(SED) 's,^\+\+\+ .*cvs-$(CVS_VERSION)/,+++ cvs-$(CVS_VERSION)/,' $$i; \ done; \ ); \ - support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*; \ + $(APPLY_PATCHES) $(@D) $(@D)/debian/patches \*; \ fi endef endif diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index 7bed159..1352bdf 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -37,14 +37,14 @@ endef ifeq ($(ARCH),powerpc) ifneq ($(BR2_SOFT_FLOAT),) define HOST_GCC_APPLY_POWERPC_PATCH - support/scripts/apply-patches.sh $(@D) package/gcc/$(GCC_VERSION) powerpc-link-with-math-lib.patch.conditional + $(APPLY_PATCHES) $(@D) package/gcc/$(GCC_VERSION) powerpc-link-with-math-lib.patch.conditional endef endif endif define HOST_GCC_APPLY_PATCHES if test -d package/gcc/$(GCC_VERSION); then \ - support/scripts/apply-patches.sh $(@D) package/gcc/$(GCC_VERSION) \*.patch ; \ + $(APPLY_PATCHES) $(@D) package/gcc/$(GCC_VERSION) \*.patch ; \ fi; $(HOST_GCC_APPLY_POWERPC_PATCH) endef diff --git a/package/input-tools/input-tools.mk b/package/input-tools/input-tools.mk index e7b1561..9fb94bf 100644 --- a/package/input-tools/input-tools.mk +++ b/package/input-tools/input-tools.mk @@ -17,7 +17,7 @@ INPUT_TOOLS_TARGETS_$(BR2_PACKAGE_INPUT_TOOLS_JSTEST) += jstest define INPUT_TOOLS_DEBIAN_PATCHES if [ -d $(@D)/debian/patches ]; then \ - support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*.patch; \ + $(APPLY_PATCHES) $(@D) $(@D)/debian/patches \*.patch; \ fi endef diff --git a/package/mii-diag/mii-diag.mk b/package/mii-diag/mii-diag.mk index af2d8776..aec13be 100644 --- a/package/mii-diag/mii-diag.mk +++ b/package/mii-diag/mii-diag.mk @@ -15,7 +15,7 @@ MII_DIAG_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) define MII_DIAG_DEBIAN_PATCHES if [ -d $(@D)/debian/patches ]; then \ - support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*.patch; \ + $(APPLY_PATCHES) $(@D) $(@D)/debian/patches \*.patch; \ fi endef diff --git a/package/netcat-openbsd/netcat-openbsd.mk b/package/netcat-openbsd/netcat-openbsd.mk index 64fb7f0..bf5c4b7 100644 --- a/package/netcat-openbsd/netcat-openbsd.mk +++ b/package/netcat-openbsd/netcat-openbsd.mk @@ -18,7 +18,7 @@ endif define NETCAT_OPENBSD_APPLY_DEBIAN_PATCHES if [ -d $(@D)/debian/patches ]; then \ - support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches *.dpatch; \ + $(APPLY_PATCHES) $(@D) $(@D)/debian/patches *.dpatch; \ fi endef diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index 80adc8b..3c6bb0d 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -204,11 +204,11 @@ define LIBTOOL_PATCH_HOOK ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$$$i | \ sed -e 's/\([0-9].[0-9]*\).*/\1/' -e 's/\"//'`; \ if test $$$${ltmain_version} = '1.5'; then \ - support/scripts/apply-patches.sh $$$${i%/*} support/libtool buildroot-libtool-v1.5.patch; \ + $$(APPLY_PATCHES) $$$${i%/*} support/libtool buildroot-libtool-v1.5.patch; \ elif test $$$${ltmain_version} = "2.2"; then\ - support/scripts/apply-patches.sh $$$${i%/*} support/libtool buildroot-libtool-v2.2.patch; \ + $$(APPLY_PATCHES) $$$${i%/*} support/libtool buildroot-libtool-v2.2.patch; \ elif test $$$${ltmain_version} = "2.4"; then\ - support/scripts/apply-patches.sh $$$${i%/*} support/libtool buildroot-libtool-v2.4.patch; \ + $$(APPLY_PATCHES) $$$${i%/*} support/libtool buildroot-libtool-v2.4.patch; \ fi \ done \ fi @@ -238,11 +238,11 @@ define AUTORECONF_HOOK ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$$$i | \ sed -e 's/\([0-9].[0-9]*\).*/\1/' -e 's/\"//'`; \ if test $$$${ltmain_version} = "1.5"; then \ - support/scripts/apply-patches.sh $$$${i%/*} support/libtool buildroot-libtool-v1.5.patch; \ + $$(APPLY_PATCHES) $$$${i%/*} support/libtool buildroot-libtool-v1.5.patch; \ elif test $$$${ltmain_version} = "2.2"; then\ - support/scripts/apply-patches.sh $$$${i%/*} support/libtool buildroot-libtool-v2.2.patch; \ + $$(APPLY_PATCHES) $$$${i%/*} support/libtool buildroot-libtool-v2.2.patch; \ elif test $$$${ltmain_version} = "2.4"; then\ - support/scripts/apply-patches.sh $$$${i%/*} support/libtool buildroot-libtool-v2.4.patch; \ + $$(APPLY_PATCHES) $$$${i%/*} support/libtool buildroot-libtool-v2.4.patch; \ fi \ done \ fi diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 259ee02..7a6d5e6 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -146,14 +146,14 @@ $(BUILD_DIR)/%/.stamp_patched: @$(call step_start,patch) @$(call MESSAGE,"Patching") $(foreach hook,$($(PKG)_PRE_PATCH_HOOKS),$(call $(hook))$(sep)) - $(foreach p,$($(PKG)_PATCH),support/scripts/apply-patches.sh $(@D) $(DL_DIR) $(notdir $(p))$(sep)) + $(foreach p,$($(PKG)_PATCH),$(APPLY_PATCHES) $(@D) $(DL_DIR) $(notdir $(p))$(sep)) $(Q)( \ for D in $(PATCH_BASE_DIRS); do \ if test -d $${D}; then \ if test -d $${D}/$($(PKG)_VERSION); then \ - support/scripts/apply-patches.sh $(@D) $${D}/$($(PKG)_VERSION) \*.patch \*.patch.$(ARCH) || exit 1; \ + $(APPLY_PATCHES) $(@D) $${D}/$($(PKG)_VERSION) \*.patch \*.patch.$(ARCH) || exit 1; \ else \ - support/scripts/apply-patches.sh $(@D) $${D} \*.patch \*.patch.$(ARCH) || exit 1; \ + $(APPLY_PATCHES) $(@D) $${D} \*.patch \*.patch.$(ARCH) || exit 1; \ fi; \ fi; \ done; \ diff --git a/package/setserial/setserial.mk b/package/setserial/setserial.mk index 55be4c1..ffdf129 100644 --- a/package/setserial/setserial.mk +++ b/package/setserial/setserial.mk @@ -18,7 +18,7 @@ define SETSERIAL_APPLY_DEBIAN_PATCHES if [ -d $(@D)/debian/patches ]; then \ touch $(@D)/gorhack.h; \ rm $(@D)/debian/patches/01_makefile.dpatch; \ - support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches *.dpatch; \ + $(APPLY_PATCHES) $(@D) $(@D)/debian/patches *.dpatch; \ fi endef diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk index d588122..bdba38f 100644 --- a/package/sysvinit/sysvinit.mk +++ b/package/sysvinit/sysvinit.mk @@ -18,7 +18,7 @@ endif define SYSVINIT_DEBIAN_PATCHES if [ -d $(@D)/debian/patches ]; then \ - support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*.patch; \ + $(APPLY_PATCHES) $(@D) $(@D)/debian/patches \*.patch; \ fi endef diff --git a/package/thttpd/thttpd.mk b/package/thttpd/thttpd.mk index a621ae0..781043c 100644 --- a/package/thttpd/thttpd.mk +++ b/package/thttpd/thttpd.mk @@ -14,7 +14,7 @@ THTTPD_LICENSE_FILES = thttpd.c ifneq ($(THTTPD_PATCH),) define THTTPD_DEBIAN_PATCHES if [ -d $(@D)/debian/patches ]; then \ - support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*.patch; \ + $(APPLY_PATCHES) $(@D) $(@D)/debian/patches \*.patch; \ fi endef endif