[PATCH 0/7] meta: several fixes

[PATCH 0/7] meta: several fixes

[Robert Yang]

The following changes since commit 6bf5cbbcac80ee818cc932d69227e70e41ce02d3:

  libtool: Fix option parsing performance regression (2015-02-10 22:36:09 +0000)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib rbt/fixes
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/fixes

Robert Yang (7):
  Revert "libtool: avoid running automake/autoconf --version"
  libtool: don't execute automake and autoconf on every invocation
  rt-tests: fix gzip command
  gcc-sanitizers: check gcc-build-internal before link
  btrfs-tools: fix for parallel build
  btrfs-tools: remove nodocs.patch
  neard: do not ship version.h

 .../neard/Makefile.am-do-not-ship-version.h.patch  |   36 ++++++++++
 meta/recipes-connectivity/neard/neard_0.15.bb      |    1 +
 .../btrfs-tools/btrfs-tools/fix-parallel.patch     |   32 +++++++++
 .../btrfs-tools/btrfs-tools/nodocs.patch           |   22 ------
 .../btrfs-tools/btrfs-tools_git.bb                 |    5 +-
 meta/recipes-devtools/gcc/gcc-sanitizers.inc       |    4 +-
 meta/recipes-devtools/libtool/libtool-2.4.5.inc    |    2 +-
 .../avoid-running-automake-autoconf-version.patch  |   54 ---------------
 ...-t-execute-automake-and-autoconf-on-every.patch |   71 ++++++++++++++++++++
 .../rt-tests/files/Makefile-fix-gzip-command.patch |   30 +++++++++
 meta/recipes-rt/rt-tests/rt-tests.inc              |    1 +
 11 files changed, 179 insertions(+), 79 deletions(-)
 create mode 100644 meta/recipes-connectivity/neard/neard/Makefile.am-do-not-ship-version.h.patch
 create mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch
 delete mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/nodocs.patch
 delete mode 100644 meta/recipes-devtools/libtool/libtool/avoid-running-automake-autoconf-version.patch
 create mode 100644 meta/recipes-devtools/libtool/libtool/libtool-don-t-execute-automake-and-autoconf-on-every.patch
 create mode 100644 meta/recipes-rt/rt-tests/files/Makefile-fix-gzip-command.patch

-- 
1.7.9.5

[PATCH 1/7] Revert "libtool: avoid running automake/autoconf --version"

[Robert Yang]

This reverts commit 1f53edeaf9ea59dd55459a6d5a93829fb4983839.

There is a better fix on upstream, will backport it.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-devtools/libtool/libtool-2.4.5.inc    |    1 -
 .../avoid-running-automake-autoconf-version.patch  |   54 --------------------
 2 files changed, 55 deletions(-)
 delete mode 100644 meta/recipes-devtools/libtool/libtool/avoid-running-automake-autoconf-version.patch

diff --git a/meta/recipes-devtools/libtool/libtool-2.4.5.inc b/meta/recipes-devtools/libtool/libtool-2.4.5.inc
index 909c7da..88e281f 100644
--- a/meta/recipes-devtools/libtool/libtool-2.4.5.inc
+++ b/meta/recipes-devtools/libtool/libtool-2.4.5.inc
@@ -18,7 +18,6 @@ SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
            file://dont-depend-on-help2man.patch \
            file://fix-resolve-lt-sysroot.patch \
            file://nohardcodepaths.patch \
-           file://avoid-running-automake-autoconf-version.patch \
            file://unwind-opt-parsing.patch \
           "
 
diff --git a/meta/recipes-devtools/libtool/libtool/avoid-running-automake-autoconf-version.patch b/meta/recipes-devtools/libtool/libtool/avoid-running-automake-autoconf-version.patch
deleted file mode 100644
index ac2d370..0000000
--- a/meta/recipes-devtools/libtool/libtool/avoid-running-automake-autoconf-version.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 7d3b0331d91a9f80bc4bcddea929a93b07b8ef91 Mon Sep 17 00:00:00 2001
-From: Robert Yang <liezhi.yang@windriver.com>
-Date: Wed, 4 Feb 2015 17:14:46 -0800
-Subject: [PATCH] avoid running automake/autoconf --version
-
-The libtool would be very slow if run "automake/autoconf --version", for
-example, when compile xz (make -j1):
-
-before patched: 19s
-after patched:  11s
-
-Use plain text to instead of running them.
-
-Upstream-Status: Pending [Report to libtool community]
-
-Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
----
- build-aux/ltmain.in |    4 ++--
- libtoolize.in       |    4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
-index 0441e48..49cd39a 100644
---- a/build-aux/ltmain.in
-+++ b/build-aux/ltmain.in
-@@ -152,8 +152,8 @@ include the following information:
-        compiler flags: $LTCFLAGS
-        linker:         $LD (gnu? $with_gnu_ld)
-        version:        $progname (GNU @PACKAGE@) @VERSION@
--       automake:       `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
--       autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`
-+       automake:       run $AUTOMAKE --version
-+       autoconf:       run $AUTOCONF --version
- 
- Report bugs to <@PACKAGE_BUGREPORT@>.
- GNU @PACKAGE@ home page: <@PACKAGE_URL@>.
-diff --git a/libtoolize.in b/libtoolize.in
-index 684d799..e57c89b 100644
---- a/libtoolize.in
-+++ b/libtoolize.in
-@@ -115,8 +115,8 @@ include the following information:
- 
-        host-triplet:   @host_triplet@
-        version:        $progname (GNU @PACKAGE@) @VERSION@
--       automake:       `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
--       autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`
-+       automake:       run $AUTOMAKE --version
-+       autoconf:       run $AUTOCONF --version
- 
- Report bugs to <@PACKAGE_BUGREPORT@>.
- GNU @PACKAGE@ home page: <@PACKAGE_URL@>.
--- 
-1.7.9.5
-
-- 
1.7.9.5

[PATCH 2/7] libtool: don't execute automake and autoconf on every invocation

[Robert Yang]

From the origin commit message:
Regression from 2.4.2 was causing noticable slow-down in builds
that call libtool many times.
* build-aux/ltmain.in (func_help): Override func_help() from
gl/build-aux/options-parser to only run automake --version and
autoconf --version when libtool --help is executed on the command
line.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-devtools/libtool/libtool-2.4.5.inc    |    1 +
 ...-t-execute-automake-and-autoconf-on-every.patch |   71 ++++++++++++++++++++
 2 files changed, 72 insertions(+)
 create mode 100644 meta/recipes-devtools/libtool/libtool/libtool-don-t-execute-automake-and-autoconf-on-every.patch

diff --git a/meta/recipes-devtools/libtool/libtool-2.4.5.inc b/meta/recipes-devtools/libtool/libtool-2.4.5.inc
index 88e281f..0f6bdc8 100644
--- a/meta/recipes-devtools/libtool/libtool-2.4.5.inc
+++ b/meta/recipes-devtools/libtool/libtool-2.4.5.inc
@@ -19,6 +19,7 @@ SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
            file://fix-resolve-lt-sysroot.patch \
            file://nohardcodepaths.patch \
            file://unwind-opt-parsing.patch \
+           file://libtool-don-t-execute-automake-and-autoconf-on-every.patch \
           "
 
 SRC_URI[md5sum] = "7d30ed9fa6bb11270ebb31639a37bd54"
diff --git a/meta/recipes-devtools/libtool/libtool/libtool-don-t-execute-automake-and-autoconf-on-every.patch b/meta/recipes-devtools/libtool/libtool/libtool-don-t-execute-automake-and-autoconf-on-every.patch
new file mode 100644
index 0000000..f48f09c
--- /dev/null
+++ b/meta/recipes-devtools/libtool/libtool/libtool-don-t-execute-automake-and-autoconf-on-every.patch
@@ -0,0 +1,71 @@
+From 408cfb9c5fa8a666917167ffb806cb19deded429 Mon Sep 17 00:00:00 2001
+From: "Gary V. Vaughan" <gary@gnu.org>
+Date: Fri, 6 Feb 2015 12:58:34 +0000
+Subject: [PATCH] libtool: don't execute automake and autoconf on every
+ invocation.
+
+Regression from 2.4.2 was causing noticable slow-down in builds
+that call libtool many times.
+* build-aux/ltmain.in (func_help): Override func_help() from
+gl/build-aux/options-parser to only run automake --version and
+autoconf --version when libtool --help is executed on the command
+line.
+* NO-THANKS: Add Robert Yang.
+Reported by Robert Yang
+
+Signed-off-by: Gary V. Vaughan <gary@gnu.org>
+
+Updated: Change NO-THANKS to THANKS to apply the patch since upsream
+renamed it.
+
+Upstream-Stauts: Backport
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+
+---
+ THANKS           |    1 +
+ build-aux/ltmain.in |    9 ++++++++-
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/THANKS b/THANKS
+index 0ab162d..aa7aa8c 100644
+--- a/THANKS
++++ b/THANKS
+@@ -258,6 +258,7 @@ Robert Garron                       Robert.Garron@Access3000.net
+ Robert Millan                       rmh@aybabtu.com
+ Robert Ögren                        lists@roboros.com
+ Roberto Bagnara                     bagnara@cs.unipr.it
++Robert Yang                         liezhi.yang@windriver.com
+ Roger Cornelius                     rac@tenzing.org
+ Roland Mainz                        roland.mainz@nrubsig.org
+ Roumen Petrov                       bugtrack@roumenpetrov.info
+diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
+index 46a0bb5..d5cf07a 100644
+--- a/build-aux/ltmain.in
++++ b/build-aux/ltmain.in
+@@ -127,7 +127,12 @@ usage_message="Options:
+ "
+ 
+ # Additional text appended to 'usage_message' in response to '--help'.
+-long_help_message=$long_help_message"
++func_help ()
++{
++    $debug_cmd
++
++    func_usage_message
++    $ECHO "$long_help_message
+ 
+ MODE must be one of the following:
+ 
+@@ -158,6 +163,8 @@ include the following information:
+ Report bugs to <@PACKAGE_BUGREPORT@>.
+ GNU @PACKAGE@ home page: <@PACKAGE_URL@>.
+ General help using GNU software: <http://www.gnu.org/gethelp/>."
++    exit 0
++}
+ 
+ 
+ # func_lo2o OBJECT-NAME
+-- 
+1.7.9.5
+
-- 
1.7.9.5

[PATCH 3/7] rt-tests: fix gzip command

[Robert Yang]

The "-c" doesn't work in command "gzip file -c", need use "gzip -c file"

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../rt-tests/files/Makefile-fix-gzip-command.patch |   30 ++++++++++++++++++++
 meta/recipes-rt/rt-tests/rt-tests.inc              |    1 +
 2 files changed, 31 insertions(+)
 create mode 100644 meta/recipes-rt/rt-tests/files/Makefile-fix-gzip-command.patch

diff --git a/meta/recipes-rt/rt-tests/files/Makefile-fix-gzip-command.patch b/meta/recipes-rt/rt-tests/files/Makefile-fix-gzip-command.patch
new file mode 100644
index 0000000..0a35ddc
--- /dev/null
+++ b/meta/recipes-rt/rt-tests/files/Makefile-fix-gzip-command.patch
@@ -0,0 +1,30 @@
+From 07b5ed42d7041ccc084889eaa96817aa097bf461 Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Tue, 3 Feb 2015 03:10:25 +0000
+Subject: [PATCH] Makefile: fix gzip command
+
+The "-c" doesn't work in command "gzip file -c", need use "gzip -c file"
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 219a591..c7d147a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -144,7 +144,7 @@ install_hwlatdetect: hwlatdetect
+ 		install -D -m 755 src/hwlatdetect/hwlatdetect.py $(DESTDIR)$(PYLIB)/hwlatdetect.py ; \
+ 		rm -f "$(DESTDIR)$(bindir)/hwlatdetect" ; \
+ 		ln -s $(PYLIB)/hwlatdetect.py "$(DESTDIR)$(bindir)/hwlatdetect" ; \
+-		gzip src/hwlatdetect/hwlatdetect.8 -c >"$(DESTDIR)$(mandir)/man8/hwlatdetect.8.gz" ; \
++		gzip -c src/hwlatdetect/hwlatdetect.8 >"$(DESTDIR)$(mandir)/man8/hwlatdetect.8.gz" ; \
+ 	fi
+ 
+ .PHONY: release
+-- 
+2.0.1
+
diff --git a/meta/recipes-rt/rt-tests/rt-tests.inc b/meta/recipes-rt/rt-tests/rt-tests.inc
index 7fbe6d4..4942701 100644
--- a/meta/recipes-rt/rt-tests/rt-tests.inc
+++ b/meta/recipes-rt/rt-tests/rt-tests.inc
@@ -7,6 +7,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/clrkwllms/rt-tests.git
            file://0002-rt-tests-Break-out-install_hwlatdetect.patch \
            file://added-missing-dependencies.patch \
            file://hackbench-fix-error-check.patch \
+           file://Makefile-fix-gzip-command.patch \
 "
 
 S = "${WORKDIR}/git"
-- 
1.7.9.5

[PATCH 4/7] gcc-sanitizers: check gcc-build-internal before link

[Robert Yang]

The ${STAGING_INCDIR_NATIVE}/gcc-build-internal-$mtarget may not exist
when use the external sdk toolchain, we need check before link for it.

Fixed:
run.do_configure.12538: 149: cd: can't cd to sysroots/x86_64-linux/usr/include/gcc-build-internal-x86_64-wrs-linux

(LOCAL REV: NOT UPSTREAM) -- Sent to oe-core on 20150204

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-devtools/gcc/gcc-sanitizers.inc |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/gcc/gcc-sanitizers.inc b/meta/recipes-devtools/gcc/gcc-sanitizers.inc
index 35c9247..c987ccb 100644
--- a/meta/recipes-devtools/gcc/gcc-sanitizers.inc
+++ b/meta/recipes-devtools/gcc/gcc-sanitizers.inc
@@ -14,7 +14,9 @@ EXTRA_OECONF_PATHS = "\
 do_configure () {
     mtarget=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##`
     target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##`
-    hardlinkdir ${STAGING_INCDIR_NATIVE}/gcc-build-internal-$mtarget ${B}
+    if [ -d ${STAGING_INCDIR_NATIVE}/gcc-build-internal-$mtarget ]; then
+        hardlinkdir ${STAGING_INCDIR_NATIVE}/gcc-build-internal-$mtarget ${B}
+    fi
 
     echo "Configuring libsanitizer"
     rm -rf ${B}/$target/libsanitizer/
-- 
1.7.9.5

[PATCH 5/7] btrfs-tools: fix for parallel build

[Robert Yang]

Fixed:
mkfs.c:300:46: error: 'BTRFS_BUILD_VERSION' undeclared (first use in this function)
  fprintf(stderr, "mkfs.btrfs, part of %s\n", BTRFS_BUILD_VERSION);

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../btrfs-tools/btrfs-tools/fix-parallel.patch     |   32 ++++++++++++++++++++
 .../btrfs-tools/btrfs-tools_git.bb                 |    5 ++-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch

diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch
new file mode 100644
index 0000000..65c31a4
--- /dev/null
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch
@@ -0,0 +1,32 @@
+From 373eb51328b5e10529763cad441210e6b0efb24e Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Wed, 11 Feb 2015 22:08:41 -0800
+Subject: [PATCH] Makefile: fix for parallel build
+
+Fixed:
+mkfs.c:300:46: error: 'BTRFS_BUILD_VERSION' undeclared (first use in this function)
+  fprintf(stderr, "mkfs.btrfs, part of %s\n", BTRFS_BUILD_VERSION);
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 9c69ada..30c6f06 100644
+--- a/Makefile
++++ b/Makefile
+@@ -118,7 +118,7 @@ else
+ 	AM_CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+ endif
+ 
+-%.o.d: %.c
++%.o.d: %.c version.h
+ 	$(Q)$(CC) -MM -MG -MF $@ -MT $(@:.o.d=.o) -MT $(@:.o.d=.static.o) -MT $@ $(AM_CFLAGS) $(CFLAGS) $<
+ 
+ .c.o:
+-- 
+1.7.9.5
+
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
index ef85057..d800426 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
@@ -13,7 +13,10 @@ SECTION = "base"
 DEPENDS = "util-linux attr e2fsprogs lzo acl"
 
 SRCREV = "44cdb62d3478c834f41c87ea79d261b9c8982dce"
-SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git"
+SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
+           file://fix-parallel.patch \
+"
+
 S = "${WORKDIR}/git"
 
 PV = "3.14.2+git${SRCPV}"
-- 
1.7.9.5

[PATCH 6/7] btrfs-tools: remove nodocs.patch

[Robert Yang]

It isn't used anymore, the docs is disabled by DISABLE_DOCUMENTATION=1.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../btrfs-tools/btrfs-tools/nodocs.patch           |   22 --------------------
 1 file changed, 22 deletions(-)
 delete mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/nodocs.patch

diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/nodocs.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/nodocs.patch
deleted file mode 100644
index 6df4e10..0000000
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/nodocs.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Doc generation requires xmlto and ascidoc which we don't have right now.
-Disable doc generation until such times as we have the right dependencies.
-
-RP 2014/7/16
-
-Upstream-Status: Inappropriate
-
-Index: git/Makefile
-===================================================================
---- git.orig/Makefile	2014-07-16 13:21:43.289386655 +0000
-+++ git/Makefile	2014-07-16 13:42:46.453421079 +0000
-@@ -57,8 +57,8 @@
- btrfs_fragment_libs = -lgd -lpng -ljpeg -lfreetype
- 
- SUBDIRS =
--BUILDDIRS = $(patsubst %,build-%,$(SUBDIRS)) build-Documentation
--INSTALLDIRS = $(patsubst %,install-%,$(SUBDIRS)) install-Documentation
-+BUILDDIRS = $(patsubst %,build-%,$(SUBDIRS))
-+INSTALLDIRS = $(patsubst %,install-%,$(SUBDIRS))
- CLEANDIRS = $(patsubst %,clean-%,$(SUBDIRS))
- 
- .PHONY: $(SUBDIRS)
-- 
1.7.9.5

[PATCH 7/7] neard: do not ship version.h

[Robert Yang]

The HEADERS' name has been changed to pkginclude_HEADERS, so use
nodist_pkginclude_HEADERS, otherwise version.h would be shipped.

It would cause other pkgs failed to build if ship version.h to
usr/include/version.h

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../neard/Makefile.am-do-not-ship-version.h.patch  |   36 ++++++++++++++++++++
 meta/recipes-connectivity/neard/neard_0.15.bb      |    1 +
 2 files changed, 37 insertions(+)
 create mode 100644 meta/recipes-connectivity/neard/neard/Makefile.am-do-not-ship-version.h.patch

diff --git a/meta/recipes-connectivity/neard/neard/Makefile.am-do-not-ship-version.h.patch b/meta/recipes-connectivity/neard/neard/Makefile.am-do-not-ship-version.h.patch
new file mode 100644
index 0000000..16875e0
--- /dev/null
+++ b/meta/recipes-connectivity/neard/neard/Makefile.am-do-not-ship-version.h.patch
@@ -0,0 +1,36 @@
+From bfd32d68cfc9f1e31dab88e07446d1c02bc80b5e Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Thu, 12 Feb 2015 00:39:29 -0800
+Subject: [PATCH] Makefile.am: do not ship version.h
+
+The HEADERS' name has been changed to pkginclude_HEADERS, so use
+nodist_pkginclude_HEADERS, otherwise version.h would be shipped.
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ Makefile.am |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 3334790..69cd58f 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -10,11 +10,11 @@ pkginclude_HEADERS = include/types.h include/log.h include/plugin.h \
+ 			include/tlv.h include/setting.h include/device.h \
+ 			include/nfc_copy.h include/snep.h
+ 
+-nodist_include_HEADERS = include/version.h
++nodist_pkginclude_HEADERS = include/version.h
+ 
+ noinst_HEADERS = include/dbus.h
+ 
+-local_headers = $(foreach file,$(pkginclude_HEADERS) $(nodist_include_HEADERS) \
++local_headers = $(foreach file,$(pkginclude_HEADERS) $(nodist_pkginclude_HEADERS) \
+ 			$(noinst_HEADERS), include/near/$(notdir $(file)))
+ 
+ gdbus_sources = gdbus/gdbus.h gdbus/mainloop.c gdbus/watch.c \
+-- 
+1.7.9.5
+
diff --git a/meta/recipes-connectivity/neard/neard_0.15.bb b/meta/recipes-connectivity/neard/neard_0.15.bb
index c92a171..508c622 100644
--- a/meta/recipes-connectivity/neard/neard_0.15.bb
+++ b/meta/recipes-connectivity/neard/neard_0.15.bb
@@ -3,6 +3,7 @@ require neard.inc
 SRC_URI = "${KERNELORG_MIRROR}/linux/network/nfc/${BP}.tar.xz \
            file://neard.in \
            file://Makefile.am-fix-parallel-issue.patch \
+           file://Makefile.am-do-not-ship-version.h.patch \
           "
 SRC_URI[md5sum] = "b746ce62eeef88e8de90765e00a75a1c"
 SRC_URI[sha256sum] = "651f6513d32cdaf8a426255d03aff38a6620a89b0567ec2b36606c6330a93353"
-- 
1.7.9.5

Re: [PATCH 2/7] libtool: don't execute automake and autoconf on every invocation

[Henning Heinold]

On Thu, Feb 12, 2015 at 01:07:35AM -0800, Robert Yang wrote:
> From the origin commit message:
> Regression from 2.4.2 was causing noticable slow-down in builds
> that call libtool many times.
> * build-aux/ltmain.in (func_help): Override func_help() from
> gl/build-aux/options-parser to only run automake --version and
> autoconf --version when libtool --help is executed on the command
> line.
> 
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
>  meta/recipes-devtools/libtool/libtool-2.4.5.inc    |    1 +
>  ...-t-execute-automake-and-autoconf-on-every.patch |   71 ++++++++++++++++++++
>  2 files changed, 72 insertions(+)
>  create mode 100644 meta/recipes-devtools/libtool/libtool/libtool-don-t-execute-automake-and-autoconf-on-every.patch
> 
> diff --git a/meta/recipes-devtools/libtool/libtool-2.4.5.inc b/meta/recipes-devtools/libtool/libtool-2.4.5.inc
> index 88e281f..0f6bdc8 100644
> --- a/meta/recipes-devtools/libtool/libtool-2.4.5.inc
> +++ b/meta/recipes-devtools/libtool/libtool-2.4.5.inc
> @@ -19,6 +19,7 @@ SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
>             file://fix-resolve-lt-sysroot.patch \
>             file://nohardcodepaths.patch \
>             file://unwind-opt-parsing.patch \
> +           file://libtool-don-t-execute-automake-and-autoconf-on-every.patch \
>            "
>  
>  SRC_URI[md5sum] = "7d30ed9fa6bb11270ebb31639a37bd54"
> diff --git a/meta/recipes-devtools/libtool/libtool/libtool-don-t-execute-automake-and-autoconf-on-every.patch b/meta/recipes-devtools/libtool/libtool/libtool-don-t-execute-automake-and-autoconf-on-every.patch
> new file mode 100644
> index 0000000..f48f09c
> --- /dev/null
> +++ b/meta/recipes-devtools/libtool/libtool/libtool-don-t-execute-automake-and-autoconf-on-every.patch
> @@ -0,0 +1,71 @@
> +From 408cfb9c5fa8a666917167ffb806cb19deded429 Mon Sep 17 00:00:00 2001
> +From: "Gary V. Vaughan" <gary@gnu.org>
> +Date: Fri, 6 Feb 2015 12:58:34 +0000
> +Subject: [PATCH] libtool: don't execute automake and autoconf on every
> + invocation.
> +
> +Regression from 2.4.2 was causing noticable slow-down in builds
> +that call libtool many times.
> +* build-aux/ltmain.in (func_help): Override func_help() from
> +gl/build-aux/options-parser to only run automake --version and
> +autoconf --version when libtool --help is executed on the command
> +line.
> +* NO-THANKS: Add Robert Yang.
> +Reported by Robert Yang
> +
> +Signed-off-by: Gary V. Vaughan <gary@gnu.org>
> +

typo
> +Updated: Change NO-THANKS to THANKS to apply the patch since upsream
                                                                ^^^^^^^
> +renamed it.
> +
> +Upstream-Stauts: Backport
> +
> +Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> +
> +---
> + THANKS           |    1 +
> + build-aux/ltmain.in |    9 ++++++++-
> + 2 files changed, 9 insertions(+), 1 deletion(-)
> +
> +diff --git a/THANKS b/THANKS
> +index 0ab162d..aa7aa8c 100644
> +--- a/THANKS
> ++++ b/THANKS
> +@@ -258,6 +258,7 @@ Robert Garron                       Robert.Garron@Access3000.net
> + Robert Millan                       rmh@aybabtu.com
> + Robert Ögren                        lists@roboros.com
> + Roberto Bagnara                     bagnara@cs.unipr.it
> ++Robert Yang                         liezhi.yang@windriver.com
> + Roger Cornelius                     rac@tenzing.org
> + Roland Mainz                        roland.mainz@nrubsig.org
> + Roumen Petrov                       bugtrack@roumenpetrov.info
> +diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
> +index 46a0bb5..d5cf07a 100644
> +--- a/build-aux/ltmain.in
> ++++ b/build-aux/ltmain.in
> +@@ -127,7 +127,12 @@ usage_message="Options:
> + "
> + 
> + # Additional text appended to 'usage_message' in response to '--help'.
> +-long_help_message=$long_help_message"
> ++func_help ()
> ++{
> ++    $debug_cmd
> ++
> ++    func_usage_message
> ++    $ECHO "$long_help_message
> + 
> + MODE must be one of the following:
> + 
> +@@ -158,6 +163,8 @@ include the following information:
> + Report bugs to <@PACKAGE_BUGREPORT@>.
> + GNU @PACKAGE@ home page: <@PACKAGE_URL@>.
> + General help using GNU software: <http://www.gnu.org/gethelp/>."
> ++    exit 0
> ++}
> + 
> + 
> + # func_lo2o OBJECT-NAME

Bye Henning

Re: [PATCH 2/7] libtool: don't execute automake and autoconf on every invocation

[Robert Yang]

On 02/12/2015 05:14 PM, Henning Heinold wrote:
> On Thu, Feb 12, 2015 at 01:07:35AM -0800, Robert Yang wrote:
>>  From the origin commit message:
>> Regression from 2.4.2 was causing noticable slow-down in builds
>> that call libtool many times.
>> * build-aux/ltmain.in (func_help): Override func_help() from
>> gl/build-aux/options-parser to only run automake --version and
>> autoconf --version when libtool --help is executed on the command
>> line.
>>
>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>> ---
>>   meta/recipes-devtools/libtool/libtool-2.4.5.inc    |    1 +
>>   ...-t-execute-automake-and-autoconf-on-every.patch |   71 ++++++++++++++++++++
>>   2 files changed, 72 insertions(+)
>>   create mode 100644 meta/recipes-devtools/libtool/libtool/libtool-don-t-execute-automake-and-autoconf-on-every.patch
>>
>> diff --git a/meta/recipes-devtools/libtool/libtool-2.4.5.inc b/meta/recipes-devtools/libtool/libtool-2.4.5.inc
>> index 88e281f..0f6bdc8 100644
>> --- a/meta/recipes-devtools/libtool/libtool-2.4.5.inc
>> +++ b/meta/recipes-devtools/libtool/libtool-2.4.5.inc
>> @@ -19,6 +19,7 @@ SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
>>              file://fix-resolve-lt-sysroot.patch \
>>              file://nohardcodepaths.patch \
>>              file://unwind-opt-parsing.patch \
>> +           file://libtool-don-t-execute-automake-and-autoconf-on-every.patch \
>>             "
>>
>>   SRC_URI[md5sum] = "7d30ed9fa6bb11270ebb31639a37bd54"
>> diff --git a/meta/recipes-devtools/libtool/libtool/libtool-don-t-execute-automake-and-autoconf-on-every.patch b/meta/recipes-devtools/libtool/libtool/libtool-don-t-execute-automake-and-autoconf-on-every.patch
>> new file mode 100644
>> index 0000000..f48f09c
>> --- /dev/null
>> +++ b/meta/recipes-devtools/libtool/libtool/libtool-don-t-execute-automake-and-autoconf-on-every.patch
>> @@ -0,0 +1,71 @@
>> +From 408cfb9c5fa8a666917167ffb806cb19deded429 Mon Sep 17 00:00:00 2001
>> +From: "Gary V. Vaughan" <gary@gnu.org>
>> +Date: Fri, 6 Feb 2015 12:58:34 +0000
>> +Subject: [PATCH] libtool: don't execute automake and autoconf on every
>> + invocation.
>> +
>> +Regression from 2.4.2 was causing noticable slow-down in builds
>> +that call libtool many times.
>> +* build-aux/ltmain.in (func_help): Override func_help() from
>> +gl/build-aux/options-parser to only run automake --version and
>> +autoconf --version when libtool --help is executed on the command
>> +line.
>> +* NO-THANKS: Add Robert Yang.
>> +Reported by Robert Yang
>> +
>> +Signed-off-by: Gary V. Vaughan <gary@gnu.org>
>> +
>
> typo
>> +Updated: Change NO-THANKS to THANKS to apply the patch since upsream
>                                                                  ^^^^^^^

Thanks, fixed in the repo.

// Robert

>> +renamed it.
>> +
>> +Upstream-Stauts: Backport
>> +
>> +Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>> +
>> +---
>> + THANKS           |    1 +
>> + build-aux/ltmain.in |    9 ++++++++-
>> + 2 files changed, 9 insertions(+), 1 deletion(-)
>> +
>> +diff --git a/THANKS b/THANKS
>> +index 0ab162d..aa7aa8c 100644
>> +--- a/THANKS
>> ++++ b/THANKS
>> +@@ -258,6 +258,7 @@ Robert Garron                       Robert.Garron@Access3000.net
>> + Robert Millan                       rmh@aybabtu.com
>> + Robert Ögren                        lists@roboros.com
>> + Roberto Bagnara                     bagnara@cs.unipr.it
>> ++Robert Yang                         liezhi.yang@windriver.com
>> + Roger Cornelius                     rac@tenzing.org
>> + Roland Mainz                        roland.mainz@nrubsig.org
>> + Roumen Petrov                       bugtrack@roumenpetrov.info
>> +diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
>> +index 46a0bb5..d5cf07a 100644
>> +--- a/build-aux/ltmain.in
>> ++++ b/build-aux/ltmain.in
>> +@@ -127,7 +127,12 @@ usage_message="Options:
>> + "
>> +
>> + # Additional text appended to 'usage_message' in response to '--help'.
>> +-long_help_message=$long_help_message"
>> ++func_help ()
>> ++{
>> ++    $debug_cmd
>> ++
>> ++    func_usage_message
>> ++    $ECHO "$long_help_message
>> +
>> + MODE must be one of the following:
>> +
>> +@@ -158,6 +163,8 @@ include the following information:
>> + Report bugs to <@PACKAGE_BUGREPORT@>.
>> + GNU @PACKAGE@ home page: <@PACKAGE_URL@>.
>> + General help using GNU software: <http://www.gnu.org/gethelp/>."
>> ++    exit 0
>> ++}
>> +
>> +
>> + # func_lo2o OBJECT-NAME
>
> Bye Henning
>

Re: [PATCH 5/7] btrfs-tools: fix for parallel build

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 420 bytes --]

On 12 February 2015 at 09:07, Robert Yang <liezhi.yang@windriver.com> wrote:

> Fixed:
> mkfs.c:300:46: error: 'BTRFS_BUILD_VERSION' undeclared (first use in this
> function)
>   fprintf(stderr, "mkfs.btrfs, part of %s\n", BTRFS_BUILD_VERSION);
>
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>

In mut (about to be merged to master) there's a btrfs upgrade, can you
rebase this?

Cheers,
Ross

[-- Attachment #2: Type: text/html, Size: 938 bytes --]