meta: 4 fixes
cover meta: 4 fixes
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
Signature · 1 line
1.7.9.5
PATCH 1/4 meta: fix build with gettext 0.16.1
The gettext 0.16.1 doesn't install any m4 files to sysroot, please see the following commit:
commit 9e10db5bdfe77c0ef2aff2f1cf89958b62c294a1
Author: Christopher Larson <[email protected]>
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.
--- .../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(-)
meta/recipes-connectivity/connman/connman-gnome_0.7.bb +1 -1
@@ -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"
meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb +1 -1
@@ -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"
meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb +1 -1
@@ -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"
meta/recipes-kernel/oprofile/oprofileui-server_git.bb +1 -1
@@ -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"
meta/recipes-kernel/oprofile/oprofileui_git.bb +1 -1
@@ -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}"
meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb +1 -1
@@ -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"
meta/recipes-sato/pcmanfm/pcmanfm_1.2.3.bb +1 -1
@@ -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"
meta/recipes-sato/puzzles/oh-puzzles_git.bb +1 -1
@@ -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"
meta/recipes-support/atk/at-spi2-core_2.14.1.bb +1 -1
@@ -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
meta/recipes-support/libfm/libfm-extra_1.2.3.bb +1 -1
@@ -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"
meta/recipes-support/libfm/libfm_1.2.3.bb +1 -1
@@ -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"
meta/recipes-support/pinentry/pinentry_0.9.0.bb +2 -0
@@ -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"
Signature · 1 line
1.7.9.5
PATCH 2/4 gettext 0.16.1: disable native
In reply to Robert YangERROR: 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.
--- meta/recipes-core/gettext/gettext_0.16.1.bb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
meta/recipes-core/gettext/gettext_0.16.1.bb +1 -3
@@ -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"
Signature · 1 line
1.7.9.5
Re: [PATCH 2/4] gettext 0.16.1: disable native
Hello,
Any comments on the two patches, please ?
// Robert
Quoted 37 lines · 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 <[email protected]>--- meta/recipes-core/gettext/gettext_0.16.1.bb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)meta/recipes-core/gettext/gettext_0.16.1.bb +1
-3@@ -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
Quoted 1 line · Robert Yang
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
Quoted 11 lines · Richard Purdie
Quoted 1 line · Robert Yang
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
Quoted 7 lines
Cheers,
Richard
PATCH 3/4 btrfs-tools: fix for parallel build
In reply to Robert YangFixed:
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);
--- .../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
meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch new file +32 -0
@@ -0,0 +1,32 @@ +From 373eb51328b5e10529763cad441210e6b0efb24e Mon Sep 17 00:00:00 2001 +From: Robert Yang <[email protected]> +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 <[email protected]> +--- + 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 +
meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb +4 -1
@@ -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}"
Signature · 1 line
1.7.9.5
PATCH 4/4 bind: fix paralle issue
In reply to Robert YangFixed: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.
--- .../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
meta/recipes-connectivity/bind/bind/bind-confgen-build-unix.o-once.patch new file +44 -0
@@ -0,0 +1,44 @@ +From 9b40619ff6fddfef2758ba797789f8487f412df3 Mon Sep 17 00:00:00 2001 +From: Robert Yang <[email protected]> +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 <[email protected]> +--- + 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 +
meta/recipes-connectivity/bind/bind_9.9.5.bb +1 -0
@@ -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"
Signature · 1 line
1.7.9.5