package: remove trailing whitespace

PATCH New Ricardo Martincoski 4 participants 17 messages Apr 4, 2017 – Apr 24, 2017 Arm i.MX and Layerscape

lore

Share & tools

lore

Ricardo Martincoski

author

2017-04-04 22:50 UTC #0 lore raw

PATCH 1/11 package: remove trailing whitespace

Occurrences were searched using [1]:
check-package --include-only TrailingSpace $(find * -type f) and manually removed.

[1] http://patchwork.ozlabs.org/patch/729666/

Signed-off-by Ricardo Martincoski <[email protected]>

---
build-tested with:

$ echo BR2_GOOGLE_BREAKPAD_ENABLE=y > host-google-breakpad.config
$ support/scripts/test-pkg -c host-google-breakpad.config \
  -d /home/builds/test-pkg -p host-google-breakpad
49 builds, 29 skipped, 0 failed
---
 package/google-breakpad/google-breakpad.mk | 2 +-
 package/leafnode2/leafnode2.mk             | 2 +-
 package/mbedtls/Config.in                  | 2 +-
 package/protobuf/Config.in                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

package/google-breakpad/google-breakpad.mk +1 -1

index fd5a45d87..191ee5bec 100644
@@ -15,7 +15,7 @@ GOOGLE_BREAKPAD_LICENSE = BSD-3-Clause
 GOOGLE_BREAKPAD_LICENSE_FILES = LICENSE
 GOOGLE_BREAKPAD_DEPENDENCIES = host-google-breakpad linux-syscall-support
 
-HOST_GOOGLE_BREAKPAD_DEPENDENCIES = host-linux-syscall-support 
+HOST_GOOGLE_BREAKPAD_DEPENDENCIES = host-linux-syscall-support
 
 # Avoid using depot-tools to download this file.
 define HOST_GOOGLE_BREAKPAD_LSS

package/leafnode2/leafnode2.mk +1 -1

index 92039c13c..4a920ccf9 100644
@@ -16,7 +16,7 @@ LEAFNODE2_CONF_ENV = \
 
 # --enable-runas-user use 'news' as default but the configure stop
 # if news doesn't exist on the build host.
-# Use 'root' while cross-compiling 
+# Use 'root' while cross-compiling
 LEAFNODE2_CONF_OPTS = \
 	--sysconfdir=/etc/leafnode2 \
 	--enable-spooldir=/var/spool/news \

package/mbedtls/Config.in +1 -1

index ed63f2da5..8836984cb 100644
@@ -23,7 +23,7 @@ config BR2_PACKAGE_MBEDTLS_COMPRESSION
 	help
 	  Enable support for compression of the content data before it
 	  enters the secure channel as described in RFC 3749.
-	  
+
 	  Warning: TLS compression may make you vulnerable to the CRIME
 	  attack. You should not enable it unless you know for sure CRIME
 	  and similar attacks are not applicable to your particular

package/protobuf/Config.in +1 -1

index bccf258f6..bece56c29 100644
@@ -11,7 +11,7 @@
 #
 # Since protobuf most likely only uses the 1, 2 and 4-byte variants, it
 # *could* technically build with gcc 4.7. This is probably not a big deal,
-# and we can live with requiring gcc 4.8 on PowerPC to build protobuf. 
+# and we can live with requiring gcc 4.8 on PowerPC to build protobuf.
 #
 # The SPARC64 build fails due to a missing definition of Atomic64. This
 # has been fixed on the master branch but the build still breaks due to

Signature · 1 line

2.11.0

Ricardo Martincoski

author

2017-04-04 22:50 UTC #1 lore raw

PATCH 2/11 package: remove empty line at end of file

Occurrences were searched using [1]:
check-package --include-only EmptyLastLine $(find * -type f) and manually removed.

[1] http://patchwork.ozlabs.org/patch/729666/

Signed-off-by Ricardo Martincoski <[email protected]>

---
 package/acpica/acpica.hash                                             | 1 -
 package/cbootimage/cbootimage.mk                                       | 1 -
 package/freescale-imx/imx-kobs/Config.in                               | 1 -
 package/freescale-imx/imx-lib/Config.in                                | 1 -
 package/guile/Config.in                                                | 1 -
 package/libcli/Config.in                                               | 1 -
 package/libfreeimage/libfreeimage.mk                                   | 1 -
 package/ljsyscall/Config.in                                            | 1 -
 package/lua-csnappy/Config.in                                          | 1 -
 package/luasql-sqlite3/Config.in                                       | 1 -
 package/netsnmp/netsnmp.hash                                           | 1 -
 package/perl-netaddr-ip/Config.in                                      | 1 -
 package/ptpd2/Config.in                                                | 1 -
 package/python-cbor/Config.in                                          | 1 -
 package/python-iniparse/python-iniparse.hash                           | 1 -
 package/python-lxml/Config.in.host                                     | 1 -
 package/python3/python3.hash                                           | 1 -
 package/ts4900-fpga/Config.in                                          | 1 -
 package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk | 1 -
 19 files changed, 19 deletions(-)

package/acpica/acpica.hash +0 -1

index 8f1c08a67..71c110ba8 100644
@@ -1,3 +1,2 @@
 # locally computed hash
 sha256 dfb33db5599bd48134dbd6e50c8804099be0cf1c35d98975a6cb84dabca78b67 acpica-unix2-20161117.tar.gz
-

package/cbootimage/cbootimage.mk +0 -1

index 22a6e5331..40a248aed 100644
@@ -12,4 +12,3 @@ CBOOTIMAGE_AUTORECONF = YES
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
-

package/freescale-imx/imx-kobs/Config.in +0 -1

index fc2344ed0..61be9f26d 100644
@@ -7,4 +7,3 @@ config BR2_PACKAGE_IMX_KOBS
 
 	  This library is provided by Freescale as-is and doesn't have
 	  an upstream.
-

package/freescale-imx/imx-lib/Config.in +0 -1

index 3b0f7a921..368770504 100644
@@ -13,4 +13,3 @@ config BR2_PACKAGE_IMX_LIB
 
 	  This library is provided by Freescale as-is and doesn't have
 	  an upstream.
-

package/guile/Config.in +0 -1

index e0f657127..c26c296e4 100644
@@ -19,4 +19,3 @@ config BR2_PACKAGE_GUILE
 comment "guile needs a uClibc or glibc toolchain w/ threads, wchar, dynamic library"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \
 		BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL
-

package/libcli/Config.in +0 -1

index e20afb0e0..3b625c364 100644
@@ -8,4 +8,3 @@ config BR2_PACKAGE_LIBCLI
 	  tree.
 
 	  http://sites.dparrish.com/libcli
-

package/libfreeimage/libfreeimage.mk +0 -1

index cd73f5a8e..0ca23933a 100644
@@ -30,4 +30,3 @@ define LIBFREEIMAGE_INSTALL_TARGET_CMDS
 endef
 
 $(eval $(generic-package))
-

package/ljsyscall/Config.in +0 -1

index 149e71d3f..d78591ec9 100644
@@ -9,4 +9,3 @@ config BR2_PACKAGE_LJSYSCALL
 
 comment "ljsyscall needs LuaJIT"
 	depends on !BR2_PACKAGE_LUAJIT
-

package/lua-csnappy/Config.in +0 -1

index 0562277a0..54d68a2e1 100644
@@ -5,4 +5,3 @@ config BR2_PACKAGE_LUA_CSNAPPY
 	  which implements the Google's Snappy (de)compressor.
 
 	  http://fperrad.github.io/lua-csnappy/
-

package/luasql-sqlite3/Config.in +0 -1

index 3bd73f3ba..483d6a0f3 100644
@@ -6,4 +6,3 @@ config BR2_PACKAGE_LUASQL_SQLITE3
 	  LuaSQL is a simple interface from Lua to a DBMS.
 
 	  http://www.keplerproject.org/luasql
-

package/netsnmp/netsnmp.hash +0 -1

index 2c18441fe..fc7792602 100644
@@ -1,4 +1,3 @@
 # From http://sourceforge.net/projects/net-snmp/files/net-snmp/5.7.3/
 md5	d4a3459e1577d0efa8d96ca70a885e53	net-snmp-5.7.3.tar.gz
 sha1	97dc25077257680815de44e34128d365c76bd839	net-snmp-5.7.3.tar.gz
-

package/perl-netaddr-ip/Config.in +0 -1

index 152583008..d4061e1df 100644
@@ -4,4 +4,3 @@ config BR2_PACKAGE_PERL_NETADDR_IP
 	  Manages IPv4 and IPv6 addresses and subnets
 
 	  https://metacpan.org/release/NetAddr-IP
-

package/ptpd2/Config.in +0 -1

index e88a9bb1a..406276af3 100644
@@ -6,4 +6,3 @@ config BR2_PACKAGE_PTPD2
 	  (PTP) as defined by the IEEE-1588-2008.
 
 	  https://github.com/ptpd/ptpd
-

package/python-cbor/Config.in +0 -1

index 2d0962d59..403fab3f0 100644
@@ -4,4 +4,3 @@ config BR2_PACKAGE_PYTHON_CBOR
 	  RFC 7049 - Concise Binary Object Representation.
 
 	  https://pypi.python.org/pypi/cbor
-

package/python-iniparse/python-iniparse.hash +0 -1

index d7d8e9336..f1f803823 100644
@@ -1,4 +1,3 @@
 # md5 from https://pypi.python.org/pypi?:action=show_md5&digest=5e573e9e9733d97623881ce9bbe5eca6, sha256 locally computed
 md5 5e573e9e9733d97623881ce9bbe5eca6 iniparse-0.4.tar.gz
 sha256 abc1ee12d2cfb2506109072d6c21e40b6c75a3fe90a9c924327d80bc0d99c054  iniparse-0.4.tar.gz
-

package/python-lxml/Config.in.host +0 -1

index 580e440e1..7bf1e4859 100644
@@ -5,4 +5,3 @@ config BR2_PACKAGE_HOST_PYTHON_LXML
 	  libxml2 and libxslt.
 
 	  http://lxml.de/
-

package/python3/python3.hash +0 -1

index 694b09be1..26d08dee4 100644
@@ -2,4 +2,3 @@
 md5 692b4fc3a2ba0d54d1495d4ead5b0b5c Python-3.6.1.tar.xz
 # Locally computed
 sha256 a01810ddfcec216bcdb357a84bfaafdfaa0ca42bbdaa4cb7ff74f5a9961e4041 Python-3.6.1.tar.xz
-

package/ts4900-fpga/Config.in +0 -1

index 7910631bc..77a73b5ae 100644
@@ -9,4 +9,3 @@ config BR2_PACKAGE_TS4900_FPGA
 	  script expects to find it in the /boot folder.
 
 	  http://wiki.embeddedarm.com/wiki/TS-4900#FPGA_Changelog
-

package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk +0 -1

index 2a3e99745..b31d98fbf 100644
@@ -33,4 +33,3 @@ define XDRIVER_XF86_VIDEO_IMX_VIV_INSTALL_TARGET_CMDS
 endef
 
 $(eval $(generic-package))
-

Signature · 1 line

2.11.0

Ricardo Martincoski

author

2017-04-04 22:50 UTC #2 lore raw

PATCH 3/11 package: remove consecutive empty lines

In reply to Ricardo Martincoski

Occurrences were searched using [1]:
check-package --include-only ConsecutiveEmptyLines $(find * -type f) and manually removed.

[1] http://patchwork.ozlabs.org/patch/729666/

Signed-off-by Ricardo Martincoski <[email protected]>

---
 package/amd-catalyst/amd-catalyst.mk                      | 2 --
 package/bcusdk/bcusdk.mk                                  | 1 -
 package/dhcp/Config.in                                    | 1 -
 package/docker-engine/docker-engine.mk                    | 1 -
 package/efl/Config.in                                     | 1 -
 package/ffmpeg/ffmpeg.mk                                  | 1 -
 package/gcc/gcc-final/gcc-final.mk                        | 1 -
 package/glibc/glibc.mk                                    | 1 -
 package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 1 -
 package/linux-zigbee/Config.in                            | 1 -
 package/ltp-testsuite/ltp-testsuite.mk                    | 1 -
 package/ne10/ne10.mk                                      | 1 -
 package/network-manager/network-manager.mk                | 1 -
 package/opencv3/Config.in                                 | 1 -
 package/openocd/openocd.mk                                | 1 -
 package/oracle-mysql/oracle-mysql.mk                      | 1 -
 package/qt/qt.mk                                          | 2 --
 package/qt5/qt5location/qt5location.mk                    | 1 -
 package/qt5/qt5quickcontrols/qt5quickcontrols.mk          | 1 -
 package/rpcbind/rpcbind.mk                                | 1 -
 package/rrdtool/rrdtool.mk                                | 1 -
 package/rt-tests/Config.in                                | 1 -
 package/x11vnc/x11vnc.mk                                  | 1 -
 23 files changed, 25 deletions(-)

package/amd-catalyst/amd-catalyst.mk +0 -2

index 5636f81c9..d4f5d1cc3 100644
@@ -16,7 +16,6 @@ AMD_CATALYST_SUFFIX = $(if $(BR2_x86_64),_64)
 AMD_CATALYST_ARCH_DIR = $(@D)/arch/x86$(AMD_CATALYST_SUFFIX)
 AMD_CATALYST_LIB_SUFFIX = $(if $(BR2_x86_64),64)
 
-
 define AMD_CATALYST_EXTRACT_CMDS
 	unzip -q $(DL_DIR)/$(AMD_CATALYST_SOURCE) -d $(@D)
 	$(SHELL) $(@D)/AMD-Catalyst-$(AMD_CATALYST_VERSION)-Linux-installer-$(AMD_CATALYST_VERBOSE_VER)-x86.x86_64.run --extract $(@D)

@@ -102,7 +101,6 @@ define AMD_CATALYST_INSTALL_XORG
 	$(INSTALL) -D -m 0644 package/amd-catalyst/20-fglrx.conf \
 		$(TARGET_DIR)/etc/X11/xorg.conf.d/20-fglrx.conf
 
-
 	# Common files: containing binary profiles about GPUs,
 	# required by the fglrx_drv xorg driver
 	$(INSTALL) -d $(TARGET_DIR)/etc/ati

package/bcusdk/bcusdk.mk +0 -1

index 12f41eac8..f99dd70cb 100644
@@ -24,7 +24,6 @@ BCUSDK_DEPENDENCIES = \
 	libpthsem \
 	$(if $(BR2_PACKAGE_ARGP_STANDALONE),argp-standalone)
 
-
 define BCUSDK_REMOVE_EXAMPLES
 	$(RM) -rf $(TARGET_DIR)/usr/share/bcusdk
 endef

package/dhcp/Config.in +0 -1

index 4a3049584..d09256aad 100644
@@ -26,7 +26,6 @@ config BR2_PACKAGE_DHCP_RELAY
 	help
 	  DHCP relay agent from the ISC DHCP distribution.
 
-
 config BR2_PACKAGE_DHCP_CLIENT
 	bool "dhcp client"
 	help

package/docker-engine/docker-engine.mk +0 -1

index 5ff595e64..db2653a3d 100644
@@ -34,7 +34,6 @@ DOCKER_ENGINE_GLDFLAGS_DOCKER += -extldflags '-static'
 endif
 endif
 
-
 DOCKER_ENGINE_BUILD_TAGS = cgo exclude_graphdriver_zfs autogen
 DOCKER_ENGINE_BUILD_TARGETS = docker

package/efl/Config.in +0 -1

index 960f2752c..b9c4334c2 100644
@@ -135,7 +135,6 @@ config BR2_PACKAGE_EFL_HAS_RECOMMENDED_CONFIG
 		BR2_PACKAGE_EFL_PULSEAUDIO && \
 		BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT
 
-
 comment "Warning: one of the recommended option for EFL is not enabled"
 	depends on !BR2_PACKAGE_EFL_HAS_RECOMMENDED_CONFIG

package/ffmpeg/ffmpeg.mk +0 -1

index f1a1e0df8..348bc8212 100644
@@ -473,7 +473,6 @@ else ifneq ($(call qstrip,$(BR2_GCC_TARGET_ARCH)),)
 FFMPEG_CONF_OPTS += --cpu=$(BR2_GCC_TARGET_ARCH)
 endif
 
-
 FFMPEG_CONF_OPTS += $(call qstrip,$(BR2_PACKAGE_FFMPEG_EXTRACONF))
 
 # Override FFMPEG_CONFIGURE_CMDS: FFmpeg does not support --target and others

package/gcc/gcc-final/gcc-final.mk +0 -1

index a15d837a8..e8d2e18fe 100644
@@ -50,7 +50,6 @@ define  HOST_GCC_FINAL_CONFIGURE_CMDS
 	)
 endef
 
-
 # Languages supported by the cross-compiler
 GCC_FINAL_CROSS_LANGUAGES-y = c
 GCC_FINAL_CROSS_LANGUAGES-$(BR2_INSTALL_LIBSTDCPP) += c++

package/glibc/glibc.mk +0 -1

index 58cb3d46c..58ffa6cb8 100644
@@ -94,7 +94,6 @@ define GLIBC_CONFIGURE_CMDS
 	$(GLIBC_ADD_MISSING_STUB_H)
 endef
 
-
 #
 # We also override the install to target commands since we only want
 # to install the libraries, and nothing more.

package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +0 -1

index 69bb7163f..6bf159d2e 100644
@@ -24,7 +24,6 @@ GST1_PLUGINS_GOOD_CONF_OPTS = \
 	--disable-esd \
 	--disable-esdtest
 
-
 # Options which require currently unpackaged libraries
 GST1_PLUGINS_GOOD_CONF_OPTS += \
 	--disable-jack \

package/linux-zigbee/Config.in +0 -1

index fc21faa44..ff2b0f7c9 100644
@@ -40,7 +40,6 @@ config BR2_PACKAGE_LINUX_ZIGBEE_TESTS
 	  Enable this option to install the Linux-ZigBee test programs
 	  to the target.
 
-
 config BR2_PACKAGE_LINUX_ZIGBEE_OLD_KERNEL_COMPAT
 	bool "compatibility with older kernels"
 	help

package/ltp-testsuite/ltp-testsuite.mk +0 -1

index cd9a34528..7f26bd2a5 100644
@@ -68,5 +68,4 @@ endef
 LTP_TESTSUITE_POST_PATCH_HOOKS += LTP_TESTSUITE_REMOVE_UNSUPPORTED
 endif
 
-
 $(eval $(autotools-package))

package/ne10/ne10.mk +0 -1

index 63a79e75f..cb303bd7b 100644
@@ -32,7 +32,6 @@ define NE10_INSTALL_STAGING_CMDS
 	$(NE10_INSTALL_STAGING_SHARED_LIB)
 endef
 
-
 define NE10_INSTALL_TARGET_CMDS
 	cp -dpf $(@D)/modules/libNE10*.so* $(TARGET_DIR)/usr/lib/
 endef

package/network-manager/network-manager.mk +0 -1

index 0815bdd6a..6adc9b1ab 100644
@@ -22,7 +22,6 @@ NETWORK_MANAGER_CONF_ENV = \
 	ac_cv_file__etc_redhat_release=no \
 	ac_cv_file__etc_SuSE_release=no
 
-
 NETWORK_MANAGER_CONF_OPTS = \
 	--disable-tests \
 	--disable-qt \

package/opencv3/Config.in +0 -1

index 4c00bf1b9..ee589f950 100644
@@ -130,7 +130,6 @@ comment "opengl support needs an OpenGL provider"
 
 endif # BR2_PACKAGE_OPENCV3_LIB_HIGHGUI
 
-
 config BR2_PACKAGE_OPENCV3_LIB_IMGCODECS
 	bool "imgcodecs"
 	select BR2_PACKAGE_OPENCV3_LIB_IMGPROC

package/openocd/openocd.mk +0 -1

index 8407bbcbd..911d31168 100644
@@ -113,6 +113,5 @@ endef
 OPENOCD_POST_BUILD_HOOKS += OPENOCD_FIX_VERSION_TEXI
 HOST_OPENOCD_POST_BUILD_HOOKS += OPENOCD_FIX_VERSION_TEXI
 
-
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

package/oracle-mysql/oracle-mysql.mk +0 -1

index 45a71fac6..4307008d4 100644
@@ -125,7 +125,6 @@ ORACLE_MYSQL_CONF_OPTS += \
 	--without-server
 endif
 
-
 define ORACLE_MYSQL_REMOVE_TEST_PROGS
 	rm -rf $(TARGET_DIR)/usr/mysql-test $(TARGET_DIR)/usr/sql-bench
 endef

package/qt/qt.mk +0 -2

index 1fdb1bf70..2580ee7c0 100644
@@ -79,7 +79,6 @@ else
 QT_CONFIGURE_OPTS += -no-glib
 endif
 
-
 ### Pixel depths
 QT_PIXEL_DEPTHS = # empty
 ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_1),y)

@@ -547,7 +546,6 @@ define QT_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
 endef
 
-
 # Build the list of libraries and plugins to install to the target
 
 QT_INSTALL_LIBS += QtCore

package/qt5/qt5location/qt5location.mk +0 -1

index 24b26b2db..96263e89b 100644
@@ -62,5 +62,4 @@ define QT5LOCATION_INSTALL_TARGET_CMDS
 	$(QT5LOCATION_INSTALL_TARGET_QMLS)
 endef
 
-
 $(eval $(generic-package))

package/qt5/qt5quickcontrols/qt5quickcontrols.mk +0 -1

index 0f11b79ca..d28993244 100644
@@ -30,7 +30,6 @@ define QT5QUICKCONTROLS_INSTALL_STAGING_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
 endef
 
-
 ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5BASE_WIDGETS),yy)
 define QT5QUICKCONTROLS_INSTALL_TARGET_PRIVATEWIDGETS
 	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/PrivateWidgets $(TARGET_DIR)/usr/qml/QtQuick

package/rpcbind/rpcbind.mk +0 -1

index 28deb50ef..cf2e81dbb 100644
@@ -36,5 +36,4 @@ define RPCBIND_INSTALL_INIT_SYSV
 		$(TARGET_DIR)/etc/init.d/S30rpcbind
 endef
 
-
 $(eval $(autotools-package))

package/rrdtool/rrdtool.mk +0 -1

index 84c7bb7ac..028b7cbbb 100644
@@ -25,7 +25,6 @@ RRDTOOL_CONF_OPTS = \
 	--disable-ruby \
 	--disable-tcl
 
-
 ifeq ($(BR2_NEEDS_GETTEXT),y)
 RRDTOOL_DEPENDENCIES += gettext
 endif

package/rt-tests/Config.in +0 -1

index b39856d34..23e911b9f 100644
@@ -23,7 +23,6 @@ config BR2_PACKAGE_RT_TESTS
 
 	  http://rt.wiki.kernel.org
 
-
 comment "rt-tests may not work on MIPS with an external uClibc toolchain"
 	depends on BR2_PACKAGE_RT_TESTS
 	depends on BR2_TOOLCHAIN_EXTERNAL_UCLIBC

package/x11vnc/x11vnc.mk +0 -1

index 561d7bf13..9f4af1258 100644
@@ -61,5 +61,4 @@ else
 X11VNC_CONF_OPTS += --without-zlib
 endif
 
-
 $(eval $(autotools-package))

Signature · 1 line

2.11.0

Ricardo Martincoski

author

2017-04-04 22:50 UTC #3 lore raw

PATCH 4/11 package: normalize separator size to 80

In reply to Ricardo Martincoski

Occurrences were searched using [1]:
check-package --include-only PackageHeader $(find * -type f) and manually fixed to comply to [2].

[1] http://patchwork.ozlabs.org/patch/729669/
[2] http://nightly.buildroot.org/#writing-rules-mk

Signed-off-by Ricardo Martincoski <[email protected]>

---
 package/cxxtest/cxxtest.mk                       | 4 ++--
 package/fwup/fwup.mk                             | 4 ++--
 package/python-docutils/python-docutils.mk       | 4 ++--
 package/python-simpleaudio/python-simpleaudio.mk | 4 ++--
 package/rabbitmq-server/rabbitmq-server.mk       | 4 ++--
 package/trousers/trousers.mk                     | 4 ++--
 package/udpxy/udpxy.mk                           | 2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)

package/cxxtest/cxxtest.mk +2 -2

index 4ea9adf6a..7d494c8f1 100644
@@ -1,8 +1,8 @@
-#######################################################################################
+################################################################################
 #
 # cxxtest
 #
-#######################################################################################
+################################################################################
 
 CXXTEST_VERSION = 4.4
 CXXTEST_SITE = https://github.com/CxxTest/cxxtest/releases/download/$(CXXTEST_VERSION)

package/fwup/fwup.mk +2 -2

index d87bdca96..0c2b0f919 100644
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # fwup
 #
-#############################################################
+################################################################################
 
 FWUP_VERSION = v0.8.2
 FWUP_SITE = $(call github,fhunleth,fwup,$(FWUP_VERSION))

package/python-docutils/python-docutils.mk +2 -2

index a42b34b0e..1ce259bd1 100644
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # python-docutils
 #
-#############################################################
+################################################################################
 
 PYTHON_DOCUTILS_VERSION = 0.13.1
 PYTHON_DOCUTILS_SOURCE = docutils-$(PYTHON_DOCUTILS_VERSION).tar.gz

package/python-simpleaudio/python-simpleaudio.mk +2 -2

index b9562ee6b..24ec067da 100644
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # python-simpleaudio
 #
-#############################################################
+################################################################################
 
 PYTHON_SIMPLEAUDIO_VERSION = 1.0.1
 PYTHON_SIMPLEAUDIO_SOURCE = simpleaudio-$(PYTHON_SIMPLEAUDIO_VERSION).tar.gz

package/rabbitmq-server/rabbitmq-server.mk +2 -2

index f4671ae3c..6df770793 100644
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # rabbitmq-server
 #
-#############################################################
+################################################################################
 
 RABBITMQ_SERVER_VERSION = 3.6.6
 RABBITMQ_SERVER_SITE = http://www.rabbitmq.com/releases/rabbitmq-server/v$(RABBITMQ_SERVER_VERSION)

package/trousers/trousers.mk +2 -2

index e6d564a88..e49c2ac14 100644
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # trousers
 #
-##############################################################
+################################################################################
 
 TROUSERS_VERSION = 0.3.13
 TROUSERS_SITE = http://downloads.sourceforge.net/project/trousers/trousers/$(TROUSERS_VERSION)

package/udpxy/udpxy.mk +1 -1

index 36b9afd10..22467948a 100644
@@ -2,7 +2,7 @@
 #
 # udpxy
 #
-#################################################################################
+################################################################################
 
 UDPXY_VERSION = 1.0.23-9-prod
 UDPXY_SOURCE = udpxy.$(UDPXY_VERSION).tar.gz

Signature · 1 line

2.11.0

Ricardo Martincoski

author

2017-04-04 22:50 UTC #4 lore raw

PATCH 5/11 package: add missing empty line after header

In reply to Ricardo Martincoski

Occurrences were searched using [1]:
check-package --include-only PackageHeader $(find * -type f) and manually fixed to comply to [2].

[1] http://patchwork.ozlabs.org/patch/729669/
[2] http://nightly.buildroot.org/#writing-rules-mk

Signed-off-by Ricardo Martincoski <[email protected]>

---
 package/grantlee/grantlee.mk | 1 +
 package/lesstif/lesstif.mk   | 1 +
 2 files changed, 2 insertions(+)

package/grantlee/grantlee.mk +1 -0

index 812603b82..575b63fef 100644
@@ -3,6 +3,7 @@
 # grantlee
 #
 ################################################################################
+
 GRANTLEE_VERSION = 5.1.0
 GRANTLEE_SITE = http://downloads.grantlee.org
 GRANTLEE_INSTALL_STAGING = YES

package/lesstif/lesstif.mk +1 -0

index 3d381fff8..933dd1337 100644
@@ -3,6 +3,7 @@
 # lesstif
 #
 ################################################################################
+
 LESSTIF_VERSION = 0.95.2
 LESSTIF_SOURCE = lesstif-$(LESSTIF_VERSION).tar.bz2
 LESSTIF_SITE = http://downloads.sourceforge.net/project/lesstif/lesstif/$(LESSTIF_VERSION)

Signature · 1 line

2.11.0

Ricardo Martincoski

author

2017-04-04 22:50 UTC #5 lore raw

PATCH 6/11 package: remove trailing backslash

In reply to Ricardo Martincoski

Occurrences were searched using [1]:
check-package --include-only TrailingBackslash $(find * -type f) and manually removed.

[1] http://patchwork.ozlabs.org/patch/729669/

Signed-off-by Ricardo Martincoski <[email protected]>

---
 package/cegui06/cegui06.mk             |  4 ++--
 package/celt051/celt051.mk             |  2 +-
 package/flannel/flannel.mk             |  2 +-
 package/hostapd/hostapd.mk             |  2 +-
 package/jimtcl/jimtcl.mk               |  2 +-
 package/libnice/libnice.mk             |  2 +-
 package/nvidia-driver/nvidia-driver.mk | 10 +++++-----
 package/parted/parted.mk               |  2 +-
 package/redis/redis.mk                 |  2 +-
 package/spice/spice.mk                 |  4 ++--
 package/tiff/tiff.mk                   |  2 +-
 package/uclibc/uclibc.mk               |  2 +-
 package/vlc/vlc.mk                     |  2 +-
 13 files changed, 19 insertions(+), 19 deletions(-)

package/cegui06/cegui06.mk +2 -2

index 43d3b09dd..8b2c886c7 100644
@@ -16,7 +16,7 @@ CEGUI06_INSTALL_STAGING = YES
 CEGUI06_DEPENDENCIES =              \
 	expat                       \
 	freetype                    \
-	pcre                        \
+	pcre
 
 CEGUI06_CONF_OPTS =                 \
 	--enable-expat              \

@@ -31,6 +31,6 @@ CEGUI06_CONF_OPTS =                 \
 	--disable-samples           \
 	--disable-lua-module        \
 	--disable-toluacegui        \
-	--disable-external-toluapp  \
+	--disable-external-toluapp
 
 $(eval $(autotools-package))

package/celt051/celt051.mk +1 -1

index 6074c4939..a5b6f47a0 100644
@@ -25,6 +25,6 @@ CELT051_CONF_OPTS =                       \
 	--disable-static-modes            \
 	--disable-assertions              \
 	--disable-oggtest                 \
-	--with-ogg=$(STAGING_DIR)/usr     \
+	--with-ogg=$(STAGING_DIR)/usr
 
 $(eval $(autotools-package))

package/flannel/flannel.mk +1 -1

index 18c0af160..8393c5992 100644
@@ -20,7 +20,7 @@ FLANNEL_MAKE_ENV = \
 	CGO_ENABLED=1
 
 FLANNEL_GLDFLAGS = \
-	-X github.com/coreos/flannel/version.Version=$(FLANNEL_VERSION) \
+	-X github.com/coreos/flannel/version.Version=$(FLANNEL_VERSION)
 
 ifeq ($(BR2_STATIC_LIBS),y)
 FLANNEL_GLDFLAGS += -extldflags '-static'

package/hostapd/hostapd.mk +1 -1

index cf651f8d1..dc28d1323 100644
@@ -51,7 +51,7 @@ endif
 ifeq ($(BR2_PACKAGE_HOSTAPD_EAP),y)
 HOSTAPD_CONFIG_ENABLE += \
 	CONFIG_EAP \
-	CONFIG_RADIUS_SERVER \
+	CONFIG_RADIUS_SERVER
 
 # Enable both TLS v1.1 (CONFIG_TLSV11) and v1.2 (CONFIG_TLSV12)
 HOSTAPD_CONFIG_ENABLE += CONFIG_TLSV1

package/jimtcl/jimtcl.mk +1 -1

index 78517c4f4..cdbf8ae47 100644
@@ -17,7 +17,7 @@ JIMTCL_HEADERS_TO_INSTALL = \
 	jim-signal.h \
 	jim-subcmd.h \
 	jim-win32compat.h \
-	jim-config.h \
+	jim-config.h
 
 ifeq ($(BR2_PACKAGE_TCL),)
 define JIMTCL_LINK_TCLSH

package/libnice/libnice.mk +1 -1

index 5ec2b6151..6afcb7635 100644
@@ -14,6 +14,6 @@ LIBNICE_INSTALL_STAGING = YES
 LIBNICE_AUTORECONF = YES
 LIBNICE_CONF_OPTS = \
 	--without-gstreamer \
-	--without-gstreamer-0.10 \
+	--without-gstreamer-0.10
 
 $(eval $(autotools-package))

package/nvidia-driver/nvidia-driver.mk +5 -5

index cb9b7faec..0d0311001 100644
@@ -43,18 +43,18 @@ NVIDIA_DRIVER_PROVIDES = libgl libegl libgles
 NVIDIA_DRIVER_LIBS_GL = \
 	libGLX.so.0 \
 	libGL.so.$(NVIDIA_DRIVER_VERSION) \
-	libGLX_nvidia.so.$(NVIDIA_DRIVER_VERSION) \
+	libGLX_nvidia.so.$(NVIDIA_DRIVER_VERSION)
 
 NVIDIA_DRIVER_LIBS_EGL = \
 	libEGL.so.1 \
 	libGLdispatch.so.0 \
-	libEGL_nvidia.so.$(NVIDIA_DRIVER_VERSION) \
+	libEGL_nvidia.so.$(NVIDIA_DRIVER_VERSION)
 
 NVIDIA_DRIVER_LIBS_GLES = \
 	libGLESv1_CM.so.1 \
 	libGLESv2.so.2 \
 	libGLESv1_CM_nvidia.so.$(NVIDIA_DRIVER_VERSION) \
-	libGLESv2_nvidia.so.$(NVIDIA_DRIVER_VERSION) \
+	libGLESv2_nvidia.so.$(NVIDIA_DRIVER_VERSION)
 
 NVIDIA_DRIVER_LIBS_MISC = \
 	libnvidia-eglcore.so.$(NVIDIA_DRIVER_VERSION) \

@@ -63,13 +63,13 @@ NVIDIA_DRIVER_LIBS_MISC = \
 	libnvidia-glsi.so.$(NVIDIA_DRIVER_VERSION) \
 	tls/libnvidia-tls.so.$(NVIDIA_DRIVER_VERSION) \
 	libvdpau_nvidia.so.$(NVIDIA_DRIVER_VERSION) \
-	libnvidia-ml.so.$(NVIDIA_DRIVER_VERSION) \
+	libnvidia-ml.so.$(NVIDIA_DRIVER_VERSION)
 
 NVIDIA_DRIVER_LIBS = \
 	$(NVIDIA_DRIVER_LIBS_GL) \
 	$(NVIDIA_DRIVER_LIBS_EGL) \
 	$(NVIDIA_DRIVER_LIBS_GLES) \
-	$(NVIDIA_DRIVER_LIBS_MISC) \
+	$(NVIDIA_DRIVER_LIBS_MISC)
 
 # Install the gl.pc file
 define NVIDIA_DRIVER_INSTALL_GL_DEV

package/parted/parted.mk +1 -1

index f88143bc2..fb4987fd5 100644
@@ -36,7 +36,7 @@ endif
 HOST_PARTED_DEPENDENCIES = host-pkgconf host-util-linux
 HOST_PARTED_CONF_OPTS += \
 	--without-readline \
-	--disable-device-mapper \
+	--disable-device-mapper
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

package/redis/redis.mk +1 -1

index 679862093..3f4956cf3 100644
@@ -23,7 +23,7 @@ endif
 # instead.
 REDIS_BUILDOPTS = $(TARGET_CONFIGURE_OPTS) \
 	LDFLAGS="$(TARGET_LDFLAGS) $(REDIS_LIBATOMIC)" \
-	PREFIX=$(TARGET_DIR)/usr MALLOC=libc \
+	PREFIX=$(TARGET_DIR)/usr MALLOC=libc
 
 define REDIS_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) $(REDIS_BUILDOPTS) -C $(@D)

package/spice/spice.mk +2 -2

index 047453848..086f5d6bb 100644
@@ -18,7 +18,7 @@ SPICE_DEPENDENCIES =        \
 	openssl             \
 	pixman              \
 	python-pyparsing    \
-	spice-protocol      \
+	spice-protocol
 
 # We disable everything for now, because the dependency tree can become
 # quite deep if we try to enable some features, and I have not tested that.

@@ -26,7 +26,7 @@ SPICE_CONF_OPTS =                 \
 	--disable-opengl          \
 	--disable-smartcard       \
 	--disable-automated-tests \
-	--without-sasl            \
+	--without-sasl
 
 SPICE_DEPENDENCIES += host-pkgconf

package/tiff/tiff.mk +1 -1

index ffb1a425c..e5b01db88 100644
@@ -11,7 +11,7 @@ TIFF_LICENSE_FILES = COPYRIGHT
 TIFF_INSTALL_STAGING = YES
 TIFF_CONF_OPTS = \
 	--disable-cxx \
-	--without-x \
+	--without-x
 
 TIFF_DEPENDENCIES = host-pkgconf

package/uclibc/uclibc.mk +1 -1

index b1e611293..44c23a788 100644
@@ -35,7 +35,7 @@ UCLIBC_KCONFIG_OPTS = \
 	$(UCLIBC_MAKE_FLAGS) \
 	PREFIX=$(STAGING_DIR) \
 	DEVEL_PREFIX=/usr/ \
-	RUNTIME_PREFIX=$(STAGING_DIR)/ \
+	RUNTIME_PREFIX=$(STAGING_DIR)/
 
 UCLIBC_TARGET_ARCH = $(call qstrip,$(BR2_UCLIBC_TARGET_ARCH))

package/vlc/vlc.mk +1 -1

index 6fc77348f..36b5fd3ea 100644
@@ -61,7 +61,7 @@ VLC_CONF_OPTS += \
 	--disable-mfx \
 	--disable-vdpau \
 	--disable-addonmanagermodules \
-	--enable-run-as-root \
+	--enable-run-as-root
 
 # Uses __atomic_fetch_add_4
 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)

Signature · 1 line

2.11.0

Ricardo Martincoski

author

2017-04-04 22:50 UTC #6 lore raw

PATCH 7/11 python-pylibftdi: check hash

In reply to Ricardo Martincoski

Currently the hash is not checked, returning this message:
WARNING: no hash file for pylibftdi-0.15.0.tar.gz

Rename the .hash file to use the package name.

Signed-off-by Ricardo Martincoski <[email protected]>

---
From get-developers:
Cc: Christian Kellermann <[email protected]>
Cc: Yegor Yefremov <[email protected]>

---
 package/python-pylibftdi/{python-libftdi.hash => python-pylibftdi.hash} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename package/python-pylibftdi/{python-libftdi.hash => python-pylibftdi.hash} (100%)

package/python-pylibftdi/python-pylibftdi.hash renamed from package/python-pylibftdi/python-libftdi.hash +0 -0

similarity index 100%
rename from package/python-pylibftdi/python-libftdi.hash
rename to package/python-pylibftdi/python-pylibftdi.hash

Signature · 1 line

2.11.0

Ricardo Martincoski

author

2017-04-04 22:50 UTC #7 lore raw

PATCH 8/11 python-pylibftdi: use package name for .mk file

In reply to Ricardo Martincoski

Found using [1]:
check-package --include-only TypoInPackageVariable $(find * -type f) and manually fixed.

[1] http://patchwork.ozlabs.org/patch/729672/

Signed-off-by Ricardo Martincoski <[email protected]>

---
From get-developers:
Cc: Christian Kellermann <[email protected]>
Cc: Yegor Yefremov <[email protected]>

---
 package/python-pylibftdi/{python-libftdi.mk => python-pylibftdi.mk} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename package/python-pylibftdi/{python-libftdi.mk => python-pylibftdi.mk} (96%)

package/python-pylibftdi/python-pylibftdi.mk renamed from package/python-pylibftdi/python-libftdi.mk +1 -1

similarity index 96%
rename from package/python-pylibftdi/python-libftdi.mk
rename to package/python-pylibftdi/python-pylibftdi.mk
index b375abb4e..0a5887b2e 100644
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# python-libftdi
+# python-pylibftdi
 #
 ################################################################################

Signature · 1 line

2.11.0

Ricardo Martincoski

author

2017-04-04 22:50 UTC #8 lore raw

PATCH 9/11 tesseract-ocr: fix typo in variable name

In reply to Ricardo Martincoski

TESSERACT_OCF_CONF_OPTS

Found using [1]:
check-package --include-only TypoInPackageVariable $(find * -type f) and manually fixed.

[1] http://patchwork.ozlabs.org/patch/729672/

Signed-off-by Ricardo Martincoski <[email protected]>

---
From get-developers:
Cc: Gilles Talis <[email protected]>

build-tested using:

$ echo BR2_PACKAGE_TESSERACT_OCR=y > tesseract-ocr.config
$ test-pkg -c tesseract-ocr.config -d /tmp/pkg/ -p tesseract-ocr
49 builds, 10 skipped, 0 failed
---
 package/tesseract-ocr/tesseract-ocr.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

package/tesseract-ocr/tesseract-ocr.mk +1 -1

index 76ca930d8..9e315b239 100644
@@ -20,7 +20,7 @@ TESSERACT_OCR_DEPENDENCIES = leptonica host-pkgconf
 TESSERACT_OCR_INSTALL_STAGING = YES
 TESSERACT_OCR_CONF_ENV = \
 	LIBLEPT_HEADERSDIR=$(STAGING_DIR)/usr/include/leptonica
-TESSERACT_OCF_CONF_OPTS = \
+TESSERACT_OCR_CONF_OPTS = \
 	--disable-opencl
 
 # Language data files download

Signature · 1 line

2.11.0

Ricardo Martincoski

author

2017-04-04 22:50 UTC #9 lore raw

PATCH 10/11 gst1-plugins-base: remove legacy freetype handling

In reply to Ricardo Martincoski

In 2010 commit 32d319e6f "gst-plugins-base: ensure <stdint.h> is used" introduced a typo (missing backslash) that made the code ineffective.

In 2013 commit f8e7fdcd3 "gst1-plugins-base: add gstreamer1 base plugins" copied the code.

It can be confirmed by looking at the output of:

$ make printvars | grep '^GST1_PLUGINS_BASE_CONF_ENV\|^FT2_CONFIG'
FT2_CONFIG=/bin/false ac_cv_header_stdint_t="stdint.h"
GST1_PLUGINS_BASE_CONF_ENV=

Direct use of freetype was dropped in version 1.7.2 by upstream [1], so remove the code instead of fixing it.

Found using [2]:
check-package --include-only Indent $(find * -type f) and manually removed.

[1] https://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=183610c035dd6955c9b3540b940aec50474af031
[2] http://patchwork.ozlabs.org/patch/729669/

Signed-off-by Ricardo Martincoski <[email protected]>

---
From get-developers:
Cc: Gustavo Zacarias <[email protected]>

---
 package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 7 -------
 1 file changed, 7 deletions(-)

package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +0 -7

index 8da1f4220..08f53f75c 100644
@@ -11,13 +11,6 @@ GST1_PLUGINS_BASE_INSTALL_STAGING = YES
 GST1_PLUGINS_BASE_LICENSE_FILES = COPYING.LIB
 GST1_PLUGINS_BASE_LICENSE = LGPL-2.0+, LGPL-2.1+
 
-# freetype is only used by examples, but if it is not found
-# and the host has a freetype-config script, then the host
-# include dirs are added to the search path causing trouble
-GST1_PLUGINS_BASE_CONF_ENV =
-	FT2_CONFIG=/bin/false \
-	ac_cv_header_stdint_t="stdint.h"
-
 # gio_unix_2_0 is only used for tests
 GST1_PLUGINS_BASE_CONF_OPTS = \
 	--disable-examples \

Signature · 1 line

2.11.0

Ricardo Martincoski

author

2017-04-04 22:50 UTC #10 lore raw

PATCH 11/11 gst-plugins-base: fix handling of freetype

In reply to Ricardo Martincoski

In 2010 commit 32d319e6f "gst-plugins-base: ensure <stdint.h> is used" introduced a typo (missing backslash) that made the code ineffective.

It can be confirmed by looking at the output of:

$ make printvars | grep '^GST_PLUGINS_BASE_CONF_ENV\|^FT2_CONFIG'
FT2_CONFIG=/bin/false ac_cv_header_stdint_t="stdint.h"
GST_PLUGINS_BASE_CONF_ENV=

Add the missing backslash to fix the code.
While at it, fix the indentation to use one tab instead of two.

The (end of the) diff of config.log confirms the code is still needed
when the host has freetype-config installed:
1704c1702
< configure:22348: result: make use of stdint.h in _stdint.h (assuming C99 compatible system)
---

Quoted 1 line

configure:22348: result: make use of stdint.h in _stdint.h

2499,2500c2497
< configure:31316: found /usr/bin/freetype-config < configure:31329: result: /usr/bin/freetype-config
---

Quoted 1 line

configure:31329: result: /bin/false

2820c2817
< ac_cv_path_FT2_CONFIG='/usr/bin/freetype-config'
---

Quoted 1 line

ac_cv_path_FT2_CONFIG='/bin/false'

2849d2845
< ac_cv_stdint_result='(assuming C99 compatible system)' 2996,2998c2992,2994
< FT2_CFLAGS='-I/usr/include/freetype2'
< FT2_CONFIG='/usr/bin/freetype-config'
< FT2_LIBS='-lfreetype'
---

Quoted 3 lines

FT2_CFLAGS=''
FT2_CONFIG='/bin/false'
FT2_LIBS=''

Found using [1]:
check-package --include-only Indent $(find * -type f) and manually fixed.

[1] http://patchwork.ozlabs.org/patch/729669/

Signed-off-by Ricardo Martincoski <[email protected]>

---
From get-developers:

---
 package/gstreamer/gst-plugins-base/gst-plugins-base.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

package/gstreamer/gst-plugins-base/gst-plugins-base.mk +3 -3

index fc3b2036a..735314365 100644
@@ -14,9 +14,9 @@ GST_PLUGINS_BASE_LICENSE_FILES = COPYING COPYING.LIB
 # freetype is only used by examples, but if it is not found
 # and the host has a freetype-config script, then the host
 # include dirs are added to the search path causing trouble
-GST_PLUGINS_BASE_CONF_ENV =
-		FT2_CONFIG=/bin/false \
-		ac_cv_header_stdint_t="stdint.h"
+GST_PLUGINS_BASE_CONF_ENV = \
+	FT2_CONFIG=/bin/false \
+	ac_cv_header_stdint_t="stdint.h"
 
 GST_PLUGINS_BASE_CONF_OPTS = \
 	--disable-examples \

Signature · 1 line

2.11.0

Thomas Petazzoni

2017-04-06 20:46 UTC #11 lore raw

PATCH 11/11 gst-plugins-base: fix handling of freetype

Hello,

Quoted 25 lines · Ricardo Martincoski

In 2010 commit 32d319e6f "gst-plugins-base: ensure <stdint.h> is used" introduced a typo (missing backslash) that made the code ineffective.
It can be confirmed by looking at the output of:
$ make printvars | grep '^GST_PLUGINS_BASE_CONF_ENV\|^FT2_CONFIG'
FT2_CONFIG=/bin/false ac_cv_header_stdint_t="stdint.h"
GST_PLUGINS_BASE_CONF_ENV=
Add the missing backslash to fix the code.
While at it, fix the indentation to use one tab instead of two.
The (end of the) diff of config.log confirms the code is still needed
when the host has freetype-config installed:
1704c1702
< configure:22348: result: make use of stdint.h in _stdint.h (assuming C99 compatible system)
---
Quoted 1 line
configure:22348: result: make use of stdint.h in _stdint.h
2499,2500c2497
< configure:31316: found /usr/bin/freetype-config < configure:31329: result: /usr/bin/freetype-config
---
Quoted 1 line
configure:31329: result: /bin/false
2820c2817
< ac_cv_path_FT2_CONFIG='/usr/bin/freetype-config'
---

Quoted 11 lines

Quoted 1 line
ac_cv_path_FT2_CONFIG='/bin/false'
2849d2845
< ac_cv_stdint_result='(assuming C99 compatible system)' 2996,2998c2992,2994
< FT2_CFLAGS='-I/usr/include/freetype2'
< FT2_CONFIG='/usr/bin/freetype-config'
< FT2_LIBS='-lfreetype'
---
Quoted 3 lines
FT2_CFLAGS=''
FT2_CONFIG='/bin/false'
FT2_LIBS=''

The patch looks good, but this diff format is really unreadable. Could you regenerate it with "diff -u" so that it becomes readable?

Thanks a lot!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

Ricardo Martincoski

author

2017-04-11 22:59 UTC #12 lore raw

PATCH v2 1/1 gst-plugins-base: fix handling of freetype

In 2010 commit 32d319e6f "gst-plugins-base: ensure <stdint.h> is used" introduced a typo (missing backslash) that made the code ineffective.

It can be confirmed by looking at the output of:

$ make printvars | grep '^GST_PLUGINS_BASE_CONF_ENV\|^FT2_CONFIG'
FT2_CONFIG=/bin/false ac_cv_header_stdint_t="stdint.h"
GST_PLUGINS_BASE_CONF_ENV=

Add the missing backslash to fix the code.
While at it, fix the indentation to use one tab instead of two.

The (end of the) diff of config.log confirms the code is still needed
when the host has freetype-config installed:
@@ -1674,10 +1674,8 @@
configure:21882: checking for emmintrin.h
configure:21882: result: no
configure:21894: checking for stdint types
-configure:21917: /tmp/gst/output/host/usr/bin/i686-pc-linux-gnu-gcc -std=gnu99 -c conftest.c >&5
-configure:21917: $? = 0
configure:21961: result: stdint.h (shortcircuit)
-configure:22348: result: make use of stdint.h in _stdint.h (assuming C99 compatible system)
+configure:22348: result: make use of stdint.h in _stdint.h
configure:22359: checking for localtime_r
configure:22359: /tmp/gst/output/host/usr/bin/i686-pc-linux-gnu-gcc -std=gnu99 -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c >&5 configure:22359: $? = 0
@@ -2468,8 +2466,7 @@
Package 'freetype2', required by 'world', not found
configure:31257: result: no
configure:31298: checking for freetype-config
-configure:31316: found /usr/bin/freetype-config
-configure:31329: result: /usr/bin/freetype-config
+configure:31329: result: /bin/false
configure:31339: checking for FreeType - version >= 2.0.9
configure:31427: result: yes
configure:32250: creating ./config.status
@@ -2789,7 +2786,7 @@
ac_cv_objext='o'
ac_cv_path_EGREP='/bin/grep -E'
ac_cv_path_FGREP='/bin/grep -F'
-ac_cv_path_FT2_CONFIG='/usr/bin/freetype-config'
+ac_cv_path_FT2_CONFIG='/bin/false'
ac_cv_path_GMSGFMT='/tmp/gst/output/host/usr/bin/msgfmt'
ac_cv_path_GREP='/bin/grep'
ac_cv_path_MSGFMT='/tmp/gst/output/host/usr/bin/msgfmt'
@@ -2818,7 +2815,6 @@
ac_cv_prog_cxx_g='yes'
ac_cv_prog_make_make_set='yes'
ac_cv_stdint_message='using gnu compiler i686-pc-linux-gnu-gcc (Sourcery CodeBench Lite 2012.09-62) 4.7.2'
-ac_cv_stdint_result='(assuming C99 compatible system)'
ac_cv_sys_file_offset_bits='no'
ac_cv_sys_largefile_CC='no'
ac_cv_sys_largefile_source='no'
@@ -2965,9 +2961,9 @@
EXEEXT=''
FFLAGS=' -Os '
FGREP='/bin/grep -F'
-FT2_CFLAGS='-I/usr/include/freetype2'
-FT2_CONFIG='/usr/bin/freetype-config'
-FT2_LIBS='-lfreetype'
+FT2_CFLAGS=''
+FT2_CONFIG='/bin/false'
+FT2_LIBS=''
GCOV=''
GCOV_CFLAGS=''
GCOV_LIBS=''

Detected by check-package.

Signed-off-by Ricardo Martincoski <[email protected]>

Cc Thomas Petazzoni <[email protected]>

---
Changes v1 -> v2:
- make the diff in commit message readable using 'diff -u' (Thomas);
- check-package is now merged, so remove URL from commit message;

Thomas,
I was unsure what to do with the long lines, so I pasted the raw output. Please feel free to ask me to respin or to tweak the message yourself. Below is the link [1] to the config.log files.

[1] https://gist.github.com/ricardo-martincoski/d9c27b7f589b35313f676357fc1037ac/archive/12363aac7be1adf9e62c2c20aa1aeefc18212dbb.zip

Regards,
Ricardo

---
 package/gstreamer/gst-plugins-base/gst-plugins-base.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

package/gstreamer/gst-plugins-base/gst-plugins-base.mk +3 -3

index fc3b2036a..735314365 100644
@@ -14,9 +14,9 @@ GST_PLUGINS_BASE_LICENSE_FILES = COPYING COPYING.LIB
 # freetype is only used by examples, but if it is not found
 # and the host has a freetype-config script, then the host
 # include dirs are added to the search path causing trouble
-GST_PLUGINS_BASE_CONF_ENV =
-		FT2_CONFIG=/bin/false \
-		ac_cv_header_stdint_t="stdint.h"
+GST_PLUGINS_BASE_CONF_ENV = \
+	FT2_CONFIG=/bin/false \
+	ac_cv_header_stdint_t="stdint.h"
 
 GST_PLUGINS_BASE_CONF_OPTS = \
 	--disable-examples \

Signature · 1 line

2.11.0

Arnout Vandecappelle

2017-04-12 12:41 UTC #13 lore raw

PATCH v2 1/1 gst-plugins-base: fix handling of freetype

Quoted 13 lines · Ricardo Martincoski

In 2010 commit 32d319e6f "gst-plugins-base: ensure <stdint.h> is used" introduced a typo (missing backslash) that made the code ineffective.
It can be confirmed by looking at the output of:
$ make printvars | grep '^GST_PLUGINS_BASE_CONF_ENV\|^FT2_CONFIG'
FT2_CONFIG=/bin/false ac_cv_header_stdint_t="stdint.h"
GST_PLUGINS_BASE_CONF_ENV=
Add the missing backslash to fix the code.
While at it, fix the indentation to use one tab instead of two.
The (end of the) diff of config.log confirms the code is still needed when the host has freetype-config installed:

[snip]

Review line 2821

Quoted 5 lines

(quoted diff) +0 -1

@@ -2818,7 +2815,6 @@
 ac_cv_prog_cxx_g='yes'
 ac_cv_prog_make_make_set='yes'
 ac_cv_stdint_message='using gnu compiler i686-pc-linux-gnu-gcc (Sourcery CodeBench Lite 2012.09-62) 4.7.2'
-ac_cv_stdint_result='(assuming C99 compatible system)'

Apparently the ac_cv_header_stdint_t assigment wasn't really needed then,
because it hasn't changed. But OK, that's for a separate patch.

Quoted 17 lines

(quoted diff) +3 -3

 ac_cv_sys_file_offset_bits='no'
 ac_cv_sys_largefile_CC='no'
 ac_cv_sys_largefile_source='no'

@@ -2965,9 +2961,9 @@
 EXEEXT=''
 FFLAGS=' -Os '
 FGREP='/bin/grep -F'
-FT2_CFLAGS='-I/usr/include/freetype2'
-FT2_CONFIG='/usr/bin/freetype-config'
-FT2_LIBS='-lfreetype'
+FT2_CFLAGS=''
+FT2_CONFIG='/bin/false'
+FT2_LIBS=''
 GCOV=''
 GCOV_CFLAGS=''
 GCOV_LIBS=''

Quoted 4 lines

Detected by check-package.
Signed-off-by Ricardo Martincoski <[email protected]>
Cc Thomas Petazzoni <[email protected]>

Reviewed-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

[snip]

package/gstreamer/gst-plugins-base/gst-plugins-base.mk GST_PLUGINS_BASE_LICENSE_FILES = COPYING COPYING.LIB · line 16

Quoted 8 lines

package/gstreamer/gst-plugins-base/gst-plugins-base.mk +0 -0

index fc3b2036a..735314365 100644
@@ -14,9 +14,9 @@ GST_PLUGINS_BASE_LICENSE_FILES = COPYING COPYING.LIB
 # freetype is only used by examples, but if it is not found
 # and the host has a freetype-config script, then the host
 # include dirs are added to the search path causing trouble

Note that the autobuilders don't catch this because they don't have
freetype-config installed...

Regards,
Arnout

Quoted 10 lines

package/gstreamer/gst-plugins-base/gst-plugins-base.mk +3 -3

-GST_PLUGINS_BASE_CONF_ENV =
-		FT2_CONFIG=/bin/false \
-		ac_cv_header_stdint_t="stdint.h"
+GST_PLUGINS_BASE_CONF_ENV = \
+	FT2_CONFIG=/bin/false \
+	ac_cv_header_stdint_t="stdint.h"
 
 GST_PLUGINS_BASE_CONF_OPTS = \
 	--disable-examples \

Signature · 6 lines

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

Thomas Petazzoni

Applied

2017-04-12 19:06 UTC #14 lore raw

PATCH v2 1/1 gst-plugins-base: fix handling of freetype

In reply to Ricardo Martincoski

Hello,

Quoted 66 lines · Ricardo Martincoski

In 2010 commit 32d319e6f "gst-plugins-base: ensure <stdint.h> is used" introduced a typo (missing backslash) that made the code ineffective.

It can be confirmed by looking at the output of:

$ make printvars | grep '^GST_PLUGINS_BASE_CONF_ENV\|^FT2_CONFIG'
FT2_CONFIG=/bin/false ac_cv_header_stdint_t="stdint.h"
GST_PLUGINS_BASE_CONF_ENV=

Add the missing backslash to fix the code.
While at it, fix the indentation to use one tab instead of two.

The (end of the) diff of config.log confirms the code is still needed when the host has freetype-config installed:

(quoted diff) +6 ~~-10~~

@@ -1674,10 +1674,8 @@
 configure:21882: checking for emmintrin.h
 configure:21882: result: no
 configure:21894: checking for stdint types
-configure:21917: /tmp/gst/output/host/usr/bin/i686-pc-linux-gnu-gcc -std=gnu99 -c   conftest.c >&5
-configure:21917: $? = 0
 configure:21961: result: stdint.h (shortcircuit)
-configure:22348: result: make use of stdint.h in _stdint.h (assuming C99 compatible system)
+configure:22348: result: make use of stdint.h in _stdint.h
 configure:22359: checking for localtime_r
 configure:22359: /tmp/gst/output/host/usr/bin/i686-pc-linux-gnu-gcc -std=gnu99 -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  -Os  -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  conftest.c  >&5
 configure:22359: $? = 0

@@ -2468,8 +2466,7 @@
 Package 'freetype2', required by 'world', not found
 configure:31257: result: no
 configure:31298: checking for freetype-config
-configure:31316: found /usr/bin/freetype-config
-configure:31329: result: /usr/bin/freetype-config
+configure:31329: result: /bin/false
 configure:31339: checking for FreeType - version >= 2.0.9
 configure:31427: result: yes
 configure:32250: creating ./config.status

@@ -2789,7 +2786,7 @@
 ac_cv_objext='o'
 ac_cv_path_EGREP='/bin/grep -E'
 ac_cv_path_FGREP='/bin/grep -F'
-ac_cv_path_FT2_CONFIG='/usr/bin/freetype-config'
+ac_cv_path_FT2_CONFIG='/bin/false'
 ac_cv_path_GMSGFMT='/tmp/gst/output/host/usr/bin/msgfmt'
 ac_cv_path_GREP='/bin/grep'
 ac_cv_path_MSGFMT='/tmp/gst/output/host/usr/bin/msgfmt'

@@ -2818,7 +2815,6 @@
 ac_cv_prog_cxx_g='yes'
 ac_cv_prog_make_make_set='yes'
 ac_cv_stdint_message='using gnu compiler i686-pc-linux-gnu-gcc (Sourcery CodeBench Lite 2012.09-62) 4.7.2'
-ac_cv_stdint_result='(assuming C99 compatible system)'
 ac_cv_sys_file_offset_bits='no'
 ac_cv_sys_largefile_CC='no'
 ac_cv_sys_largefile_source='no'

@@ -2965,9 +2961,9 @@
 EXEEXT=''
 FFLAGS=' -Os '
 FGREP='/bin/grep -F'
-FT2_CFLAGS='-I/usr/include/freetype2'
-FT2_CONFIG='/usr/bin/freetype-config'
-FT2_LIBS='-lfreetype'
+FT2_CFLAGS=''
+FT2_CONFIG='/bin/false'
+FT2_LIBS=''
 GCOV=''
 GCOV_CFLAGS=''
 GCOV_LIBS=''

Quoted 8 lines

Detected by check-package.
Signed-off-by Ricardo Martincoski <[email protected]>
Cc Thomas Petazzoni <[email protected]>
---
Changes v1 -> v2:
- make the diff in commit message readable using 'diff -u' (Thomas);
- check-package is now merged, so remove URL from commit message;

Applied to master, thanks.

Peter: I guess we probably want this one in the LTS branch as well.

Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Peter Korsgaard

2017-04-24 19:20 UTC #15 lore raw

PATCH v2 1/1 gst-plugins-base: fix handling of freetype

In reply to Ricardo Martincoski

Quoted 77 lines

Quoted 1 line

Quoted 1 line
Quoted 1 line
Quoted 1 line
"Ricardo" == Ricardo Martincoski <[email protected]> writes:

In 2010 commit 32d319e6f "gst-plugins-base: ensure <stdint.h> is used" introduced a typo (missing backslash) that made the code ineffective.

It can be confirmed by looking at the output of:

$ make printvars | grep '^GST_PLUGINS_BASE_CONF_ENV\|^FT2_CONFIG'
FT2_CONFIG=/bin/false ac_cv_header_stdint_t="stdint.h"
GST_PLUGINS_BASE_CONF_ENV=

Add the missing backslash to fix the code.
While at it, fix the indentation to use one tab instead of two.

The (end of the) diff of config.log confirms the code is still needed when the host has freetype-config installed:

(quoted diff) +6 ~~-10~~

@@ -1674,10 +1674,8 @@
 configure:21882: checking for emmintrin.h
 configure:21882: result: no
 configure:21894: checking for stdint types
-configure:21917: /tmp/gst/output/host/usr/bin/i686-pc-linux-gnu-gcc -std=gnu99 -c   conftest.c >&5
-configure:21917: $? = 0
 configure:21961: result: stdint.h (shortcircuit)
-configure:22348: result: make use of stdint.h in _stdint.h (assuming C99 compatible system)
+configure:22348: result: make use of stdint.h in _stdint.h
 configure:22359: checking for localtime_r
 configure:22359: /tmp/gst/output/host/usr/bin/i686-pc-linux-gnu-gcc -std=gnu99 -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  -Os  -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  conftest.c  >&5
 configure:22359: $? = 0

@@ -2468,8 +2466,7 @@
 Package 'freetype2', required by 'world', not found
 configure:31257: result: no
 configure:31298: checking for freetype-config
-configure:31316: found /usr/bin/freetype-config
-configure:31329: result: /usr/bin/freetype-config
+configure:31329: result: /bin/false
 configure:31339: checking for FreeType - version >= 2.0.9
 configure:31427: result: yes
 configure:32250: creating ./config.status

@@ -2789,7 +2786,7 @@
 ac_cv_objext='o'
 ac_cv_path_EGREP='/bin/grep -E'
 ac_cv_path_FGREP='/bin/grep -F'
-ac_cv_path_FT2_CONFIG='/usr/bin/freetype-config'
+ac_cv_path_FT2_CONFIG='/bin/false'
 ac_cv_path_GMSGFMT='/tmp/gst/output/host/usr/bin/msgfmt'
 ac_cv_path_GREP='/bin/grep'
 ac_cv_path_MSGFMT='/tmp/gst/output/host/usr/bin/msgfmt'

@@ -2818,7 +2815,6 @@
 ac_cv_prog_cxx_g='yes'
 ac_cv_prog_make_make_set='yes'
 ac_cv_stdint_message='using gnu compiler i686-pc-linux-gnu-gcc (Sourcery CodeBench Lite 2012.09-62) 4.7.2'
-ac_cv_stdint_result='(assuming C99 compatible system)'
 ac_cv_sys_file_offset_bits='no'
 ac_cv_sys_largefile_CC='no'
 ac_cv_sys_largefile_source='no'

@@ -2965,9 +2961,9 @@
 EXEEXT=''
 FFLAGS=' -Os '
 FGREP='/bin/grep -F'
-FT2_CFLAGS='-I/usr/include/freetype2'
-FT2_CONFIG='/usr/bin/freetype-config'
-FT2_LIBS='-lfreetype'
+FT2_CFLAGS=''
+FT2_CONFIG='/bin/false'
+FT2_LIBS=''
 GCOV=''
 GCOV_CFLAGS=''
 GCOV_LIBS=''

Detected by check-package.

Signed-off-by Ricardo Martincoski <[email protected]>

Cc Thomas Petazzoni <[email protected]>

---
Changes v1 -> v2:
- make the diff in commit message readable using 'diff -u' (Thomas);
- check-package is now merged, so remove URL from commit message;

Quoted 6 lines

Thomas,
I was unsure what to do with the long lines, so I pasted the raw output. Please feel free to ask me to respin or to tweak the message yourself. Below is the link [1] to the config.log files.
[1] https://gist.github.com/ricardo-martincoski/d9c27b7f589b35313f676357fc1037ac/archive/12363aac7be1adf9e62c2c20aa1aeefc18212dbb.zip

Committed to 2017.02.x, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Thomas Petazzoni

2017-04-06 20:45 UTC #16 lore raw

PATCH 1/11 package: remove trailing whitespace

In reply to Ricardo Martincoski

Hello,

Quoted 9 lines · Ricardo Martincoski

Occurrences were searched using [1]:
check-package --include-only TrailingSpace $(find * -type f) and manually removed.
[1] http://patchwork.ozlabs.org/patch/729666/
Signed-off-by Ricardo Martincoski <[email protected]>
---
build-tested with:

Quoted 10 lines

$ echo BR2_GOOGLE_BREAKPAD_ENABLE=y > host-google-breakpad.config
$ support/scripts/test-pkg -c host-google-breakpad.config \
  -d /home/builds/test-pkg -p host-google-breakpad
49 builds, 29 skipped, 0 failed
---
 package/google-breakpad/google-breakpad.mk | 2 +-
 package/leafnode2/leafnode2.mk             | 2 +-
 package/mbedtls/Config.in                  | 2 +-
 package/protobuf/Config.in                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

I've applied patches 1 to 10, but left patch 11 unapplied for now. I'll reply to patch 11 to explain why.

Thanks a lot for doing this great cleanup series, much appreciated!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com