* [PATCH 01/11] recipetool.append: don't choke on a trailing ; in a url
2015-11-12 23:39 [PATCH 00/11] Misc fixes from Mentor Christopher Larson
@ 2015-11-12 23:39 ` Christopher Larson
2015-11-12 23:39 ` [PATCH 02/11] qemu.bbclass: correct the fsl ppc QEMU_EXTRAOPTIONS Christopher Larson
` (9 subsequent siblings)
10 siblings, 0 replies; 16+ messages in thread
From: Christopher Larson @ 2015-11-12 23:39 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
Apparently bb.fetch.URI can't handle this at the moment.
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
scripts/lib/recipetool/append.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/scripts/lib/recipetool/append.py b/scripts/lib/recipetool/append.py
index 7fe4115..867d55a 100644
--- a/scripts/lib/recipetool/append.py
+++ b/scripts/lib/recipetool/append.py
@@ -343,6 +343,8 @@ def appendsrc(args, files, rd, extralines=None):
simplified = {}
src_uri = rd.getVar('SRC_URI', True).split()
for uri in src_uri:
+ if uri.endswith(';'):
+ uri = uri[:-1]
simple_uri = bb.fetch.URI(uri)
simple_uri.params = {}
simplified[str(simple_uri)] = uri
--
2.2.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 02/11] qemu.bbclass: correct the fsl ppc QEMU_EXTRAOPTIONS
2015-11-12 23:39 [PATCH 00/11] Misc fixes from Mentor Christopher Larson
2015-11-12 23:39 ` [PATCH 01/11] recipetool.append: don't choke on a trailing ; in a url Christopher Larson
@ 2015-11-12 23:39 ` Christopher Larson
2015-11-12 23:39 ` [PATCH 03/11] qemu.bbclass: fix vardeps of QEMU_OPTIONS Christopher Larson
` (8 subsequent siblings)
10 siblings, 0 replies; 16+ messages in thread
From: Christopher Larson @ 2015-11-12 23:39 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
These need to be based on PACKAGE_ARCH rather than TARGET_ARCH, as we aren't
using overrides for this.
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
meta/classes/qemu.bbclass | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/meta/classes/qemu.bbclass b/meta/classes/qemu.bbclass
index 601f587..064b57e 100644
--- a/meta/classes/qemu.bbclass
+++ b/meta/classes/qemu.bbclass
@@ -42,10 +42,10 @@ QEMU_OPTIONS = "-r ${OLDEST_KERNEL} ${@d.getVar("QEMU_EXTRAOPTIONS_%s" % d.getVa
QEMU_EXTRAOPTIONS_iwmmxt = " -cpu pxa270-c5"
QEMU_EXTRAOPTIONS_armv6 = " -cpu arm1136"
QEMU_EXTRAOPTIONS_armv7a = " -cpu cortex-a8"
-QEMU_EXTRAOPTIONS_e500v2 = " -cpu e500v2"
-QEMU_EXTRAOPTIONS_e500mc = " -cpu e500mc"
-QEMU_EXTRAOPTIONS_e5500 = " -cpu e5500"
-QEMU_EXTRAOPTIONS_e5500-64b = " -cpu e5500"
-QEMU_EXTRAOPTIONS_e6500 = " -cpu e6500"
-QEMU_EXTRAOPTIONS_e6500-64b = " -cpu e6500"
+QEMU_EXTRAOPTIONS_ppce500v2 = " -cpu e500v2"
+QEMU_EXTRAOPTIONS_ppce500mc = " -cpu e500mc"
+QEMU_EXTRAOPTIONS_ppce5500 = " -cpu e5500"
+QEMU_EXTRAOPTIONS_ppc64e5500 = " -cpu e5500"
+QEMU_EXTRAOPTIONS_ppce6500 = " -cpu e6500"
+QEMU_EXTRAOPTIONS_ppc64e6500 = " -cpu e6500"
QEMU_EXTRAOPTIONS_ppc7400 = " -cpu 7400"
--
2.2.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 03/11] qemu.bbclass: fix vardeps of QEMU_OPTIONS
2015-11-12 23:39 [PATCH 00/11] Misc fixes from Mentor Christopher Larson
2015-11-12 23:39 ` [PATCH 01/11] recipetool.append: don't choke on a trailing ; in a url Christopher Larson
2015-11-12 23:39 ` [PATCH 02/11] qemu.bbclass: correct the fsl ppc QEMU_EXTRAOPTIONS Christopher Larson
@ 2015-11-12 23:39 ` Christopher Larson
2015-11-12 23:39 ` [PATCH 04/11] blkspace: fix ldflags for iowatcher Christopher Larson
` (7 subsequent siblings)
10 siblings, 0 replies; 16+ messages in thread
From: Christopher Larson @ 2015-11-12 23:39 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
The variable name for QEMU_EXTRAOPTIONS is constructed programmatically, so we
need an explicit variable dependency, otherwise changes to it won't cause e.g.
qemuwrapper-cross to be rebuilt.
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
meta/classes/qemu.bbclass | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/classes/qemu.bbclass b/meta/classes/qemu.bbclass
index 064b57e..315c17f 100644
--- a/meta/classes/qemu.bbclass
+++ b/meta/classes/qemu.bbclass
@@ -39,6 +39,7 @@ def qemu_run_binary(data, rootfs_path, binary):
# PACKAGE_ARCH, not overrides and hence have to do this dance. Simply being arch
# specific isn't good enough.
QEMU_OPTIONS = "-r ${OLDEST_KERNEL} ${@d.getVar("QEMU_EXTRAOPTIONS_%s" % d.getVar('PACKAGE_ARCH', True), True) or ""}"
+QEMU_OPTIONS[vardeps] += "QEMU_EXTRAOPTIONS_${PACKAGE_ARCH}"
QEMU_EXTRAOPTIONS_iwmmxt = " -cpu pxa270-c5"
QEMU_EXTRAOPTIONS_armv6 = " -cpu arm1136"
QEMU_EXTRAOPTIONS_armv7a = " -cpu cortex-a8"
--
2.2.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 04/11] blkspace: fix ldflags for iowatcher
2015-11-12 23:39 [PATCH 00/11] Misc fixes from Mentor Christopher Larson
` (2 preceding siblings ...)
2015-11-12 23:39 ` [PATCH 03/11] qemu.bbclass: fix vardeps of QEMU_OPTIONS Christopher Larson
@ 2015-11-12 23:39 ` Christopher Larson
2015-11-12 23:39 ` [PATCH 05/11] tcf-agent: obey LDFLAGS Christopher Larson
` (6 subsequent siblings)
10 siblings, 0 replies; 16+ messages in thread
From: Christopher Larson @ 2015-11-12 23:39 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
This quiets a GNU_HASH warning.
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
.../recipes-kernel/blktrace/blktrace/ldflags.patch | 23 +++++++++++++++++-----
1 file changed, 18 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-kernel/blktrace/blktrace/ldflags.patch b/meta/recipes-kernel/blktrace/blktrace/ldflags.patch
index 037d161..dea1aa2 100644
--- a/meta/recipes-kernel/blktrace/blktrace/ldflags.patch
+++ b/meta/recipes-kernel/blktrace/blktrace/ldflags.patch
@@ -9,11 +9,6 @@ http://git.yoctoproject.org/cgit/cgit.cgi/meta-mentor as of commit id
aed463414e2e2bf8ca44ba54ee5973e7ed599e57
Signed-off-by: Fahad Usman <fahad_usman@mentor.com>
----
- Makefile | 11 ++++++-----
- btreplay/Makefile | 3 ++-
- btt/Makefile | 3 ++-
- 3 files changed, 10 insertions(+), 7 deletions(-)
--- git.orig/Makefile
+++ git/Makefile
@@ -91,3 +86,21 @@ Signed-off-by: Fahad Usman <fahad_usman@mentor.com>
ifneq ($(wildcard .depend),)
include .depend
+--- git.orig/iowatcher/Makefile
++++ git/iowatcher/Makefile
+@@ -1,5 +1,6 @@
+ C = gcc
+ CFLAGS = -Wall -O0 -g -W
++LDFLAGS =
+ ALL_CFLAGS = $(CFLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+
+ PROGS = iowatcher
+@@ -19,7 +20,7 @@ all: $(ALL)
+ $(CC) -o $*.o -c $(ALL_CFLAGS) $<
+
+ iowatcher: blkparse.o plot.o main.o tracers.o mpstat.o fio.o
+- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) -lm
++ $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) -lm $(LDFLAGS)
+
+ depend:
+ @$(CC) -MM $(ALL_CFLAGS) *.c 1> .depend
--
2.2.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 05/11] tcf-agent: obey LDFLAGS
2015-11-12 23:39 [PATCH 00/11] Misc fixes from Mentor Christopher Larson
` (3 preceding siblings ...)
2015-11-12 23:39 ` [PATCH 04/11] blkspace: fix ldflags for iowatcher Christopher Larson
@ 2015-11-12 23:39 ` Christopher Larson
2015-11-12 23:39 ` [PATCH 06/11] latencytop: " Christopher Larson
` (5 subsequent siblings)
10 siblings, 0 replies; 16+ messages in thread
From: Christopher Larson @ 2015-11-12 23:39 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
This silences a GNU_HASH warning when using external toolchains. The patch is
courtesy Abdur Rehman <abdur_rehman@mentor.com>.
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
.../tcf-agent/tcf-agent/ldflags.patch | 28 ++++++++++++++++++++++
meta/recipes-devtools/tcf-agent/tcf-agent_git.bb | 1 +
2 files changed, 29 insertions(+)
create mode 100644 meta/recipes-devtools/tcf-agent/tcf-agent/ldflags.patch
diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent/ldflags.patch b/meta/recipes-devtools/tcf-agent/tcf-agent/ldflags.patch
new file mode 100644
index 0000000..c03c55d
--- /dev/null
+++ b/meta/recipes-devtools/tcf-agent/tcf-agent/ldflags.patch
@@ -0,0 +1,28 @@
+Upstream-Status: Pending
+
+From d92af0483c20365fd0af740d0baef8870b4aa374 Mon Sep 17 00:00:00 2001
+From: Abdur Rehman <abdur_rehman@mentor.com>
+Date: Wed, 26 Aug 2015 19:18:11 +0500
+Subject: [PATCH] tcf-agent: obey LDFLAGS
+
+Signed-off-by: Abdur Rehman <abdur_rehman@mentor.com>
+---
+ Makefile.inc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.inc b/Makefile.inc
+index 959028f..3148942 100644
+--- a/Makefile.inc
++++ b/Makefile.inc
+@@ -96,7 +96,7 @@ NO_LINK_F ?= -c
+ # Linker definition and flags
+
+ LINK ?= $(CC)
+-LINK_FLAGS ?= $(CFLAGS)
++LINK_FLAGS ?= $(LDFLAGS) $(CFLAGS)
+ LINK_OUT_F ?= $(OUT_OBJ_F)
+
+ # Archiver definition and flags
+--
+1.7.9.5
+
diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
index f8fd390..1337da9 100644
--- a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
+++ b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
@@ -10,6 +10,7 @@ PV = "1.3.0+git${SRCPV}"
SRC_URI = "git://git.eclipse.org/gitroot/tcf/org.eclipse.tcf.agent.git;branch=1.3_mars_bugfix \
file://fix_ranlib.patch \
+ file://ldflags.patch \
file://tcf-agent.init \
file://tcf-agent.service \
"
--
2.2.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 06/11] latencytop: obey LDFLAGS
2015-11-12 23:39 [PATCH 00/11] Misc fixes from Mentor Christopher Larson
` (4 preceding siblings ...)
2015-11-12 23:39 ` [PATCH 05/11] tcf-agent: obey LDFLAGS Christopher Larson
@ 2015-11-12 23:39 ` Christopher Larson
2015-11-12 23:39 ` [PATCH 07/11] systemd: chown hwdb.bin to root:root for do_rootfs Christopher Larson
` (4 subsequent siblings)
10 siblings, 0 replies; 16+ messages in thread
From: Christopher Larson @ 2015-11-12 23:39 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
Patch update courtesy Abdur Rehman <abdur_rehman@mentor.com>.
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-makefile.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-makefile.patch b/meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-makefile.patch
index 0cf217f..af19b37 100644
--- a/meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-makefile.patch
+++ b/meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-makefile.patch
@@ -12,7 +12,7 @@ index 16a2369..fa797a2 100644
SBINDIR = /usr/sbin
XCFLAGS = -W -g `pkg-config --cflags glib-2.0` -D_FORTIFY_SOURCE=2 -Wno-sign-compare
-LDF = -Wl,--as-needed `pkg-config --libs glib-2.0` -lncursesw
-+LDF = -Wl,--as-needed `pkg-config --libs glib-2.0` -lncurses
++LDF = -Wl,--as-needed `pkg-config --libs glib-2.0` -lncurses $(LDFLAGS)
+CC ?= gcc
OBJS= latencytop.o text_display.o translate.o fsync.o
--
2.2.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 07/11] systemd: chown hwdb.bin to root:root for do_rootfs
2015-11-12 23:39 [PATCH 00/11] Misc fixes from Mentor Christopher Larson
` (5 preceding siblings ...)
2015-11-12 23:39 ` [PATCH 06/11] latencytop: " Christopher Larson
@ 2015-11-12 23:39 ` Christopher Larson
2015-11-12 23:39 ` [PATCH 08/11] systemd: drop unneeded $D check in prerm Christopher Larson
` (3 subsequent siblings)
10 siblings, 0 replies; 16+ messages in thread
From: Christopher Larson @ 2015-11-12 23:39 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
This is created by qemu for the do_rootfs case, which bypasses pseudo, so we
need to correct the ownership. This fixes a warning issued by
rootfs_check_host_user_contaminated.
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
meta/recipes-core/systemd/systemd_225.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-core/systemd/systemd_225.bb b/meta/recipes-core/systemd/systemd_225.bb
index 18c2448..9b0503d 100644
--- a/meta/recipes-core/systemd/systemd_225.bb
+++ b/meta/recipes-core/systemd/systemd_225.bb
@@ -401,6 +401,7 @@ pkg_postinst_udev-hwdb () {
if test -n "$D"; then
${@qemu_run_binary(d, '$D', '${base_bindir}/udevadm')} hwdb --update \
--root $D
+ chown root:root $D${sysconfdir}/udev/hwdb.bin
else
udevadm hwdb --update
fi
--
2.2.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 08/11] systemd: drop unneeded $D check in prerm
2015-11-12 23:39 [PATCH 00/11] Misc fixes from Mentor Christopher Larson
` (6 preceding siblings ...)
2015-11-12 23:39 ` [PATCH 07/11] systemd: chown hwdb.bin to root:root for do_rootfs Christopher Larson
@ 2015-11-12 23:39 ` Christopher Larson
2015-11-16 15:18 ` Burton, Ross
2015-11-12 23:39 ` [PATCH 09/11] connman: depend on readline Christopher Larson
` (2 subsequent siblings)
10 siblings, 1 reply; 16+ messages in thread
From: Christopher Larson @ 2015-11-12 23:39 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
meta/classes/qemu.bbclass | 5 +++++
meta/recipes-core/systemd/systemd_225.bb | 6 +-----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/meta/classes/qemu.bbclass b/meta/classes/qemu.bbclass
index 315c17f..1f5bbcc 100644
--- a/meta/classes/qemu.bbclass
+++ b/meta/classes/qemu.bbclass
@@ -50,3 +50,8 @@ QEMU_EXTRAOPTIONS_ppc64e5500 = " -cpu e5500"
QEMU_EXTRAOPTIONS_ppce6500 = " -cpu e6500"
QEMU_EXTRAOPTIONS_ppc64e6500 = " -cpu e6500"
QEMU_EXTRAOPTIONS_ppc7400 = " -cpu 7400"
+
+python () {
+ if "QEMU_EXTRAOPTIONS" in d and d.expand("QEMU_EXTRAOPTIONS_${PACKAGE_ARCH}") not in d and d.getVar("PACKAGE_ARCH", True) != "all":
+ bb.fatal("Incorrect use of overrides rather than PACKAGE_ARCH for QEMU_EXTRAOPTIONS")
+}
diff --git a/meta/recipes-core/systemd/systemd_225.bb b/meta/recipes-core/systemd/systemd_225.bb
index 9b0503d..6bd9adc 100644
--- a/meta/recipes-core/systemd/systemd_225.bb
+++ b/meta/recipes-core/systemd/systemd_225.bb
@@ -408,11 +408,7 @@ pkg_postinst_udev-hwdb () {
}
pkg_prerm_udev-hwdb () {
- if test -n "$D"; then
- exit 1
- fi
-
- rm -f ${sysconfdir}/udev/hwdb.bin
+ rm -f $D${sysconfdir}/udev/hwdb.bin
}
# As this recipe builds udev, respect systemd being in DISTRO_FEATURES so
--
2.2.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: [PATCH 08/11] systemd: drop unneeded $D check in prerm
2015-11-12 23:39 ` [PATCH 08/11] systemd: drop unneeded $D check in prerm Christopher Larson
@ 2015-11-16 15:18 ` Burton, Ross
2015-11-16 15:54 ` Christopher Larson
0 siblings, 1 reply; 16+ messages in thread
From: Burton, Ross @ 2015-11-16 15:18 UTC (permalink / raw)
To: Christopher Larson; +Cc: Christopher Larson, OE-core
[-- Attachment #1: Type: text/plain, Size: 786 bytes --]
On 12 November 2015 at 23:39, Christopher Larson <kergoth@gmail.com> wrote:
> diff --git a/meta/classes/qemu.bbclass b/meta/classes/qemu.bbclass
> index 315c17f..1f5bbcc 100644
> --- a/meta/classes/qemu.bbclass
> +++ b/meta/classes/qemu.bbclass
> @@ -50,3 +50,8 @@ QEMU_EXTRAOPTIONS_ppc64e5500 = " -cpu e5500"
> QEMU_EXTRAOPTIONS_ppce6500 = " -cpu e6500"
> QEMU_EXTRAOPTIONS_ppc64e6500 = " -cpu e6500"
> QEMU_EXTRAOPTIONS_ppc7400 = " -cpu 7400"
> +
> +python () {
> + if "QEMU_EXTRAOPTIONS" in d and
> d.expand("QEMU_EXTRAOPTIONS_${PACKAGE_ARCH}") not in d and
> d.getVar("PACKAGE_ARCH", True) != "all":
> + bb.fatal("Incorrect use of overrides rather than PACKAGE_ARCH for
> QEMU_EXTRAOPTIONS")
> +}
>
I think you meant to split this out.
Ross
[-- Attachment #2: Type: text/html, Size: 1302 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH 08/11] systemd: drop unneeded $D check in prerm
2015-11-16 15:18 ` Burton, Ross
@ 2015-11-16 15:54 ` Christopher Larson
2015-11-16 15:55 ` Burton, Ross
0 siblings, 1 reply; 16+ messages in thread
From: Christopher Larson @ 2015-11-16 15:54 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 1159 bytes --]
On Mon, Nov 16, 2015 at 8:18 AM, Burton, Ross <ross.burton@intel.com> wrote:
> On 12 November 2015 at 23:39, Christopher Larson <kergoth@gmail.com>
> wrote:
>
>> diff --git a/meta/classes/qemu.bbclass b/meta/classes/qemu.bbclass
>> index 315c17f..1f5bbcc 100644
>> --- a/meta/classes/qemu.bbclass
>> +++ b/meta/classes/qemu.bbclass
>> @@ -50,3 +50,8 @@ QEMU_EXTRAOPTIONS_ppc64e5500 = " -cpu e5500"
>> QEMU_EXTRAOPTIONS_ppce6500 = " -cpu e6500"
>> QEMU_EXTRAOPTIONS_ppc64e6500 = " -cpu e6500"
>> QEMU_EXTRAOPTIONS_ppc7400 = " -cpu 7400"
>> +
>> +python () {
>> + if "QEMU_EXTRAOPTIONS" in d and
>> d.expand("QEMU_EXTRAOPTIONS_${PACKAGE_ARCH}") not in d and
>> d.getVar("PACKAGE_ARCH", True) != "all":
>> + bb.fatal("Incorrect use of overrides rather than PACKAGE_ARCH
>> for QEMU_EXTRAOPTIONS")
>> +}
>>
>
> I think you meant to split this out.
>
Er, yes, no idea how I missed that when reviewing the diffs. That was meant
to stay local. Sorry about that.
--
Christopher Larson
kergoth at gmail dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics
[-- Attachment #2: Type: text/html, Size: 1918 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH 08/11] systemd: drop unneeded $D check in prerm
2015-11-16 15:54 ` Christopher Larson
@ 2015-11-16 15:55 ` Burton, Ross
2015-11-16 15:57 ` Christopher Larson
0 siblings, 1 reply; 16+ messages in thread
From: Burton, Ross @ 2015-11-16 15:55 UTC (permalink / raw)
To: Christopher Larson; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 285 bytes --]
On 16 November 2015 at 15:54, Christopher Larson <kergoth@gmail.com> wrote:
> Er, yes, no idea how I missed that when reviewing the diffs. That was
> meant to stay local. Sorry about that.
>
Don't bother with a v2 by the way, I dropped that chunk when merging to mut.
Ross
[-- Attachment #2: Type: text/html, Size: 644 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 08/11] systemd: drop unneeded $D check in prerm
2015-11-16 15:55 ` Burton, Ross
@ 2015-11-16 15:57 ` Christopher Larson
0 siblings, 0 replies; 16+ messages in thread
From: Christopher Larson @ 2015-11-16 15:57 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 549 bytes --]
On Mon, Nov 16, 2015 at 8:55 AM, Burton, Ross <ross.burton@intel.com> wrote:
> On 16 November 2015 at 15:54, Christopher Larson <kergoth@gmail.com>
> wrote:
>
>> Er, yes, no idea how I missed that when reviewing the diffs. That was
>> meant to stay local. Sorry about that.
>>
>
> Don't bother with a v2 by the way, I dropped that chunk when merging to
> mut.
>
Ah, thanks.
--
Christopher Larson
kergoth at gmail dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics
[-- Attachment #2: Type: text/html, Size: 1161 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 09/11] connman: depend on readline
2015-11-12 23:39 [PATCH 00/11] Misc fixes from Mentor Christopher Larson
` (7 preceding siblings ...)
2015-11-12 23:39 ` [PATCH 08/11] systemd: drop unneeded $D check in prerm Christopher Larson
@ 2015-11-12 23:39 ` Christopher Larson
2015-11-12 23:39 ` [PATCH 10/11] sysklogd: inhibit updatercd for non-sysvinit Christopher Larson
2015-11-12 23:39 ` [PATCH 11/11] openjade-native: statically link local libs Christopher Larson
10 siblings, 0 replies; 16+ messages in thread
From: Christopher Larson @ 2015-11-12 23:39 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
When the client is enabled, which we do by default, readline is required.
Currently it gets pulled in by other dependencies of connman, indirectly,
but we should be explicit rather than relying on this.
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
meta/recipes-connectivity/connman/connman.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index afdb3f2..6324d7a 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
inherit autotools pkgconfig systemd update-rc.d bluetooth
-DEPENDS = "dbus glib-2.0 ppp iptables"
+DEPENDS = "dbus glib-2.0 ppp iptables readline"
INC_PR = "r20"
--
2.2.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 10/11] sysklogd: inhibit updatercd for non-sysvinit
2015-11-12 23:39 [PATCH 00/11] Misc fixes from Mentor Christopher Larson
` (8 preceding siblings ...)
2015-11-12 23:39 ` [PATCH 09/11] connman: depend on readline Christopher Larson
@ 2015-11-12 23:39 ` Christopher Larson
2015-11-12 23:39 ` [PATCH 11/11] openjade-native: statically link local libs Christopher Larson
10 siblings, 0 replies; 16+ messages in thread
From: Christopher Larson @ 2015-11-12 23:39 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
This recipe doesn't inherit systemd, so we need to take care of it ourselves.
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
meta/recipes-extended/sysklogd/sysklogd.inc | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc
index bcf8aa7..85b3cdc 100644
--- a/meta/recipes-extended/sysklogd/sysklogd.inc
+++ b/meta/recipes-extended/sysklogd/sysklogd.inc
@@ -56,3 +56,8 @@ pkg_prerm_${PN} () {
fi
fi
}
+
+python () {
+ if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d):
+ d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1")
+}
--
2.2.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 11/11] openjade-native: statically link local libs
2015-11-12 23:39 [PATCH 00/11] Misc fixes from Mentor Christopher Larson
` (9 preceding siblings ...)
2015-11-12 23:39 ` [PATCH 10/11] sysklogd: inhibit updatercd for non-sysvinit Christopher Larson
@ 2015-11-12 23:39 ` Christopher Larson
10 siblings, 0 replies; 16+ messages in thread
From: Christopher Larson @ 2015-11-12 23:39 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
Statically link local libs to avoid gold link issue. This is clearly
a workaround, but does get us past the failures with systems using gold by
default until we find a better solution.
[YOCTO #2972]
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
.../openjade/openjade-native_1.3.2.bb | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
index fa7aa62..355ed6a 100644
--- a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
+++ b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
@@ -24,6 +24,10 @@ SRC_URI[sha256sum] = "1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7
inherit autotools-brokensep native
+# Statically link local libs to avoid gold link issue [YOCTO #2972]
+PACKAGECONFIG ?= "static-only-libs"
+PACKAGECONFIG[static-only-libs] = "--enable-static --disable-shared,--enable-static --enable-shared,,"
+
EXTRA_OECONF = "--enable-spincludedir=${STAGING_INCDIR}/OpenSP \
--enable-splibdir=${STAGING_LIBDIR}"
@@ -57,14 +61,20 @@ do_compile_prepend () {
do_install() {
# Refer to http://www.linuxfromscratch.org/blfs/view/stable/pst/openjade.html
# for details.
- install -d ${D}${bindir}
- install -m 0755 ${S}/jade/.libs/openjade ${D}${bindir}/openjade
+ install -d ${D}${bindir} ${D}${libdir}
+ if ${@bb.utils.contains('PACKAGECONFIG', 'static-only-libs', 'true', 'false', d)}; then
+ install -m 0755 jade/openjade ${D}${bindir}/openjade
+ oe_libinstall -a -C style libostyle ${D}${libdir}
+ oe_libinstall -a -C spgrove libospgrove ${D}${libdir}
+ oe_libinstall -a -C grove libogrove ${D}${libdir}
+ else
+ install -m 0755 jade/.libs/openjade ${D}${bindir}/openjade
+ oe_libinstall -a -so -C style libostyle ${D}${libdir}
+ oe_libinstall -a -so -C spgrove libospgrove ${D}${libdir}
+ oe_libinstall -a -so -C grove libogrove ${D}${libdir}
+ fi
ln -sf openjade ${D}${bindir}/jade
- oe_libinstall -a -so -C style libostyle ${D}${libdir}
- oe_libinstall -a -so -C spgrove libospgrove ${D}${libdir}
- oe_libinstall -a -so -C grove libogrove ${D}${libdir}
-
install -d ${D}${datadir}/sgml/openjade-${PV}
install -m 644 dsssl/catalog ${D}${datadir}/sgml/openjade-${PV}
install -m 644 dsssl/*.dtd ${D}${datadir}/sgml/openjade-${PV}
--
2.2.1
^ permalink raw reply related [flat|nested] 16+ messages in thread