* [Buildroot] [PATCH v2 1/3] package/Makefile.in: fix coding style regarding the '=' sign
2014-07-25 16:38 [Buildroot] [PATCH v2 0/3] apply-patches.sh: be quiet when "make -s" is used Fabio Porcedda
@ 2014-07-25 16:38 ` Fabio Porcedda
2014-07-26 7:07 ` Thomas Petazzoni
2014-07-25 16:38 ` [Buildroot] [PATCH v2 2/3] apply-patches.sh: Use the "APPLY_PATCHES" variable to call the script Fabio Porcedda
` (2 subsequent siblings)
3 siblings, 1 reply; 11+ messages in thread
From: Fabio Porcedda @ 2014-07-25 16:38 UTC (permalink / raw)
To: buildroot
As stated in the buildroot user manual add just a single space before
and after a '=' sign.
Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
---
package/Makefile.in | 148 ++++++++++++++++++++++++++--------------------------
1 file changed, 74 insertions(+), 74 deletions(-)
diff --git a/package/Makefile.in b/package/Makefile.in
index 97053ba..fc55850 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -1,24 +1,24 @@
ifndef MAKE
-MAKE:=make
+MAKE := make
endif
ifndef HOSTMAKE
-HOSTMAKE=$(MAKE)
+HOSTMAKE = $(MAKE)
endif
-HOSTMAKE :=$(shell which $(HOSTMAKE) || type -p $(HOSTMAKE) || echo make)
+HOSTMAKE := $(shell which $(HOSTMAKE) || type -p $(HOSTMAKE) || echo make)
# If BR2_LEVEL is 0, scale the maximum concurrency with the number of
# CPUs. An additional job is used in order to keep processors busy
# while waiting on I/O.
# If the number of processors is not available, assume one.
ifeq ($(BR2_JLEVEL),0)
-PARALLEL_JOBS:=$(shell echo \
+PARALLEL_JOBS := $(shell echo \
$$((1 + `getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1`)))
else
-PARALLEL_JOBS:=$(BR2_JLEVEL)
+PARALLEL_JOBS := $(BR2_JLEVEL)
endif
-MAKE1:=$(HOSTMAKE) -j1
-MAKE:=$(HOSTMAKE) $(if $(PARALLEL_JOBS),-j$(PARALLEL_JOBS))
+MAKE1 := $(HOSTMAKE) -j1
+MAKE := $(HOSTMAKE) $(if $(PARALLEL_JOBS),-j$(PARALLEL_JOBS))
ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
TARGET_VENDOR = $(call qstrip,$(BR2_TOOLCHAIN_BUILDROOT_VENDOR))
@@ -36,21 +36,21 @@ $(error BR2_TOOLCHAIN_BUILDROOT_VENDOR cannot be 'unknown'. \
endif
# Compute GNU_TARGET_NAME
-GNU_TARGET_NAME=$(ARCH)-$(TARGET_VENDOR)-$(TARGET_OS)-$(LIBC)$(ABI)
+GNU_TARGET_NAME = $(ARCH)-$(TARGET_VENDOR)-$(TARGET_OS)-$(LIBC)$(ABI)
# Blackfin FLAT needs uclinux
ifeq ($(BR2_bfin)$(BR2_BINFMT_FLAT),yy)
-TARGET_OS=uclinux
+TARGET_OS = uclinux
else
-TARGET_OS=linux
+TARGET_OS = linux
endif
ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
-LIBC=uclibc
+LIBC = uclibc
else ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y)
-LIBC=musl
+LIBC = musl
else
-LIBC=gnu
+LIBC = gnu
endif
# The ABI suffix is a bit special on ARM, as it needs to be
@@ -59,28 +59,28 @@ endif
# which explains why we need the test on LIBC below.
ifeq ($(BR2_arm)$(BR2_armeb),y)
ifeq ($(LIBC),uclibc)
-ABI=gnueabi
+ABI = gnueabi
else
-ABI=eabi
+ABI = eabi
endif
ifeq ($(BR2_ARM_EABIHF),y)
-ABI:=$(ABI)hf
+ABI := $(ABI)hf
endif
endif
# For FSL PowerPC there's SPE
ifeq ($(BR2_powerpc_SPE),y)
-ABI=spe
+ABI = spe
# MPC8540s are e500v1 with single precision FP
ifeq ($(BR2_powerpc_8540),y)
-TARGET_ABI+=-mabi=spe -mfloat-gprs=single -Wa,-me500
+TARGET_ABI += -mabi=spe -mfloat-gprs=single -Wa,-me500
endif
ifeq ($(BR2_powerpc_8548),y)
-TARGET_ABI+=-mabi=spe -mfloat-gprs=double -Wa,-me500x2
+TARGET_ABI += -mabi=spe -mfloat-gprs=double -Wa,-me500x2
endif
ifeq ($(BR2_powerpc_e500mc),y)
-TARGET_ABI+=-mabi=spe -mfloat-gprs=double -Wa,-me500mc
+TARGET_ABI += -mabi=spe -mfloat-gprs=double -Wa,-me500mc
endif
endif
@@ -105,31 +105,31 @@ endif
STAGING_SUBDIR = usr/$(GNU_TARGET_NAME)/sysroot
STAGING_DIR = $(HOST_DIR)/$(STAGING_SUBDIR)
-TARGET_OPTIMIZATION:=$(call qstrip,$(BR2_TARGET_OPTIMIZATION))
+TARGET_OPTIMIZATION := $(call qstrip,$(BR2_TARGET_OPTIMIZATION))
ifeq ($(BR2_OPTIMIZE_0),y)
-TARGET_OPTIMIZATION+=-O0
+TARGET_OPTIMIZATION += -O0
endif
ifeq ($(BR2_OPTIMIZE_1),y)
-TARGET_OPTIMIZATION+=-O1
+TARGET_OPTIMIZATION += -O1
endif
ifeq ($(BR2_OPTIMIZE_2),y)
-TARGET_OPTIMIZATION+=-O2
+TARGET_OPTIMIZATION += -O2
endif
ifeq ($(BR2_OPTIMIZE_3),y)
-TARGET_OPTIMIZATION+=-O3
+TARGET_OPTIMIZATION += -O3
endif
ifeq ($(BR2_OPTIMIZE_S),y)
-TARGET_OPTIMIZATION+=-Os
+TARGET_OPTIMIZATION += -Os
endif
ifeq ($(BR2_DEBUG_1),y)
-TARGET_DEBUGGING=-g1
+TARGET_DEBUGGING = -g1
endif
ifeq ($(BR2_DEBUG_2),y)
-TARGET_DEBUGGING=-g2
+TARGET_DEBUGGING = -g2
endif
ifeq ($(BR2_DEBUG_3),y)
-TARGET_DEBUGGING=-g3
+TARGET_DEBUGGING = -g3
endif
ifeq ($(BR2_LARGEFILE),y)
@@ -165,9 +165,9 @@ TARGET_CXXFLAGS += -fstack-protector-all
endif
ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
-TARGET_CROSS=$(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-
+TARGET_CROSS = $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-
else
-TARGET_CROSS=$(HOST_DIR)/usr/bin/$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX))-
+TARGET_CROSS = $(HOST_DIR)/usr/bin/$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX))-
endif
# Define TARGET_xx variables for all common binutils/gcc
@@ -193,30 +193,30 @@ TARGET_CXX := $(CCACHE) $(TARGET_CXX)
endif
ifeq ($(BR2_STRIP_strip),y)
-STRIP_STRIP_DEBUG:=--strip-debug
-STRIP_STRIP_UNNEEDED:=--strip-unneeded
-STRIP_STRIP_ALL:=--strip-all
-TARGET_STRIP=$(TARGET_CROSS)strip
-STRIPCMD=$(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note
-KSTRIPCMD=$(STRIPCMD) $(STRIP_STRIP_UNNEEDED)
+STRIP_STRIP_DEBUG := --strip-debug
+STRIP_STRIP_UNNEEDED := --strip-unneeded
+STRIP_STRIP_ALL := --strip-all
+TARGET_STRIP = $(TARGET_CROSS)strip
+STRIPCMD = $(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note
+KSTRIPCMD = $(STRIPCMD) $(STRIP_STRIP_UNNEEDED)
endif
ifeq ($(BR2_STRIP_sstrip),y)
-STRIP_STRIP_DEBUG:=
-STRIP_STRIP_UNNEEDED:=
-STRIP_STRIP_ALL:=
-TARGET_STRIP=$(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-sstrip
-STRIPCMD=$(TARGET_STRIP)
-KSTRIPCMD=$(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note --strip-unneeded
+STRIP_STRIP_DEBUG :=
+STRIP_STRIP_UNNEEDED :=
+STRIP_STRIP_ALL :=
+TARGET_STRIP = $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-sstrip
+STRIPCMD = $(TARGET_STRIP)
+KSTRIPCMD = $(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note --strip-unneeded
endif
ifeq ($(BR2_STRIP_none),y)
-TARGET_STRIP=true
-STRIPCMD=$(TARGET_STRIP)
-KSTRIPCMD=$(TARGET_STRIP)
+TARGET_STRIP = true
+STRIPCMD = $(TARGET_STRIP)
+KSTRIPCMD = $(TARGET_STRIP)
endif
-INSTALL:=$(shell which install || type -p install)
-FLEX:=$(shell which flex || type -p flex)
-BISON:=$(shell which bison || type -p bison)
-SED:=$(shell which sed || type -p sed) -i -e
+INSTALL := $(shell which install || type -p install)
+FLEX := $(shell which flex || type -p flex)
+BISON := $(shell which bison || type -p bison)
+SED := $(shell which sed || type -p sed) -i -e
HOST_CPPFLAGS = -I$(HOST_DIR)/usr/include
HOST_CFLAGS ?= -O2
@@ -225,13 +225,13 @@ HOST_CXXFLAGS += $(HOST_CFLAGS)
HOST_LDFLAGS += -L$(HOST_DIR)/lib -L$(HOST_DIR)/usr/lib -Wl,-rpath,$(HOST_DIR)/usr/lib
# hostcc version as an integer - E.G. 4.3.2 => 432
-HOSTCC_VERSION:=$(shell $(HOSTCC_NOCCACHE) --version | \
+HOSTCC_VERSION := $(shell $(HOSTCC_NOCCACHE) --version | \
sed -n 's/^.* \([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)[ ]*.*$$/\1\2\3/p')
HOST_PERL_ARCHNAME := $(shell perl -MConfig -e "print Config->{archname}")
export PERL5LIB := $(HOST_DIR)/usr/lib/perl5/$(HOST_PERL_ARCHNAME):$(HOST_DIR)/usr/lib/perl5
-TARGET_CONFIGURE_OPTS=PATH=$(BR_PATH) \
+TARGET_CONFIGURE_OPTS = PATH=$(BR_PATH) \
AR="$(TARGET_AR)" \
AS="$(TARGET_AS)" \
LD="$(TARGET_LD)" \
@@ -268,10 +268,10 @@ TARGET_CONFIGURE_OPTS=PATH=$(BR_PATH) \
PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
STAGING_DIR="$(STAGING_DIR)"
-TARGET_MAKE_ENV=PATH=$(BR_PATH)
+TARGET_MAKE_ENV = PATH=$(BR_PATH)
-HOST_CONFIGURE_OPTS=PATH=$(BR_PATH) \
+HOST_CONFIGURE_OPTS = PATH=$(BR_PATH) \
AR="$(HOSTAR)" \
AS="$(HOSTAS)" \
LD="$(HOSTLD)" \
@@ -293,7 +293,7 @@ HOST_CONFIGURE_OPTS=PATH=$(BR_PATH) \
PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig:$(HOST_DIR)/usr/share/pkgconfig" \
LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib:$(LD_LIBRARY_PATH)"
-HOST_MAKE_ENV=PATH=$(BR_PATH) \
+HOST_MAKE_ENV = PATH=$(BR_PATH) \
LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib:$(LD_LIBRARY_PATH)" \
PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
PKG_CONFIG_SYSROOT_DIR="/" \
@@ -303,7 +303,7 @@ HOST_MAKE_ENV=PATH=$(BR_PATH) \
# packages use that variable internally, eg. uboot), so we have to
# explicitly pass it to user-supplied external hooks (eg. post-build,
# post-images)
-EXTRA_ENV=\
+EXTRA_ENV = \
PATH=$(BR_PATH) \
BR2_DL_DIR=$(BR2_DL_DIR) \
BUILD_DIR=$(BUILD_DIR)
@@ -312,27 +312,27 @@ EXTRA_ENV=\
# settings we need to pass to configure
# does unaligned access trap?
-BR2_AC_CV_TRAP_CHECK=ac_cv_lbl_unaligned_fail=yes
+BR2_AC_CV_TRAP_CHECK = ac_cv_lbl_unaligned_fail=yes
ifeq ($(BR2_i386),y)
-BR2_AC_CV_TRAP_CHECK=ac_cv_lbl_unaligned_fail=no
+BR2_AC_CV_TRAP_CHECK = ac_cv_lbl_unaligned_fail=no
endif
ifeq ($(BR2_x86_64),y)
-BR2_AC_CV_TRAP_CHECK=ac_cv_lbl_unaligned_fail=no
+BR2_AC_CV_TRAP_CHECK = ac_cv_lbl_unaligned_fail=no
endif
ifeq ($(BR2_m68k),y)
-BR2_AC_CV_TRAP_CHECK=ac_cv_lbl_unaligned_fail=no
+BR2_AC_CV_TRAP_CHECK = ac_cv_lbl_unaligned_fail=no
endif
ifeq ($(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpc64le),y)
-BR2_AC_CV_TRAP_CHECK=ac_cv_lbl_unaligned_fail=no
+BR2_AC_CV_TRAP_CHECK = ac_cv_lbl_unaligned_fail=no
endif
ifeq ($(BR2_ENDIAN),"BIG")
-BR2_AC_CV_C_BIGENDIAN=ac_cv_c_bigendian=yes
+BR2_AC_CV_C_BIGENDIAN = ac_cv_c_bigendian=yes
else
-BR2_AC_CV_C_BIGENDIAN=ac_cv_c_bigendian=no
+BR2_AC_CV_C_BIGENDIAN = ac_cv_c_bigendian=no
endif
-TARGET_CONFIGURE_ARGS= \
+TARGET_CONFIGURE_ARGS = \
$(BR2_AC_CV_TRAP_CHECK) \
ac_cv_func_mmap_fixed_mapped=yes \
ac_cv_func_memcmp_working=yes \
@@ -347,36 +347,36 @@ TARGET_CONFIGURE_ARGS= \
################################################################################
ifeq ($(BR2_ENABLE_LOCALE),y)
-DISABLE_NLS:=
+DISABLE_NLS :=
else
-DISABLE_NLS:=--disable-nls
+DISABLE_NLS :=--disable-nls
endif
ifneq ($(BR2_LARGEFILE),y)
-DISABLE_LARGEFILE= --disable-largefile
+DISABLE_LARGEFILE = --disable-largefile
endif
ifeq ($(BR2_INET_IPV6),y)
-DISABLE_IPV6= --enable-ipv6
+DISABLE_IPV6 = --enable-ipv6
else
-DISABLE_IPV6= --disable-ipv6
+DISABLE_IPV6 = --disable-ipv6
endif
ifneq ($(BR2_INSTALL_LIBSTDCPP),y)
-TARGET_CONFIGURE_OPTS+=CXX=false
+TARGET_CONFIGURE_OPTS += CXX=false
endif
ifeq ($(BR2_ENABLE_DEBUG),y)
-ENABLE_DEBUG:=--enable-debug
+ENABLE_DEBUG := --enable-debug
else
-ENABLE_DEBUG:=
+ENABLE_DEBUG :=
endif
ifeq ($(BR2_PREFER_STATIC_LIB),y)
-SHARED_STATIC_LIBS_OPTS=--enable-static --disable-shared
+SHARED_STATIC_LIBS_OPTS = --enable-static --disable-shared
TARGET_LDFLAGS += --static
else
-SHARED_STATIC_LIBS_OPTS=--enable-static --enable-shared
+SHARED_STATIC_LIBS_OPTS = --enable-static --enable-shared
endif
include package/pkg-utils.mk
--
2.0.2
^ permalink raw reply related [flat|nested] 11+ messages in thread* [Buildroot] [PATCH v2 1/3] package/Makefile.in: fix coding style regarding the '=' sign
2014-07-25 16:38 ` [Buildroot] [PATCH v2 1/3] package/Makefile.in: fix coding style regarding the '=' sign Fabio Porcedda
@ 2014-07-26 7:07 ` Thomas Petazzoni
0 siblings, 0 replies; 11+ messages in thread
From: Thomas Petazzoni @ 2014-07-26 7:07 UTC (permalink / raw)
To: buildroot
Dear Fabio Porcedda,
On Fri, 25 Jul 2014 18:38:37 +0200, Fabio Porcedda wrote:
> As stated in the buildroot user manual add just a single space before
> and after a '=' sign.
>
> Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
> ---
> package/Makefile.in | 148 ++++++++++++++++++++++++++--------------------------
> 1 file changed, 74 insertions(+), 74 deletions(-)
Thanks, I've applied this one, after checking that a "diff -w -u" (i.e
diff ignoring whitespace changes) returns an empty result between the
old and new versions.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH v2 2/3] apply-patches.sh: Use the "APPLY_PATCHES" variable to call the script
2014-07-25 16:38 [Buildroot] [PATCH v2 0/3] apply-patches.sh: be quiet when "make -s" is used Fabio Porcedda
2014-07-25 16:38 ` [Buildroot] [PATCH v2 1/3] package/Makefile.in: fix coding style regarding the '=' sign Fabio Porcedda
@ 2014-07-25 16:38 ` Fabio Porcedda
2014-07-25 17:40 ` Yann E. MORIN
2014-07-25 16:38 ` [Buildroot] [PATCH v2 3/3] apply-patches.sh: don't print anything when "make -s" is used Fabio Porcedda
2014-07-31 17:12 ` [Buildroot] [PATCH v2 0/3] apply-patches.sh: be quiet " Fabio Porcedda
3 siblings, 1 reply; 11+ messages in thread
From: Fabio Porcedda @ 2014-07-25 16:38 UTC (permalink / raw)
To: 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 <fabio.porcedda@gmail.com>
---
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/pkg-autotools.mk | 12 ++++++------
package/pkg-generic.mk | 6 +++---
package/setserial/setserial.mk | 2 +-
package/sysklogd/sysklogd.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 c5fd099..896804e 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 07df75d..be63252 100644
--- a/boot/at91bootstrap3/at91bootstrap3.mk
+++ b/boot/at91bootstrap3/at91bootstrap3.mk
@@ -21,7 +21,7 @@ AT91BOOTSTRAP3_MAKE_OPT = 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 f57d297..d970fbc 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 532ac8b..522b531 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 2a9bf3e..000d654 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 fc55850..be95d8a 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -218,6 +218,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 596eabf..3229e83 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 5b60bc3..8be0233 100644
--- a/package/gcc/gcc.mk
+++ b/package/gcc/gcc.mk
@@ -44,14 +44,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 ae3f7d2..b1d0149 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 7a7bc7f..d2b3b9f 100644
--- a/package/mii-diag/mii-diag.mk
+++ b/package/mii-diag/mii-diag.mk
@@ -15,7 +15,7 @@ MII_DIAG_MAKE_OPT = $(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/pkg-autotools.mk b/package/pkg-autotools.mk
index bcc648d..0daf012 100644
--- a/package/pkg-autotools.mk
+++ b/package/pkg-autotools.mk
@@ -196,11 +196,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
@@ -230,11 +230,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 fb4b849..95a95b7 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 9f28216..6900197 100644
--- a/package/setserial/setserial.mk
+++ b/package/setserial/setserial.mk
@@ -16,7 +16,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/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk
index 37293da..9c4895d 100644
--- a/package/sysklogd/sysklogd.mk
+++ b/package/sysklogd/sysklogd.mk
@@ -18,7 +18,7 @@ endif
define SYSKLOGD_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/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk
index 3a7eac2..ff1ba24 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 7be264a..7d663b9 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
--
2.0.2
^ permalink raw reply related [flat|nested] 11+ messages in thread* [Buildroot] [PATCH v2 2/3] apply-patches.sh: Use the "APPLY_PATCHES" variable to call the script
2014-07-25 16:38 ` [Buildroot] [PATCH v2 2/3] apply-patches.sh: Use the "APPLY_PATCHES" variable to call the script Fabio Porcedda
@ 2014-07-25 17:40 ` Yann E. MORIN
2014-07-28 9:38 ` Fabio Porcedda
0 siblings, 1 reply; 11+ messages in thread
From: Yann E. MORIN @ 2014-07-25 17:40 UTC (permalink / raw)
To: buildroot
Fabio, All,
On 2014-07-25 18:38 +0200, Fabio Porcedda spake thusly:
> To easy up adding optional parameters when calling the
> "apply-patches.sh" add and use the "APPLY_PATCHES" variable to execute
> the script.
[--SNIP--]
> diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
> index bcc648d..0daf012 100644
> --- a/package/pkg-autotools.mk
> +++ b/package/pkg-autotools.mk
> @@ -196,11 +196,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; \
Variables in hooks should be double-escaped:
$$(APPLY_PATCHES)
See: http://git.buildroot.org/buildroot/tree/package/pkg-generic.mk#n277
(for pkg-generic, but valid for all pkg-* infras.)
Ditto for the five following occurences, of course.
> 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
> @@ -230,11 +230,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 fb4b849..95a95b7 100644
> --- a/package/pkg-generic.mk
> +++ b/package/pkg-generic.mk
> @@ -146,14 +146,14 @@ $(BUILD_DIR)/%/.stamp_patched:
Note: the fololowing is not in a define-block, so needs no
double-escaping, so it is good as is:
> @$(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; \
Otherwise, looks good. Thanks! :-)
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 11+ messages in thread* [Buildroot] [PATCH v2 2/3] apply-patches.sh: Use the "APPLY_PATCHES" variable to call the script
2014-07-25 17:40 ` Yann E. MORIN
@ 2014-07-28 9:38 ` Fabio Porcedda
0 siblings, 0 replies; 11+ messages in thread
From: Fabio Porcedda @ 2014-07-28 9:38 UTC (permalink / raw)
To: buildroot
On Fri, Jul 25, 2014 at 7:40 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> Fabio, All,
>
> On 2014-07-25 18:38 +0200, Fabio Porcedda spake thusly:
>> To easy up adding optional parameters when calling the
>> "apply-patches.sh" add and use the "APPLY_PATCHES" variable to execute
>> the script.
> [--SNIP--]
>> diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
>> index bcc648d..0daf012 100644
>> --- a/package/pkg-autotools.mk
>> +++ b/package/pkg-autotools.mk
>> @@ -196,11 +196,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; \
>
> Variables in hooks should be double-escaped:
> $$(APPLY_PATCHES)
Ok, done.
> See: http://git.buildroot.org/buildroot/tree/package/pkg-generic.mk#n277
> (for pkg-generic, but valid for all pkg-* infras.)
I didn't know about that, thanks.
> Ditto for the five following occurences, of course.
Ok, done.
>> 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
>> @@ -230,11 +230,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 fb4b849..95a95b7 100644
>> --- a/package/pkg-generic.mk
>> +++ b/package/pkg-generic.mk
>> @@ -146,14 +146,14 @@ $(BUILD_DIR)/%/.stamp_patched:
>
> Note: the fololowing is not in a define-block, so needs no
> double-escaping, so it is good as is:
>
>> @$(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; \
>
> Otherwise, looks good. Thanks! :-)
Great!
Thanks
--
Fabio Porcedda
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH v2 3/3] apply-patches.sh: don't print anything when "make -s" is used
2014-07-25 16:38 [Buildroot] [PATCH v2 0/3] apply-patches.sh: be quiet when "make -s" is used Fabio Porcedda
2014-07-25 16:38 ` [Buildroot] [PATCH v2 1/3] package/Makefile.in: fix coding style regarding the '=' sign Fabio Porcedda
2014-07-25 16:38 ` [Buildroot] [PATCH v2 2/3] apply-patches.sh: Use the "APPLY_PATCHES" variable to call the script Fabio Porcedda
@ 2014-07-25 16:38 ` Fabio Porcedda
2014-07-25 17:45 ` Yann E. MORIN
2014-07-31 17:12 ` [Buildroot] [PATCH v2 0/3] apply-patches.sh: be quiet " Fabio Porcedda
3 siblings, 1 reply; 11+ messages in thread
From: Fabio Porcedda @ 2014-07-25 16:38 UTC (permalink / raw)
To: buildroot
The make "-s" option is used to enable the "Silent operation" so if that
option is used don't print anything as far as there isn't any error.
Add the "-s" option to "apply-patches.sh" to enable silent operation.
Also add the "BR_SILENT" variable the contain "YES" when "make -s" is
used so others parts can use it to silence the build as well.
Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
---
Makefile | 2 ++
package/Makefile.in | 2 +-
support/scripts/apply-patches.sh | 17 ++++++++++++++---
3 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 6f502b0..d0d92e2 100644
--- a/Makefile
+++ b/Makefile
@@ -198,6 +198,8 @@ else
Q = @
endif
+BR_SILENT = $(if $(findstring s,$(MAKEFLAGS)),YES)
+
# we want bash as shell
SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
else if [ -x /bin/bash ]; then echo /bin/bash; \
diff --git a/package/Makefile.in b/package/Makefile.in
index be95d8a..7e4fd47 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -218,7 +218,7 @@ 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
+APPLY_PATCHES = support/scripts/apply-patches.sh $(if $(BR_SILENT),-s)
HOST_CPPFLAGS = -I$(HOST_DIR)/usr/include
HOST_CFLAGS ?= -O2
diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh
index 37f2d81..8d4ba6d 100755
--- a/support/scripts/apply-patches.sh
+++ b/support/scripts/apply-patches.sh
@@ -6,6 +6,8 @@
# (c) 2002 Erik Andersen <andersen@codepoet.org>
#
# Parameters:
+# - "-s",optional. Silent operation, don't print anything if there
+# isn't any error.
# - the build directory, optional, default value is '.'. The place where are
# the package sources.
# - the patch directory, optional, default '../kernel-patches'. The place
@@ -28,6 +30,13 @@
# applied. The list of the patches applied is stored in '.applied_patches_list'
# file in the build directory.
+silent=
+if [[ $1 == "-s" ]] ; then
+ # add option to be used by the patch tool
+ silent=-s
+ shift
+fi
+
# Set directories from arguments, or use defaults.
builddir=${1-.}
patchdir=${2-../kernel-patches}
@@ -77,14 +86,16 @@ function apply_patch {
return 0
;;
esac
- echo ""
- echo "Applying $patch using ${type}: "
+ if [[ ! $silent ]] ; then
+ echo ""
+ echo "Applying $patch using ${type}: "
+ fi
if [ ! -e "${path}/$patch" ] ; then
echo "Error: missing patch file ${path}/$patch"
exit 1
fi
echo $patch >> ${builddir}/.applied_patches_list
- ${uncomp} "${path}/$patch" | patch -g0 -p1 -E -d "${builddir}" -t -N
+ ${uncomp} "${path}/$patch" | patch $silent -g0 -p1 -E -d "${builddir}" -t -N
if [ $? != 0 ] ; then
echo "Patch failed! Please fix ${patch}!"
exit 1
--
2.0.2
^ permalink raw reply related [flat|nested] 11+ messages in thread* [Buildroot] [PATCH v2 3/3] apply-patches.sh: don't print anything when "make -s" is used
2014-07-25 16:38 ` [Buildroot] [PATCH v2 3/3] apply-patches.sh: don't print anything when "make -s" is used Fabio Porcedda
@ 2014-07-25 17:45 ` Yann E. MORIN
2014-07-26 5:31 ` Thomas De Schampheleire
0 siblings, 1 reply; 11+ messages in thread
From: Yann E. MORIN @ 2014-07-25 17:45 UTC (permalink / raw)
To: buildroot
Fabio, All,
On 2014-07-25 18:38 +0200, Fabio Porcedda spake thusly:
> The make "-s" option is used to enable the "Silent operation" so if that
> option is used don't print anything as far as there isn't any error.
>
> Add the "-s" option to "apply-patches.sh" to enable silent operation.
>
> Also add the "BR_SILENT" variable the contain "YES" when "make -s" is
> used so others parts can use it to silence the build as well.
>
> Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
[--SNIP--]
> diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh
> index 37f2d81..8d4ba6d 100755
> --- a/support/scripts/apply-patches.sh
> +++ b/support/scripts/apply-patches.sh
> @@ -6,6 +6,8 @@
> # (c) 2002 Erik Andersen <andersen@codepoet.org>
> #
> # Parameters:
> +# - "-s",optional. Silent operation, don't print anything if there
> +# isn't any error.
> # - the build directory, optional, default value is '.'. The place where are
> # the package sources.
> # - the patch directory, optional, default '../kernel-patches'. The place
> @@ -28,6 +30,13 @@
> # applied. The list of the patches applied is stored in '.applied_patches_list'
> # file in the build directory.
>
> +silent=
> +if [[ $1 == "-s" ]] ; then
The script uses single-[ tests, so please stay aligned with that. E.g.:
if [ ${1} == "-s" ]; then
> + # add option to be used by the patch tool
> + silent=-s
> + shift
> +fi
> +
> # Set directories from arguments, or use defaults.
> builddir=${1-.}
> patchdir=${2-../kernel-patches}
> @@ -77,14 +86,16 @@ function apply_patch {
> return 0
> ;;
> esac
> - echo ""
> - echo "Applying $patch using ${type}: "
> + if [[ ! $silent ]] ; then
Ditto:
if [ -z "$silent" ]; then
Otherwise, looks good-to-me. ;-)
Regards,
Yann E. MORIN.
> + echo ""
> + echo "Applying $patch using ${type}: "
> + fi
> if [ ! -e "${path}/$patch" ] ; then
> echo "Error: missing patch file ${path}/$patch"
> exit 1
> fi
> echo $patch >> ${builddir}/.applied_patches_list
> - ${uncomp} "${path}/$patch" | patch -g0 -p1 -E -d "${builddir}" -t -N
> + ${uncomp} "${path}/$patch" | patch $silent -g0 -p1 -E -d "${builddir}" -t -N
> if [ $? != 0 ] ; then
> echo "Patch failed! Please fix ${patch}!"
> exit 1
> --
> 2.0.2
>
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 11+ messages in thread* [Buildroot] [PATCH v2 3/3] apply-patches.sh: don't print anything when "make -s" is used
2014-07-25 17:45 ` Yann E. MORIN
@ 2014-07-26 5:31 ` Thomas De Schampheleire
2014-07-30 16:07 ` Fabio Porcedda
0 siblings, 1 reply; 11+ messages in thread
From: Thomas De Schampheleire @ 2014-07-26 5:31 UTC (permalink / raw)
To: buildroot
"Yann E. MORIN" <yann.morin.1998@free.fr> schreef:
>Fabio, All,
>
>On 2014-07-25 18:38 +0200, Fabio Porcedda spake thusly:
>> The make "-s" option is used to enable the "Silent operation" so if that
>> option is used don't print anything as far as there isn't any error.
>>
>> Add the "-s" option to "apply-patches.sh" to enable silent operation.
>>
>> Also add the "BR_SILENT" variable the contain "YES" when "make -s" is
>> used so others parts can use it to silence the build as well.
>>
>> Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
>[--SNIP--]
>> diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh
>> index 37f2d81..8d4ba6d 100755
>> --- a/support/scripts/apply-patches.sh
>> +++ b/support/scripts/apply-patches.sh
>> @@ -6,6 +6,8 @@
>> # (c) 2002 Erik Andersen <andersen@codepoet.org>
>> #
>> # Parameters:
>> +# - "-s",optional. Silent operation, don't print anything if there
>> +# isn't any error.
>> # - the build directory, optional, default value is '.'. The place where are
>> # the package sources.
>> # - the patch directory, optional, default '../kernel-patches'. The place
>> @@ -28,6 +30,13 @@
>> # applied. The list of the patches applied is stored in '.applied_patches_list'
>> # file in the build directory.
>>
>> +silent=
>> +if [[ $1 == "-s" ]] ; then
>
>The script uses single-[ tests, so please stay aligned with that. E.g.:
>
> if [ ${1} == "-s" ]; then
In standard 'test' this should then also be a single = sign.
^ permalink raw reply [flat|nested] 11+ messages in thread* [Buildroot] [PATCH v2 3/3] apply-patches.sh: don't print anything when "make -s" is used
2014-07-26 5:31 ` Thomas De Schampheleire
@ 2014-07-30 16:07 ` Fabio Porcedda
0 siblings, 0 replies; 11+ messages in thread
From: Fabio Porcedda @ 2014-07-30 16:07 UTC (permalink / raw)
To: buildroot
On Sat, Jul 26, 2014 at 7:31 AM, Thomas De Schampheleire
<patrickdepinguin@gmail.com> wrote:
> "Yann E. MORIN" <yann.morin.1998@free.fr> schreef:
>>Fabio, All,
>>
>>On 2014-07-25 18:38 +0200, Fabio Porcedda spake thusly:
>>> The make "-s" option is used to enable the "Silent operation" so if that
>>> option is used don't print anything as far as there isn't any error.
>>>
>>> Add the "-s" option to "apply-patches.sh" to enable silent operation.
>>>
>>> Also add the "BR_SILENT" variable the contain "YES" when "make -s" is
>>> used so others parts can use it to silence the build as well.
>>>
>>> Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
>>[--SNIP--]
>>> diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh
>>> index 37f2d81..8d4ba6d 100755
>>> --- a/support/scripts/apply-patches.sh
>>> +++ b/support/scripts/apply-patches.sh
>>> @@ -6,6 +6,8 @@
>>> # (c) 2002 Erik Andersen <andersen@codepoet.org>
>>> #
>>> # Parameters:
>>> +# - "-s",optional. Silent operation, don't print anything if there
>>> +# isn't any error.
>>> # - the build directory, optional, default value is '.'. The place where are
>>> # the package sources.
>>> # - the patch directory, optional, default '../kernel-patches'. The place
>>> @@ -28,6 +30,13 @@
>>> # applied. The list of the patches applied is stored in '.applied_patches_list'
>>> # file in the build directory.
>>>
>>> +silent=
>>> +if [[ $1 == "-s" ]] ; then
>>
>>The script uses single-[ tests, so please stay aligned with that. E.g.:
Because the "[[ ]]" operator is a safer improvement on the "[ ]" i
prefer to use the "[[ ]]" operator, so for sake of consistency i
prefer to do another patch to convert all tests to use the better "[[
]]" operator.
>> if [ ${1} == "-s" ]; then
>
> In standard 'test' this should then also be a single = sign.
>
Thanks, I've discovered only now that i can use the single "=" sign
with both operators.
Thanks & BR
--
Fabio Porcedda
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH v2 0/3] apply-patches.sh: be quiet when "make -s" is used
2014-07-25 16:38 [Buildroot] [PATCH v2 0/3] apply-patches.sh: be quiet when "make -s" is used Fabio Porcedda
` (2 preceding siblings ...)
2014-07-25 16:38 ` [Buildroot] [PATCH v2 3/3] apply-patches.sh: don't print anything when "make -s" is used Fabio Porcedda
@ 2014-07-31 17:12 ` Fabio Porcedda
3 siblings, 0 replies; 11+ messages in thread
From: Fabio Porcedda @ 2014-07-31 17:12 UTC (permalink / raw)
To: buildroot
On Fri, Jul 25, 2014 at 6:38 PM, Fabio Porcedda
<fabio.porcedda@gmail.com> wrote:
> To reduce further the noise when "make -s" is used silence the
> "apply-patches.sh" script.
>
> v2:
> - move the second patch as first to easy up merging
> - split the first patch in two (Yann)
> - add BR_SILENT variable (Yann)
I've sent a newer version:
http://lists.busybox.net/pipermail/buildroot/2014-July/103302.html
BR
--
Fabio Porcedda
^ permalink raw reply [flat|nested] 11+ messages in thread