* [Buildroot] [PATCH v4 0/2] apply-patches.sh: be quiet when "make -s" is used
@ 2014-08-01 11:24 Fabio Porcedda
2014-08-01 11:24 ` [Buildroot] [PATCH v4 1/2] apply-patches.sh: Use the "APPLY_PATCHES" variable to call the script Fabio Porcedda
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Fabio Porcedda @ 2014-08-01 11:24 UTC (permalink / raw)
To: buildroot
From: Fabio Porcedda <fabio.porcedda@telit.com>
To reduce further the noise when "make -s" is used, silence the
"apply-patches.sh" script.
v4:
- remove use of [[...]] construct to easy up accepting this patch set
v3:
- Remove the already merged patch
- Use double $$ inside hooks (Yann)
- Add patch to use [[ ]] construct
v2:
- move the second patch as first to easy up merging
- split the first patch in two (Yann)
- add BR_SILENT variable (Yann)
Fabio Porcedda (2):
apply-patches.sh: Use the "APPLY_PATCHES" variable to call the script
apply-patches.sh: don't print anything when "make -s" is used
Makefile | 2 ++
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 +-
support/scripts/apply-patches.sh | 17 ++++++++++++++---
19 files changed, 45 insertions(+), 30 deletions(-)
--
2.0.3
^ permalink raw reply [flat|nested] 7+ messages in thread* [Buildroot] [PATCH v4 1/2] apply-patches.sh: Use the "APPLY_PATCHES" variable to call the script 2014-08-01 11:24 [Buildroot] [PATCH v4 0/2] apply-patches.sh: be quiet when "make -s" is used Fabio Porcedda @ 2014-08-01 11:24 ` Fabio Porcedda 2014-08-06 19:04 ` Yann E. MORIN 2014-08-01 11:24 ` [Buildroot] [PATCH v4 2/2] apply-patches.sh: don't print anything when "make -s" is used Fabio Porcedda 2014-08-07 8:17 ` [Buildroot] [PATCH v4 0/2] apply-patches.sh: be quiet " Fabio Porcedda 2 siblings, 1 reply; 7+ messages in thread From: Fabio Porcedda @ 2014-08-01 11:24 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 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 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 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 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 e433e0d..4d7f58e 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 02f6e3d..d17115b 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 416f9b8..f9efb16 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 b344a14..833132e 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 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 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..94d3008 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 d4c0396..9c8779e 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 a621ad9..de14867 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.3 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH v4 1/2] apply-patches.sh: Use the "APPLY_PATCHES" variable to call the script 2014-08-01 11:24 ` [Buildroot] [PATCH v4 1/2] apply-patches.sh: Use the "APPLY_PATCHES" variable to call the script Fabio Porcedda @ 2014-08-06 19:04 ` Yann E. MORIN 0 siblings, 0 replies; 7+ messages in thread From: Yann E. MORIN @ 2014-08-06 19:04 UTC (permalink / raw) To: buildroot Fabio, All, On 2014-08-01 13:24 +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. > > Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Regards, 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/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 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 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 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 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 e433e0d..4d7f58e 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 02f6e3d..d17115b 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 416f9b8..f9efb16 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 b344a14..833132e 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 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 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..94d3008 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 d4c0396..9c8779e 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 a621ad9..de14867 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.3 > -- .-----------------.--------------------.------------------.--------------------. | 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] 7+ messages in thread
* [Buildroot] [PATCH v4 2/2] apply-patches.sh: don't print anything when "make -s" is used 2014-08-01 11:24 [Buildroot] [PATCH v4 0/2] apply-patches.sh: be quiet when "make -s" is used Fabio Porcedda 2014-08-01 11:24 ` [Buildroot] [PATCH v4 1/2] apply-patches.sh: Use the "APPLY_PATCHES" variable to call the script Fabio Porcedda @ 2014-08-01 11:24 ` Fabio Porcedda 2014-08-06 19:16 ` Yann E. MORIN 2014-08-07 8:17 ` [Buildroot] [PATCH v4 0/2] apply-patches.sh: be quiet " Fabio Porcedda 2 siblings, 1 reply; 7+ messages in thread From: Fabio Porcedda @ 2014-08-01 11:24 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 c82b07f..73eb033 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 d17115b..c00c4f3 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..16e0b41 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 [ -z "$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.3 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH v4 2/2] apply-patches.sh: don't print anything when "make -s" is used 2014-08-01 11:24 ` [Buildroot] [PATCH v4 2/2] apply-patches.sh: don't print anything when "make -s" is used Fabio Porcedda @ 2014-08-06 19:16 ` Yann E. MORIN 2014-08-07 7:37 ` Fabio Porcedda 0 siblings, 1 reply; 7+ messages in thread From: Yann E. MORIN @ 2014-08-06 19:16 UTC (permalink / raw) To: buildroot Fabio, All, On 2014-08-01 13:24 +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> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> HOwever, I have a comment about it, see below... > --- > 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 c82b07f..73eb033 100644 > --- a/Makefile > +++ b/Makefile > @@ -198,6 +198,8 @@ else > Q = @ > endif > > +BR_SILENT = $(if $(findstring s,$(MAKEFLAGS)),YES) Unfortunately, that also matches '--warn-undefined-variables' since it has an 's' in it. It is the onlt long option with an 's' in it, for which there is no corresponding short option. All other long options with an 's' in them have corresponding short options, and that's what appears in MAKEFLAGS. I think we can well live with the fact that --warn-undefined-variables would trigger a silent patching, because this should really only be rarely used, if at all, because we do rely on variables not being defined, so this is not an error, not even a warning. That's why I added my reviewed tag. Regards, Yann E. MORIN. > # 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 d17115b..c00c4f3 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..16e0b41 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 [ -z "$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.3 > -- .-----------------.--------------------.------------------.--------------------. | 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] 7+ messages in thread
* [Buildroot] [PATCH v4 2/2] apply-patches.sh: don't print anything when "make -s" is used 2014-08-06 19:16 ` Yann E. MORIN @ 2014-08-07 7:37 ` Fabio Porcedda 0 siblings, 0 replies; 7+ messages in thread From: Fabio Porcedda @ 2014-08-07 7:37 UTC (permalink / raw) To: buildroot On Wed, Aug 6, 2014 at 9:16 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote: > Fabio, All, > > On 2014-08-01 13:24 +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> > > Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> > > HOwever, I have a comment about it, see below... > >> --- >> 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 c82b07f..73eb033 100644 >> --- a/Makefile >> +++ b/Makefile >> @@ -198,6 +198,8 @@ else >> Q = @ >> endif >> >> +BR_SILENT = $(if $(findstring s,$(MAKEFLAGS)),YES) > > Unfortunately, that also matches '--warn-undefined-variables' since it > has an 's' in it. It is the onlt long option with an 's' in it, for > which there is no corresponding short option. All other long options > with an 's' in them have corresponding short options, and that's what > appears in MAKEFLAGS. Good point, I was confused by the official documentation of Make: http://www.gnu.org/software/make/manual/make.html#Testing-Flags Using the filter function instead of substring fix the problem: -BR_SILENT = $(if $(findstring s,$(MAKEFLAGS)),YES) +BR_SILENT = $(if $(filter s -s,$(MAKEFLAGS)),YES) I will send an updated patch. > I think we can well live with the fact that --warn-undefined-variables > would trigger a silent patching, because this should really only be > rarely used, if at all, because we do rely on variables not being > defined, so this is not an error, not even a warning. > > That's why I added my reviewed tag. Thanks -- Fabio Porcedda ^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH v4 0/2] apply-patches.sh: be quiet when "make -s" is used 2014-08-01 11:24 [Buildroot] [PATCH v4 0/2] apply-patches.sh: be quiet when "make -s" is used Fabio Porcedda 2014-08-01 11:24 ` [Buildroot] [PATCH v4 1/2] apply-patches.sh: Use the "APPLY_PATCHES" variable to call the script Fabio Porcedda 2014-08-01 11:24 ` [Buildroot] [PATCH v4 2/2] apply-patches.sh: don't print anything when "make -s" is used Fabio Porcedda @ 2014-08-07 8:17 ` Fabio Porcedda 2 siblings, 0 replies; 7+ messages in thread From: Fabio Porcedda @ 2014-08-07 8:17 UTC (permalink / raw) To: buildroot I've sent an updated version: http://lists.busybox.net/pipermail/buildroot/2014-August/103900.html BR -- Fabio Porcedda ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-08-07 8:17 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-08-01 11:24 [Buildroot] [PATCH v4 0/2] apply-patches.sh: be quiet when "make -s" is used Fabio Porcedda 2014-08-01 11:24 ` [Buildroot] [PATCH v4 1/2] apply-patches.sh: Use the "APPLY_PATCHES" variable to call the script Fabio Porcedda 2014-08-06 19:04 ` Yann E. MORIN 2014-08-01 11:24 ` [Buildroot] [PATCH v4 2/2] apply-patches.sh: don't print anything when "make -s" is used Fabio Porcedda 2014-08-06 19:16 ` Yann E. MORIN 2014-08-07 7:37 ` Fabio Porcedda 2014-08-07 8:17 ` [Buildroot] [PATCH v4 0/2] apply-patches.sh: be quiet " Fabio Porcedda
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox