[OE-core] [PATCH 0/2 v3] openssh: two fixes
From: Roy.Li rongqing...@windriver.com The following changes since commit 1aeecaeee9bb1eee779973fce7f15cc7fad269a0: classes/qmake_base: allow parallel make (2013-06-13 17:37:58 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib roy/openssh-4 http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=roy/openssh-4 Roy.Li (2): openssh: fix a unaligned memory access issue openssh: obey 'tcp-wrappers' PACKAGECONFIG .../openssh/openssh-6.2p2/mac.patch| 76 meta/recipes-connectivity/openssh/openssh_6.2p2.bb |4 ++ 2 files changed, 80 insertions(+) create mode 100644 meta/recipes-connectivity/openssh/openssh-6.2p2/mac.patch -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] openssh: obey 'tcp-wrappers' PACKAGECONFIG
From: Roy.Li rongqing...@windriver.com Signed-off-by: Roy.Li rongqing...@windriver.com --- meta/recipes-connectivity/openssh/openssh_6.2p2.bb |3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-connectivity/openssh/openssh_6.2p2.bb b/meta/recipes-connectivity/openssh/openssh_6.2p2.bb index 0459032..ab2eefb 100644 --- a/meta/recipes-connectivity/openssh/openssh_6.2p2.bb +++ b/meta/recipes-connectivity/openssh/openssh_6.2p2.bb @@ -41,6 +41,9 @@ INITSCRIPT_PACKAGES = ${PN}-sshd INITSCRIPT_NAME_${PN}-sshd = sshd INITSCRIPT_PARAMS_${PN}-sshd = defaults 9 +PACKAGECONFIG ??= tcp-wrappers +PACKAGECONFIG[tcp-wrappers] = --with-tcp-wrappers,,tcp-wrappers + inherit autotools # LFS support: -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] openssh: fix a unaligned memory access issue
From: Roy.Li rongqing...@windriver.com Backport patch to fix segment fault due to unaligned memory access Signed-off-by: Roy.Li rongqing...@windriver.com --- .../openssh/openssh-6.2p2/mac.patch| 76 meta/recipes-connectivity/openssh/openssh_6.2p2.bb |1 + 2 files changed, 77 insertions(+) create mode 100644 meta/recipes-connectivity/openssh/openssh-6.2p2/mac.patch diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/mac.patch b/meta/recipes-connectivity/openssh/openssh-6.2p2/mac.patch new file mode 100644 index 000..69fb69d --- /dev/null +++ b/meta/recipes-connectivity/openssh/openssh-6.2p2/mac.patch @@ -0,0 +1,76 @@ +[PATCH] force the MAC output to be 64-bit aligned + +Upstream-Status: Backport[anoncvs.mindrot.org/index.cgi/openssh/mac.c?r1=1.27r2=1.28] + +Backport patch to fix segment fault due to unaligned memory access + +Wed Jun 5 22:12:37 2013 UTC (7 days, 3 hours ago) by dtucker +Branch: MAIN +CVS Tags: HEAD +Changes since 1.27: +11 -8 lines +Diff to previous 1.27 + + - dtuc...@cvs.openbsd.org 2013/06/03 00:03:18 + [mac.c] + force the MAC output to be 64-bit aligned so umac won't see +unaligned + accesses on strict-alignment architectures. bz#2101, patch from + tomas.kuthan at oracle.com, ok djm@ +--- + mac.c | 18 +++--- + 1 file changed, 11 insertions(+), 7 deletions(-) + +diff --git a/mac.c b/mac.c +index 3f2dc6f..a5a80d3 100644 +--- a/mac.c b/mac.c +@@ -152,12 +152,16 @@ mac_init(Mac *mac) + u_char * + mac_compute(Mac *mac, u_int32_t seqno, u_char *data, int datalen) + { +- static u_char m[EVP_MAX_MD_SIZE]; ++ static union { ++ u_char m[EVP_MAX_MD_SIZE]; ++ u_int64_t for_align; ++ } u; ++ + u_char b[4], nonce[8]; + +- if (mac-mac_len sizeof(m)) ++ if (mac-mac_len sizeof(u)) + fatal(mac_compute: mac too long %u %lu, +- mac-mac_len, (u_long)sizeof(m)); ++ mac-mac_len, (u_long)sizeof(u)); + + switch (mac-type) { + case SSH_EVP: +@@ -166,22 +170,22 @@ mac_compute(Mac *mac, u_int32_t seqno, u_char *data, int datalen) + HMAC_Init(mac-evp_ctx, NULL, 0, NULL); + HMAC_Update(mac-evp_ctx, b, sizeof(b)); + HMAC_Update(mac-evp_ctx, data, datalen); +- HMAC_Final(mac-evp_ctx, m, NULL); ++ HMAC_Final(mac-evp_ctx, u.m, NULL); + break; + case SSH_UMAC: + put_u64(nonce, seqno); + umac_update(mac-umac_ctx, data, datalen); +- umac_final(mac-umac_ctx, m, nonce); ++ umac_final(mac-umac_ctx, u.m, nonce); + break; + case SSH_UMAC128: + put_u64(nonce, seqno); + umac128_update(mac-umac_ctx, data, datalen); +- umac128_final(mac-umac_ctx, m, nonce); ++ umac128_final(mac-umac_ctx, u.m, nonce); + break; + default: + fatal(mac_compute: unknown MAC type); + } +- return (m); ++ return (u.m); + } + + void +-- +1.7.9.5 + diff --git a/meta/recipes-connectivity/openssh/openssh_6.2p2.bb b/meta/recipes-connectivity/openssh/openssh_6.2p2.bb index 06297da..0459032 100644 --- a/meta/recipes-connectivity/openssh/openssh_6.2p2.bb +++ b/meta/recipes-connectivity/openssh/openssh_6.2p2.bb @@ -25,6 +25,7 @@ SRC_URI = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar. file://ssh_config \ file://init \ file://openssh-CVE-2011-4327.patch \ + file://mac.patch \ ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} PAM_SRC_URI = file://sshd -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] directfb:filter out -fno-omit-frame-pointer option on x86 arch
From: Roy.Li rongqing...@windriver.com The following changes since commit 1aeecaeee9bb1eee779973fce7f15cc7fad269a0: classes/qmake_base: allow parallel make (2013-06-13 17:37:58 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib roy/directfd http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=roy/directfd Roy.Li (1): directfb:filter out -fno-omit-frame-pointer option on x86 arch meta/recipes-graphics/directfb/directfb.inc |4 1 file changed, 4 insertions(+) -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] directfb:filter out -fno-omit-frame-pointer option on x86 arch
From: Roy.Li rongqing...@windriver.com directfb need -fomit-frame-pointer option of gcc to build some inline asm code about mmx. But once -fno-omit-frame-pointer was added into TARGET_CFLAGS. That will cause directfb build error on x86 arch. Signed-off-by: Roy.Li rongqing...@windriver.com --- meta/recipes-graphics/directfb/directfb.inc |4 1 file changed, 4 insertions(+) diff --git a/meta/recipes-graphics/directfb/directfb.inc b/meta/recipes-graphics/directfb/directfb.inc index aecc834..cff8a7f 100644 --- a/meta/recipes-graphics/directfb/directfb.inc +++ b/meta/recipes-graphics/directfb/directfb.inc @@ -34,6 +34,10 @@ EXTRA_OECONF = \ --disable-mesa \ +#Once -fno-omit-frame-pointer option of gcc is added into TARGET_CLFAGS as default +#this will cause directfb build failure on x86 arch, so filter out it. +TARGET_CFLAGS_x86 := ${@oe_filter_out('-fno-omit-frame-pointer', '${TARGET_CFLAGS}', d)} + #PACKAGES_DYNAMIC += ^directfb-inputdrivers-.* # #python populate_packages_prepend () { -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] consolekit: move libck-connector to base_libdir
From: Jackie Huang jackie.hu...@windriver.com move libck-connector.so.* to base_libdir to kill two warnings: WARNING: QA Issue: consolekit: /lib64/security/pam_ck_connector.so, installed in the base_prefix, requires a shared library under exec_prefix (/usr): libck-connector.so.0 = /usr/lib64/ libck-connector.so.0 (0xdead300 WARNING: QA Issue: lib32-consolekit: Found a reference to /usr/ in /buildarea1/jhuang0/t_multilib/p_x64_0217/bitbake_build/tmp/work/ x86-wrsmllib32-linux/lib32-consolekit-0.4.5-r10/packages-split/i lib32-consolekit/lib/security/pam_ck_connector.la WARNING: QA Issue: Shell scripts in base_bindir and base_sbindir should not reference anything in exec_prefix Signed-off-by: Roy.Li rongqing...@windriver.com Signed-off-by: Jackie Huang jackie.hu...@windriver.com --- .../recipes-support/consolekit/consolekit_0.4.5.bb | 11 ++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/meta/recipes-support/consolekit/consolekit_0.4.5.bb b/meta/recipes-support/consolekit/consolekit_0.4.5.bb index 7d66b39..3d976d4 100644 --- a/meta/recipes-support/consolekit/consolekit_0.4.5.bb +++ b/meta/recipes-support/consolekit/consolekit_0.4.5.bb @@ -2,7 +2,7 @@ DESCRIPTION = ConsoleKit is a framework for defining and tracking users, login HOMEPAGE=http://www.freedesktop.org/wiki/Software/ConsoleKit; BUGTRACKER=https://bugs.freedesktop.org/buglist.cgi?query_format=specificproduct=ConsoleKit; -PR = r10 +PR = r11 LICENSE = GPLv2+ LIC_FILES_CHKSUM = file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ @@ -41,4 +41,13 @@ RDEPENDS_pam-plugin-ck-connector += ${PN} do_install_append() { # Remove /var/run from package as console-kit-daemon will populate it on startup rm -fr ${D}${localstatedir}/run + # Moving libck-connector to base_libdir + if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then + mkdir -p ${D}/${base_libdir}/ + mv -f ${D}${libdir}/libck-connector.so.0* ${D}${base_libdir}/ + mv -f ${D}${base_libdir}/security/pam_ck_connector.la ${D}${libdir}/ + rel_lib_prefix=`echo ${libdir} | sed 's,\(^/\|\)[^/][^/]*,..,g'` + ln -sf ${rel_lib_prefix}${base_libdir}/libck-connector.so.0.0.0 ${D}${libdir}/libck-connector.so + fi + } -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] do not pass CFLAGS to gcc while building libcap
From: Jackie Huang jackie.hu...@windriver.com During do_configure(), we modify the BUILD_CFLAGS used but do not remove the default inclusion of CFLAGS in BUILD_CFLAGS. This fix removes CFLAGS inclusion by modifying do_configure(). Signed-off-by: Joe Slater jsla...@windriver.com Signed-off-by: Jackie Huang jackie.hu...@windriver.com --- meta/recipes-support/libcap/libcap.inc |6 -- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/libcap/libcap.inc b/meta/recipes-support/libcap/libcap.inc index 2fd5718..5ace7d7 100644 --- a/meta/recipes-support/libcap/libcap.inc +++ b/meta/recipes-support/libcap/libcap.inc @@ -12,15 +12,17 @@ DEPENDS_class-native = perl-native-runtime SRC_URI = ${DEBIAN_MIRROR}/main/libc/libcap2/${BPN}2_${PV}.orig.tar.gz -PR = r2 +PR = r3 inherit lib_package +# do NOT pass target cflags to host compilations +# do_configure() { # libcap uses := for compilers, fortunately, it gives us a hint # on what should be replaced with ?= sed -e 's,:=,?=,g' -i Make.Rules - sed -e 's,BUILD_CFLAGS ?=,BUILD_CFLAGS := $(BUILD_CFLAGS),' -i Make.Rules + sed -e 's,^BUILD_CFLAGS ?= $(CFLAGS),BUILD_CFLAGS := $(BUILD_CFLAGS),' -i Make.Rules } EXTRA_OEMAKE = \ -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] acl attr libcap: mark shared libraries executable
From: Jackie Huang jackie.hu...@windriver.com While it is not necessary that shared libraries be executable, if they are not marked as such bitbake will not examine them for debug information. So, we make them executable at the end of installation. Signed-off-by: Joe Slater jsla...@windriver.com Signed-off-by: Jackie Huang jackie.hu...@windriver.com --- meta/recipes-support/attr/acl.inc |4 meta/recipes-support/attr/attr.inc |4 meta/recipes-support/libcap/libcap.inc |7 ++- 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/meta/recipes-support/attr/acl.inc b/meta/recipes-support/attr/acl.inc index b504517..060d09b 100644 --- a/meta/recipes-support/attr/acl.inc +++ b/meta/recipes-support/attr/acl.inc @@ -20,7 +20,11 @@ do_configure_append() { } # libdir should point to .la +# install somehow leaves the actual shared library 644 instead of 755 +# this means it will be ignored for debug info extraction +# do_install_append() { sed -i ${D}${libdir}/libacl.la -e \ s,^libdir=\'${base_libdir}\'$,libdir=\'${libdir}\', + chmod a+x ${D}${base_libdir}/*.so.*.* } diff --git a/meta/recipes-support/attr/attr.inc b/meta/recipes-support/attr/attr.inc index eaed7af..375d2e9 100644 --- a/meta/recipes-support/attr/attr.inc +++ b/meta/recipes-support/attr/attr.inc @@ -18,7 +18,11 @@ SRC_URI = http://download.savannah.gnu.org/releases/attr/${BP}.src.tar.gz \ require ea-acl.inc # libdir should point to .la +# install somehow leaves the actual shared library 644 instead of 755 +# this means it will be ignored for debug info extraction +# do_install_append() { sed -i ${D}${libdir}/libattr.la -e \ s,^libdir=\'${base_libdir}\'$,libdir=\'${libdir}\', + chmod a+x ${D}${base_libdir}/*.so.*.* } diff --git a/meta/recipes-support/libcap/libcap.inc b/meta/recipes-support/libcap/libcap.inc index 7f16a56..2fd5718 100644 --- a/meta/recipes-support/libcap/libcap.inc +++ b/meta/recipes-support/libcap/libcap.inc @@ -12,7 +12,7 @@ DEPENDS_class-native = perl-native-runtime SRC_URI = ${DEBIAN_MIRROR}/main/libc/libcap2/${BPN}2_${PV}.orig.tar.gz -PR = r1 +PR = r2 inherit lib_package @@ -51,6 +51,11 @@ do_install_append() { mv ${D}${libdir}/* ${D}${base_libdir} rmdir ${D}${libdir} fi + + # install somehow leaves the actual shared library 644 instead of 755 + # this means it will be ignored for debug info extraction + # + chmod a+x ${D}${base_libdir}/*.so.*.* } FILES_${PN}-dev += ${base_libdir}/*.so -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] cogl: make cogl be able to build on ARM arch
From: Roy.Li rongqing...@windriver.com The following changes since commit 1aeecaeee9bb1eee779973fce7f15cc7fad269a0: classes/qmake_base: allow parallel make (2013-06-13 17:37:58 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib roy/cogl http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=roy/cogl Roy.Li (1): cogl: make cogl be able to build on ARM arch meta/recipes-graphics/cogl/cogl-1.0.inc|4 +++ .../cogl/files/cogl-fixed-thumb.patch | 30 .../cogl/files/cogl_fixed_mul-constraint.patch | 22 ++ 3 files changed, 56 insertions(+) create mode 100644 meta/recipes-graphics/cogl/files/cogl-fixed-thumb.patch create mode 100644 meta/recipes-graphics/cogl/files/cogl_fixed_mul-constraint.patch -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] cogl: make cogl be able to build on ARM arch
From: Roy.Li rongqing...@windriver.com 1. Fix asm() register constraints in cogl when building for ARM. 2. Fix cogl to handle Thumb builds. Signed-off-by: Roy.Li rongqing...@windriver.com --- meta/recipes-graphics/cogl/cogl-1.0.inc|4 +++ .../cogl/files/cogl-fixed-thumb.patch | 30 .../cogl/files/cogl_fixed_mul-constraint.patch | 22 ++ 3 files changed, 56 insertions(+) create mode 100644 meta/recipes-graphics/cogl/files/cogl-fixed-thumb.patch create mode 100644 meta/recipes-graphics/cogl/files/cogl_fixed_mul-constraint.patch diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc index a44e6c4..c9c6165 100644 --- a/meta/recipes-graphics/cogl/cogl-1.0.inc +++ b/meta/recipes-graphics/cogl/cogl-1.0.inc @@ -2,6 +2,10 @@ DESCRIPTION = a modern 3D graphics API with associated utility APIs HOMEPAGE = http://wiki.clutter-project.org/wiki/Cogl; LICENSE = LGPLv2.1+ +SRC_URI += file://cogl_fixed_mul-constraint.patch \ +file://cogl-fixed-thumb.patch \ + + inherit clutter DEPENDS = pango glib-2.0 gdk-pixbuf diff --git a/meta/recipes-graphics/cogl/files/cogl-fixed-thumb.patch b/meta/recipes-graphics/cogl/files/cogl-fixed-thumb.patch new file mode 100644 index 000..77b0db2 --- /dev/null +++ b/meta/recipes-graphics/cogl/files/cogl-fixed-thumb.patch @@ -0,0 +1,30 @@ +Upstream-Status: Inappropriate [cogl-fixed.c disappears in cogl 2.0] + +There are two asm() statements in cogl-fixed.c that can't be assembled +in Thumb mode. Add a patch to switch to the generic code in Thumb mode. + +Signed-off-by: Donn Seeley donn.see...@windriver.com +--- + cogl/cogl-fixed.c |4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/cogl/cogl-fixed.c b/cogl/cogl-fixed.c +@@ -626,7 +626,7 @@ cogl_fixed_sqrt (CoglFixed x) + /* +* Find the highest bit set +*/ +-#if defined (__arm__) !defined(__ARM_ARCH_4T__) ++#if defined (__arm__) !defined(__ARM_ARCH_4T__) !defined(__thumb__) + /* This actually requires at least arm v5, but gcc does not seem +* to set the architecture defines correctly, and it is I think +* very unlikely that anyone will want to use clutter on anything +@@ -804,7 +804,7 @@ CoglFixed + cogl_fixed_mul (CoglFixed a, + CoglFixed b) + { +-#ifdef __arm__ ++#if defined(__arm__) !defined(__thumb__) + /* This provides about 12% speedeup on the gcc -O2 optimised +* C version +* diff --git a/meta/recipes-graphics/cogl/files/cogl_fixed_mul-constraint.patch b/meta/recipes-graphics/cogl/files/cogl_fixed_mul-constraint.patch new file mode 100644 index 000..7eb9da3 --- /dev/null +++ b/meta/recipes-graphics/cogl/files/cogl_fixed_mul-constraint.patch @@ -0,0 +1,22 @@ +Upstream-Status: Inappropriate [cogl-fixed.c disappears in cogl 2.0] + +Add register constraints to prevent asm statement complaints like: + + {standard input}:382: rdhi, rdlo and rm must all be different + +Signed-off-by: Donn Seeley donn.see...@windriver.com +--- + cogl/cogl-fixed.c |2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/cogl/cogl-fixed.c b/cogl/cogl-fixed.c +@@ -816,7 +816,7 @@ cogl_fixed_mul (CoglFixed a, + __asm__ (smull %0, %1, %2, %3 \n +mov %0, %0, lsr %4 \n +add %1, %0, %1, lsl %5 \n +- : =r(res_hi), =r(res_low) \ ++ : =r(res_hi), =r(res_low) \ +: r(a), r(b), i(COGL_FIXED_Q), i(32 - COGL_FIXED_Q)); + + return (CoglFixed) res_low; -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] acl attr libcap: mark shared libraries executable
On 14 June 2013 09:09, jackie.hu...@windriver.com wrote: From: Jackie Huang jackie.hu...@windriver.com While it is not necessary that shared libraries be executable, if they are not marked as such bitbake will not examine them for debug information. So, we make them executable at the end of installation. Wouldn't it be preferable to change the class that does the debug extraction so that it doesn't require executable bits on libraries? Fix the cause not the symptoms and all that. Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 00/10] Mesa cleanup and more PACKAGECONFIG options
On 13 June 2013 00:19, Martin Jansa martin.ja...@gmail.com wrote: Martin Jansa (10): mesa: merge mesa-common.inc to mesa.inc mesa: use PACKAGECONFIG instead of DISTRO_FEATURES to define EGL_PLATFORMS mesa: move LIC_FILES_CHKSUM to .inc mesa: merge mesa-git.inc to mesa_git.bb mesa: introduce PACKAGECONFIG for dri mesa: remove more .la files mesa: introduce gallium PACKAGECONFIG mesa: introduce openvg PACKAGECONFIG mesa: use PACKAGESPLITFUNCS mesa: introduce gallium-llvmpipe PACKAGECONFIG Signed-off-by: Ross Burton ross.bur...@intel.com Great stuff :) Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] populate-sysroot files in sstate cache overwritten by empty ones
On Thu, Jun 13, 2013 at 10:21:47PM +0100, Richard Purdie wrote: On Thu, 2013-06-13 at 12:16 +0100, Mike Crowe wrote: The problem seems to be caused by having an ancillary task in recipe1 that depends on do_configure and the same ancillary task in recipe2 that depends on recipe1:populate-sysroot. The result is that recipe1:do_configure runs followed by recipe1:do_populate_sysroot without the intervening important tasks such as do_install. Hmm, interesting. There is some code in staging.bbclass: BB_SETSCENE_VERIFY_FUNCTION = sysroot_checkhashes where sysroot_checkhashes() is meant to notice that do_configure reruns and hence forces do_populate_sysroot to rerun. It appears to do this successfully, however its missing out the dependencies of do_populate_sysroot (compile, install) which is why the package ends up broken. I think this is a collision of two sets of data, there are some tasks being skipped which shouldn't be. So I'd guess that the values from BB_SETSCENE_VERIFY_FUNCTION aren't being processed with respect to removing things from the setscene covered list. Thanks for analysing this. What is the correct thing to happen in this situation? Should do_configure be run but not do_populate_sysroot? Or, should the fact that do_configure needs to be run stop the sstate solution from being considered valid altogether and force recipe1 to be compiled, installed and populate_sysroot'ed in the traditional manner? Thanks. Mike. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][V2] systemd: update install-quotaon-once.patch
This patch has been merged upstream now, so refresh the patch with a backport (the patch was changed before being merged). Signed-off-by: Ross Burton ross.bur...@intel.com --- .../systemd/systemd/install-quotaon-once.patch | 32 +++- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/meta/recipes-core/systemd/systemd/install-quotaon-once.patch b/meta/recipes-core/systemd/systemd/install-quotaon-once.patch index 10280da..6b7cf2f 100644 --- a/meta/recipes-core/systemd/systemd/install-quotaon-once.patch +++ b/meta/recipes-core/systemd/systemd/install-quotaon-once.patch @@ -1,7 +1,7 @@ -Upstream-Status: Submitted (https://bugs.freedesktop.org/show_bug.cgi?id=65659) +Upstream-Status: Backport Signed-off-by: Ross Burton ross.bur...@intel.com -From 44b7c4dc877984b5ea3f2c9fa09a93ee16dbe3b2 Mon Sep 17 00:00:00 2001 +From 622004565eca385c685086cd478aa79afe73b785 Mon Sep 17 00:00:00 2001 From: Ross Burton ross.bur...@intel.com Date: Tue, 11 Jun 2013 17:16:37 +0100 Subject: [PATCH] build-sys: don't install quotaon.service twice @@ -9,24 +9,26 @@ Subject: [PATCH] build-sys: don't install quotaon.service twice quotaon.service is already installed through dist_systemunit_DATA, so it doesn't need to be added to nodist_systemunit_DATA. Installing the same file twice results in a race condition where the install process can fail. + +https://bugs.freedesktop.org/show_bug.cgi?id=65659 + +[zj: actually remove quotaon.service from the other list.] --- - Makefile.am |3 --- - 1 file changed, 3 deletions(-) + Makefile.am |1 - + 1 file changed, 1 deletion(-) diff --git a/Makefile.am b/Makefile.am -index 28ae7ed..197119e 100644 +index 3a196a6..d444eac 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -3229,9 +3229,6 @@ endif - EXTRA_DIST += \ - units/systemd-quotacheck.service.in - --nodist_systemunit_DATA += \ -- units/quotaon.service -- - # -- - if ENABLE_RANDOMSEED - rootlibexec_PROGRAMS += \ +@@ -401,7 +401,6 @@ dist_systemunit_DATA = \ + units/bluetooth.target \ + units/smartcard.target \ + units/systemd-tmpfiles-clean.timer \ +- units/quotaon.service \ + units/systemd-ask-password-wall.path \ + units/systemd-ask-password-console.path \ + units/systemd-udevd-control.socket \ -- 1.7.10.4 -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] cogl: make cogl be able to build on ARM arch
On 14 June 2013 09:37, rongqing...@windriver.com wrote: +Upstream-Status: Inappropriate [cogl-fixed.c disappears in cogl 2.0] Whilst it's true that this file doesn't exist in cogl 2.0, cogl 1.x is still maintained. I've forwarded this mail to the maintainers and it's been merged into both the 1.14.x and 1.16.x release branches: https://git.gnome.org/browse/cogl/log/?h=cogl-1.14 I encourage everyone to only consider a patch inappropriate in the most extreme situations, as every patch we carry means upstream doesn't have it, and we have the cost of forward-porting it. Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] populate-sysroot files in sstate cache overwritten by empty ones
On Fri, 2013-06-14 at 12:19 +0100, Mike Crowe wrote: On Thu, Jun 13, 2013 at 10:21:47PM +0100, Richard Purdie wrote: On Thu, 2013-06-13 at 12:16 +0100, Mike Crowe wrote: The problem seems to be caused by having an ancillary task in recipe1 that depends on do_configure and the same ancillary task in recipe2 that depends on recipe1:populate-sysroot. The result is that recipe1:do_configure runs followed by recipe1:do_populate_sysroot without the intervening important tasks such as do_install. Hmm, interesting. There is some code in staging.bbclass: BB_SETSCENE_VERIFY_FUNCTION = sysroot_checkhashes where sysroot_checkhashes() is meant to notice that do_configure reruns and hence forces do_populate_sysroot to rerun. It appears to do this successfully, however its missing out the dependencies of do_populate_sysroot (compile, install) which is why the package ends up broken. I think this is a collision of two sets of data, there are some tasks being skipped which shouldn't be. So I'd guess that the values from BB_SETSCENE_VERIFY_FUNCTION aren't being processed with respect to removing things from the setscene covered list. Thanks for analysing this. What is the correct thing to happen in this situation? Should do_configure be run but not do_populate_sysroot? Or, should the fact that do_configure needs to be run stop the sstate solution from being considered valid altogether and force recipe1 to be compiled, installed and populate_sysroot'ed in the traditional manner? I think this needs to stop the sstate solution from being considered valid altogether. The reason is that the re-run of do_configure cleans out the result of do_populate_sysroot so we have to force things to wait for it to complete again. (http://git.yoctoproject.org/cgit.cgi/poky/commit/meta/classes/staging.bbclass?id=3ab018c6254b883a6b6a61f79405dc3f8e40ad77) Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 4/8] busybox: add the ability to split the busybox binary
On 13 June 2013 08:46, ChenQi qi.c...@windriver.com wrote: On 06/12/2013 04:26 AM, Bernhard Reutner-Fischer wrote: On Fri, Jun 07, 2013 at 02:13:58PM +0800, qi.c...@windriver.com wrote: Hi Bernhard, Thank you very much for your review and suggestions! I went through your methods below very carefully and I tried your patch out. Here are two problems. 1) The config_list.suid could be derived by renaming the `original suid_config_list' file, but what about the config_list.nosuid? We have a suid_config_list, because compared with the non-suid apps, the amount of config items for suid apps or related to suid apps are relatively small. It seems that config_list.nosuid will be a very long list. yes. You can derive the nosuid by subtracting the suid from the full .config. If that is inconvenient, see the attached on top to generate both busybox.cfg.nosuid and busybox.cfg.suid . see below. 2) Your patch in the attachment worked out well. `make busybox.applets.suid' generates a file named busybox.applets.suid which contains the following config items. CONFIG_LOGIN CONFIG_PASSWD CONFIG_FEATURE_PASSWD_WEAK_CHECK CONFIG_SU CONFIG_FEATURE_SU_SYSLOG CONFIG_FEATURE_SU_CHECKS_SHELLS CONFIG_VLOCK CONFIG_FINDFS CONFIG_MOUNT CONFIG_FEATURE_MOUNT_FAKE CONFIG_FEATURE_MOUNT_VERBOSE CONFIG_FEATURE_MOUNT_LABEL CONFIG_FEATURE_MOUNT_CIFS CONFIG_FEATURE_MOUNT_FLAGS CONFIG_FEATURE_MOUNT_FSTAB CONFIG_FEATURE_MOUNT_LOOP CONFIG_FEATURE_MOUNT_LOOP_CREATE CONFIG_CRONTAB CONFIG_WALL CONFIG_PING CONFIG_PING6 CONFIG_TRACEROUTE CONFIG_TRACEROUTE6 CONFIG_FEATURE_TRACEROUTE_VERBOSE You see, this is a subset of the suid_config_list. As stated in the file's comments, part of the list is obtained from a command, and part of it is obtained by manually examine the Config.in files to find out the config items that are related to suid apps. Yes, i know. Do you have suggestions there? I think what we/you want is to build: - busybox.suid with all nosuid *applets* turned off, but the non-applet CONFIG_ as per full.config - busybox.nosuid with all suid *applets* turned off, but the non-applet CONFIG_ as per full.config I.e. take busybox.cfg.nosuid (contains only applets), take busybox.cfg.suid (also contains only applets) subtract these - non-applet_part_of_full.config. merge non-applet_part_of_full.config + suid - bb.suid merge non-applet_part_of_full.config + nosuid - bb.nosuid Didn't try that, but you get the idea. Would that work out for you? cheers, Best Regards, Chen Qi cat .config .config-oe-full # it would be nice to 'for s in suid nosuid' # but that would mean operating on ${s}_config_list which bitbake (IIRC) # ruins. Better rename the files to config_list.suid to be able to loop. # for s in suid nosuid; do egrep ^CONFIG_ ${WORKDIR}/config_list.$s | while read i; do grep -w $i .config done .config.$s # populate the config, default everything else to no KCONFIG_ALLCONFIG=config.$s make allnoconfig oe_runmake busybox_unstripped busybox.links mv busybox_unstripped busybox.$s mv busybox.links busybox.links.$s done cat .config-oe-full .config I would much prefer to make the generation of the suid cfg stuff more robust. Could you live with the attached helper thing (untested)? That would make it a prepended oe_runmake busybox.applets.suid to generate the list busybox.applets.suid. If that suits your needs we can apply it to busybox for general use.. The other possibility is, obviously, to fit all this in busybox' build itself, but given that we do have a seemingly working, bugless suid handling this might be better suited to be dealt with by the user as you suggest here. Thoughts? thanks, + cp .config .config.orig + oe_runmake allnoconfig + cp .config .config.allno + for item in `grep 'CONFIG_' ${WORKDIR}/suid_config_list`; do + echo # $item is not set .config.nosuid.tmp + grep -w $item .config.orig .config.suid.tmp + done + merge_config.sh -m .config.orig .config.nosuid.tmp + cp .config .config.nosuid + merge_config.sh -m .config.allno .config.suid.tmp + cp .config .config.suid + + # compile with no suid apps + cp .config.nosuid .config + oe_runmake busybox_unstripped + cp busybox_unstripped busybox.nosuid + oe_runmake busybox.links + cp busybox.links busybox.links.nosuid + + # compile with suid apps + cp .config.suid .config + oe_runmake busybox_unstripped + cp busybox_unstripped busybox.suid + oe_runmake busybox.links + cp busybox.links busybox.links.suid + + # copy .config.orig back to .config, because the install process may check this file +
[OE-core] [PATCH] qt4: disable gdb_dwarf_index
* qmake is trying to call native gdb and we don't depend on gdb-native (or even provide gdb-native) * fixes errors like this: /bin/sh: gdb: command not found /bin/sh: line 0: test: -gt: unary operator expected Signed-off-by: Jonathan Liu net...@gmail.com --- meta/recipes-qt/qt4/qt4-4.8.4/g++.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/g++.conf b/meta/recipes-qt/qt4/qt4-4.8.4/g++.conf index e58fb15..d34c62c 100644 --- a/meta/recipes-qt/qt4/qt4-4.8.4/g++.conf +++ b/meta/recipes-qt/qt4/qt4-4.8.4/g++.conf @@ -49,6 +49,9 @@ QMAKE_PCH_OUTPUT_EXT= .gch QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list, +# do not depend on gdb +CONFIG -= gdb_dwarf_index + # some linking helper... CONFIG += rpath_libdirs -- 1.8.3 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] qt4: set QMAKE_COMPILER to gcc in mkspec
This avoids the following warning when running qmake: Project WARNING: qmake spec does not announce the compiler family. Guessed gcc. Signed-off-by: Jonathan Liu net...@gmail.com --- meta/recipes-qt/qt4/qt4-4.8.4/g++.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/g++.conf b/meta/recipes-qt/qt4/qt4-4.8.4/g++.conf index d34c62c..8755031 100644 --- a/meta/recipes-qt/qt4/qt4-4.8.4/g++.conf +++ b/meta/recipes-qt/qt4/qt4-4.8.4/g++.conf @@ -2,6 +2,8 @@ # qmake configuration for common gcc # +QMAKE_COMPILER = gcc + QMAKE_CC = $(OE_QMAKE_CC) QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS) QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $(OE_QMAKE_CFLAGS) -- 1.8.3 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] acl attr libcap: mark shared libraries executable
On 6/14/13 3:53 AM, Burton, Ross wrote: On 14 June 2013 09:09, jackie.hu...@windriver.com wrote: From: Jackie Huang jackie.hu...@windriver.com While it is not necessary that shared libraries be executable, if they are not marked as such bitbake will not examine them for debug information. So, we make them executable at the end of installation. Wouldn't it be preferable to change the class that does the debug extraction so that it doesn't require executable bits on libraries? Fix the cause not the symptoms and all that. I thought the class specifically looked for items in ${base_libdir} and ${libdir} as well as executables elsewhere in the system. We don't want to blindly scan and filter everything that is ELF, so the executable flag makes sense outside of the libdir. from package.bbclass, split_and_strip_files: libdir = os.path.abspath(dvar + os.sep + d.getVar(libdir, True)) baselibdir = os.path.abspath(dvar + os.sep + d.getVar(base_libdir, True)) for root, dirs, files in cpath.walk(dvar): for f in files: # Check its an excutable if (s[stat.ST_MODE] stat.S_IXUSR) or (s[stat.ST_MODE] stat.S_IXGRP) or (s[stat.ST_MODE] stat.S_IXOTH) \ or ((file.startswith(libdir) or file.startswith(baselibdir)) and .so in f): if elf ... add to list of files to split/strip So the above iterates and checks if it is executable -or- lives in the libdir and baselibdir directory -and- contains '.so' in the name. If this is not working, we need to fix it.. If this is working, but something later isn't, we need to fix that then. It may be that the tool we're using (debugedit) requires the binaries to be executable, if that is the case then we'll need to capture the original perms, add executable, run debugedit and restore them. But this will need some further investigation. Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] do not pass CFLAGS to gcc while building libcap
On 06/14/2013 01:09 AM, jackie.hu...@windriver.com wrote: From: Jackie Huang jackie.hu...@windriver.com During do_configure(), we modify the BUILD_CFLAGS used but do not remove the default inclusion of CFLAGS in BUILD_CFLAGS. This fix removes CFLAGS inclusion by modifying do_configure(). Signed-off-by: Joe Slater jsla...@windriver.com Signed-off-by: Jackie Huang jackie.hu...@windriver.com --- meta/recipes-support/libcap/libcap.inc |6 -- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/libcap/libcap.inc b/meta/recipes-support/libcap/libcap.inc index 2fd5718..5ace7d7 100644 --- a/meta/recipes-support/libcap/libcap.inc +++ b/meta/recipes-support/libcap/libcap.inc @@ -12,15 +12,17 @@ DEPENDS_class-native = perl-native-runtime SRC_URI = ${DEBIAN_MIRROR}/main/libc/libcap2/${BPN}2_${PV}.orig.tar.gz -PR = r2 +PR = r3 No PR bumps needed here or in your other patch, in this case they cause trouble if the 2 patches are not applied in order! Sau! inherit lib_package +# do NOT pass target cflags to host compilations +# do_configure() { # libcap uses := for compilers, fortunately, it gives us a hint # on what should be replaced with ?= sed -e 's,:=,?=,g' -i Make.Rules - sed -e 's,BUILD_CFLAGS ?=,BUILD_CFLAGS := $(BUILD_CFLAGS),' -i Make.Rules + sed -e 's,^BUILD_CFLAGS ?= $(CFLAGS),BUILD_CFLAGS := $(BUILD_CFLAGS),' -i Make.Rules } EXTRA_OEMAKE = \ -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] atk: inherit gnomebase
This recipe was missing a dependency on gnome-common, so lets just inherit gnomebase and get both it and GNOME SRC_URI handling for free. Signed-off-by: Ross Burton ross.bur...@intel.com --- meta/recipes-support/atk/atk_2.8.0.bb |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/recipes-support/atk/atk_2.8.0.bb b/meta/recipes-support/atk/atk_2.8.0.bb index a190c0a..cfe2f58 100644 --- a/meta/recipes-support/atk/atk_2.8.0.bb +++ b/meta/recipes-support/atk/atk_2.8.0.bb @@ -10,11 +10,10 @@ LIC_FILES_CHKSUM = file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ DEPENDS = glib-2.0 -inherit autotools gtk-doc pkgconfig +inherit gnome gtk-doc -MAJ_VER = ${@oe.utils.trim_version(${PV}, 2)} +GNOME_COMPRESS_TYPE = xz -SRC_URI = ${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz SRC_URI[md5sum] = c652bd25530825d604dae1c1ebd2da02 SRC_URI[sha256sum] = b22519176226f3e07cf6d932b77852e6b6be478090704b32d0f4e0686df4 -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] atk: inherit gnomebase
On Fri, 2013-06-14 at 16:40 +0100, Ross Burton wrote: This recipe was missing a dependency on gnome-common, so lets just inherit gnomebase and get both it and GNOME SRC_URI handling for free. Signed-off-by: Ross Burton ross.bur...@intel.com --- meta/recipes-support/atk/atk_2.8.0.bb |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/recipes-support/atk/atk_2.8.0.bb b/meta/recipes-support/atk/atk_2.8.0.bb index a190c0a..cfe2f58 100644 --- a/meta/recipes-support/atk/atk_2.8.0.bb +++ b/meta/recipes-support/atk/atk_2.8.0.bb @@ -10,11 +10,10 @@ LIC_FILES_CHKSUM = file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ DEPENDS = glib-2.0 -inherit autotools gtk-doc pkgconfig +inherit gnome gtk-doc The above and the commit message don't match (gnome verses gnomebase) :/ Cheers, Richard -MAJ_VER = ${@oe.utils.trim_version(${PV}, 2)} +GNOME_COMPRESS_TYPE = xz -SRC_URI = ${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz SRC_URI[md5sum] = c652bd25530825d604dae1c1ebd2da02 SRC_URI[sha256sum] = b22519176226f3e07cf6d932b77852e6b6be478090704b32d0f4e0686df4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] atk: inherit gnomebase
Gnar, sorry. I retract this, I inherited the wrong class. Ross On Friday, 14 June 2013, Richard Purdie wrote: On Fri, 2013-06-14 at 16:40 +0100, Ross Burton wrote: This recipe was missing a dependency on gnome-common, so lets just inherit gnomebase and get both it and GNOME SRC_URI handling for free. Signed-off-by: Ross Burton ross.bur...@intel.com javascript:; --- meta/recipes-support/atk/atk_2.8.0.bb |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/recipes-support/atk/atk_2.8.0.bbb/meta/recipes-support/atk/ atk_2.8.0.bb index a190c0a..cfe2f58 100644 --- a/meta/recipes-support/atk/atk_2.8.0.bb +++ b/meta/recipes-support/atk/atk_2.8.0.bb @@ -10,11 +10,10 @@ LIC_FILES_CHKSUM = file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ DEPENDS = glib-2.0 -inherit autotools gtk-doc pkgconfig +inherit gnome gtk-doc The above and the commit message don't match (gnome verses gnomebase) :/ Cheers, Richard -MAJ_VER = ${@oe.utils.trim_version(${PV}, 2)} +GNOME_COMPRESS_TYPE = xz -SRC_URI = ${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz SRC_URI[md5sum] = c652bd25530825d604dae1c1ebd2da02 SRC_URI[sha256sum] = b22519176226f3e07cf6d932b77852e6b6be478090704b32d0f4e0686df4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] consolekit: move libck-connector to base_libdir
On 06/14/2013 12:54 AM, jackie.hu...@windriver.com wrote: From: Jackie Huang jackie.hu...@windriver.com move libck-connector.so.* to base_libdir to kill two warnings: WARNING: QA Issue: consolekit: /lib64/security/pam_ck_connector.so, installed in the base_prefix, requires a shared library under exec_prefix (/usr): libck-connector.so.0 = /usr/lib64/ libck-connector.so.0 (0xdead300 WARNING: QA Issue: lib32-consolekit: Found a reference to /usr/ in /buildarea1/jhuang0/t_multilib/p_x64_0217/bitbake_build/tmp/work/ x86-wrsmllib32-linux/lib32-consolekit-0.4.5-r10/packages-split/i lib32-consolekit/lib/security/pam_ck_connector.la WARNING: QA Issue: Shell scripts in base_bindir and base_sbindir should not reference anything in exec_prefix Signed-off-by: Roy.Li rongqing...@windriver.com Signed-off-by: Jackie Huang jackie.hu...@windriver.com --- .../recipes-support/consolekit/consolekit_0.4.5.bb | 11 ++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/meta/recipes-support/consolekit/consolekit_0.4.5.bb b/meta/recipes-support/consolekit/consolekit_0.4.5.bb index 7d66b39..3d976d4 100644 --- a/meta/recipes-support/consolekit/consolekit_0.4.5.bb +++ b/meta/recipes-support/consolekit/consolekit_0.4.5.bb @@ -2,7 +2,7 @@ DESCRIPTION = ConsoleKit is a framework for defining and tracking users, login HOMEPAGE=http://www.freedesktop.org/wiki/Software/ConsoleKit; BUGTRACKER=https://bugs.freedesktop.org/buglist.cgi?query_format=specificproduct=ConsoleKit; -PR = r10 +PR = r11 LICENSE = GPLv2+ LIC_FILES_CHKSUM = file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ @@ -41,4 +41,13 @@ RDEPENDS_pam-plugin-ck-connector += ${PN} do_install_append() { # Remove /var/run from package as console-kit-daemon will populate it on startup rm -fr ${D}${localstatedir}/run + # Moving libck-connector to base_libdir + if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then + mkdir -p ${D}/${base_libdir}/ + mv -f ${D}${libdir}/libck-connector.so.0* ${D}${base_libdir}/ + mv -f ${D}${base_libdir}/security/pam_ck_connector.la ${D}${libdir}/ + rel_lib_prefix=`echo ${libdir} | sed 's,\(^/\|\)[^/][^/]*,..,g'` + ln -sf ${rel_lib_prefix}${base_libdir}/libck-connector.so.0.0.0 ${D}${libdir}/libck-connector.so + fi + Something did not work out right here. | make[1]: Leaving directory `/srv/ssd/sgw/builds/world/tmp/work/x86_64-poky-linux/consolekit/0.4.5-r11/build' | mv: cannot stat `/srv/ssd/sgw/builds/world/tmp/work/x86_64-poky-linux/consolekit/0.4.5-r11/image/lib/security/pam_ck_connector.la': No such file or directory Sau! } -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][V2] atk: inherit gnomebase
This recipe was missing a dependency on gnome-common, so lets just inherit gnomebase and get both it and GNOME SRC_URI handling for free. Signed-off-by: Ross Burton ross.bur...@intel.com --- meta/recipes-support/atk/atk_2.8.0.bb |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/recipes-support/atk/atk_2.8.0.bb b/meta/recipes-support/atk/atk_2.8.0.bb index a190c0a..989151d 100644 --- a/meta/recipes-support/atk/atk_2.8.0.bb +++ b/meta/recipes-support/atk/atk_2.8.0.bb @@ -10,11 +10,10 @@ LIC_FILES_CHKSUM = file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ DEPENDS = glib-2.0 -inherit autotools gtk-doc pkgconfig +inherit gnomebase gtk-doc -MAJ_VER = ${@oe.utils.trim_version(${PV}, 2)} +GNOME_COMPRESS_TYPE = xz -SRC_URI = ${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz SRC_URI[md5sum] = c652bd25530825d604dae1c1ebd2da02 SRC_URI[sha256sum] = b22519176226f3e07cf6d932b77852e6b6be478090704b32d0f4e0686df4 -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] qmake2.bbclass: export OE_QMAKE_QT_CONFIG
On 06/13/2013 04:51 PM, Saul Wold wrote: On 06/13/2013 04:35 PM, Jonathan Liu wrote: On 14/06/2013 1:20 AM, Saul Wold wrote: On 06/11/2013 04:46 PM, Jonathan Liu wrote: On 6/06/2013 3:04 AM, Paul Eggleton wrote: On Wednesday 05 June 2013 17:57:32 Paul Eggleton wrote: On Wednesday 05 June 2013 09:46:49 Saul Wold wrote: On 06/05/2013 02:30 AM, Martin Jansa wrote: On Wed, Jun 05, 2013 at 07:01:50PM +1000, Jonathan Liu wrote: qconfig.pri was not being loaded by qmake properly. This means Qt qmake projects are unable to query QT_ARCH, QT_VERSION and other variables defined in qconfig.pri. Export OE_QMAKE_QT_CONFIG, setting it to the location of qconfig.pri so that it can be located by qmake. There is such patch already: http://lists.openembedded.org/pipermail/openembedded-core/2013-May/07831 4. html Got lost in my queue, adding it for the next MUT. FWIW I am still concerned by the assertion in the commit message about it causing undesirable behaviour. I'd want that checked out and the note removed before we look at merging this. (I mean undesirable behaviour on rebuild after applying this patch; I should mention I'm testing this at the moment.) Cheers, Paul Looks like this was missed in the last pull. After some further local testing with this patch there was a problem when I built world and it built qt-mobility-embedded, I got the following error on multi-architectures ake[3]: Entering directory `/srv/ssd/sgw/builds/world/tmp/work/x86_64-poky-linux/qt-mobility-embedded/1.2.0-r8/qt-mobility-opensource-src-1.2.0/examples/sensors/cubehouse' x86_64-poky-linux-g++ -m64 --sysroot=/srv/ssd/sgw/builds/world/tmp/sysroots/qemux86-64 -c -pipe -pipe -pipe -O2 -pipe -g -feliminate-unused-debug-types -O2 -pipe -g -feliminate-unused-debug-types -fpermissive -fvisibility-inlines-hidden -g -g -g -Wall -W -Wall -W -Wall -W -D_REENTRANT -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED -I/srv/ssd/sgw/builds/world/tmp/sysroots/qemux86-64/usr/share/qtopia/mkspecs/linux-g++ -I. -I/srv/ssd/sgw/builds/world/tmp/sysroots/qemux86-64/usr/include/qtopia/QtCore -I/srv/ssd/sgw/builds/world/tmp/sysroots/qemux86-64/usr/include/qtopia/QtGui -I/srv/ssd/sgw/builds/world/tmp/sysroots/qemux86-64/usr/include/qtopia/QtOpenGL -I/srv/ssd/sgw/builds/world/tmp/sysroots/qemux86-64/usr/include/qtopia -I../../../src/global -I../../../src/sensors -I../../../build/Debug/cubehouse/moc -o ../../../build/Debug/cubehouse/view.o view.cpp In file included from view.cpp:41:0: view.h:44:26: fatal error: QtOpenGL/qgl.h: No such file or directory #include QtOpenGL/qgl.h ^ compilation terminated. What does /srv/ssd/sgw/builds/world/tmp/sysroots/qemux86-64/usr/include/qtopia/QtOpenGL contain? Non existant! ls /srv/ssd/sgw/builds/world/tmp/sysroots/qemux86-64/usr/include/qtopia/ phonon QtDBus QtHelpQtScriptTools QtUiTools Qt QtDeclarative QtMultimedia QtSql QtWebKit Qt3Support QtDesigner QtNetwork QtSvg QtXml QtCore QtGui QtScript QtTest QtXmlPatterns A follow-up to this, it seems I have both a qtopia include dir and a qt4 include dir with qt4 being a superset of qtopia except for the qconfig.h in Qt and QtCore, where qtopia seems to have more checks. Sau! Regards, Jonathan make[3]: *** [../../../build/Debug/cubehouse/view.o] Error 1 make[3]: Leaving directory `/srv/ssd/sgw/builds/world/tmp/work/x86_64-poky-linux/qt-mobility-embedded/1.2.0-r8/qt-mobility-opensource-src-1.2.0/examples/sensors/cubehouse' make[2]: *** [sub-cubehouse-make_default] Error 2 make[2]: *** Waiting for unfinished jobs So I have placed this on hold. SaU! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] oe-buildenv-internal: Preserve/Unset and Restore TERM
Having a value in TERM that is not recognized by the nativesdk can cause potential escape sequences appearing in the output stream, the can be seen on Ubuntu with TERM=xterm-256color. Unsetting TERM allows for consistent results in the python output. Also, don't exit, use return, otherwise the shell exits and get no error information. [YOCTO #4732] Signed-off-by: Saul Wold s...@linux.intel.com --- scripts/oe-buildenv-internal | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal index 40d95b7..9be034b 100755 --- a/scripts/oe-buildenv-internal +++ b/scripts/oe-buildenv-internal @@ -29,6 +29,8 @@ if [ ! -z $OECORE_SDK_VERSION ]; then return 1 fi +TERM_save=$TERM +unset TERM # Make sure we're not using python v3.x. This check can't go into # sanity.bbclass because bitbake's source code doesn't even pass # parsing stage when used with python v3, so we catch it here so we @@ -37,7 +39,7 @@ py_v3_check=`/usr/bin/env python --version 21 | grep Python 3` if [ $py_v3_check != ]; then echo Bitbake is not compatible with python v3 echo Please set up python v2 as your default python interpreter - exit 1 + return 1 fi # Similarly, we now have code that doesn't parse correctly with older @@ -46,7 +48,7 @@ fi py_v26_check=`python -c 'import sys; print sys.version_info = (2,7,3)'` if [ $py_v26_check != True ]; then echo BitBake requires Python 2.7.3 or later - exit 1 + return 1 fi if [ x$BDIR = x ]; then @@ -107,3 +109,5 @@ HTTPS_PROXY https_proxy FTP_PROXY ftp_proxy FTPS_PROXY ftps_proxy ALL_PROXY \ all_proxy NO_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY \ SDKMACHINE BB_NUMBER_THREADS BB_NO_NETWORK PARALLEL_MAKE GIT_PROXY_COMMAND \ SOCKS5_PASSWD SOCKS5_USER SCREENDIR STAMPS_DIR + +export TERM=$TERM_save -- 1.8.1.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] oe-buildenv-internal: Preserve/Unset and Restore TERM
On Fri, 2013-06-14 at 13:48 -0700, Saul Wold wrote: Having a value in TERM that is not recognized by the nativesdk can cause potential escape sequences appearing in the output stream, the can be seen on Ubuntu with TERM=xterm-256color. Unsetting TERM allows for consistent results in the python output. Also, don't exit, use return, otherwise the shell exits and get no error information. [YOCTO #4732] Signed-off-by: Saul Wold s...@linux.intel.com --- scripts/oe-buildenv-internal | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal index 40d95b7..9be034b 100755 --- a/scripts/oe-buildenv-internal +++ b/scripts/oe-buildenv-internal @@ -29,6 +29,8 @@ if [ ! -z $OECORE_SDK_VERSION ]; then return 1 fi +TERM_save=$TERM +unset TERM # Make sure we're not using python v3.x. This check can't go into # sanity.bbclass because bitbake's source code doesn't even pass # parsing stage when used with python v3, so we catch it here so we @@ -37,7 +39,7 @@ py_v3_check=`/usr/bin/env python --version 21 | grep Python 3` if [ $py_v3_check != ]; then echo Bitbake is not compatible with python v3 echo Please set up python v2 as your default python interpreter - exit 1 + return 1 fi # Similarly, we now have code that doesn't parse correctly with older @@ -46,7 +48,7 @@ fi py_v26_check=`python -c 'import sys; print sys.version_info = (2,7,3)'` if [ $py_v26_check != True ]; then echo BitBake requires Python 2.7.3 or later - exit 1 + return 1 fi if [ x$BDIR = x ]; then @@ -107,3 +109,5 @@ HTTPS_PROXY https_proxy FTP_PROXY ftp_proxy FTPS_PROXY ftps_proxy ALL_PROXY \ all_proxy NO_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY \ SDKMACHINE BB_NUMBER_THREADS BB_NO_NETWORK PARALLEL_MAKE GIT_PROXY_COMMAND \ SOCKS5_PASSWD SOCKS5_USER SCREENDIR STAMPS_DIR + +export TERM=$TERM_save No. This is just wrong in so many ways. I commented on the bug. This also means any command you run after sourcing the script gets a broken TERM value. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] oe-buildenv-internal: Preserve/Unset and Restore TERM
On 06/14/2013 02:08 PM, Richard Purdie wrote: On Fri, 2013-06-14 at 13:48 -0700, Saul Wold wrote: Having a value in TERM that is not recognized by the nativesdk can cause potential escape sequences appearing in the output stream, the can be seen on Ubuntu with TERM=xterm-256color. Unsetting TERM allows for consistent results in the python output. Also, don't exit, use return, otherwise the shell exits and get no error information. [YOCTO #4732] Signed-off-by: Saul Wold s...@linux.intel.com --- scripts/oe-buildenv-internal | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal index 40d95b7..9be034b 100755 --- a/scripts/oe-buildenv-internal +++ b/scripts/oe-buildenv-internal @@ -29,6 +29,8 @@ if [ ! -z $OECORE_SDK_VERSION ]; then return 1 fi +TERM_save=$TERM +unset TERM # Make sure we're not using python v3.x. This check can't go into # sanity.bbclass because bitbake's source code doesn't even pass # parsing stage when used with python v3, so we catch it here so we @@ -37,7 +39,7 @@ py_v3_check=`/usr/bin/env python --version 21 | grep Python 3` if [ $py_v3_check != ]; then echo Bitbake is not compatible with python v3 echo Please set up python v2 as your default python interpreter - exit 1 + return 1 fi # Similarly, we now have code that doesn't parse correctly with older @@ -46,7 +48,7 @@ fi py_v26_check=`python -c 'import sys; print sys.version_info = (2,7,3)'` if [ $py_v26_check != True ]; then echo BitBake requires Python 2.7.3 or later - exit 1 + return 1 fi if [ x$BDIR = x ]; then @@ -107,3 +109,5 @@ HTTPS_PROXY https_proxy FTP_PROXY ftp_proxy FTPS_PROXY ftps_proxy ALL_PROXY \ all_proxy NO_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY \ SDKMACHINE BB_NUMBER_THREADS BB_NO_NETWORK PARALLEL_MAKE GIT_PROXY_COMMAND \ SOCKS5_PASSWD SOCKS5_USER SCREENDIR STAMPS_DIR + +export TERM=$TERM_save No. This is just wrong in so many ways. I commented on the bug. This also means any command you run after sourcing the script gets a broken TERM value. It's not a broken TERM value from the Distro's standpoint, only from our nativesdk python's standpoint, the value is correct for the distro, devshell and visual tools all work correctly. We need to at least fix the exit vs return. Sau! Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 00/23] End of week wrap-up
Rchard, Here is a batch of chanegs that I have tested in the autobuilder and locally. I will be out next week, but will catch things up after the 24th when I am back. Sau! The following changes since commit d2e0adc9720b66f56439c574520a1d58eaf0426f: documentation.conf: Drop variables for class that no longer exists in OE-Core (2013-06-14 14:50:23 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib sgw/stage http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage Diego Rondini (1): licences: Add SGI license Jackie Huang (1): libcap: do not pass CFLAGS to gcc Kevin Strasser (3): dhcp: drop fixincludes.patch dhcp: drop noattrmode.patch archiver.bbclass: check if package contains a copyleft license Khem Raj (1): webkit-gtk: Support build on mips64 Muhammad Shakeel (1): openssl: Add fix for cipher des-ede3-cfb1 Ross Burton (11): at-spi2: add -core and -atk, for GTK+ 3.8 gtk+3: update to 3.8.2 gtk+3: explicitly disable introspection gtk+3: respect x11 and wayland DISTRO_FEATURES gtk+3: add dependencies for gtk+3-demo gtk+: remove spurious libgcrypt dependency gtk+3: register GSetting schemas gtk+3: split into .bb/.inc gtk+3: clean up libtool link creation to avoid errors in configure log gtk+3: fix repainting under Weston 1.1 atk: inherit gnomebase Roy.Li (4): bind: backport six CVE patches openssh: fix a unaligned memory access issue openssh: obey 'tcp-wrappers' PACKAGECONFIG directfb:filter out -fno-omit-frame-pointer option on x86 arch Saul Wold (1): oe-buildenv-internal: exit - return so the shell does not exit meta/classes/archiver.bbclass | 5 +- meta/conf/licenses.conf| 5 +- meta/files/common-licenses/SGI-1 | 36 +++ .../bind/bind-9.8.1/bind-9.8.1-CVE-2012-5166.patch | 119 + .../bind/bind-9.8.1/bind-CVE-2011-4313.patch | 89 +++ .../bind/bind-9.8.1/bind-CVE-2012-1667.patch | 92 +++ .../bind/bind-9.8.1/bind-CVE-2012-3817.patch | 40 +++ .../bind/bind-9.8.1/bind-CVE-2013-2266.patch | 41 +++ .../bind/bind-9.8.1/bind-Fix-CVE-2012-4244.patch | 141 ++ meta/recipes-connectivity/bind/bind_9.8.1.bb | 6 + .../dhcp/dhcp/fixincludes.patch| 12 - .../dhcp/dhcp/noattrmode.patch | 21 -- meta/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bb| 3 +- .../openssh/openssh-6.2p2/mac.patch| 76 ++ meta/recipes-connectivity/openssh/openssh_6.2p2.bb | 4 + .../openssl-1.0.1e/fix-cipher-des-ede3-cfb1.patch | 22 ++ .../recipes-connectivity/openssl/openssl_1.0.1e.bb | 1 + meta/recipes-gnome/gtk+/gtk+.inc | 2 +- .../gtk+/{gtk+3_3.4.4.bb = gtk+3.inc} | 33 ++- meta/recipes-gnome/gtk+/gtk+3/cross.patch | 293 - .../gtk+/gtk+3/no-x11-in-wayland.patch | 32 +++ meta/recipes-gnome/gtk+/gtk+3/wayland-attach.patch | 42 +++ meta/recipes-gnome/gtk+/gtk+3_3.8.2.bb | 17 ++ meta/recipes-graphics/directfb/directfb.inc| 4 + .../0001-Enable-mips64-build.patch | 69 + meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb | 1 + meta/recipes-support/atk/at-spi2-atk_2.8.1.bb | 19 ++ meta/recipes-support/atk/at-spi2-core_2.8.0.bb | 17 ++ meta/recipes-support/atk/atk_2.8.0.bb | 9 +- meta/recipes-support/libcap/libcap.inc | 4 +- scripts/oe-buildenv-internal | 4 +- 31 files changed, 903 insertions(+), 356 deletions(-) create mode 100644 meta/files/common-licenses/SGI-1 create mode 100644 meta/recipes-connectivity/bind/bind-9.8.1/bind-9.8.1-CVE-2012-5166.patch create mode 100644 meta/recipes-connectivity/bind/bind-9.8.1/bind-CVE-2011-4313.patch create mode 100644 meta/recipes-connectivity/bind/bind-9.8.1/bind-CVE-2012-1667.patch create mode 100644 meta/recipes-connectivity/bind/bind-9.8.1/bind-CVE-2012-3817.patch create mode 100644 meta/recipes-connectivity/bind/bind-9.8.1/bind-CVE-2013-2266.patch create mode 100644 meta/recipes-connectivity/bind/bind-9.8.1/bind-Fix-CVE-2012-4244.patch delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/fixincludes.patch delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/noattrmode.patch create mode 100644 meta/recipes-connectivity/openssh/openssh-6.2p2/mac.patch create mode 100644 meta/recipes-connectivity/openssl/openssl-1.0.1e/fix-cipher-des-ede3-cfb1.patch rename meta/recipes-gnome/gtk+/{gtk+3_3.4.4.bb = gtk+3.inc} (79%) delete mode 100644 meta/recipes-gnome/gtk+/gtk+3/cross.patch create mode 100644 meta/recipes-gnome/gtk+/gtk+3/no-x11-in-wayland.patch create mode 100644 meta/recipes-gnome/gtk+/gtk+3/wayland-attach.patch create mode 100644 meta/recipes-gnome/gtk+/gtk+3_3.8.2.bb create mode 100644