[PATCH 0/4] meta: 4 fixes

[PATCH 0/4] meta: 4 fixes

[Robert Yang]

The following changes since commit b61a2acc321489c3427f0afa3059486dc144a13b:

  bind: Update libxml2 check to make it deterministic. (2015-01-08 09:21:18 +0000)

are available in the git repository at:

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

Robert Yang (4):
  libical: use BPN in SRC_URI
  cups: remove fakeroot from do_install()
  man: remove fakeroot from do_install()
  portmap: remove obsolete lines

 meta/recipes-connectivity/portmap/portmap.inc      |   19 +------------------
 .../destdir-no-strip.patch                         |    0
 .../{portmap-6.0 => portmap}/tcpd-config.patch     |    0
 meta/recipes-connectivity/portmap/portmap_6.0.bb   |    2 +-
 meta/recipes-extended/cups/cups.inc                |    2 +-
 meta/recipes-extended/man/man_1.6g.bb              |    2 +-
 meta/recipes-support/libical/libical_1.0.0.bb      |    2 +-
 7 files changed, 5 insertions(+), 22 deletions(-)
 rename meta/recipes-connectivity/portmap/{portmap-6.0 => portmap}/destdir-no-strip.patch (100%)
 rename meta/recipes-connectivity/portmap/{portmap-6.0 => portmap}/tcpd-config.patch (100%)

-- 
1.7.9.5

[PATCH 0/4] meta: 4 fixes

[Robert Yang]

Hello,

I had sent the patch "cpan-base.bbclass: avoid using xxx" before, now
send it again. The other 3 are new.

// Robert

The following changes since commit eaea05c88661a88a89fa6b139f7e6b243155d492:

  depmodwrapper-cross: Update to use STAGING_KERNEL_BUILDDIR (2015-01-17 17:05:25 +0000)

are available in the git repository at:

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

Robert Yang (4):
  cpan-base.bbclass: avoid using immmediate assignment for PERLLIBDIRS
  python3: fix for cross compiling
  gnutls: fix sed command
  perf: fix for rebuilding

 meta/classes/cpan-base.bbclass                     |    4 +-
 .../python/python3-native_3.3.3.bb                 |    2 +
 ...p.py-check-cross_compiling-when-get-FLAGS.patch |   50 ++++++++++++++++++
 .../sysconfig.py-add-_PYTHON_PROJECT_SRC.patch     |   54 ++++++++++++++++++++
 meta/recipes-devtools/python/python3_3.3.3.bb      |   10 ++--
 meta/recipes-kernel/perf/perf.bb                   |    3 ++
 .../gnutls/configure.ac-fix-sed-command.patch      |   31 +++++++++++
 meta/recipes-support/gnutls/gnutls_3.3.11.bb       |    1 +
 8 files changed, 149 insertions(+), 6 deletions(-)
 create mode 100644 meta/recipes-devtools/python/python3/setup.py-check-cross_compiling-when-get-FLAGS.patch
 create mode 100644 meta/recipes-devtools/python/python3/sysconfig.py-add-_PYTHON_PROJECT_SRC.patch
 create mode 100644 meta/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch

-- 
1.7.9.5

[PATCH 0/4] meta: 4 fixes

[Robert Yang]

The following changes since commit 2bb8b2abb689d91b7b7e28e6bd528747bde94dd2:

  license.bbclass: fix unexpected operator for LICENSE values with space (2015-02-17 22:29:27 +0000)

are available in the git repository at:

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

Robert Yang (4):
  meta: fix build with gettext 0.16.1
  gettext 0.16.1: disable native
  btrfs-tools: fix for parallel build
  bind: fix paralle issue

 .../bind/bind/bind-confgen-build-unix.o-once.patch |   44 ++++++++++++++++++++
 meta/recipes-connectivity/bind/bind_9.9.5.bb       |    1 +
 .../connman/connman-gnome_0.7.bb                   |    2 +-
 meta/recipes-core/gettext/gettext_0.16.1.bb        |    4 +-
 .../btrfs-tools/btrfs-tools/fix-parallel.patch     |   32 ++++++++++++++
 .../btrfs-tools/btrfs-tools_git.bb                 |    5 ++-
 .../gtk-engines/gtk-engines_2.20.2.bb              |    2 +-
 meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb   |    2 +-
 .../oprofile/oprofileui-server_git.bb              |    2 +-
 meta/recipes-kernel/oprofile/oprofileui_git.bb     |    2 +-
 meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb      |    2 +-
 meta/recipes-sato/pcmanfm/pcmanfm_1.2.3.bb         |    2 +-
 meta/recipes-sato/puzzles/oh-puzzles_git.bb        |    2 +-
 meta/recipes-support/atk/at-spi2-core_2.14.1.bb    |    2 +-
 meta/recipes-support/libfm/libfm-extra_1.2.3.bb    |    2 +-
 meta/recipes-support/libfm/libfm_1.2.3.bb          |    2 +-
 meta/recipes-support/pinentry/pinentry_0.9.0.bb    |    2 +
 17 files changed, 95 insertions(+), 15 deletions(-)
 create mode 100644 meta/recipes-connectivity/bind/bind/bind-confgen-build-unix.o-once.patch
 create mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch

-- 
1.7.9.5

[PATCH 1/4] meta: fix build with gettext 0.16.1

[Robert Yang]

The gettext 0.16.1 doesn't install any m4 files to sysroot, please see
the following commit:

  commit 9e10db5bdfe77c0ef2aff2f1cf89958b62c294a1
  Author: Christopher Larson <kergoth@gmail.com>
  Date:   Mon Mar 17 18:10:54 2014 +0000

      gettext-0.16.1: kill target m4 macros from sysroot

This is aim for using gettext-native's macros(gettext-native-0.19.4),
but when we set:
  PREFERRED_VERSION_gettext = "0.16.1"
And build the recipes like pcmanfm, we would get errors when
do_configure:

configure:5164: error: possibly undefined macro: AM_NLS

This is because autotools_copy_aclocals doesn't copy the native macros
for target unless they're direct dependencies.

Add gettext-native to DEPENDS will fix the problem.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../connman/connman-gnome_0.7.bb                   |    2 +-
 .../gtk-engines/gtk-engines_2.20.2.bb              |    2 +-
 meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb   |    2 +-
 .../oprofile/oprofileui-server_git.bb              |    2 +-
 meta/recipes-kernel/oprofile/oprofileui_git.bb     |    2 +-
 meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb      |    2 +-
 meta/recipes-sato/pcmanfm/pcmanfm_1.2.3.bb         |    2 +-
 meta/recipes-sato/puzzles/oh-puzzles_git.bb        |    2 +-
 meta/recipes-support/atk/at-spi2-core_2.14.1.bb    |    2 +-
 meta/recipes-support/libfm/libfm-extra_1.2.3.bb    |    2 +-
 meta/recipes-support/libfm/libfm_1.2.3.bb          |    2 +-
 meta/recipes-support/pinentry/pinentry_0.9.0.bb    |    2 ++
 12 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/meta/recipes-connectivity/connman/connman-gnome_0.7.bb b/meta/recipes-connectivity/connman/connman-gnome_0.7.bb
index f5575d2..b54d703 100644
--- a/meta/recipes-connectivity/connman/connman-gnome_0.7.bb
+++ b/meta/recipes-connectivity/connman/connman-gnome_0.7.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
                     file://properties/main.c;beginline=1;endline=20;md5=50c77c81871308b033ab7a1504626afb \
                     file://common/connman-dbus.c;beginline=1;endline=20;md5=de6b485c0e717a0236402d220187717a"
 
-DEPENDS = "gtk+ dbus-glib intltool-native"
+DEPENDS = "gtk+ dbus-glib intltool-native gettext-native"
 
 # 0.7 tag
 SRCREV = "cf3c325b23dae843c5499a113591cfbc98acb143"
diff --git a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
index 33b6afe..7ec64b9 100644
--- a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
+++ b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
@@ -6,7 +6,7 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
 
 SECTION = "x11/base"
-DEPENDS = "intltool-native gtk+"
+DEPENDS = "intltool-native gtk+ gettext-native"
 
 PR = "r3"
 
diff --git a/meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb b/meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb
index 7a45241..0c23d19 100644
--- a/meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb
+++ b/meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb
@@ -7,7 +7,7 @@ windows.  Information may include window position, size, color depth, \
 and a number of other items."
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=78976cd3115f6faf615accc4e094d90e"
-DEPENDS += "libxext libxmu"
+DEPENDS += "libxext libxmu gettext-native"
 
 PE = "0"
 
diff --git a/meta/recipes-kernel/oprofile/oprofileui-server_git.bb b/meta/recipes-kernel/oprofile/oprofileui-server_git.bb
index eb3b78b..cc3477b 100644
--- a/meta/recipes-kernel/oprofile/oprofileui-server_git.bb
+++ b/meta/recipes-kernel/oprofile/oprofileui-server_git.bb
@@ -9,7 +9,7 @@ SRC_URI = "git://git.yoctoproject.org/oprofileui \
            file://init \
            file://oprofileui-server.service "
 
-DEPENDS += "intltool-native"
+DEPENDS += "intltool-native gettext-native"
 
 EXTRA_OECONF += "--disable-client --enable-server"
 
diff --git a/meta/recipes-kernel/oprofile/oprofileui_git.bb b/meta/recipes-kernel/oprofile/oprofileui_git.bb
index bb69d54..7fbc03d 100644
--- a/meta/recipes-kernel/oprofile/oprofileui_git.bb
+++ b/meta/recipes-kernel/oprofile/oprofileui_git.bb
@@ -1,6 +1,6 @@
 require oprofileui.inc
 
-DEPENDS += "gtk+ libglade libxml2 avahi-ui gconf"
+DEPENDS += "gtk+ libglade libxml2 avahi-ui gconf gettext-native"
 
 SRCREV = "389e1875af4721d52c7e65cf9cfffb69b0ed6a59"
 PV = "0.0+git${SRCPV}"
diff --git a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb b/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
index 830c053..711fe1d 100644
--- a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
+++ b/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://src/leafpad.h;endline=20;md5=d3d6a89f5e61e8b13bdea537511ba1fa \
                     file://src/utils.c;endline=20;md5=0d2cc6584ba3202448bb274f62739571"
 
-DEPENDS = "gtk+ intltool-native"
+DEPENDS = "gtk+ intltool-native gettext-native"
 DEPENDS_append_poky = " libowl"
 SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
 	   file://leafpad.desktop"
diff --git a/meta/recipes-sato/pcmanfm/pcmanfm_1.2.3.bb b/meta/recipes-sato/pcmanfm/pcmanfm_1.2.3.bb
index 14f58ae..ad1acf7 100644
--- a/meta/recipes-sato/pcmanfm/pcmanfm_1.2.3.bb
+++ b/meta/recipes-sato/pcmanfm/pcmanfm_1.2.3.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
                     file://src/gseal-gtk-compat.h;endline=21;md5=46922c8691f58d124f9420fe16149ce2"
 
 SECTION = "x11"
-DEPENDS = "gtk+ startup-notification libfm intltool-native"
+DEPENDS = "gtk+ startup-notification libfm intltool-native gettext-native"
 DEPENDS_append_poky = " libowl"
 
 
diff --git a/meta/recipes-sato/puzzles/oh-puzzles_git.bb b/meta/recipes-sato/puzzles/oh-puzzles_git.bb
index bd762e9..b99f5e6 100644
--- a/meta/recipes-sato/puzzles/oh-puzzles_git.bb
+++ b/meta/recipes-sato/puzzles/oh-puzzles_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=f56ec6772dd1c7c367067bbea8ea1675 \
                     file://src/tree234.c;endline=28;md5=b4feb1976feebf8f1379093ed52f2945"
 
 SECTION = "x11"
-DEPENDS = "gtk+ gconf intltool-native librsvg"
+DEPENDS = "gtk+ gconf intltool-native librsvg gettext-native"
 DEPENDS_append_poky = " libowl"
 
 SRCREV = "92f1a20e4b72eed7a35b00984d9793b51dc2fb3b"
diff --git a/meta/recipes-support/atk/at-spi2-core_2.14.1.bb b/meta/recipes-support/atk/at-spi2-core_2.14.1.bb
index 8d01124..0a06475 100644
--- a/meta/recipes-support/atk/at-spi2-core_2.14.1.bb
+++ b/meta/recipes-support/atk/at-spi2-core_2.14.1.bb
@@ -9,7 +9,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz"
 SRC_URI[md5sum] = "a37993cc50d90465c9aeed95e2ac439a"
 SRC_URI[sha256sum] = "eef9660b14fdf0fb1f30d1be7c72d591fa7cbb87b00ca3a444425712f46ce657"
 
-DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst intltool-native"
+DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst intltool-native gettext-native"
 
 inherit autotools gtk-doc pkgconfig
 
diff --git a/meta/recipes-support/libfm/libfm-extra_1.2.3.bb b/meta/recipes-support/libfm/libfm-extra_1.2.3.bb
index 85bcc3c..aab6e6d 100644
--- a/meta/recipes-support/libfm/libfm-extra_1.2.3.bb
+++ b/meta/recipes-support/libfm/libfm-extra_1.2.3.bb
@@ -5,7 +5,7 @@ LICENSE = "LGPLv2+"
 LIC_FILES_CHKSUM = "file://src/fm-extra.h;beginline=8;endline=21;md5=ef1f84da64b3c01cca447212f7ef6007"
 
 SECTION = "x11/libs"
-DEPENDS = "glib-2.0 intltool-native"
+DEPENDS = "glib-2.0 intltool-native gettext-native"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz"
 
diff --git a/meta/recipes-support/libfm/libfm_1.2.3.bb b/meta/recipes-support/libfm/libfm_1.2.3.bb
index 629502f..aa48fb9 100644
--- a/meta/recipes-support/libfm/libfm_1.2.3.bb
+++ b/meta/recipes-support/libfm/libfm_1.2.3.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
 
 
 SECTION = "x11/libs"
-DEPENDS = "glib-2.0 pango gtk+ menu-cache intltool-native libexif libfm-extra"
+DEPENDS = "glib-2.0 pango gtk+ menu-cache intltool-native libexif libfm-extra gettext-native"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz"
 
diff --git a/meta/recipes-support/pinentry/pinentry_0.9.0.bb b/meta/recipes-support/pinentry/pinentry_0.9.0.bb
index 10b329b..6338597 100644
--- a/meta/recipes-support/pinentry/pinentry_0.9.0.bb
+++ b/meta/recipes-support/pinentry/pinentry_0.9.0.bb
@@ -12,6 +12,8 @@ PR = "r1"
 
 inherit autotools
 
+DEPENDS = "gettext-native"
+
 SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2"
 
 SRC_URI[md5sum] = "40a05856cb3accf6679987b7899b0f5a"
-- 
1.7.9.5

[PATCH 2/4] gettext 0.16.1: disable native

[Robert Yang]

ERROR: The recipe gettext-native is trying to install files into a shared area when those files already exist. Those files and their manifest location are:
   sysroots/x86_64-linux/usr/share/gettext/config.rpath
 Matched in manifest-x86_64-gettext-minimal-native.populate_sysroot
 sysroots/x86_64-linux/usr/share/gettext/po/remove-potcdate.sin
 Matched in manifest-x86_64-gettext-minimal-native.populate_sysroot
 sysroots/x86_64-linux/usr/share/gettext/po/Makefile.in.in
 Matched in manifest-x86_64-gettext-minimal-native.populate_sysroot
Please verify which recipe should provide the above files.

We have 0.19.4, so disable it rather than fix.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-core/gettext/gettext_0.16.1.bb |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/meta/recipes-core/gettext/gettext_0.16.1.bb b/meta/recipes-core/gettext/gettext_0.16.1.bb
index 892194c..97acf7b 100644
--- a/meta/recipes-core/gettext/gettext_0.16.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.16.1.bb
@@ -7,9 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9ea3144f04c41cd2eada5d3f472e6ea5"
 
 PR = "r6"
 DEPENDS = "virtual/libiconv"
-DEPENDS_class-native = ""
 PROVIDES = "virtual/libintl virtual/gettext"
-PROVIDES_class-native = ""
 
 SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
            file://gettext-vpath.patch \
@@ -106,4 +104,4 @@ remove_sysroot_m4_macros () {
     rm -r "${SYSROOT_DESTDIR}${datadir}/aclocal"
 }
 
-BBCLASSEXTEND = "native nativesdk"
+BBCLASSEXTEND = "nativesdk"
-- 
1.7.9.5

[PATCH 3/4] 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 f796f6f..d86075c 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 = "344599a7aefe23c7169ccdde3ad1b921bb60024c"
-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.18.2+git${SRCPV}"
-- 
1.7.9.5

[PATCH 4/4] bind: fix paralle issue

[Robert Yang]

Fixed:
unix/os.o: file not recognized: File truncated
collect2: error: ld returned 1 exit status

This is because os.o was built twice:
* The implicity rule (depends on unix/os.o)
* The "make all" in unix subdir (depends on unix/os.o)

Depend on subdirs which is unix only rather than unix/os.o will fix the
problem.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../bind/bind/bind-confgen-build-unix.o-once.patch |   44 ++++++++++++++++++++
 meta/recipes-connectivity/bind/bind_9.9.5.bb       |    1 +
 2 files changed, 45 insertions(+)
 create mode 100644 meta/recipes-connectivity/bind/bind/bind-confgen-build-unix.o-once.patch

diff --git a/meta/recipes-connectivity/bind/bind/bind-confgen-build-unix.o-once.patch b/meta/recipes-connectivity/bind/bind/bind-confgen-build-unix.o-once.patch
new file mode 100644
index 0000000..096d5d8
--- /dev/null
+++ b/meta/recipes-connectivity/bind/bind/bind-confgen-build-unix.o-once.patch
@@ -0,0 +1,44 @@
+From 9b40619ff6fddfef2758ba797789f8487f412df3 Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Mon, 16 Feb 2015 00:50:01 -0800
+Subject: [PATCH] confgen: don't build unix.o twice
+
+Fixed:
+unix/os.o: file not recognized: File truncated
+collect2: error: ld returned 1 exit status
+
+This is because os.o was built twice:
+* The implicity rule (depends on unix/os.o)
+* The "make all" in unix subdir (depends on unix/os.o)
+
+Depend on subdirs which is unix only rather than unix/os.o will fix the
+problem.
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ bin/confgen/Makefile.in |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/bin/confgen/Makefile.in b/bin/confgen/Makefile.in
+index 8b3e5aa..4868a24 100644
+--- a/bin/confgen/Makefile.in
++++ b/bin/confgen/Makefile.in
+@@ -74,11 +74,11 @@ rndc-confgen.@O@: rndc-confgen.c
+ ddns-confgen.@O@: ddns-confgen.c
+ 	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -c ${srcdir}/ddns-confgen.c
+ 
+-rndc-confgen@EXEEXT@: rndc-confgen.@O@ util.@O@ keygen.@O@ ${UOBJS} ${CONFDEPLIBS} 
++rndc-confgen@EXEEXT@: rndc-confgen.@O@ util.@O@ keygen.@O@ ${CONFDEPLIBS} $(SUBDIRS)
+ 	export BASEOBJS="rndc-confgen.@O@ util.@O@ keygen.@O@ ${UOBJS}"; \
+ 	${FINALBUILDCMD}
+ 
+-ddns-confgen@EXEEXT@: ddns-confgen.@O@ util.@O@ keygen.@O@ ${UOBJS} ${CONFDEPLIBS} 
++ddns-confgen@EXEEXT@: ddns-confgen.@O@ util.@O@ keygen.@O@ ${CONFDEPLIBS} $(SUBDIRS)
+ 	export BASEOBJS="ddns-confgen.@O@ util.@O@ keygen.@O@ ${UOBJS}"; \
+ 	${FINALBUILDCMD}
+ 
+-- 
+1.7.9.5
+
diff --git a/meta/recipes-connectivity/bind/bind_9.9.5.bb b/meta/recipes-connectivity/bind/bind_9.9.5.bb
index 8431eb9..5d97874 100644
--- a/meta/recipes-connectivity/bind/bind_9.9.5.bb
+++ b/meta/recipes-connectivity/bind/bind_9.9.5.bb
@@ -20,6 +20,7 @@ SRC_URI = "ftp://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \
            file://bind9_9_5-CVE-2014-8500.patch \
            file://bind-add-crosscripts-search-path-for-xml2-config.patch \
            file://bind-subdirs-run-serially.patch \
+           file://bind-confgen-build-unix.o-once.patch \
 	   "
 
 SRC_URI[md5sum] = "e676c65cad5234617ee22f48e328c24e"
-- 
1.7.9.5

Re: [PATCH 2/4] gettext 0.16.1: disable native

[Robert Yang]

Hello,

Any comments on the two patches, please ?

// Robert

On 02/18/2015 11:28 AM, Robert Yang wrote:
> ERROR: The recipe gettext-native is trying to install files into a shared area when those files already exist. Those files and their manifest location are:
>     sysroots/x86_64-linux/usr/share/gettext/config.rpath
>   Matched in manifest-x86_64-gettext-minimal-native.populate_sysroot
>   sysroots/x86_64-linux/usr/share/gettext/po/remove-potcdate.sin
>   Matched in manifest-x86_64-gettext-minimal-native.populate_sysroot
>   sysroots/x86_64-linux/usr/share/gettext/po/Makefile.in.in
>   Matched in manifest-x86_64-gettext-minimal-native.populate_sysroot
> Please verify which recipe should provide the above files.
>
> We have 0.19.4, so disable it rather than fix.
>
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
>   meta/recipes-core/gettext/gettext_0.16.1.bb |    4 +---
>   1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/meta/recipes-core/gettext/gettext_0.16.1.bb b/meta/recipes-core/gettext/gettext_0.16.1.bb
> index 892194c..97acf7b 100644
> --- a/meta/recipes-core/gettext/gettext_0.16.1.bb
> +++ b/meta/recipes-core/gettext/gettext_0.16.1.bb
> @@ -7,9 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9ea3144f04c41cd2eada5d3f472e6ea5"
>
>   PR = "r6"
>   DEPENDS = "virtual/libiconv"
> -DEPENDS_class-native = ""
>   PROVIDES = "virtual/libintl virtual/gettext"
> -PROVIDES_class-native = ""
>
>   SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
>              file://gettext-vpath.patch \
> @@ -106,4 +104,4 @@ remove_sysroot_m4_macros () {
>       rm -r "${SYSROOT_DESTDIR}${datadir}/aclocal"
>   }
>
> -BBCLASSEXTEND = "native nativesdk"
> +BBCLASSEXTEND = "nativesdk"
>

Re: [PATCH 2/4] gettext 0.16.1: disable native

[Richard Purdie]

On Fri, 2015-02-20 at 13:33 +0800, Robert Yang wrote:
> Any comments on the two patches, please ?

Well, I'm not convinced these are correct.

If you have differing native and target gettext versions, I don't think
it will work well and we're storing up potential trouble.

Having said that, I haven't replied so far as you're going to ask how
this breaks and how we fix it and I simply don't know. The patches don't
look/feel right though.

Cheers,

Richard

Re: [PATCH 2/4] gettext 0.16.1: disable native

[Robert Yang]

On 02/20/2015 08:53 PM, Richard Purdie wrote:
> On Fri, 2015-02-20 at 13:33 +0800, Robert Yang wrote:
>> Any comments on the two patches, please ?
>
> Well, I'm not convinced these are correct.
>
> If you have differing native and target gettext versions, I don't think
> it will work well and we're storing up potential trouble.
>
> Having said that, I haven't replied so far as you're going to ask how
> this breaks and how we fix it and I simply don't know. The patches don't
> look/feel right though.

Thanks, maybe we can fix the lower version gettext-native, I will try.

// Robert

>
> Cheers,
>
> Richard
>
>
>

[PATCH 0/4] meta: 4 fixes

[Robert Yang]

The following changes since commit 99f209a49a4390192b95184ff86bd6f973010111:

  layer.conf: bump version as error-report interface changed (2015-03-10 17:44:56 +0000)

are available in the git repository at:

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

Robert Yang (4):
  license.bbclass: set dirs for do_populate_lic_setscene
  mailx: disable parallel build
  kernelsrc.bbclass: fix KERNEL_VERSION
  pixbufcache.bbclass: add harfbuzz-native to PIXBUFCACHE_SYSROOT_DEP

 meta/classes/kernelsrc.bbclass            |    2 +-
 meta/classes/license.bbclass              |    2 ++
 meta/classes/pixbufcache.bbclass          |    7 ++++++-
 meta/recipes-extended/mailx/mailx_12.5.bb |    5 +++++
 4 files changed, 14 insertions(+), 2 deletions(-)

-- 
1.7.9.5

[PATCH 0/4] meta: 4 fixes

[Robert Yang]

The following changes since commit 58b45240739da210ef2fecea931c8b8daa9a4c07:

  epiphany: Add libxml2-native to DEPENDS (2016-02-18 22:55:12 +0000)

are available in the git repository at:

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

Robert Yang (4):
  image.bbclass: fix circular dependency when IMAGE_FSTYPES append
    hddimg
  recipe_sanity.bbclass: skip DataSmart in recipe_sanity_eh()
  terminal.bbclass: import oe.terminal for oe.terminal.prioritized()
  staging.bbclass: remove trail slash from SYSROOT_DESTDIR

 meta/classes/image-live.bbclass    |   11 ++++++++++-
 meta/classes/recipe_sanity.bbclass |    5 ++---
 meta/classes/staging.bbclass       |    2 +-
 meta/classes/terminal.bbclass      |    6 ++++--
 4 files changed, 17 insertions(+), 7 deletions(-)

-- 
1.7.9.5

[PATCH 0/4] meta: 4 fixes

[Robert Yang]

The following changes since commit e41c90b852167bbcb434da57b84280e855acae33:

  busybox: In defconfig enable ASH_CMDCMD for built-in 'command' (2017-04-12 15:18:42 +0100)

are available in the git repository at:

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

Robert Yang (4):
  binconfig.bbclass: fix typo in get_binconfig_mangle()
  apt: fix libdir path for apt.systemd.daily
  autogen: update libopts.m4's patch
  grep: do_configure: fix "Argument list too long"

 meta/classes/binconfig.bbclass                                        | 2 +-
 meta/recipes-devtools/apt/apt-package.inc                             | 4 +++-
 .../0001-config-libopts.m4-regenerate-it-from-config-libopts..patch   | 2 +-
 meta/recipes-extended/grep/grep_3.0.bb                                | 3 +++
 4 files changed, 8 insertions(+), 3 deletions(-)

-- 
2.10.2

[PATCH 0/4] meta: 4 fixes

[Robert Yang]

The following changes since commit 2106a567820bad438ff78d54a49e3d87da428dcf:

  python3: python3: Fix build error x86->x86 (2019-06-19 13:15:55 +0100)

are available in the git repository at:

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

Robert Yang (4):
  linux-dummy: Add do_compile_kernelmodules
  make-mod-scripts: Depends on bison-native
  update-alternatives.bbclass: run update-alternatives firstly in
    postinst script
  gtk-icon-cache.bbclass: Depends on gtk+3

 meta/classes/gtk-icon-cache.bbclass                        | 14 ++++++++++----
 meta/classes/update-alternatives.bbclass                   |  7 +++++--
 meta/recipes-kernel/linux/linux-dummy.bb                   |  5 +++++
 .../make-mod-scripts/make-mod-scripts_1.0.bb               |  2 +-
 4 files changed, 21 insertions(+), 7 deletions(-)

-- 
2.7.4