Skip to contentSkip to conversation

apply-patches.sh: don't print anything when "-s" option is used

PATCH In review Fabio Porcedda 3 participants 12 messages Jul 9, 2014 – Jul 25, 2014 Arm/Microchip (AT91) SoC support

lore
Share & tools
lore

Fabio Porcedda

author
#0 lore raw

PATCH 1/2 apply-patches.sh: don't print anything when "-s" option is used

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. Because "apply-patches.sh" is called in many places add a "APPLY_PATCHES" variable to permit adding the "-s" easily.

Signed-off-by Fabio Porcedda <[email protected]>
---
 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                   |  6 ++++++
 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 ++++++++++++++---
 18 files changed, 47 insertions(+), 30 deletions(-)
boot/at91bootstrap/at91bootstrap.mk +1 -1
index c5fd099..896804e 100644
@@ -24,7 +24,7 @@ endef
 
 ifneq ($(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_CUSTOM_PATCH_DIR)),)
 define AT91BOOTSTRAP_APPLY_CUSTOM_PATCHES
-	support/scripts/apply-patches.sh $(@D) $(BR2_TARGET_AT91BOOTSTRAP_CUSTOM_PATCH_DIR) \
+	$(APPLY_PATCHES) $(@D) $(BR2_TARGET_AT91BOOTSTRAP_CUSTOM_PATCH_DIR) \
 		at91bootstrap-$(AT91BOOTSTRAP_VERSION)-\*.patch
 endef
boot/at91bootstrap3/at91bootstrap3.mk +1 -1
index 07df75d..be63252 100644
@@ -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
boot/barebox/barebox.mk +1 -1
index f57d297..d970fbc 100644
@@ -26,7 +26,7 @@ BAREBOX_LICENSE_FILES = COPYING
 
 ifneq ($(call qstrip,$(BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR)),)
 define BAREBOX_APPLY_CUSTOM_PATCHES
-	support/scripts/apply-patches.sh $(@D) \
+	$(APPLY_PATCHES) $(@D) \
 		$(BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR) \
 		barebox-$(BAREBOX_VERSION)-\*.patch
 endef
boot/uboot/uboot.mk +1 -1
index 532ac8b..522b531 100644
@@ -87,7 +87,7 @@ UBOOT_POST_EXTRACT_HOOKS += UBOOT_COPY_OLD_LICENSE_FILE
 
 ifneq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR)),)
 define UBOOT_APPLY_CUSTOM_PATCHES
-	support/scripts/apply-patches.sh $(@D) $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR) \
+	$(APPLY_PATCHES) $(@D) $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR) \
 		uboot-\*.patch
 endef
linux/linux-ext-rtai.mk +2 -2
index dcfab49..bf998d5 100644
@@ -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))
linux/linux.mk +3 -3
index bd3f2ac..30ee740 100644
@@ -148,11 +148,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
package/Makefile.in +6 -0
index 97053ba..e1fdb4d 100644
@@ -218,6 +218,12 @@ FLEX:=$(shell which flex || type -p flex)
 BISON:=$(shell which bison || type -p bison)
 SED:=$(shell which sed || type -p sed) -i -e
 
+ifeq (,$(findstring s,$(MAKEFLAGS)))
+APPLY_PATCHES = support/scripts/apply-patches.sh
+else
+APPLY_PATCHES = support/scripts/apply-patches.sh -s
+endif
+
 HOST_CPPFLAGS  = -I$(HOST_DIR)/usr/include
 HOST_CFLAGS   ?= -O2
 HOST_CFLAGS   += $(HOST_CPPFLAGS)
package/cvs/cvs.mk +1 -1
index 596eabf..3229e83 100644
@@ -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
package/gcc/gcc.mk +2 -2
index 5b60bc3..8be0233 100644
@@ -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
package/input-tools/input-tools.mk +1 -1
index ae3f7d2..b1d0149 100644
@@ -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
package/mii-diag/mii-diag.mk +1 -1
index 7a7bc7f..d2b3b9f 100644
@@ -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
package/pkg-autotools.mk +6 -6
index ddff9bf..ba44660 100644
@@ -184,11 +184,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

@@ -210,11 +210,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
package/pkg-generic.mk +3 -3
index 395e593..4e323e7 100644
@@ -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; \
package/setserial/setserial.mk +1 -1
index 9f28216..6900197 100644
@@ -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
package/sysklogd/sysklogd.mk +1 -1
index 37293da..9c4895d 100644
@@ -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
package/sysvinit/sysvinit.mk +1 -1
index 3a7eac2..ff1ba24 100644
@@ -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
package/thttpd/thttpd.mk +1 -1
index 7be264a..7d663b9 100644
@@ -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
support/scripts/apply-patches.sh +14 -3
index 37f2d81..8d4ba6d 100755
@@ -6,6 +6,8 @@
 # (c) 2002 Erik Andersen <[email protected]>
 #
 # 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
Signature · 1 line
2.0.1
author
#1 lore raw

PATCH 2/2 package/Makefile.in: fix coding style regarding the '=' sign

As stated in the buildroot user manual add just a single space before and after a '=' sign.

Signed-off-by Fabio Porcedda <[email protected]>
---
 package/Makefile.in | 148 ++++++++++++++++++++++++++--------------------------
 1 file changed, 74 insertions(+), 74 deletions(-)
package/Makefile.in +74 -74
index e1fdb4d..19cd98c 100644
@@ -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
 
 ifeq (,$(findstring s,$(MAKEFLAGS)))
 APPLY_PATCHES = support/scripts/apply-patches.sh

@@ -231,13 +231,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)" \

@@ -274,10 +274,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)" \

@@ -299,7 +299,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="/" \

@@ -309,7 +309,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)

@@ -318,27 +318,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 \

@@ -353,36 +353,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
Signature · 1 line
2.0.1
#2 lore raw

PATCH 1/2 apply-patches.sh: don't print anything when "-s" option is used

In reply to Fabio Porcedda

Dear Fabio Porcedda,

Quoted 8 lines · Fabio Porcedda

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. Because "apply-patches.sh" is called in many places add a "APPLY_PATCHES" variable to permit adding the "-s" easily.

Signed-off-by Fabio Porcedda <[email protected]>

Hum, yes, but why? The entire build process is anyway very noisy, so is there really a point in silencing specifically this part? What is the ultimate goal you're trying to achieve here?

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#3 lore raw

PATCH 1/2 apply-patches.sh: don't print anything when "-s" option is used

Quoted 10 lines · Thomas Petazzoni

Dear Fabio Porcedda,

Quoted 7 lines · Fabio Porcedda

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. Because "apply-patches.sh" is called in many places add a "APPLY_PATCHES" variable to permit adding the "-s" easily.

Quoted 5 lines
Quoted 1 line
Signed-off-by Fabio Porcedda <[email protected]>

Hum, yes, but why? The entire build process is anyway very noisy, so is there really a point in silencing specifically this part? What is the ultimate goal you're trying to achieve here?

My ultimate goal is to be able using the "-s" flags to silence all parts, because sometimes i just want to build and view only ">>> *" messages, errors, warning without anything else.

As example the "toolchain-external" target already do that when the "-s" option is used.

I've silenced only this part because it was easy and it's anyway an improvement.

Maybe i can work on silencing other parts too if the feature is desired.

Best regards

Signature · 1 line
Fabio Porcedda
#4 lore raw

[Buildroot] Silencing the build

Dear Fabio Porcedda,

Quoted 8 lines · Fabio Porcedda
Quoted 3 lines

Hum, yes, but why? The entire build process is anyway very noisy, so is there really a point in silencing specifically this part? What is the ultimate goal you're trying to achieve here?

My ultimate goal is to be able using the "-s" flags to silence all parts, because sometimes i just want to build and view only ">>> *" messages, errors, warning without anything else.

Quoted 6 lines

As example the "toolchain-external" target already do that when the "-s" option is used.

I've silenced only this part because it was easy and it's anyway an improvement.

Maybe i can work on silencing other parts too if the feature is desired.

Ok, thanks for the explanation.

I guess we need to decide whether having a fully silent build in "make -s" is a goal we should aim at. It seems like a good idea to me, but I don't have a really strong opinion about this.

What do others think about this?

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#5 lore raw

[Buildroot] Silencing the build

Thomas, All,

On 2014-07-17 20:31 +0200, Thomas Petazzoni spake thusly:

Quoted 17 lines · Fabio Porcedda
Quoted 9 lines
Quoted 4 lines

Hum, yes, but why? The entire build process is anyway very noisy, so is there really a point in silencing specifically this part? What is the ultimate goal you're trying to achieve here?

My ultimate goal is to be able using the "-s" flags to silence all parts, because sometimes i just want to build and view only ">>> *" messages, errors, warning without anything else.

Quoted 6 lines

As example the "toolchain-external" target already do that when the "-s" option is used.

I've silenced only this part because it was easy and it's anyway an improvement.

Maybe i can work on silencing other parts too if the feature is desired.

Quoted 7 lines

Ok, thanks for the explanation.

I guess we need to decide whether having a fully silent build in "make -s" is a goal we should aim at. It seems like a good idea to me, but I don't have a really strong opinion about this.

What do others think about this?

Here's what I use for a silent build:

    brmake() {
        make "${@}" \
        |sed -r -e '/^.{4}>>>[[:space:]]+(.*).{5}$/!d; s//\1/;'
    }

Then calling 'brmake' instead of 'make', will get you only the >>> lines.

Of course, does not work if you invoke a CLI configurator, either directly, or as a consequence of a missing .config. I basically always call it with no argument, otherwise, I use plain 'make'.

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'
author
#6 lore raw

[Buildroot] Silencing the build

Quoted 28 lines · Yann E. MORIN

Thomas, All,

On 2014-07-17 20:31 +0200, Thomas Petazzoni spake thusly:

Quoted 17 lines · Fabio Porcedda
Quoted 9 lines
Quoted 4 lines

Hum, yes, but why? The entire build process is anyway very noisy, so is there really a point in silencing specifically this part? What is the ultimate goal you're trying to achieve here?

My ultimate goal is to be able using the "-s" flags to silence all parts, because sometimes i just want to build and view only ">>> *" messages, errors, warning without anything else.

Quoted 6 lines

As example the "toolchain-external" target already do that when the "-s" option is used.

I've silenced only this part because it was easy and it's anyway an improvement.

Maybe i can work on silencing other parts too if the feature is desired.

Quoted 7 lines

Ok, thanks for the explanation.

I guess we need to decide whether having a fully silent build in "make -s" is a goal we should aim at. It seems like a good idea to me, but I don't have a really strong opinion about this.

What do others think about this?

Quoted 8 lines

Here's what I use for a silent build:

    brmake() {
        make "${@}" \
        |sed -r -e '/^.{4}>>>[[:space:]]+(.*).{5}$/!d; s//\1/;'
    }

Then calling 'brmake' instead of 'make', will get you only the >>> lines.

Nice, so i'm not the only one who likes a silent build ;-)

I think that a downside of this method is that even the stderr is filtered as well so messages like warning or errors are filtered as well.

Quoted 4 lines

Of course, does not work if you invoke a CLI configurator, either directly, or as a consequence of a missing .config. I basically always call it with no argument, otherwise, I use plain 'make'.

Regards

Signature · 1 line
Fabio Porcedda
#7 lore raw

[Buildroot] Silencing the build

Fabio, All,

On 2014-07-18 10:18 +0200, Fabio Porcedda spake thusly:

Quoted 31 lines · Yann E. MORIN
Quoted 30 lines

Thomas, All,

On 2014-07-17 20:31 +0200, Thomas Petazzoni spake thusly:

Quoted 17 lines · Fabio Porcedda
Quoted 9 lines
Quoted 4 lines

Hum, yes, but why? The entire build process is anyway very noisy, so is there really a point in silencing specifically this part? What is the ultimate goal you're trying to achieve here?

My ultimate goal is to be able using the "-s" flags to silence all parts, because sometimes i just want to build and view only ">>> *" messages, errors, warning without anything else.

Quoted 6 lines

As example the "toolchain-external" target already do that when the "-s" option is used.

I've silenced only this part because it was easy and it's anyway an improvement.

Maybe i can work on silencing other parts too if the feature is desired.

Quoted 7 lines

Ok, thanks for the explanation.

I guess we need to decide whether having a fully silent build in "make -s" is a goal we should aim at. It seems like a good idea to me, but I don't have a really strong opinion about this.

What do others think about this?

Here's what I use for a silent build:

Quoted 8 lines
Quoted 6 lines
    brmake() {
        make "${@}" \
        |sed -r -e '/^.{4}>>>[[:space:]]+(.*).{5}$/!d; s//\1/;'
    }

Then calling 'brmake' instead of 'make', will get you only the >>> lines.

Nice, so i'm not the only one who likes a silent build ;-)

Well, I still believe the build should be verbose by default, otherwise we would miss a lot of important information on bug reports. The problem is where to store the build.log in case of a silent build, so the user can provide it.

I think the best we can do is document a simple solution (like my little function above, for example).

Quoted 3 lines

I think that a downside of this method is that even the stderr is filtered as well so messages like warning or errors are filtered as well.

No, because only stdout is filtered, there's no redirection of stderr.

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'
author
#8 lore raw

[Buildroot] Silencing the build

Quoted 9 lines · Yann E. MORIN

Fabio, All,

On 2014-07-18 10:18 +0200, Fabio Porcedda spake thusly:

Quoted 6 lines · Yann E. MORIN
Quoted 5 lines

Thomas, All,

On 2014-07-17 20:31 +0200, Thomas Petazzoni spake thusly:

Quoted 2 lines · Fabio Porcedda

<snip>

Quoted 13 lines
Quoted 13 lines
Quoted 13 lines
Quoted 5 lines

I guess we need to decide whether having a fully silent build in "make -s" is a goal we should aim at. It seems like a good idea to me, but I don't have a really strong opinion about this.

What do others think about this?

Here's what I use for a silent build:

    brmake() {
        make "${@}" \
        |sed -r -e '/^.{4}>>>[[:space:]]+(.*).{5}$/!d; s//\1/;'
    }
Quoted 8 lines
Quoted 3 lines
Quoted 1 line

Then calling 'brmake' instead of 'make', will get you only the >>> lines.

Nice, so i'm not the only one who likes a silent build ;-)

Well, I still believe the build should be verbose by default, otherwise we would miss a lot of important information on bug reports. The problem is where to store the build.log in case of a silent build, so the user can provide it.

I don't know a way to store the full log (stdout & stderr) and view a filtered version of stdout & the unfiltered stderr, maybe you have an idea?

Quoted 2 lines

I think the best we can do is document a simple solution (like my little function above, for example).

Yes, i think it's a good idea.

I personally prefer using a line like this:
make | grep --color=never ">>> "
to be able to distinguish more easily stdoud messages from stderr messages.

Nevertheless, I still would like that this patch will be applied because:
- using "make -s" is still simpler that using some "make | sed ........", many tools have a quiet flag for this reason.
- is a work already done.
- does not change the usual behavior.
- it's just adds 12 line of code .

Quoted 5 lines
Quoted 3 lines

I think that a downside of this method is that even the stderr is filtered as well so messages like warning or errors are filtered as well.

No, because only stdout is filtered, there's no redirection of stderr.

Good point, you are right.

Regards

Signature · 1 line
Fabio Porcedda
#9 lore raw

[Buildroot] Silencing the build

Fabio, All,

On 2014-07-21 18:25 +0200, Fabio Porcedda spake thusly:

Quoted 9 lines · Yann E. MORIN
Quoted 4 lines

Well, I still believe the build should be verbose by default, otherwise we would miss a lot of important information on bug reports. The problem is where to store the build.log in case of a silent build, so the user can provide it.

I don't know a way to store the full log (stdout & stderr) and view a filtered version of stdout & the unfiltered stderr, maybe you have an idea?

    brmake() {
        # This is a bash function, pipefail is not POSIX
        set -o pipefail
        make "${@}" 2>&1 \
        |tee build.log   \
        |sed -r -e '/^.{4}>>>[[:space:]]+(.*).{5}$/!d; s//\1/;'
    }
Quoted 8 lines
Quoted 2 lines

I think the best we can do is document a simple solution (like my little function above, for example).

Yes, i think it's a good idea.

I personally prefer using a line like this:
make | grep --color=never ">>> "
to be able to distinguish more easily stdoud messages from stderr messages.

Yes, why not. That's a bit trickier to handle, but no undoable. It would need playing tricks with redirection and duplicating filedescriptors...

Quoted 6 lines

Nevertheless, I still would like that this patch will be applied because:
- using "make -s" is still simpler that using some "make | sed ........", many tools have a quiet flag for this reason.
- is a work already done.
- does not change the usual behavior.
- it's just adds 12 line of code .

I'll have another look at it...

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'
#10 lore raw

PATCH 1/2 apply-patches.sh: don't print anything when "-s" option is used

In reply to Fabio Porcedda

Fabio, All,

On 2014-07-09 13:46 +0200, Fabio Porcedda spake thusly:

Quoted 8 lines

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. Because "apply-patches.sh" is called in many places add a "APPLY_PATCHES" variable to permit adding the "-s" easily.

Signed-off-by Fabio Porcedda <[email protected]>

OK, this patch does two things:
- introduce the APPLY_PATCHES variable, to be used instead of duplicating support/scripts/apply-patches.sh everywhere,
- add the -s option to apply-patches

So, it should be split in two.

I did not initially notice that appy-patches was not always made silent, but that it was conditional to the user using 'make -s' in the first place.

So, I would not oppose that patch. After all, if the user uses make -s, and it is not really complicated to propagate that to our sub-tools, that's pretty OK.

However, see below...

[--SNIP--]

package/Makefile.in FLEX:=$(shell which flex || type -p flex) · line 225

Quoted 13 lines
package/Makefile.in +5 -0
index 97053ba..e1fdb4d 100644
@@ -218,6 +218,12 @@ FLEX:=$(shell which flex || type -p flex)
 BISON:=$(shell which bison || type -p bison)
 SED:=$(shell which sed || type -p sed) -i -e
 
+ifeq (,$(findstring s,$(MAKEFLAGS)))
+APPLY_PATCHES = support/scripts/apply-patches.sh
+else
+APPLY_PATCHES = support/scripts/apply-patches.sh -s
+endif

I would do:

    BR_SILENT = $(if $(findstring s,$(MAKEFLAGS)),YES)

    APPLY_PATCHES = support/scripts/apply-patches.sh $(if $(BR_SILENT),-s)

That way, we can re-use $(BR_SILENT) for other tools (I'm thinking of graph-depends and our other custom tools in support/scripts/ .)

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'
author
#11 lore raw

PATCH 1/2 apply-patches.sh: don't print anything when "-s" option is used

Quoted 10 lines · Yann E. MORIN

Fabio, All,

On 2014-07-09 13:46 +0200, Fabio Porcedda spake thusly:

Quoted 7 lines

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. Because "apply-patches.sh" is called in many places add a "APPLY_PATCHES" variable to permit adding the "-s" easily.

Quoted 8 lines
Quoted 1 line
Signed-off-by Fabio Porcedda <[email protected]>

OK, this patch does two things:
- introduce the APPLY_PATCHES variable, to be used instead of duplicating support/scripts/apply-patches.sh everywhere,
- add the -s option to apply-patches

So, it should be split in two.

Ok, done.

Quoted 7 lines

I did not initially notice that appy-patches was not always made silent, but that it was conditional to the user using 'make -s' in the first place.

So, I would not oppose that patch. After all, if the user uses make -s, and it is not really complicated to propagate that to our sub-tools, that's pretty OK.

Great!

Quoted 19 lines

However, see below...

[--SNIP--]

package/Makefile.in FLEX:=$(shell which flex || type -p flex) · line 225

Quoted 13 lines
package/Makefile.in +5 -0
index 97053ba..e1fdb4d 100644
@@ -218,6 +218,12 @@ FLEX:=$(shell which flex || type -p flex)
 BISON:=$(shell which bison || type -p bison)
 SED:=$(shell which sed || type -p sed) -i -e
 
+ifeq (,$(findstring s,$(MAKEFLAGS)))
+APPLY_PATCHES = support/scripts/apply-patches.sh
+else
+APPLY_PATCHES = support/scripts/apply-patches.sh -s
+endif

I would do:

Quoted 3 lines
    BR_SILENT = $(if $(findstring s,$(MAKEFLAGS)),YES)

    APPLY_PATCHES = support/scripts/apply-patches.sh $(if $(BR_SILENT),-s)

Ok, done.

Quoted 2 lines

That way, we can re-use $(BR_SILENT) for other tools (I'm thinking of graph-depends and our other custom tools in support/scripts/ .)

I've sent a new revision:
http://lists.busybox.net/pipermail/buildroot/2014-July/102796.html

Thanks and best regards

Signature · 1 line
Fabio Porcedda