[OE-core] [PATCH] base-files:fix the command line wrap around issue
From: Zongchun Yu b40...@freescale.com when the character number of cmdline is more than 80. the following character should go to a new line. rather than cover the prompt and the inputting character before. Signed-off-by: Zongchun Yu b40...@freescale.com --- meta/recipes-core/base-files/base-files/profile |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/meta/recipes-core/base-files/base-files/profile b/meta/recipes-core/base-files/base-files/profile index 8eeaac3..f58ae3d 100644 --- a/meta/recipes-core/base-files/base-files/profile +++ b/meta/recipes-core/base-files/base-files/profile @@ -27,6 +27,7 @@ if [ -d /etc/profile.d ]; then fi export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM +export COLUMNS=2000 umask 022 -- 1.6.2.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] connman: upgrade to 1.14
The following changes since commit 6271ac326d08fb3e9b4c2008b796233ee11a83e4: zlib: put shared libraries in base_libdir (2013-05-21 00:18:46 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib ciorga/work http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ciorga/work Cristian Iorga (1): connman: upgrade to 1.14 .../connman/{connman_1.13.bb = connman_1.14.bb} |9 + 1 file changed, 5 insertions(+), 4 deletions(-) rename meta/recipes-connectivity/connman/{connman_1.13.bb = connman_1.14.bb} (59%) -- 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] connman: upgrade to 1.14
- switched to archive releases; Signed-off-by: Cristian Iorga cristian.io...@intel.com --- .../connman/{connman_1.13.bb = connman_1.14.bb} |9 + 1 file changed, 5 insertions(+), 4 deletions(-) rename meta/recipes-connectivity/connman/{connman_1.13.bb = connman_1.14.bb} (59%) diff --git a/meta/recipes-connectivity/connman/connman_1.13.bb b/meta/recipes-connectivity/connman/connman_1.14.bb similarity index 59% rename from meta/recipes-connectivity/connman/connman_1.13.bb rename to meta/recipes-connectivity/connman/connman_1.14.bb index 4f23538..f9a5ecc 100644 --- a/meta/recipes-connectivity/connman/connman_1.13.bb +++ b/meta/recipes-connectivity/connman/connman_1.14.bb @@ -1,14 +1,15 @@ require connman.inc -# 1.13 tag -SRCREV = 96fcd8871531c9012135110769618d65a3523b4d -SRC_URI = git://git.kernel.org/pub/scm/network/connman/connman.git \ +SRC_URI = ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \ file://add_xuser_dbus_permission.patch \ file://connman \ file://inet-fix-ip-cleanup-functions.patch \ -S = ${WORKDIR}/git + +SRC_URI[md5sum] = 6c9ecaf9c044f8c66a7b465f6716b569 +SRC_URI[sha256sum] = d0c37452a4e8eec27e433ff901a6c447963b9d8a8ceddd4a7311cc322e2dbf8c + PR = ${INC_PR}.0 RRECOMMENDS_${PN} = connman-conf -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 0/1] runqemu: fix networking issues
Additional changes in v2: * Use 'ip route' instead of 'route'; Thanks, Laurentiu The following changes since commit 6271ac326d08fb3e9b4c2008b796233ee11a83e4: zlib: put shared libraries in base_libdir (2013-05-21 00:18:46 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib lpalcu/runqemu_fix http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=lpalcu/runqemu_fix Laurentiu Palcu (1): runqemu: fix networking issues scripts/runqemu-ifup | 15 +++ 1 file changed, 3 insertions(+), 12 deletions(-) -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 1/1] runqemu: fix networking issues
After switching from ifconfig to ip, networking stopped working. This commit contains the following fixes: * set a decent broadcast address for the tap device; * bring up the device; * add the route using ip tool instead of the old route tool; Signed-off-by: Laurentiu Palcu laurentiu.pa...@intel.com --- scripts/runqemu-ifup | 15 +++ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/scripts/runqemu-ifup b/scripts/runqemu-ifup index 8948153..5f6a437 100755 --- a/scripts/runqemu-ifup +++ b/scripts/runqemu-ifup @@ -80,16 +80,6 @@ if [ ! -x $IFCONFIG ]; then exit 1 fi -ROUTE=`which route` -if [ x$ROUTE = x ]; then - # better than nothing... - ROUTE=/sbin/route -fi -if [ ! -x $ROUTE ]; then - echo $ROUTE cannot be executed - exit 1 -fi - IPTABLES=`which iptables 2 /dev/null` if [ x$IPTABLES = x ]; then IPTABLES=/sbin/iptables @@ -100,10 +90,11 @@ if [ ! -x $IPTABLES ]; then fi n=$[ (`echo $TAP | sed 's/tap//'` * 2) + 1 ] -$IFCONFIG addr add 192.168.7.$n/32 dev $TAP +$IFCONFIG addr add 192.168.7.$n/32 broadcast 192.168.7.255 dev $TAP +$IFCONFIG link set dev $TAP up dest=$[ (`echo $TAP | sed 's/tap//'` * 2) + 2 ] -$ROUTE add -host 192.168.7.$dest $TAP +$IFCONFIG route add to 192.168.7.$dest dev $TAP # setup NAT for tap0 interface to have internet access in QEMU $IPTABLES -A POSTROUTING -t nat -j MASQUERADE -s 192.168.7.$n/32 -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] update-alternatives: Drop deprecated code, update to show error message
This code has been deprecated for a while and confuses the class, lets drop it and just give the user hard error messages instead of the current warnings/fixups. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/classes/update-alternatives.bbclass | 95 +--- 1 file changed, 1 insertion(+), 94 deletions(-) diff --git a/meta/classes/update-alternatives.bbclass b/meta/classes/update-alternatives.bbclass index 2cadaf7..f75f5b6 100644 --- a/meta/classes/update-alternatives.bbclass +++ b/meta/classes/update-alternatives.bbclass @@ -57,96 +57,12 @@ # # The package priority for a specific target # ALTERNATIVE_PRIORITY_pkg[name] = priority -# -# -# - -# -# -# The following describes deprecated behavior, using any of the -# following modes will result in a warning, and eventually an error: -# -# There are two basic modes supported: 'single update' and 'batch update' -# -# 'single update' is used for a single alternative command, and you're -# expected to provide at least below keywords: -# -# ALTERNATIVE_NAME - the name that the alternative is registered -# ALTERNATIVE_PATH - the path of installed alternative -# -# ALTERNATIVE_PRIORITY and ALTERNATIVE_LINK are optional which have defaults -# in this class. -# -# 'batch update' is used if you have multiple alternatives to be updated. -# Unlike 'single update', 'batch update' in most times only require two -# parameters: -# -# ALTERNATIVE_LINKS - a list of symbolic links for which you'd like to -# create alternatives, with space as delimiter, e.g: -# -# ALTERNATIVE_LINKS = ${bindir}/cmd1 ${sbindir}/cmd2 ... -# -# ALTERNATIVE_PRIORITY - optional, applies to all -# -# To simplify the design, this class has the assumption that for a name -# listed in ALTERNATIVE_LINKS, say /path/cmd: -# -# the name of the alternative would be: cmd -# the path of installed alternative would be: /path/cmd.${BPN} -# ${D}/path/cmd will be renamed to ${D}/path/cmd.{BPN} automatically -# priority will be the same from ALTERNATIVE_PRIORITY -# -# If above assumption breaks your requirement, then you still need to use -# your own update-alternatives command directly. -# defaults ALTERNATIVE_PRIORITY = 10 -# The following code is deprecated, but included for compatibility with older packages -def update_alternatives_after_parse(d): -if bb.data.inherits_class('native', d) or bb.data.inherits_class('nativesdk', d): -return - -# The following code is deprecated, but included for compatibility with older packages -pn = d.getVar('BPN', True) - -if d.getVar('ALTERNATIVE_LINKS') != None: -# Convert old format to new format... -alt_links = d.getVar('ALTERNATIVE_LINKS', True) or -for alt_link in alt_links.split(): -alt_name = os.path.basename(alt_link) - -alternative = d.getVar('ALTERNATIVE_%s' % pn, True) or -alternative += + alt_name -d.setVar('ALTERNATIVE_%s' % pn, alternative) -d.setVarFlag('ALTERNATIVE_LINK_NAME', alt_name, alt_link) -d.setVarFlag('ALTERNATIVE_TARGET', alt_name, alt_link) -return - -if d.getVar('ALTERNATIVE_NAME') != None or d.getVar('ALTERNATIVE_PATH') != None: -# Convert old format to new format... -alt_name = d.getVar('ALTERNATIVE_NAME', True) -alt_path = d.getVar('ALTERNATIVE_PATH', True) -alt_link = d.getVar('ALTERNATIVE_LINK', True) or (%s/%s % (d.getVar('bindir', True), alt_name)) -if alt_name == None: -raise bb.build.build.FuncFailed(%s inherits update-alternatives but doesn't set ALTERNATIVE_NAME % d.getVar('FILE')) -if alt_path == None: -raise bb.build.build.FuncFailed(%s inherits update-alternatives but doesn't set ALTERNATIVE_PATH % d.getVar('FILE')) - -alternative = d.getVar('ALTERNATIVE_%s' % pn, True) or -alternative += + alt_name - -# Fix the alt_path if it's relative -alt_path = os.path.join(os.path.dirname(alt_link), alt_path) - -d.setVar('ALTERNATIVE_%s' % pn, alternative) -d.setVarFlag('ALTERNATIVE_LINK_NAME', alt_name, alt_link) -d.setVarFlag('ALTERNATIVE_TARGET', alt_name, alt_path) - - # We need special processing for vardeps because it can not work on # modified flag values. So we agregate the flags into a new variable # and include that vairable in the set. - UPDALTVARS = ALTERNATIVE ALTERNATIVE_LINK_NAME ALTERNATIVE_TARGET ALTERNATIVE_PRIORITY def gen_updatealternativesvardeps(d): @@ -178,9 +94,6 @@ python __anonymous() { bb.data.inherits_class('cross-canadian', d): return -# deprecated stuff... -update_alternatives_after_parse(d) - # compute special vardeps gen_updatealternativesvardeps(d) @@ -202,9 +115,6 @@ def gen_updatealternativesvars(d): ret.append(v + _VARDEPS_ + p) return .join(ret)
[OE-core] [PATCH] task.bbclass: Drop deprecated class
Any users have had time to adapt to this change by now, drop the old class. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/classes/task.bbclass | 6 -- 1 file changed, 6 deletions(-) delete mode 100644 meta/classes/task.bbclass diff --git a/meta/classes/task.bbclass b/meta/classes/task.bbclass deleted file mode 100644 index 28db500..000 --- a/meta/classes/task.bbclass +++ /dev/null @@ -1,6 +0,0 @@ -python __anonymous() { -bb.warn(%s: task.bbclass is deprecated, please inherit packagegroup instead % d.getVar(PN, True)) -} - -inherit packagegroup - ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V3 0/4] Postinst logging reimplementation
From: Chen Qi qi.c...@windriver.com Goal: 1. Enable postinst logging if 'debug-tweaks' is in IMAGE_FEATURES 2. Make rpm, opkg and dpkg not depend on IMAGE_FEATURES and POSTLOG Implementation: 1. The run-postinst scripts will log outputs by checking the configuration in /etc/default/postinst. 2. The log location is by default /var/log/postinstall.log. But it could be configured to a different location. The following changes since commit 6271ac326d08fb3e9b4c2008b796233ee11a83e4: zlib: put shared libraries in base_libdir (2013-05-21 00:18:46 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib ChenQi/postinst-logging-reimplementation http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/postinst-logging-reimplementation Chen Qi (4): image.bbclass: add postinst_enable_logging dpkg: modify the run-postinst script to enable postinst logging opkg: modify the run-postinst script to enable postinst logging rpm-postinsts.bb: enable postinst logging meta/classes/image.bbclass | 11 +++ meta/recipes-devtools/dpkg/dpkg.inc| 11 ++- meta/recipes-devtools/opkg/opkg.inc|7 ++- meta/recipes-devtools/rpm/rpm-postinsts.bb | 13 +++-- 4 files changed, 30 insertions(+), 12 deletions(-) -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V3 1/4] image.bbclass: add postinst_enable_logging
From: Chen Qi qi.c...@windriver.com Add a function postinst_enable_logging, so that when 'debug-tweaks' is in IMAGE_FEATURES, we create /etc/default/postinst config file, which is sourced by run-postinst scripts to determine whether to log or not, and where to log. [YOCTO #4262] Signed-off-by: Chen Qi qi.c...@windriver.com --- meta/classes/image.bbclass | 11 +++ 1 file changed, 11 insertions(+) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 4f07708..c7eedd4 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -175,6 +175,10 @@ MACHINE_POSTPROCESS_COMMAND ?= ROOTFS_POSTPROCESS_COMMAND_prepend = run_intercept_scriptlets; # Allow dropbear/openssh to accept logins from accounts with an empty password string if debug-tweaks is enabled ROOTFS_POSTPROCESS_COMMAND += '${@base_contains(IMAGE_FEATURES, debug-tweaks, ssh_allow_empty_password; , ,d)}' +# Enable postinst logging if debug-tweaks is enabled +ROOTFS_POSTPROCESS_COMMAND += '${@base_contains(IMAGE_FEATURES, debug-tweaks, postinst_enable_logging; , ,d)}' +# Set default postinst log file +POSTINST_LOGFILE ?= ${localstatedir}/log/postinstall.log # some default locales IMAGE_LINGUAS ?= de-de fr-fr en-gb @@ -484,6 +488,13 @@ ssh_allow_empty_password () { fi } +# Enable postinst logging if debug-tweaks is enabled +postinst_enable_logging () { + mkdir -p ${IMAGE_ROOTFS}/etc/default + echo POSTINST_LOGGING=1 ${IMAGE_ROOTFS}/etc/default/postinst + echo LOGFILE=${POSTINST_LOGFILE} ${IMAGE_ROOTFS}/etc/default/postinst +} + # Turn any symbolic /sbin/init link into a file remove_init_link () { if [ -h ${IMAGE_ROOTFS}/sbin/init ]; then -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V3 2/4] dpkg: modify the run-postinst script to enable postinst logging
From: Chen Qi qi.c...@windriver.com Enable postinst logging by checking the configuration in /etc/ default/postinst. In this way, the postinst logging is enabled if 'debug-tweaks' is in IMAGE_FEATURES, and at the same time, we avoid unnecessary rebuilt if IMAGE_FEATURES is changed. [YOCTO #4262] Signed-off-by: Chen Qi qi.c...@windriver.com --- meta/recipes-devtools/dpkg/dpkg.inc | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc index d773fbd..08a9f5a 100644 --- a/meta/recipes-devtools/dpkg/dpkg.inc +++ b/meta/recipes-devtools/dpkg/dpkg.inc @@ -35,10 +35,6 @@ do_configure () { autotools_do_configure } -POSTLOG ?= /var/log/postinstall.log -REDIRECT_CMD = ${@base_contains('IMAGE_FEATURES', 'debug-tweaks', '${POSTLOG} 21', '', d)} -REDIRECT_CMD[vardepsexclude] += IMAGE_FEATURES POSTLOG - DPKG_INIT_POSITION ?= 98 do_install_append () { @@ -67,7 +63,12 @@ if [ x$D != x ] [ -f $D/var/lib/dpkg/status ]; then # this happens at S98 where our good 'ole packages script used to run echo #!/bin/sh -dpkg --configure -a ${REDIRECT_CMD} +[ -e /etc/default/postinst ] . /etc/default/postinst +if [ \\$POSTINST_LOGGING\ = \1\ ]; then +dpkg --configure -a \$LOGFILE 21 +else +dpkg --configure -a +fi rm -f ${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}run-postinsts $D${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}run-postinsts chmod 0755 $D${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}run-postinsts -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V3 3/4] opkg: modify the run-postinst script to enable postinst logging
From: Chen Qi qi.c...@windriver.com Enable postinst logging by checking the configuration in /etc/ default/postinst. In this way, the postinst logging is enabled if 'debug-tweaks' is in IMAGE_FEATURES, and at the same time, we avoid unnecessary rebuilt if IMAGE_FEATURES is changed. [YOCTO #4262] Signed-off-by: Chen Qi qi.c...@windriver.com --- meta/recipes-devtools/opkg/opkg.inc |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc index 631aafc..2de75e1 100644 --- a/meta/recipes-devtools/opkg/opkg.inc +++ b/meta/recipes-devtools/opkg/opkg.inc @@ -68,7 +68,12 @@ if [ x$D != x ] [ -f $D${OPKGLIBDIR}/opkg/status ]; then # this happens at S98 where our good 'ole packages script used to run echo #!/bin/sh -opkg-cl configure ${REDIRECT_CMD} +[ -e /etc/default/postinst ] . /etc/default/postinst +if [ \\$POSTINST_LOGGING\ = \1\ ]; then +opkg-cl configure \$LOGFILE 21 +else +opkg-cl configure +fi rm -f ${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts chmod 0755 $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V3 4/4] rpm-postinsts.bb: enable postinst logging
From: Chen Qi qi.c...@windriver.com Enable postinst logging by checking the configuration in /etc/ default/postinst. In this way, the postinst logging is enabled if 'debug-tweaks' is in IMAGE_FEATURES, and at the same time, we avoid unnecessary rebuild if IMAGE_FEATURES is changed. [YOCTO #4262] Signed-off-by: Chen Qi qi.c...@windriver.com --- meta/recipes-devtools/rpm/rpm-postinsts.bb | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/meta/recipes-devtools/rpm/rpm-postinsts.bb b/meta/recipes-devtools/rpm/rpm-postinsts.bb index 3c0f520..7798fe6 100644 --- a/meta/recipes-devtools/rpm/rpm-postinsts.bb +++ b/meta/recipes-devtools/rpm/rpm-postinsts.bb @@ -9,10 +9,6 @@ inherit allarch # POSTINSTALL_INITPOSITION ?= 98 -POSTLOG ?= /var/log/postinstall.log -REDIRECT_CMD = ${@base_contains('IMAGE_FEATURES', 'debug-tweaks', '${POSTLOG} 21', '', d)} -REDIRECT_CMD[vardepsexclude] += IMAGE_FEATURES POSTLOG - do_fetch() { : } @@ -34,11 +30,16 @@ if [ x$D != x ] [ -f $D/var/lib/rpm/Packages ]; then install -d $D/${sysconfdir}/rcS.d cat $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts EOF #!/bin/sh - +[ -e /etc/default/postinst ] . /etc/default/postinst [ -d /etc/rpm-postinsts ] for i in `ls /etc/rpm-postinsts/`; do i=/etc/rpm-postinsts/$i echo Running postinst $i... - if [ -f $i ] $i ${REDIRECT_CMD}; then + if [ -x $i ]; then + if [ $POSTINST_LOGGING = 1 ]; then + $i $LOGFILE 21 + else + $i + fi rm $i else echo ERROR: postinst $i failed. -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] kernel.bbclass: Add dependency on binutils
On Mon, May 20, 2013 at 11:25:18PM +0100, Richard Purdie wrote: On Mon, 2013-05-20 at 10:37 -0700, Khem Raj wrote: On May 20, 2013, at 5:22 AM, Mike Crowe m...@mcrowe.com wrote: Compiling the Linux kernel requires binutils; kernel.bbclass uses INHIBIT_DEFAULT_DEPS so it had better depend on binutils explicitly. (The lack of this dependency isn't always a problem because binutils is required to build gcc-cross but if gcc-cross is reconstructed from the sstate cache then gcc-cross's dependency on binutils-cross is ignored due to being in the safe dependency list in setscene_depvalid.) what good is cross-gcc without cross-binutils. Could it be fixed in gcc recipes instead so it pulls binutils-cross This needs fixing in the logic in sstate.bbclass. The most straightforward fix there (with thanks to Phil Blundell) is to just remove binutils-cross from the safe dependency list: diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 1f85c54..be08a66 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -648,7 +648,7 @@ def setscene_depvalid(task, taskdependees, notneeded, d): def isNativeCross(x): return x.endswith(-native) or x.endswith(-cross) or x.endswith(-cross-initial) def isSafeDep(x): -if x in [quilt-native, autoconf-native, automake-native, gnu-config-native, libtool-native, pkgconfig-native, gcc-cross, binutils-cross, gcc-cross-initial]: +if x in [quilt-native, autoconf-native, automake-native, gnu-config-native, libtool-native, pkgconfig-native, gcc-cross, gcc-cross-initial]: return True return False def isPostInstDep(x): Is this the sort of fix you mean? Thanks. Mike. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] fix sudo compile failure
The following changes since commit 6271ac326d08fb3e9b4c2008b796233ee11a83e4: zlib: put shared libraries in base_libdir (2013-05-21 00:18:46 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib kangkai/sudo http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/sudo Kang Kai (1): sudo: set CFLAGS for build mksigname and mksiglist meta/recipes-extended/sudo/sudo.inc |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] sudo: set CFLAGS for build mksigname and mksiglist
mksigname and mksiglist are compiled by BUILD_CC for build host. When there are some options in CFLAGS that BUILD_CC doesn't support, compilation fails. Build for arm on a x86 host, if option -mapcs-frame is provided, error occurs with: | cc1: error: unrecognized command line option -mapcs-frame Pass BUILD_CFLAGS to CFLAGS to fix that kind of failure. Signed-off-by: Kang Kai kai.k...@windriver.com --- meta/recipes-extended/sudo/sudo.inc |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc index 35da367..9dcb677 100644 --- a/meta/recipes-extended/sudo/sudo.inc +++ b/meta/recipes-extended/sudo/sudo.inc @@ -23,7 +23,7 @@ do_configure_prepend () { # mksigname/mksiglist are used on build host to generate source files do_compile_prepend () { - oe_runmake SSP_CFLAGS= SSP_LDFLAGS= CC=$BUILD_CC CPPFLAGS=$BUILD_CPPFLAGS -I${S}/include -I${S} -I${B} -C compat mksigname mksiglist + oe_runmake SSP_CFLAGS= SSP_LDFLAGS= CC=$BUILD_CC CFLAGS=$BUILD_CFLAGS CPPFLAGS=$BUILD_CPPFLAGS -I${S}/include -I${S} -I${B} -C compat mksigname mksiglist } # Explicitly create ${localstatedir}/lib before do_install to ensure -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] base-files:fix the command line wrap around issue
On Tuesday, 21 May 2013, wrote: +export COLUMNS=2000 But there are not 2000 columns, you're just hard-coding a value that is expected to dynamically change. i.e, on my desktop in a gnome-terminal: $ echo $COLUMNS 80 Then if I resize the window: $ echo $COLUMNS 117 This is a bad workaround, can you explain the actual problem? Are you not seeing wrapping at a VT, in a terminal, or what? Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 2/8] clutter.bbclass: helper class for clutter and friends
Hi Tomas, On Monday, 20 May 2013, Tomas Frydrych wrote: +def get_minor_dir(v): +import re +m = re.match(^([0-9]+)\.([0-9]+), v) +return %s.%s % (m.group(1), m.group(2)) Just an observation not a critic, but I'd love to see these centralised, we've got the same logic duplicated all over the place now. +def get_fpu_setting(bb, d): +if d.getVar('TARGET_FPU', True) in [ 'soft' ]: +return --without-fpu +return This option isn't used by Clutter or cogl anymore, so you can drop this function. Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 3/8] New cogl recipe (1.14.0)
On Monday, 20 May 2013, Tomas Frydrych wrote: GL flavour: 'gl' for big GL or 'gles2' for GLES2 (GLES1 is availabe in cogl, but not supporeted here at present.) Does this support enabling both GL and GLES2 in the same build? (at which point the choice of backend becomes someone else's problem, but that's fine) +DEPENDS = gtk-doc-native pango glib-2.0 gdk-pixbuf The inherit gtk-doc in clutter.bbclass already adds a dependency on gtk-doc. +EXTRA_OECONF += --disable-introspection \ +--disable-gtk-doc \ gtk-doc.bbclass does this for you. +${@get_fpu_setting(bb, d)} \ Unused, you can drop this. +--enable-examples-install \ +--enable-debug \ +--disable-gl \ +--disable-gles1\ +--disable-gles2\ +--disable-glx \ Why are these not disabled flags in each of the relevant PACKAGECONFIG definitions? + # Disable DOLT + sed -i -e 's/^DOLT//' ${S}/configure.ac This was removed from clutter/cogl in 2010, so drop this. Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 3/8] New cogl recipe (1.14.0)
On 21/05/13 11:01, Burton, Ross wrote: On Monday, 20 May 2013, Tomas Frydrych wrote: GL flavour: 'gl' for big GL or 'gles2' for GLES2 (GLES1 is availabe in cogl, but not supporeted here at present.) Does this support enabling both GL and GLES2 in the same build? (at which point the choice of backend becomes someone else's problem, but that's fine) Yes, the PACKAGECONFIG options are additive. Tomas -- http://sleepfive.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] cross: Clear do_populate_sysroot[stamp-extra-info] so that stamps are not MACHINE specific
Otherwise we will try to run the setscene task once per MACHINE which will lead to file conflicts in the sysroot for packages like gcc-cross. The stamps are already namespaced by TARGET_ARCH which should be sufficient. Signed-off-by: Phil Blundell ph...@gnu.org --- meta/classes/cross.bbclass |1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass index b57e523..eaba4d1 100644 --- a/meta/classes/cross.bbclass +++ b/meta/classes/cross.bbclass @@ -55,6 +55,7 @@ libdir = ${exec_prefix}/lib/${CROSS_TARGET_SYS_DIR} libexecdir = ${exec_prefix}/libexec/${CROSS_TARGET_SYS_DIR} do_populate_sysroot[sstate-inputdirs] = ${SYSROOT_DESTDIR}/${STAGING_DIR_NATIVE}/ +do_populate_sysroot[stamp-extra-info] = python cross_virtclass_handler () { if not isinstance(e, bb.event.RecipePreFinalise): -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] updates for cogl, clutter and mx v3
Fixes per Ross' comments: * Removed unused/unnecessary configure options * Reworked PACKAGECONFIG for cogl and clutter * Removed unnecessary configure framment's from cogl/clutter/clutter-gst [PATCH v3 1/8] clutter.bbclass: helper class for clutter and friends [PATCH v3 2/8] New cogl recipe (1.14.0) [PATCH v3 3/8] New clutter recipe (1.14.4) [PATCH v3 4/8] fix clutter [PATCH v3 5/8] New clutter-gst recipe (1.6.0) [PATCH v3 6/8] New clutter-gtk recipe (1.4.2) [PATCH v3 7/8] New mx recipe (1.4.7) [PATCH v3 8/8] packagegroup-core-clutter: use clutter-1.0 packages ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 1/8] clutter.bbclass: helper class for clutter and friends
From: Tomas Frydrych to...@sleepfive.com Signed-off-by: Tomas Frydrych to...@sleepfive.com --- meta/classes/clutter.bbclass | 23 +++ 1 file changed, 23 insertions(+) create mode 100644 meta/classes/clutter.bbclass diff --git a/meta/classes/clutter.bbclass b/meta/classes/clutter.bbclass new file mode 100644 index 000..0dc4850 --- /dev/null +++ b/meta/classes/clutter.bbclass @@ -0,0 +1,23 @@ + +def get_minor_dir(v): +import re +m = re.match(^([0-9]+)\.([0-9]+), v) +return %s.%s % (m.group(1), m.group(2)) + +def get_real_name(n): +import re +m = re.match(^([a-z]+(-[a-z]+)?)(-[0-9]+\.[0-9]+)?, n) +return %s % (m.group(1)) + +VERMINOR = ${@get_minor_dir(${PV})} +REALNAME = ${@get_real_name(${BPN})} +FILESPATH = ${@base_set_filespath([${FILE_DIRNAME}/${REALNAME}-${PV}, ${FILE_DIRNAME}/${REALNAME}-${VERMINOR}, ${FILE_DIRNAME}/${REALNAME}, ${FILE_DIRNAME}/files], d)} + +CLUTTER_SRC_FTP = ${GNOME_MIRROR}/${REALNAME}/${VERMINOR}/${REALNAME}-${PV}.tar.xz;name=archive + +CLUTTER_SRC_GIT = git://git.gnome.org/${REALNAME};protocol=git + +SRC_URI = ${CLUTTER_SRC_FTP} +S = ${WORKDIR}/${REALNAME}-${PV} + +inherit autotools pkgconfig gtk-doc gettext -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 2/8] New cogl recipe (1.14.0)
From: Tomas Frydrych to...@sleepfive.com The package has been renamed to cogl-1.0 instead of cogl-vmajor.vminor, keeping up with the upstream versioning policy (e.g., all 1.x packages install cogl-1.0 pc file and headers and are backward compatible), and to simplify dependency management (worth noting that since the 1.x development files are not parallel installable, it is not possible to use two versions of cogl 1.x at the same time anyway). Package configuration is provided via PACKAGECONFIG options as follows: GL flavour: 'gl' for big GL or 'gles2' for GLES2 (GLES1 is availabe in cogl, but not supporeted here at present.) EGL platform: 'egl-null' -- PVR-style null platform 'egl-kms' -- kms platform provide by Mesa 'egl-x11' -- egl over xlib platform (Additional EGL platforms, e.g., Wayland are supported by cogl, but not supported here at present.) GLX: 'glx' for the GLX extension support (implies 'gl') Default configuration is 'glx'; typical configuration providing 'native' egl on embedded HW would be 'gles2 egl-null'. Signed-off-by: Tomas Frydrych to...@sleepfive.com --- meta/recipes-graphics/cogl/cogl-1.0.inc | 50 + meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb |7 2 files changed, 57 insertions(+) create mode 100644 meta/recipes-graphics/cogl/cogl-1.0.inc create mode 100644 meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc new file mode 100644 index 000..611d8fc --- /dev/null +++ b/meta/recipes-graphics/cogl/cogl-1.0.inc @@ -0,0 +1,50 @@ +DESCRIPTION = a modern 3D graphics API with associated utility APIs +HOMEPAGE = http://wiki.clutter-project.org/wiki/Cogl; +LICENSE = LGPLv2.1+ + +inherit clutter + +DEPENDS = pango glib-2.0 gdk-pixbuf +PACKAGES =+ ${PN}-examples +AUTOTOOLS_AUXDIR = ${S}/build + +# Extra DEPENDS for PACKAGECONFIG +EDEPENDS_GL= virtual/libgl libdrm +EDEPENDS_GLES2 = virtual/libgles2 +EDEPENDS_KMS = libdrm virtual/egl +EDEPENDS_EGL = virtual/egl +EDEPENDS_X11 = virtual/libx11 libxcomposite libxfixes libxi + +# Extra RDEPENDS for PACKAGECONFIG +# This has to be explictly listed, because cogl dlopens the backends +ERDEPENDS_GL= libgl +ERDEPENDS_GLES2 = libgles2 + +EXTRA_OECONF += --disable-introspection \ +--enable-examples-install \ +--enable-debug \ +--disable-gles1\ + + +# GL flavours +PACKAGECONFIG[gl] = --enable-gl,--disable-gl,${EDEPENDS_GL},${ERDEPENDS_GL} +PACKAGECONFIG[gles2] = --enable-gles2,,${EDEPENDS_GLES2}, ${ERDEPENDS_GLES2} + +# egl backends +PACKAGECONFIG[egl-kms] = --enable-kms-egl-platform,--disable-kms-egl-platform,${EDEPENDS_KMS} +PACKAGECONFIG[egl-null] = --enable-null-egl-platform,--disable-null-egl-platform +PACKAGECONFIG[egl-x11] = --enable-xlib-egl-platform,--disable-xlib-egl-platform,${EDEPENDS_X11} + +# glx +PACKAGECONFIG[glx] = --enable-glx,--disable-glx, ${EDEPENDS_X11} + +# Default to GLX +PACKAGECONFIG ??= gl glx + +#Fix up some weirdness in the docs +do_configure_prepend() { +sed -i s:doc/reference/Makefile::g ${S}/configure.ac +sed -i s:doc::g ${S}/Makefile.am +} + +FILES_${PN}-examples = ${bindir}/* ${datadir}/cogl/examples-data/* diff --git a/meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb b/meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb new file mode 100644 index 000..0f40c59 --- /dev/null +++ b/meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb @@ -0,0 +1,7 @@ + +require cogl-1.0.inc + +LIC_FILES_CHKSUM = file://COPYING;md5=4fbd65380cdd255951079008b364516c + +SRC_URI[archive.md5sum] = 7eabaf4241c0b87cc9e3b0fa23fd0315 +SRC_URI[archive.sha256sum] = 276e8c9f5ff0fcd57c1eaf74cc245f41ad469a95a18ac831fac2d5960baa5ae8 -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 3/8] New clutter recipe (1.14.4)
From: Tomas Frydrych to...@sleepfive.com The package has been renamed to clutter-1.0 instead of clutter-vmajor.vminor, keeping up with the upstream versioning policy (all 1.x packages install clutter-1.0 pc file and headers and are backward compatible), and to simplify dependency management (worth noting that since the 1.x development files are not parall installable, it is not possible to use two versions of clutter 1.x at the same time anyway). Package configuration is provided via PACKAGECONFIG options as follows: 'x11' : enable X11 backend, 'glx' : enable GLX backend, 'egl' : enable EGL backend, 'evdev': enable evdev input backend Default configuration is 'glx'; typical configuration for embedded HW using 'native' EGL would be 'egl evdev'. Signed-off-by: Tomas Frydrych to...@sleepfive.com --- meta/recipes-graphics/clutter/clutter-1.0.inc | 56 .../recipes-graphics/clutter/clutter-1.0_1.14.4.bb |7 +++ .../clutter/clutter-1.14/enable_tests.patch| 36 + 3 files changed, 99 insertions(+) create mode 100644 meta/recipes-graphics/clutter/clutter-1.0.inc create mode 100644 meta/recipes-graphics/clutter/clutter-1.0_1.14.4.bb create mode 100644 meta/recipes-graphics/clutter/clutter-1.14/enable_tests.patch diff --git a/meta/recipes-graphics/clutter/clutter-1.0.inc b/meta/recipes-graphics/clutter/clutter-1.0.inc new file mode 100644 index 000..6710776 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-1.0.inc @@ -0,0 +1,56 @@ +DESCRIPTION = Clutter graphics library +HOMEPAGE = http://www.clutter-project.org/; +LICENSE = LGPLv2.1+ + +inherit clutter + +SRC_URI += file://enable_tests.patch + +DEPENDS = gtk-doc-native pango glib-2.0 json-glib atk udev cogl-1.0 +PACKAGES =+ ${PN}-examples +AUTOTOOLS_AUXDIR = ${S}/build + +EDEPENDS_X11 = virtual/libx11 libxi libxfixes +EDEPENDS_GLX = virtual/libgl +EDEPENDS_EGL = virtual/egl + +EDEPENDS_EVDEV = libxkbcommon +ERDEPENDS_EVDEV = xkeyboard-config + +# Disable pretty much everything, override in platform specific set up +EXTRA_OECONF += --disable-gtk-doc \ +${@get_fpu_setting(bb, d)} \ +--disable-introspection\ +--disable-egl-backend \ +--disable-quartz-backend \ +--disable-win32-backend\ +--disable-x11-backend \ +--disable-gdk-backend \ +--disable-wayland-backend \ +--disable-wayland-compositor \ +--disable-cex100-backend \ +--disable-tslib-input \ +--disable-evdev-input \ + + +PACKAGECONFIG[x11] = --enable-x11-backend,,${EDEPENDS_X11} +PACKAGECONFIG[glx] = --enable-x11-backend,,${EDEPENDS_X11} ${EDEPENDS_GLX} +PACKAGECONFIG[egl] = --enable-egl-backend,,${EDEPENDS_EGL} +PACKAGECONFIG[evdev] = --enable-evdev-input,,${EDEPENDS_EVDEV},${ERDEPENDS_EVDEV} + +# Default configuration, distros might want to override +PACKAGECONFIG ??= glx + +FILES_${PN}-examples = ${bindir}/test-* ${pkgdatadir}/redhand.png + +do_configure_prepend() { +# Fix up some weirdness in the docs +sed -i s:doc/reference/Makefile::g ${S}/configure.ac +sed -i s:doc::g ${S}/Makefile.am + + # see https://bugzilla.gnome.org/show_bug.cgi?id=661128 for this + touch -t 2101 po/clutter-1.0.pot + + # Disable DOLT + sed -i -e 's/^DOLT//' ${S}/configure.ac +} diff --git a/meta/recipes-graphics/clutter/clutter-1.0_1.14.4.bb b/meta/recipes-graphics/clutter/clutter-1.0_1.14.4.bb new file mode 100644 index 000..35824c6 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-1.0_1.14.4.bb @@ -0,0 +1,7 @@ + +require clutter-1.0.inc + +LIC_FILES_CHKSUM = file://COPYING;md5=4fbd65380cdd255951079008b364516c + +SRC_URI[archive.md5sum] = c072e4c27e69368f2b877ea4f6da2cdf +SRC_URI[archive.sha256sum] = c996d91fff6fff24d9e23dcd545439ebc6b999fb1cf9ee44c28ca54c49c0ee1c diff --git a/meta/recipes-graphics/clutter/clutter-1.14/enable_tests.patch b/meta/recipes-graphics/clutter/clutter-1.14/enable_tests.patch new file mode 100644 index 000..f97d598 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-1.14/enable_tests.patch @@ -0,0 +1,36 @@ +Make tests installable + +The test applications are useful for image testing. + +Imported from clutter 1.8 package, git://git.openembedded.org/openembedded, +commit ae28ee3f7a060b9e0d13154a84f2444a98490b5b, updated patch header. + +Upstream-Status: Inappropriate [configuration] +Signed-off-by: Tomas Frydrych to...@sleepfive.com + +Index: git/tests/interactive/Makefile.am +=== +--- git.orig/tests/interactive/Makefile.am 2009-11-30 17:39:46.0 + git/tests/interactive/Makefile.am 2009-11-30 17:42:30.0 + +@@ -88,7 +88,7 @@ + + common_ldadd =
[OE-core] [PATCH v3 4/8] fix clutter
From: Tomas Frydrych to...@sleepfive.com Signed-off-by: Tomas Frydrych to...@sleepfive.com --- meta/recipes-graphics/clutter/clutter-1.0.inc | 22 +++--- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/meta/recipes-graphics/clutter/clutter-1.0.inc b/meta/recipes-graphics/clutter/clutter-1.0.inc index 6710776..9b4b169 100644 --- a/meta/recipes-graphics/clutter/clutter-1.0.inc +++ b/meta/recipes-graphics/clutter/clutter-1.0.inc @@ -17,29 +17,24 @@ EDEPENDS_EGL = virtual/egl EDEPENDS_EVDEV = libxkbcommon ERDEPENDS_EVDEV = xkeyboard-config -# Disable pretty much everything, override in platform specific set up -EXTRA_OECONF += --disable-gtk-doc \ -${@get_fpu_setting(bb, d)} \ ---disable-introspection\ ---disable-egl-backend \ +# Disable backends we do not currently support building +EXTRA_OECONF += --disable-introspection \ --disable-quartz-backend \ --disable-win32-backend\ ---disable-x11-backend \ --disable-gdk-backend \ --disable-wayland-backend \ --disable-wayland-compositor \ --disable-cex100-backend \ --disable-tslib-input \ ---disable-evdev-input \ -PACKAGECONFIG[x11] = --enable-x11-backend,,${EDEPENDS_X11} -PACKAGECONFIG[glx] = --enable-x11-backend,,${EDEPENDS_X11} ${EDEPENDS_GLX} -PACKAGECONFIG[egl] = --enable-egl-backend,,${EDEPENDS_EGL} -PACKAGECONFIG[evdev] = --enable-evdev-input,,${EDEPENDS_EVDEV},${ERDEPENDS_EVDEV} +PACKAGECONFIG[x11] = --enable-x11-backend,--disable-x11-backend,${EDEPENDS_X11} +PACKAGECONFIG[glx] = ,,${EDEPENDS_X11} ${EDEPENDS_GLX} +PACKAGECONFIG[egl] = --enable-egl-backend,--disable-egl-backend,${EDEPENDS_EGL} +PACKAGECONFIG[evdev] = --enable-evdev-input,--disable-evdev-input,${EDEPENDS_EVDEV},${ERDEPENDS_EVDEV} # Default configuration, distros might want to override -PACKAGECONFIG ??= glx +PACKAGECONFIG ??= x11 glx FILES_${PN}-examples = ${bindir}/test-* ${pkgdatadir}/redhand.png @@ -50,7 +45,4 @@ do_configure_prepend() { # see https://bugzilla.gnome.org/show_bug.cgi?id=661128 for this touch -t 2101 po/clutter-1.0.pot - - # Disable DOLT - sed -i -e 's/^DOLT//' ${S}/configure.ac } -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 5/8] New clutter-gst recipe (1.6.0)
From: Tomas Frydrych to...@sleepfive.com Signed-off-by: Tomas Frydrych to...@sleepfive.com --- meta/recipes-graphics/clutter/clutter-gst-1.0.inc | 19 .../clutter/clutter-gst-1.0_1.6.0.bb |9 .../clutter/clutter-gst-1.6/cogl-1.14.patch| 48 .../clutter/clutter-gst/enable-tests.patch | 23 ++ 4 files changed, 99 insertions(+) create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.0.inc create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.0_1.6.0.bb create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.6/cogl-1.14.patch create mode 100644 meta/recipes-graphics/clutter/clutter-gst/enable-tests.patch diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.0.inc b/meta/recipes-graphics/clutter/clutter-gst-1.0.inc new file mode 100644 index 000..eebfd09 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gst-1.0.inc @@ -0,0 +1,19 @@ +DESCRIPTION = Clutter GStreamer +HOMEPAGE = http://www.clutter-project.org/; +LICENSE = LGPLv2+ + +inherit clutter + +SRC_URI += file://enable-tests.patch + +DEPENDS = gst-plugins-base gst-plugins-bad clutter-1.0 +RDEPENDS_${PN} += gst-meta-base +PACKAGES =+ ${PN}-examples + +EXTRA_OECONF += --disable-introspection + +FILES_${PN} += ${libdir}/gstreamer-0.10/lib*.so +FILES_${PN}-dev += ${libdir}/gstreamer-0.10/*.la +FILES_${PN}-dbg += ${libdir}/gstreamer-0.10/.debug/lib*.so +FILES_${PN}-examples = ${bindir}/video-player ${bindir}/video-sink + diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.0_1.6.0.bb b/meta/recipes-graphics/clutter/clutter-gst-1.0_1.6.0.bb new file mode 100644 index 000..dc5cc13 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gst-1.0_1.6.0.bb @@ -0,0 +1,9 @@ +require clutter-gst-1.0.inc + +SRC_URI += file://cogl-1.14.patch + +LIC_FILES_CHKSUM = file://COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4 + +SRC_URI[archive.md5sum] = d60ab0118730cecd5dd9988ad7da034b +SRC_URI[archive.sha256sum] = abc879cdd562f1640a825131405f4327a427bfe65b805ebc25d0c78909c8c622 diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.6/cogl-1.14.patch b/meta/recipes-graphics/clutter/clutter-gst-1.6/cogl-1.14.patch new file mode 100644 index 000..a46b448 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gst-1.6/cogl-1.14.patch @@ -0,0 +1,48 @@ +From 1ae4c3e7b1e2c33892590f9ac7bf0e892a5bcbd5 Mon Sep 17 00:00:00 2001 +From: Tomas Frydrych to...@sleepfive.com +Date: Thu, 11 Oct 2012 08:53:03 +0100 +Subject: [PATCH] ClutterGstVideoSink: fix includes so we can build against + cogl-1.14 + +Cogl 1.14 exposes various GL types through the public API but it does not +pull in the GL type definitions through its public headers; specifically +compilation will fail due to undefined GL_TEXTURE_2D. So include the headers +the hard way. + +Upstream-status: Submitted @ https://bugzilla.gnome.org/show_bug.cgi?id=700509 +Signed-off-by: Tomas Frydrych to...@sleepfive.com +--- + clutter-gst/clutter-gst-video-sink.c | 17 + + 1 file changed, 17 insertions(+) + +diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c +index 9b4b53c..f092581 100644 +--- a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c +@@ -42,6 +42,23 @@ + #include config.h + #endif + ++/* ++ * cogl-1.14 exposes generic GL types in the API, but not the actual includes. ++ */ ++#include cogl/cogl.h ++ ++#ifdef COGL_HAS_GLES1 ++#include GLES/gl.h ++#include GLES/glext.h ++#elif COGL_HAS_GLES2 ++#include GLES2/gl2.h ++#include GLES2/gl2ext.h ++#elif COGL_HAS_GL ++#include GL/gl.h ++#else ++#error Unknown cogl configuration ++#endif ++ + #include clutter-gst-video-sink.h + #include clutter-gst-util.h + #include clutter-gst-private.h +-- +1.7.10.4 + diff --git a/meta/recipes-graphics/clutter/clutter-gst/enable-tests.patch b/meta/recipes-graphics/clutter/clutter-gst/enable-tests.patch new file mode 100644 index 000..b3aec39 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gst/enable-tests.patch @@ -0,0 +1,23 @@ +Install example binary needed for core-image-clutter + +Signed-off-by: Zhai Edwin edwin.z...@intel.com + +Upstream-Status: Inappropriate [configuration] + +Imported from clutter-gst-1.8 package, git://git.openembedded.org/openembedded, +commit ae28ee3f7a060b9e0d13154a84f2444a98490b5b, updated for clutter-gst 1.6 + +Signed-off-by: Tomas Frydrych to...@sleepfive.com + +Index: git/examples/Makefile.am +=== +--- git.orig/examples/Makefile.am 2011-01-31 10:14:23.0 +0800 git/examples/Makefile.am 2011-01-31 10:14:34.0 +0800 +@@ -1,6 +1,6 @@ + NULL = # + +-noinst_PROGRAMS = video-player video-sink video-sink-navigation ++bin_PROGRAMS = video-player video-sink
[OE-core] [PATCH v3 6/8] New clutter-gtk recipe (1.4.2)
From: Tomas Frydrych to...@sleepfive.com Signed-off-by: Tomas Frydrych to...@sleepfive.com --- meta/recipes-graphics/clutter/clutter-gtk-1.0.inc | 12 meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb |6 ++ 2 files changed, 18 insertions(+) create mode 100644 meta/recipes-graphics/clutter/clutter-gtk-1.0.inc create mode 100644 meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc b/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc new file mode 100644 index 000..3717f48 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc @@ -0,0 +1,12 @@ +DESCRIPTION = ClutterGtk +HOMEPAGE = http://www.clutter-project.org/; +LICENSE = LGPLv2+ + +inherit clutter + +DEPENDS = clutter-1.0 gtk+3 +PACKAGES =+ ${PN}-examples +AUTOTOOLS_AUXDIR = ${S}/build + +EXTRA_OECONF += --disable-introspection + diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb b/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb new file mode 100644 index 000..64eb70c --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb @@ -0,0 +1,6 @@ +require clutter-gtk-1.0.inc + +LIC_FILES_CHKSUM = file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 + +SRC_URI[archive.md5sum] = 842601b584daf4447a46799a4ba88df6 +SRC_URI[archive.sha256sum] = dc3ec6e90bc742c8a68ed7fa4c0d25b9b376828f1a7f013c363fbaf14f3a6974 -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 7/8] New mx recipe (1.4.7)
From: Tomas Frydrych to...@sleepfive.com The package has been renamed to mx-1.0, keeping up with the upstream versioning policy. The 1.14.7 tag does not build with clutter 1.14, so git revision 9b1db6b8060bd00b121a692f942404a24ae2960f from the 1.14 branch is used instead. Signed-off-by: Tomas Frydrych to...@sleepfive.com --- meta/recipes-graphics/mx/mx-1.0_1.4.7.bb | 14 ++ .../recipes-graphics/mx/mx-1.4/fix-build-dir.patch | 46 meta/recipes-graphics/mx/mx.inc| 21 + .../recipes-graphics/mx/mx/fix-test-includes.patch | 20 + meta/recipes-graphics/mx/mx_1.4.7.bb | 18 5 files changed, 101 insertions(+), 18 deletions(-) create mode 100644 meta/recipes-graphics/mx/mx-1.0_1.4.7.bb create mode 100644 meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch create mode 100644 meta/recipes-graphics/mx/mx.inc create mode 100644 meta/recipes-graphics/mx/mx/fix-test-includes.patch delete mode 100644 meta/recipes-graphics/mx/mx_1.4.7.bb diff --git a/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb b/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb new file mode 100644 index 000..4c4c8eb --- /dev/null +++ b/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb @@ -0,0 +1,14 @@ +require mx.inc + +# The 1.4.7 tag does not build against cogl 1.14, pull in a revision with a fix +SRCREV = 9b1db6b8060bd00b121a692f942404a24ae2960f +PV = 1.4.7+git${SRCPV} + +SRC_URI = git://github.com/clutter-project/mx.git;protocol=git \ + file://fix-build-dir.patch \ + file://fix-test-includes.patch \ + +S = ${WORKDIR}/git + +LIC_FILES_CHKSUM = file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24 \ + file://mx/mx-widget.c;beginline=8;endline=20;md5=13bba3c973a72414a701e1e87b5ee879 diff --git a/meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch b/meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch new file mode 100644 index 000..e7481e9 --- /dev/null +++ b/meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch @@ -0,0 +1,46 @@ +Fix build for S != B + +This patch is specific to version 1.4.x +Upstream-status: Submitted @ https://github.com/clutter-project/mx/issues/81 +Signed-off-by: Tomas Frydrych to...@sleepfive.com +-- +Index: git/docs/reference/libmx-gtk/Makefile.am +=== +--- git.orig/docs/reference/libmx-gtk/Makefile.am 2013-05-08 15:07:02.027154788 +0100 git/docs/reference/libmx-gtk/Makefile.am 2013-05-08 15:14:33.684318650 +0100 +@@ -1,3 +1,6 @@ ++EXTRA_DIST= ++CLEANFILES= ++ + ## Process this file with automake to produce Makefile.in + + # We require automake 1.6 at least. +@@ -77,7 +80,7 @@ + GTKDOC_LIBS=$(MX_LIBS) $(top_builddir)/mx-gtk/libmx-gtk-$(MX_API_VERSION).la + + # This includes the standard gtk-doc make rules, copied by gtkdocize. +-include $(top_srcdir)/gtk-doc.make ++include $(top_builddir)/gtk-doc.make + + # Other files to distribute + EXTRA_DIST += version.xml.in +Index: git/docs/reference/libmx/Makefile.am +=== +--- git.orig/docs/reference/libmx/Makefile.am 2013-05-08 15:07:02.027154788 +0100 git/docs/reference/libmx/Makefile.am 2013-05-08 15:14:24.456378135 +0100 +@@ -1,3 +1,6 @@ ++EXTRA_DIST= ++CLEANFILES= ++ + ## Process this file with automake to produce Makefile.in + + # We require automake 1.6 at least. +@@ -106,7 +109,7 @@ + GTKDOC_LIBS=$(MX_LIBS) $(top_builddir)/mx/libmx-$(MX_API_VERSION).la + + # This includes the standard gtk-doc make rules, copied by gtkdocize. +-include $(top_srcdir)/gtk-doc.make ++include $(top_builddir)/gtk-doc.make + + # Other files to distribute + EXTRA_DIST += version.xml.in diff --git a/meta/recipes-graphics/mx/mx.inc b/meta/recipes-graphics/mx/mx.inc new file mode 100644 index 000..e3b4b15 --- /dev/null +++ b/meta/recipes-graphics/mx/mx.inc @@ -0,0 +1,21 @@ +DESCRIPTION = Clutter based widget library +LICENSE = LGPLv2.1 + +inherit clutter + +DEPENDS = clutter-1.0 dbus-glib gdk-pixbuf + +SRC_URI = http://source.clutter-project.org/sources/mx/${@get_verdir(${PV})}/mx-${PV}.tar.xz + +EXTRA_OECONF = --disable-introspection\ + --disable-gtk-doc \ + --disable-gtk-widgets \ + --with-dbus \ + --with-winsys=none \ + --without-clutter-imcontext \ + --without-clutter-gesture \ + --without-startup-notification \ + --without-glade \ + + +FILES_${PN} += ${datadir} diff --git a/meta/recipes-graphics/mx/mx/fix-test-includes.patch b/meta/recipes-graphics/mx/mx/fix-test-includes.patch new file mode 100644 index 000..c6496a9 --- /dev/null +++ b/meta/recipes-graphics/mx/mx/fix-test-includes.patch @@ -0,0 +1,20 @@ +Fix missing include directory when building tests + +This patch
[OE-core] [PATCH v3 8/8] packagegroup-core-clutter: use clutter-1.0 packages
From: Tomas Frydrych to...@sleepfive.com Signed-off-by: Tomas Frydrych to...@sleepfive.com --- .../packagegroups/packagegroup-core-clutter.bb |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb index 7b1cedc..cb2aba0 100644 --- a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb @@ -5,7 +5,7 @@ SUMMARY = Clutter package groups LICENSE = MIT -PR = r5 +PR = r6 inherit packagegroup @@ -20,7 +20,7 @@ RCONFLICTS_${PN}-core = task-core-clutter-core SUMMARY_${PN}-core = Clutter graphics library RDEPENDS_${PN}-core = \ -clutter-1.8 \ -clutter-gst-1.8 \ -clutter-gtk-1.8 \ +clutter-1.0 \ +clutter-gst-1.0 \ +clutter-gtk-1.0 \ -- 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 v3 1/8] clutter.bbclass: helper class for clutter and friends
On Tue, 2013-05-21 at 12:04 +0100, Tomas Frydrych wrote: meta/classes/clutter.bbclass | 23 +++ 1 file changed, 23 insertions(+) create mode 100644 meta/classes/clutter.bbclass Do we really need a new class for this? Can it be merged with gnomebase somehow, perhaps? If clutter really does need its own specialised logic then maybe clutter and cogl should both stay in recipes-graphics/clutter and just share an .inc file. It seems a bit sad to clutter (no pun intended) the global classes directory with this sort of thing. p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] 答复: [PATCH] base-files:fix the command line wrap around issue
Hello Ross. Thanks for your comments, I am sorry. the description is not clear. please see the below content: Sometimes we may use long commands. For example: Normal display: user@host:~cmd arg1 arg2 arg3 arg4 arg5argn-1 argn | | 1 80 Our board display: argn@host:~cmd arg1 arg2 arg3 arg4 arg5argn-1 | | 1 80 When the number of character is more than 80, the following character will cover the character before. I.e “argn” cover “user”. We tried to add if [ -f /usr/bin/resize ]; then /usr/bin/resize /dev/null; fi to /etc/profile before. But when we boot up the board and login using our test tool, we met some invalid characters. So we give up the choice and only add “COLUMNS=2000” to /etc/profile. I know it is a bad workaround, Do you have a good method to overcome the issue? Best Regards Zongchun 发件人: Burton, Ross [mailto:ross.bur...@intel.com] 发送时间: 2013年5月21日 17:31 收件人: b40...@freescale.com; OE-core 主题: Re: [OE-core] [PATCH] base-files:fix the command line wrap around issue On Tuesday, 21 May 2013, wrote: +export COLUMNS=2000 But there are not 2000 columns, you're just hard-coding a value that is expected to dynamically change. i.e, on my desktop in a gnome-terminal: $ echo $COLUMNS 80 Then if I resize the window: $ echo $COLUMNS 117 This is a bad workaround, can you explain the actual problem? Are you not seeing wrapping at a VT, in a terminal, or what? Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3 4/8] fix clutter
On Tue, 2013-05-21 at 12:04 +0100, Tomas Frydrych wrote: -# Disable pretty much everything, override in platform specific set up -EXTRA_OECONF += --disable-gtk-doc \ - ${@get_fpu_setting(bb, d)} \ - --disable-introspection\ - --disable-egl-backend \ +# Disable backends we do not currently support building +EXTRA_OECONF += --disable-introspection \ Was this supposed to have been squashed with 3/8? p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] scripts/bitbake: Handle the case where git isn't installed cleanly
Currently the user sees ugly errors if git isn't installed, this patch cleans up the code to correctly handle that case. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- scripts/bitbake | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/bitbake b/scripts/bitbake index ca2bc82..31a34b3 100755 --- a/scripts/bitbake +++ b/scripts/bitbake @@ -60,7 +60,7 @@ fi needtar=1 needgit=1 TARVERSION=`tar --version | head -n 1 | cut -d ' ' -f 4` -GITVERSION=`git --version | cut -d ' ' -f 3` +GITVERSION=`git --version 2 /dev/null | cut -d ' ' -f 3` float_test() { echo | awk 'END { exit ( !( '$1')); }' } @@ -72,9 +72,10 @@ version_compare() { # but earlier versions do not; this needs to work properly for sstate float_test $TARVERSION 1.23 needtar=0 -# Need git = 1.7.5 for git-remote --mirror=xxx syntax -version_compare $GITVERSION = 1.7.5 needgit=0 - +if [ ! -z $GITVERSION ]; then +# Need git = 1.7.5 for git-remote --mirror=xxx syntax +version_compare $GITVERSION = 1.7.5 needgit=0 +fi buildpseudo=1 if [ $needpseudo = 1 ]; then ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] updates for cogl, clutter and mx
On Mon, 2013-05-20 at 16:05 +0100, Tomas Frydrych wrote: There are some issues with this patch set, some of the included patches either do not have Upstream-Status or Signed-off-by tags, please review that. Updated the various patch headers in v.2. Also, I want to confirm that these are all new recipes and will not cause backward PRs (ie do you need PE bumps to these)? I renamed the mx recipe also to mx-1.0 for consistency, so yes, these are all different packages now. Finally, I think you need to update the packagegroup-core-clutter recipe. Done. Thanks for this. I'm not convinced with the delete everything, then re-add approach as it makes the git history even harder to read than git's normal rename handling which is bad enough. I therefore split the removal patch over the other patches. I also tweaked the patch titles as New doesn't read well when listed alongside the other changes. I've merged this with this minor tweaks. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Poor first impression
On Fri, 2013-05-17 at 07:26 -0600, Gary Thomas wrote: I just tried to run Poky/Yocto on a fresh Ubuntu 12.04 system. I knew there would be missing bits and have seen the sanity messages in the past, so I thought I'd just carry on. Today's experience was not pretty and would it not for my experience with this, I would have been very perplexed... There are two issues there, firstly the scripts/bitbake binary is doing a really bad job, secondly, one of the improved debugging patches I added to bitbake, regressed things in this case. I posted a patch to bitbake last night, I've just posted a fix for scripts/bitbake now. These two together should improve this. I agree that particular error would create a poor first impression, thanks for reporting it. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3 4/8] fix clutter
On 21/05/13 12:20, Phil Blundell wrote: On Tue, 2013-05-21 at 12:04 +0100, Tomas Frydrych wrote: -# Disable pretty much everything, override in platform specific set up -EXTRA_OECONF += --disable-gtk-doc \ - ${@get_fpu_setting(bb, d)} \ - --disable-introspection\ - --disable-egl-backend \ +# Disable backends we do not currently support building +EXTRA_OECONF += --disable-introspection\ Was this supposed to have been squashed with 3/8? Yes, sorry :( I think Richard already pushed the previous version as well. Tomas -- http://sleepfive.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [oe] LinuxTag 2013
Florian, Thanks for all your effort on behalf of the OpenEmbedded Project! Philip On 05/19/2013 08:22 AM, Florian Boor wrote: Hi all, LinuxTag starts next week and we (well I) will be there. LinuxTag takes place from May 22th to May 25th at 'Messegelände unter dem Funkturm' in Berlin, Germany. We share the booth 141 'Linux Embedded' with other cool projects and look forward to meet you there. Greetings Florian PS: Someone with enough power please add some note to the news section of the website. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] perl-tests: convert to ptest
Jesse Zhang wrote: Ok.. Here is the new commit. Looks good to me. Reviewed-by: Björn Stenberg b...@enea.com -- Björn ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] update-alternatives: Drop deprecated code, update to show error message
On 5/21/13 2:35 AM, Richard Purdie wrote: This code has been deprecated for a while and confuses the class, lets drop it and just give the user hard error messages instead of the current warnings/fixups. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org Excellent, it was always intended for a patch similar to this to go in 'eventually'.. I'm happy for eventually to be now. Acked-by: Mark Hatle mark.ha...@windriver.com --- meta/classes/update-alternatives.bbclass | 95 +--- 1 file changed, 1 insertion(+), 94 deletions(-) diff --git a/meta/classes/update-alternatives.bbclass b/meta/classes/update-alternatives.bbclass index 2cadaf7..f75f5b6 100644 --- a/meta/classes/update-alternatives.bbclass +++ b/meta/classes/update-alternatives.bbclass @@ -57,96 +57,12 @@ # # The package priority for a specific target # ALTERNATIVE_PRIORITY_pkg[name] = priority -# -# -# - -# -# -# The following describes deprecated behavior, using any of the -# following modes will result in a warning, and eventually an error: -# -# There are two basic modes supported: 'single update' and 'batch update' -# -# 'single update' is used for a single alternative command, and you're -# expected to provide at least below keywords: -# -# ALTERNATIVE_NAME - the name that the alternative is registered -# ALTERNATIVE_PATH - the path of installed alternative -# -# ALTERNATIVE_PRIORITY and ALTERNATIVE_LINK are optional which have defaults -# in this class. -# -# 'batch update' is used if you have multiple alternatives to be updated. -# Unlike 'single update', 'batch update' in most times only require two -# parameters: -# -# ALTERNATIVE_LINKS - a list of symbolic links for which you'd like to -# create alternatives, with space as delimiter, e.g: -# -# ALTERNATIVE_LINKS = ${bindir}/cmd1 ${sbindir}/cmd2 ... -# -# ALTERNATIVE_PRIORITY - optional, applies to all -# -# To simplify the design, this class has the assumption that for a name -# listed in ALTERNATIVE_LINKS, say /path/cmd: -# -# the name of the alternative would be: cmd -# the path of installed alternative would be: /path/cmd.${BPN} -# ${D}/path/cmd will be renamed to ${D}/path/cmd.{BPN} automatically -# priority will be the same from ALTERNATIVE_PRIORITY -# -# If above assumption breaks your requirement, then you still need to use -# your own update-alternatives command directly. -# defaults ALTERNATIVE_PRIORITY = 10 -# The following code is deprecated, but included for compatibility with older packages -def update_alternatives_after_parse(d): -if bb.data.inherits_class('native', d) or bb.data.inherits_class('nativesdk', d): -return - -# The following code is deprecated, but included for compatibility with older packages -pn = d.getVar('BPN', True) - -if d.getVar('ALTERNATIVE_LINKS') != None: -# Convert old format to new format... -alt_links = d.getVar('ALTERNATIVE_LINKS', True) or -for alt_link in alt_links.split(): -alt_name = os.path.basename(alt_link) - -alternative = d.getVar('ALTERNATIVE_%s' % pn, True) or -alternative += + alt_name -d.setVar('ALTERNATIVE_%s' % pn, alternative) -d.setVarFlag('ALTERNATIVE_LINK_NAME', alt_name, alt_link) -d.setVarFlag('ALTERNATIVE_TARGET', alt_name, alt_link) -return - -if d.getVar('ALTERNATIVE_NAME') != None or d.getVar('ALTERNATIVE_PATH') != None: -# Convert old format to new format... -alt_name = d.getVar('ALTERNATIVE_NAME', True) -alt_path = d.getVar('ALTERNATIVE_PATH', True) -alt_link = d.getVar('ALTERNATIVE_LINK', True) or (%s/%s % (d.getVar('bindir', True), alt_name)) -if alt_name == None: -raise bb.build.build.FuncFailed(%s inherits update-alternatives but doesn't set ALTERNATIVE_NAME % d.getVar('FILE')) -if alt_path == None: -raise bb.build.build.FuncFailed(%s inherits update-alternatives but doesn't set ALTERNATIVE_PATH % d.getVar('FILE')) - -alternative = d.getVar('ALTERNATIVE_%s' % pn, True) or -alternative += + alt_name - -# Fix the alt_path if it's relative -alt_path = os.path.join(os.path.dirname(alt_link), alt_path) - -d.setVar('ALTERNATIVE_%s' % pn, alternative) -d.setVarFlag('ALTERNATIVE_LINK_NAME', alt_name, alt_link) -d.setVarFlag('ALTERNATIVE_TARGET', alt_name, alt_path) - - # We need special processing for vardeps because it can not work on # modified flag values. So we agregate the flags into a new variable # and include that vairable in the set. - UPDALTVARS = ALTERNATIVE ALTERNATIVE_LINK_NAME ALTERNATIVE_TARGET ALTERNATIVE_PRIORITY def gen_updatealternativesvardeps(d): @@ -178,9 +94,6 @@ python __anonymous() { bb.data.inherits_class('cross-canadian', d): return -# deprecated stuff... -
[OE-core] further colg/clutter improvements and fixes
These patches take on board Ross feedback on the previous patch set, removing unnecessary gtk-doc bits from the receipes, as well as the configure fragments related to DOLT. Also, more of the configure parameters have been moved into the PACKAGECONFIG definitions. While modifying the PACKAGECONFIG, I noticed a typo in the cogl recipe that effected the RDEPENDS setup for the 'gl' option, and also a missing comma in the 'glx' setup for clutter, so these are fixed as well. [PATCH 1/4] clutter.bbclass: removed unused function [PATCH 2/4] cogl: further improvements [PATCH 3/4] clutter: further improvements [PATCH 4/4] clutter-gst: removed no longer required configure ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/4] clutter.bbclass: removed unused function
From: Tomas Frydrych to...@sleepfive.com Clutter and cogl no longer use --with-fpu configure option, so we no longer require the get_fpu_settings() function. Signed-off-by: Tomas Frydrych to...@sleepfive.com --- meta/classes/clutter.bbclass |5 - 1 file changed, 5 deletions(-) diff --git a/meta/classes/clutter.bbclass b/meta/classes/clutter.bbclass index 184fb44..0dc4850 100644 --- a/meta/classes/clutter.bbclass +++ b/meta/classes/clutter.bbclass @@ -13,11 +13,6 @@ VERMINOR = ${@get_minor_dir(${PV})} REALNAME = ${@get_real_name(${BPN})} FILESPATH = ${@base_set_filespath([${FILE_DIRNAME}/${REALNAME}-${PV}, ${FILE_DIRNAME}/${REALNAME}-${VERMINOR}, ${FILE_DIRNAME}/${REALNAME}, ${FILE_DIRNAME}/files], d)} -def get_fpu_setting(bb, d): -if d.getVar('TARGET_FPU', True) in [ 'soft' ]: -return --without-fpu -return - CLUTTER_SRC_FTP = ${GNOME_MIRROR}/${REALNAME}/${VERMINOR}/${REALNAME}-${PV}.tar.xz;name=archive CLUTTER_SRC_GIT = git://git.gnome.org/${REALNAME};protocol=git -- 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/4] cogl: further improvements
From: Tomas Frydrych to...@sleepfive.com * Removed unnecessary gtk-doc related depends/configure options (handled in gtk-doc class) * Moved more configure options into PACKAGECONFIG * Fixed typo in RDEPENDS of PACKAGECONFIG[gl] setup * Removed no longer needed DOLT-related configure fragment Signed-off-by: Tomas Frydrych to...@sleepfive.com --- meta/recipes-graphics/cogl/cogl-1.0.inc | 24 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc index 17d8629..3a6de28 100644 --- a/meta/recipes-graphics/cogl/cogl-1.0.inc +++ b/meta/recipes-graphics/cogl/cogl-1.0.inc @@ -4,7 +4,7 @@ LICENSE = LGPLv2.1+ inherit clutter -DEPENDS = gtk-doc-native pango glib-2.0 gdk-pixbuf +DEPENDS = pango glib-2.0 gdk-pixbuf PACKAGES =+ ${PN}-examples AUTOTOOLS_AUXDIR = ${S}/build @@ -21,38 +21,30 @@ ERDEPENDS_GL= libgl ERDEPENDS_GLES2 = libgles2 EXTRA_OECONF += --disable-introspection \ ---disable-gtk-doc \ -${@get_fpu_setting(bb, d)} \ --enable-examples-install \ --enable-debug \ ---disable-gl \ --disable-gles1\ ---disable-gles2\ ---disable-glx \ # GL flavours -PACKAGECONFIG[gl] = --enable-gl,,${EDEPENDS_GL},${ERDPENDS_GL} -PACKAGECONFIG[gles2] = --enable-gles2,,${EDEPENDS_GLES2}, ${ERDEPENDS_GLES2} +PACKAGECONFIG[gl] = --enable-gl,--disable-gl,${EDEPENDS_GL},${ERDEPENDS_GL} +PACKAGECONFIG[gles2] = --enable-gles2,--disable-gles2,${EDEPENDS_GLES2}, ${ERDEPENDS_GLES2} # egl backends -PACKAGECONFIG[egl-kms] = --enable-kms-egl-platform,,${EDEPENDS_KMS} -PACKAGECONFIG[egl-null] = --enable-null-egl-platform -PACKAGECONFIG[egl-x11] = --enable-xlib-egl-platform,,${EDEPENDS_X11} +PACKAGECONFIG[egl-kms] = --enable-kms-egl-platform,--disable-kms-egl-platform,${EDEPENDS_KMS} +PACKAGECONFIG[egl-null] = --enable-null-egl-platform,--disable-null-egl-platform +PACKAGECONFIG[egl-x11] = --enable-xlib-egl-platform,--disable-xlib-egl-platform,${EDEPENDS_X11} # glx -PACKAGECONFIG[glx] = --enable-gl --enable-glx, ${EDEPENDS_GL} ${EDEPENDS_X11} +PACKAGECONFIG[glx] = --enable-glx,--disable-glx,${EDEPENDS_GL} ${EDEPENDS_X11} # Default to GLX -PACKAGECONFIG ??= glx +PACKAGECONFIG ??= gl glx #Fix up some weirdness in the docs do_configure_prepend() { sed -i s:doc/reference/Makefile::g ${S}/configure.ac sed -i s:doc::g ${S}/Makefile.am - - # Disable DOLT - sed -i -e 's/^DOLT//' ${S}/configure.ac } FILES_${PN}-examples = ${bindir}/* ${datadir}/cogl/examples-data/* -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/4] clutter: further improvements
From: Tomas Frydrych to...@sleepfive.com * Removed unnecessary gtk-doc related depends/configure options (handled in gtk-doc class), * Moved more configure options into PACKAGECONFIG, * Fixed missing comma in PACKAGECONFIG[glx] setup, * Removed no longer required DOLT-related config fragment. Signed-off-by: Tomas Frydrych to...@sleepfive.com --- meta/recipes-graphics/clutter/clutter-1.0.inc | 22 +++--- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/meta/recipes-graphics/clutter/clutter-1.0.inc b/meta/recipes-graphics/clutter/clutter-1.0.inc index 6710776..e1d3cf4 100644 --- a/meta/recipes-graphics/clutter/clutter-1.0.inc +++ b/meta/recipes-graphics/clutter/clutter-1.0.inc @@ -6,7 +6,7 @@ inherit clutter SRC_URI += file://enable_tests.patch -DEPENDS = gtk-doc-native pango glib-2.0 json-glib atk udev cogl-1.0 +DEPENDS = pango glib-2.0 json-glib atk udev cogl-1.0 PACKAGES =+ ${PN}-examples AUTOTOOLS_AUXDIR = ${S}/build @@ -18,28 +18,23 @@ EDEPENDS_EVDEV = libxkbcommon ERDEPENDS_EVDEV = xkeyboard-config # Disable pretty much everything, override in platform specific set up -EXTRA_OECONF += --disable-gtk-doc \ -${@get_fpu_setting(bb, d)} \ ---disable-introspection\ ---disable-egl-backend \ +EXTRA_OECONF += --disable-introspection \ --disable-quartz-backend \ --disable-win32-backend\ ---disable-x11-backend \ --disable-gdk-backend \ --disable-wayland-backend \ --disable-wayland-compositor \ --disable-cex100-backend \ --disable-tslib-input \ ---disable-evdev-input \ -PACKAGECONFIG[x11] = --enable-x11-backend,,${EDEPENDS_X11} -PACKAGECONFIG[glx] = --enable-x11-backend,,${EDEPENDS_X11} ${EDEPENDS_GLX} -PACKAGECONFIG[egl] = --enable-egl-backend,,${EDEPENDS_EGL} -PACKAGECONFIG[evdev] = --enable-evdev-input,,${EDEPENDS_EVDEV},${ERDEPENDS_EVDEV} +PACKAGECONFIG[x11] = --enable-x11-backend,--disable-x11-backend,${EDEPENDS_X11} +PACKAGECONFIG[glx] = ,,${EDEPENDS_X11} ${EDEPENDS_GLX} +PACKAGECONFIG[egl] = --enable-egl-backend,--disable-egl-backend,${EDEPENDS_EGL} +PACKAGECONFIG[evdev] = --enable-evdev-input,--disable-evdev-input,${EDEPENDS_EVDEV},${ERDEPENDS_EVDEV} # Default configuration, distros might want to override -PACKAGECONFIG ??= glx +PACKAGECONFIG ??= x11 glx FILES_${PN}-examples = ${bindir}/test-* ${pkgdatadir}/redhand.png @@ -50,7 +45,4 @@ do_configure_prepend() { # see https://bugzilla.gnome.org/show_bug.cgi?id=661128 for this touch -t 2101 po/clutter-1.0.pot - - # Disable DOLT - sed -i -e 's/^DOLT//' ${S}/configure.ac } -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/4] clutter-gst: removed no longer required configure fragment
From: Tomas Frydrych to...@sleepfive.com The current package no longer use DOLT, so the DOLT configure frament is no longer required. Signed-off-by: Tomas Frydrych to...@sleepfive.com --- meta/recipes-graphics/clutter/clutter-gst-1.0.inc |5 - 1 file changed, 5 deletions(-) diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.0.inc b/meta/recipes-graphics/clutter/clutter-gst-1.0.inc index f79795c..b5edcae 100644 --- a/meta/recipes-graphics/clutter/clutter-gst-1.0.inc +++ b/meta/recipes-graphics/clutter/clutter-gst-1.0.inc @@ -16,8 +16,3 @@ FILES_${PN} += ${libdir}/gstreamer-0.10/lib*.so FILES_${PN}-dev += ${libdir}/gstreamer-0.10/*.la FILES_${PN}-dbg += ${libdir}/gstreamer-0.10/.debug/lib*.so FILES_${PN}-examples = ${bindir}/video-player ${bindir}/video-sink - -do_configure_prepend () { - # Disable DOLT - sed -i -e 's/^DOLT//' ${S}/configure.ac -} -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] kernel: Remove unnecessary cd and rm
--- meta/classes/kernel.bbclass | 7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 3320747..47a96c5 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -378,13 +378,10 @@ kernel_do_deploy() { ln -sf ${MODULE_TARBALL_BASE_NAME}.bin ${MODULE_TARBALL_SYMLINK_NAME} fi - cd ${DEPLOYDIR} - rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin - ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin - ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGETYPE} + ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${DEPLOYDIR}/${KERNEL_IMAGE_SYMLINK_NAME}.bin + ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${DEPLOYDIR}/${KERNEL_IMAGETYPE} cp ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOYDIR}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt - cd - } do_deploy[dirs] = ${DEPLOYDIR} ${B} do_deploy[prefuncs] += package_get_auto_pr -- 1.8.2.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] OE TSC Minutes 23 April 2013
OpenEmbedded Technical Steering Committee 23 April 2013 Attendees: Koen (koen) Khem (khem) Fray (fray) Paul (bluelightning) Richard (RP) Apologies: Notes: Jefro Agenda at a glance: 1. pick a chair 2. new issues 3. lingering issues a. oe-classic recipe migration status b. summarize release goals 4. projects in progress - status a. oe-core release b. infrastructure c. systemd into master - still in progress d. mailing list outage e. meta-oe appends/overlayed recipes RFC f. 1.5 planning 5. projects deferred Agenda Results 1. pick a chair fray ___ 2. new issues ___ 3. lingering issues b. oe-classic recipe migration status c. systemd merge unhappiness = maintain a wiki page to summarize release goals (jefro) = no status emails yet but plan to (RP) d. oe.org flooded refs to oe.org git should point to github = khem to fix the oe wiki and reminder to ml possible to move server at some point? = jefro to investigate YP hosting, kernel.org mirror ___ 4. projects in progress - status a. oe-core release autobuilder issues qemuimagetest will change significantly in 1.5 ptest a good addition much more to integrate in 1.5 b. infrastructure see 4d c. systemd into master - done, drop from future agendas d. mailing list outage mailing list moving to YP server, in progress list addresses will not change e. meta-oe appends/overlayed recipes RFC http://lists.linuxtogo.org/pipermail/openembedded-devel/2013-February/043925.html no avr32 support in public layers = paul has patches to remove bbappends, pending discussion on ml everything uncontested has been sent for review http://lists.linuxtogo.org/pipermail/openembedded-devel/2013-February/043964.html qt4/qt tools stuff troublesome f. 1.5 planning RP supports PACKAGECONFIG proposal ___ 5. projects deferred a. raise awareness of janitor list, QA bugs defer to after 1.4 b. document whitespace changes to the shell http://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines http://www.openembedded.org/wiki/Styleguide https://wiki.yoctoproject.org/wiki/Recipe_%26_Patch_Style_Guide = still need to de-dup these, need a volunteer ask for volunteers after 1.4 (jefro) c. raise ntp with the Yocto Project [RP] immediate need addressed, reasonable default needed use LICENSE_FLAGS - non-commercial no default set after Paul's changes RP raised with YP AB = going to mailing lists someone should write a proposal = fray will send to list after 1.4 Raw Transcript (8:58:08 AM) mode (+v Jefro) by ChanServ (8:58:18 AM) koen: good morning all (8:58:37 AM) Jefro: good morning (8:59:04 AM) RP: Hi everyone (8:59:32 AM) RP: I suspect we might not get Paul today (8:59:59 AM) Jefro: I would expect not (9:00:07 AM) Jefro: any new issues to put on the agenda? (9:00:42 AM) ***fray is fried, between snow storms, house stuff and work... (9:00:53 AM) fray: so no new items from me (9:00:54 AM) ***RP is also fried, due to the release (9:01:23 AM) RP: Jefro: link to the agenda? (9:03:15 AM) Jefro: agenda in about 2 seconds (9:03:51 AM) Jefro: finally: http://pastebin.com/ZTtdqWRm (9:05:47 AM) Jefro: any new issues? (9:05:49 AM) fray: ok (9:06:47 AM) RP: nothing new from me (9:06:54 AM) RP: Who is chairing? (9:07:03 AM) ***RP did it recently so its not me :) (9:08:24 AM) fray: I can (9:09:27 AM) fray: ok? (9:09:35 AM) Jefro: sounds good to me (9:09:44 AM) fray: 2. any (additional) new issues? (9:10:18 AM) fray: 3. lingering issues (9:10:29 AM) fray: a. oe-classic migration status.. (no Paul, so no status?) (9:10:58 AM) RP: I've still not done the perl recipes (9:11:11 AM) RP: I have a small issue of figuring out which ones merged into perl itself (9:11:28 AM) RP: I think progress is being made slowly in a variety of areas (9:12:18 AM) fray: b, then? release goals.. (9:12:19 AM) fray: I saw the first email for the 1.5 bitbake changes go out.. (9:12:53 AM) RP: Yes, we're looking at 1.5 planning (9:12:55 AM) koen: I loved the if we split bitbake into a client and server response (9:12:59 AM) koen: that was done years ago :) (9:13:17 AM) RP: koen: indeed (9:13:31 AM) RP: The email was to give people the high level idea (9:13:39 AM) RP: the details are still tbd (9:14:16 AM) RP: As for the current release, 1.4 is beyond the point it can take changes without slipping now (9:14:36 AM) RP: I've seen there are some issues but nothing I believe it worth slipping the release for (9:15:00 AM) fray: I'm comfortable with a release and known bug list (9:15:04 AM) RP: As always I'd encourage people to use the bugzilla, we do work closely with it (9:15:19 AM) RP: (both for 1.4 issues and 1.5) (9:15:58 AM) koen: the postinst situation is a lot better now, the mixed gconf/gsettings/gtk-iconcache now
Re: [OE-core] [PATCH 2/4] cogl: further improvements
On Tue, May 21, 2013 at 04:08:41PM +0100, Tomas Frydrych wrote: From: Tomas Frydrych to...@sleepfive.com * Removed unnecessary gtk-doc related depends/configure options (handled in gtk-doc class) - ${@get_fpu_setting(bb, d)} \ This should be applied before 1/4 or squash them. -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3 1/8] clutter.bbclass: helper class for clutter and friends
On Tuesday 21 May 2013 12:19:36 Phil Blundell wrote: On Tue, 2013-05-21 at 12:04 +0100, Tomas Frydrych wrote: meta/classes/clutter.bbclass | 23 +++ 1 file changed, 23 insertions(+) create mode 100644 meta/classes/clutter.bbclass Do we really need a new class for this? Can it be merged with gnomebase somehow, perhaps? If clutter really does need its own specialised logic then maybe clutter and cogl should both stay in recipes-graphics/clutter and just share an .inc file. It seems a bit sad to clutter (no pun intended) the global classes directory with this sort of thing. Have to say I agree; given that this set has been merged we could take this as an additional patch if it works for Tomas? Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Poor first impression
On 2013-05-21 03:10, Richard Purdie wrote: On Fri, 2013-05-17 at 07:26 -0600, Gary Thomas wrote: I just tried to run Poky/Yocto on a fresh Ubuntu 12.04 system. I knew there would be missing bits and have seen the sanity messages in the past, so I thought I'd just carry on. Today's experience was not pretty and would it not for my experience with this, I would have been very perplexed... There are two issues there, firstly the scripts/bitbake binary is doing a really bad job, secondly, one of the improved debugging patches I added to bitbake, regressed things in this case. I posted a patch to bitbake last night, I've just posted a fix for scripts/bitbake now. These two together should improve this. I agree that particular error would create a poor first impression, thanks for reporting it. With this patch, no 'git' and a fresh build I still get this: Traceback (most recent call last): File /home/local/poky-multi/bitbake/bin/bitbake, line 293, in module ret = main() File /home/local/poky-multi/bitbake/bin/bitbake, line 260, in main event = server.event_queue.get(block=False) File /usr/lib/python2.6/multiprocessing/queues.py, line 104, in get raise Empty Empty Pseudo is not present but is required, building this first before the main build Traceback (most recent call last): File /home/local/poky-multi/bitbake/bin/bitbake, line 293, in module ret = main() File /home/local/poky-multi/bitbake/bin/bitbake, line 260, in main event = server.event_queue.get(block=False) File /usr/lib/python2.6/multiprocessing/queues.py, line 104, in get raise Empty Empty ERROR: OE-core's config sanity checker detected a potential misconfiguration. Either fix the cause of this error or at your own risk disable the checker (see sanity.conf). Following is the list of potential problems / advisories: Please install the following missing utilities: git Still not very pretty. -- Gary Thomas | Consulting for the MLB Associates |Embedded world ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] OE TSC Minutes 7 May 2013
OpenEmbedded Technical Steering Committee 7 May 2013 Attendees: Koen (koen) Khem (khem) Fray (fray) Paul (bluelightning) Richard (RP) Apologies: Notes: Jefro Agenda at a glance: 1. pick a chair 2. new issues 3. lingering issues a. systemd merge unhappiness 4. projects in progress - status a. oe-classic recipe migration status b. oe-core release c. systemd into master d. meta-oe appends/overlayed recipes RFC e. 1.5 planning 5. infrastructure a. mailing list moving to YP server, in progress b. oe.org flooded 6. projects deferred a. raise awareness of janitor list, QA bugs b. document whitespace changes to the shell c. raise ntp with the Yocto Project [RP] Agenda Results 1. pick a chair koen ___ 2. new issues a. phil's questions about the role of the TSC (http://lists.linuxtogo.org/pipermail/openembedded-core/2013-April/038756.html) original charter is to look at issues, and attempt to resolve them the pull model removed a lot of the reason the TSC was created two functions of the TSC: working group/task force type activities and actual decision making also administrative functions TSC could chair it but make it a public IRC thing - proposal: monthly IRC meeting to replace one of the bi-weekly TSC meetings, open to all timezone will be an issue = think about for next meeting ___ 3. lingering issues a. systemd merge unhappiness ~ release status notification = maintain a wiki page to summarize release goals (jefro) = status emails (RP) - ongoing ___ 4. projects in progress - status a. oe-classic recipe migration status some recipes migrated but then kept in own layers also cherry picking parts of layers like meta-oe need some documentation on right way to synchronize b. oe-core release 1.4.1 is being worked on along with 1.3.2 c. dropped d. meta-oe appends/overlayed recipes RFC no avr32 support in public layers paul has patches to remove bbappends, pending discussion on ml everything uncontested has been sent for review qt4/qt tools stuff troublesome - still remaining: busybox and gst-ffmpeg bbappends, xserver-nodm-init = RFC switching wholeheartedly to libav (bluelightning) e. 1.5 planning RP on sabbatical f. python 3 hard to support both py2 and 3 two issues: python3 on target, using p3 for bitbake don't think we can reasonably support both make the switch in the 1.5 timeframe? need to start informing people of it -now-.. ___ 5. infrastructure a. mailing list moving to YP server in progress b. oe.org flooded refs to oe.org git should point to github = fix the oe wiki and reminder to ml (khem) = remove = investigate YP hosting, kernel.org mirror (jefro) ___ 6. projects deferred a. raise awareness of janitor list, QA bugs defer to after 1.4 b. document whitespace changes to the shell http://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines http://www.openembedded.org/wiki/Styleguide https://wiki.yoctoproject.org/wiki/Recipe_%26_Patch_Style_Guide = still need to de-dup these, need a volunteer ask for volunteers after 1.4 (jefro) c. raise ntp with the Yocto Project [RP] immediate need addressed, reasonable default needed use LICENSE_FLAGS - non-commercial no default set after Paul's changes RP raised with YP AB = going to mailing lists someone should write a proposal = fray will send to list after 1.4 Raw Transcript (8:59:19 AM) Jefro: good heavens, everyone is here (8:59:29 AM) koen: yes (8:59:33 AM) koen: 17:55 koen this must be a record, every tsc member present 5 minutes early :) (8:59:47 AM) ***RP is here :) (9:00:22 AM) Jefro: there isn't some disaster I haven't heard of yet, is there? (9:01:05 AM) Jefro: I even have an agenda: http://pastebin.com/0nSZm90B (9:01:48 AM) koen: shall I chair? (9:02:15 AM) RP: koen: fine with me (9:02:24 AM) RP: Are fray, khem, bluelightning alive? (9:02:35 AM) bluelightning: hi all, yes I'm here (9:02:58 AM) RP: I'd like to add python3 to the agenda somewhere (9:03:11 AM) koen: 4f ? (9:03:55 AM) koen: no objections, so 4f python3 (9:04:03 AM) Jefro: (added to my copy) (9:04:10 AM) koen: let's wait a bit for khem and fray to wake up (9:04:38 AM) fray: sorry.. I'm here (9:05:46 AM) ***fray is busy playing with the new office build server.. :) (9:05:48 AM) fray: was distracted (9:06:22 AM) koen: looks like we have quorum, let's hope khem shows up soon (9:06:45 AM) koen: 1 - pick a chair - done (9:06:47 AM) fray: sounds good (9:06:48 AM) koen: 2 - New issues (9:07:09 AM) ***RP isn't aware of any (9:07:17 AM) koen: me neither (9:07:22 AM) bluelightning: nor me (9:07:26 AM) RP: Actually, I guess there is Phil's email (9:07:37 AM) koen: which one specifically? (9:07:38 AM) RP: His questions about the role of the TSC (9:07:40 AM) bluelightning: oh
Re: [OE-core] [PATCH] kernel: Remove unnecessary cd and rm
Please include a a comment. The burden is on the submitter to prove the cd and the rm are unnecessary, not the reviewer. On 05/21/2013 08:39 AM, Martin Jansa wrote: --- meta/classes/kernel.bbclass | 7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 3320747..47a96c5 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -378,13 +378,10 @@ kernel_do_deploy() { ln -sf ${MODULE_TARBALL_BASE_NAME}.bin ${MODULE_TARBALL_SYMLINK_NAME} fi - cd ${DEPLOYDIR} - rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin - ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin - ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGETYPE} + ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${DEPLOYDIR}/${KERNEL_IMAGE_SYMLINK_NAME}.bin + ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${DEPLOYDIR}/${KERNEL_IMAGETYPE} So we are now in a different directory (do we know which one?) but the source of the ln commands doesn't change. If we are in the same directory, then why add DEPLOYDIR to the destination? -- Darren cp ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOYDIR}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt - cd - } do_deploy[dirs] = ${DEPLOYDIR} ${B} do_deploy[prefuncs] += package_get_auto_pr -- Darren Hart Intel Open Source Technology Center Yocto Project - Technical Lead - Linux Kernel ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] kernel: Remove unnecessary cd and rm
On 05/21/2013 02:26 PM, Darren Hart wrote: Please include a a comment. The burden is on the submitter to prove the cd and the rm are unnecessary, not the reviewer. On 05/21/2013 08:39 AM, Martin Jansa wrote: --- meta/classes/kernel.bbclass | 7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 3320747..47a96c5 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -378,13 +378,10 @@ kernel_do_deploy() { ln -sf ${MODULE_TARBALL_BASE_NAME}.bin ${MODULE_TARBALL_SYMLINK_NAME} fi -cd ${DEPLOYDIR} -rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin -ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin -ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGETYPE} +ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${DEPLOYDIR}/${KERNEL_IMAGE_SYMLINK_NAME}.bin +ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${DEPLOYDIR}/${KERNEL_IMAGETYPE} So we are now in a different directory (do we know which one?) but the source of the ln commands doesn't change. If we are in the same directory, then why add DEPLOYDIR to the destination? I suspect the answer is absolute path, but this is a good example of where a proper comment is useful. -- Darren Hart Intel Open Source Technology Center Yocto Project - Technical Lead - Linux Kernel ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] OE TSC Minutes 7 May 2013
On Tue, May 21, 2013 at 12:36:54PM -0700, Jeff Osier-Mixon wrote: TSC could chair it but make it a public IRC thing - proposal: monthly IRC meeting to replace one of the bi-weekly TSC meetings, open to all timezone will be an issue = think about for next meeting I really like this idea, I think it will improve situation with: status updates - people can watch it immediately on IRC, instead of waiting for minutes lack of community input - easier for people to comment on issues or add to agenda when they see discussion about related topic community involvement - seeing some AR discussed a month ago is too late to volunteer f. python 3 hard to support both py2 and 3 two issues: python3 on target, using p3 for bitbake don't think we can reasonably support both make the switch in the 1.5 timeframe? need to start informing people of it -now-.. p3-only looks good to me, I would be happy to help testing this and then drop p2 from my minimalistic chroot. There are also some external tools like opkg-utils (IIRC this one is 99% p3 compatible now, I can take care of remaining). (9:32:11 AM) RP: For 3a, I'd agreed to provide status updates. I've now provided two of these (9:32:24 AM) Jefro: wiki page is not yet done (9:32:27 AM) RP: I'm trying to turn it into a habit (9:32:50 AM) RP: Did people like/dislike them? I like them. (9:36:03 AM) bluelightning: it's worth noting I'm aware that some people have migrated recipes and then kept them in their own layers (9:36:35 AM) bluelightning: which is not hugely bad but it would be nice if they could send them somewhere more appropriate (9:36:59 AM) RP: bluelightning: any idea why they're doing that? Simply don't know any different? For many recipes I've used meta-shr as staging area to test it on more builders and probably by more people before moving them to meta-oe. But it's also easy to forget them in staging area, when they just work for me (as I have meta-shr always included) and nobody shows any interest in them. Cheers, -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] kernel: Remove unnecessary cd and rm
On Tue, May 21, 2013 at 02:26:55PM -0700, Darren Hart wrote: Please include a a comment. The burden is on the submitter to prove the cd and the rm are unnecessary, not the reviewer. On 05/21/2013 08:39 AM, Martin Jansa wrote: --- meta/classes/kernel.bbclass | 7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 3320747..47a96c5 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -378,13 +378,10 @@ kernel_do_deploy() { ln -sf ${MODULE_TARBALL_BASE_NAME}.bin ${MODULE_TARBALL_SYMLINK_NAME} fi - cd ${DEPLOYDIR} - rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin - ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin - ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGETYPE} + ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${DEPLOYDIR}/${KERNEL_IMAGE_SYMLINK_NAME}.bin + ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${DEPLOYDIR}/${KERNEL_IMAGETYPE} So we are now in a different directory (do we know which one?) but the source of the ln commands doesn't change. If we are in the same directory, then why add DEPLOYDIR to the destination? yes we know which one - ${B} as defined in deploy.bbclass: do_deploy[dirs] = ${DEPLOYDIR} ${B}, and the same is defined again (maybe unnecessary) in kernel.bbclass DEPLOYDIR is defined in deploy.bbclass as well DEPLOYDIR = ${WORKDIR}/deploy-${PN} DEPLOYDIR is used as target for every other file deployed by do_deploy, this was just unnecessary switching CWD to create relative symlink and I have no idea why rm -f was used together with ln -sf. I'll send v2, because ln -sf ${MODULE_TARBALL_BASE_NAME}.bin ${MODULE_TARBALL_SYMLINK_NAME} is wrong. See related http://git.openembedded.org/openembedded-core/commit/meta/classes/kernel.bbclass?id=fd5d80ab1a405cb4ef94f2cde25f8c251da490f0 -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] kernel: Remove unnecessary cd and rm, fix MODULE_TARBALL_SYMLINK_NAME creation
* DEPLOYDIR is used as target for every other file deployed by do_deploy, this was just unnecessary switching CWD to create relative symlink and I have no idea why rm -f was used together with ln -sf. Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta/classes/kernel.bbclass | 9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 3320747..5a4f4ea 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -375,16 +375,13 @@ kernel_do_deploy() { if [ ${MODULE_TARBALL_DEPLOY} = 1 ] (grep -q -i -e '^CONFIG_MODULES=y$' .config); then mkdir -p ${D}/lib tar -cvzf ${DEPLOYDIR}/${MODULE_TARBALL_BASE_NAME} -C ${D} lib - ln -sf ${MODULE_TARBALL_BASE_NAME}.bin ${MODULE_TARBALL_SYMLINK_NAME} + ln -sf ${MODULE_TARBALL_BASE_NAME}.bin ${DEPLOYDIR}/${MODULE_TARBALL_SYMLINK_NAME} fi - cd ${DEPLOYDIR} - rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin - ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin - ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGETYPE} + ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${DEPLOYDIR}/${KERNEL_IMAGE_SYMLINK_NAME}.bin + ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${DEPLOYDIR}/${KERNEL_IMAGETYPE} cp ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOYDIR}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt - cd - } do_deploy[dirs] = ${DEPLOYDIR} ${B} do_deploy[prefuncs] += package_get_auto_pr -- 1.8.2.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Poor first impression
On Tue, 2013-05-21 at 12:13 -0600, Gary Thomas wrote: On 2013-05-21 03:10, Richard Purdie wrote: On Fri, 2013-05-17 at 07:26 -0600, Gary Thomas wrote: I just tried to run Poky/Yocto on a fresh Ubuntu 12.04 system. I knew there would be missing bits and have seen the sanity messages in the past, so I thought I'd just carry on. Today's experience was not pretty and would it not for my experience with this, I would have been very perplexed... There are two issues there, firstly the scripts/bitbake binary is doing a really bad job, secondly, one of the improved debugging patches I added to bitbake, regressed things in this case. I posted a patch to bitbake last night, I've just posted a fix for scripts/bitbake now. These two together should improve this. I agree that particular error would create a poor first impression, thanks for reporting it. With this patch, no 'git' and a fresh build I still get this: Traceback (most recent call last): File /home/local/poky-multi/bitbake/bin/bitbake, line 293, in module ret = main() File /home/local/poky-multi/bitbake/bin/bitbake, line 260, in main event = server.event_queue.get(block=False) File /usr/lib/python2.6/multiprocessing/queues.py, line 104, in get raise Empty Empty Pseudo is not present but is required, building this first before the main build Traceback (most recent call last): File /home/local/poky-multi/bitbake/bin/bitbake, line 293, in module ret = main() File /home/local/poky-multi/bitbake/bin/bitbake, line 260, in main event = server.event_queue.get(block=False) File /usr/lib/python2.6/multiprocessing/queues.py, line 104, in get raise Empty Empty ERROR: OE-core's config sanity checker detected a potential misconfiguration. Either fix the cause of this error or at your own risk disable the checker (see sanity.conf). Following is the list of potential problems / advisories: Please install the following missing utilities: git Still not very pretty. Did you apply both patches, the one for bitbake and the one for OE-Core? This looks like the bitbake one is missing. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3] base-files: add /run directory from FHS 3 draft specification
On 05/20/2013 08:54 PM, Jonathan Liu wrote: This adds the /run directory from the Filesystem Hierarchy Standard 3.0 Draft [1] and refactors the filesystem as follows: - Remove creation of /var/volatile/run - Remove creation of /var/volatile/lock - Remove symbolic link from /var/run to /var/volatile/run - Remove symbolic link from /var/lock to /var/volatile/lock - Add symbolic link from /var/run to /run - Add symbolic link from /var/lock - /run/lock - Add /run to /etc/fstab for sysvinit compatibility It seems that systemd or some program may still be using /var/volatile/run, I booted a systemd and non-systemd boot and the systemd had a /var/volatile/run dir. This was with your 204 system update One more nit below. A few things have also been cleaned up: - Remove udev workaround to ensure /run exists - Remove clearing of /var/run as it points to a tmpfs anyway - Remove permissions workaround for /var/run/utmp as systemd-update-utmp-runlevel.service starts correctly without it - Remove /var/run/dbus from dbus package as it is created on startup [1] http://www.linuxbase.org/betaspecs/fhs/fhs.html#runRuntimeVariableData Signed-off-by: Jonathan Liu net...@gmail.com --- meta/files/fs-perms.txt | 5 ++--- meta/recipes-core/base-files/base-files/fstab | 1 + meta/recipes-core/base-files/base-files_3.0.14.bb | 12 ++-- meta/recipes-core/dbus/dbus.inc | 9 ++--- meta/recipes-core/initscripts/initscripts-1.0/volatiles | 7 +++ meta/recipes-core/initscripts/initscripts_1.0.bb | 2 +- meta/recipes-core/systemd/systemd/00-create-volatile.conf | 2 -- meta/recipes-core/systemd/systemd/var-run.conf| 4 meta/recipes-core/systemd/systemd_199.bb | 5 + meta/recipes-core/udev/udev.inc | 6 +- meta/recipes-core/udev/udev/init | 1 - meta/recipes-core/udev/udev/volatiles | 1 - meta/recipes-core/udev/udev_182.bb| 2 +- 13 files changed, 22 insertions(+), 35 deletions(-) delete mode 100644 meta/recipes-core/systemd/systemd/var-run.conf delete mode 100644 meta/recipes-core/udev/udev/volatiles diff --git a/meta/files/fs-perms.txt b/meta/files/fs-perms.txt index becb85c..c829bec 100644 --- a/meta/files/fs-perms.txt +++ b/meta/files/fs-perms.txt @@ -45,15 +45,14 @@ ${oldincludedir}0755rootroottrue0644 rootroot # Items from base-files # Links -${localstatedir}/run linkvolatile/run +${localstatedir}/run link/run ${localstatedir}/log linkvolatile/log -${localstatedir}/lock linkvolatile/lock +${localstatedir}/lock link/run/lock ${localstatedir}/tmp linkvolatile/tmp # Special permissions from base-files # Set 1777 /tmp 01777 rootrootfalse - - - -${localstatedir}/volatile/lock 01777 rootrootfalse - - - ${localstatedir}/volatile/tmp 01777 rootrootfalse - - - # Set 2775 diff --git a/meta/recipes-core/base-files/base-files/fstab b/meta/recipes-core/base-files/base-files/fstab index f0eed36..dd613a1 100644 --- a/meta/recipes-core/base-files/base-files/fstab +++ b/meta/recipes-core/base-files/base-files/fstab @@ -4,6 +4,7 @@ rootfs /auto defaults 1 1 proc /procproc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 usbdevfs /proc/bus/usbusbdevfs noauto0 0 +tmpfs/run tmpfs mode=0755,nodev,nosuid,strictatime 0 0 tmpfs/var/volatiletmpfs defaults 0 0 tmpfs/media/ram tmpfs defaults 0 0 diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb index a56450d..6befba7 100644 --- a/meta/recipes-core/base-files/base-files_3.0.14.bb +++ b/meta/recipes-core/base-files/base-files_3.0.14.bb @@ -1,7 +1,7 @@ SUMMARY = Miscellaneous files for the base system. DESCRIPTION = The base-files package creates the basic system directory structure and provides a small set of key configuration files for the system. SECTION = base -PR = r73 +PR = r74 LICENSE = GPLv2 LIC_FILES_CHKSUM = file://licenses/GPL-2;md5=94d55d512a9ba36caa9b7df079bae19f # Removed all license related tasks in this recipe as license.bbclass @@ -31,10 +31,10 @@ S = ${WORKDIR} INHIBIT_DEFAULT_DEPS = 1 docdir_append = /${P} -dirs1777 = /tmp ${localstatedir}/volatile/lock ${localstatedir}/volatile/tmp +dirs1777 = /tmp ${localstatedir}/volatile/tmp dirs2775 = /home ${prefix}/src ${localstatedir}/local dirs755 = /bin /boot /dev ${sysconfdir} ${sysconfdir}/default \ -
[OE-core] [PATCH] patch: diable xattr as default
There is a optional dependency on xattr (and thus the attr package), disable it by default, to ensure it builds correctly. Signed-off-by: Saul Wold s...@linux.intel.com --- meta/recipes-devtools/patch/patch_2.7.1.bb |2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/patch/patch_2.7.1.bb b/meta/recipes-devtools/patch/patch_2.7.1.bb index 38df034..b131204 100644 --- a/meta/recipes-devtools/patch/patch_2.7.1.bb +++ b/meta/recipes-devtools/patch/patch_2.7.1.bb @@ -9,3 +9,5 @@ SRC_URI[sha256sum] = c05f28668c3474bc63adcd48abae921d15e71c254fbebdbaeda40456d6 LIC_FILES_CHKSUM = file://COPYING;md5=d32239bcb673463ab874e80d47fae504 acpaths = -I ${S}/m4 + +EXTRA_OECONF += --disable-xattr -- 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] patch: diable xattr as default
On 5/21/13 6:54 PM, Saul Wold wrote: There is a optional dependency on xattr (and thus the attr package), disable it by default, to ensure it builds correctly. Signed-off-by: Saul Wold s...@linux.intel.com --- meta/recipes-devtools/patch/patch_2.7.1.bb |2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/patch/patch_2.7.1.bb b/meta/recipes-devtools/patch/patch_2.7.1.bb index 38df034..b131204 100644 --- a/meta/recipes-devtools/patch/patch_2.7.1.bb +++ b/meta/recipes-devtools/patch/patch_2.7.1.bb @@ -9,3 +9,5 @@ SRC_URI[sha256sum] = c05f28668c3474bc63adcd48abae921d15e71c254fbebdbaeda40456d6 LIC_FILES_CHKSUM = file://COPYING;md5=d32239bcb673463ab874e80d47fae504 acpaths = -I ${S}/m4 + +EXTRA_OECONF += --disable-xattr There is an xattr distro feature. It would be better to use: ENABLE_XATTR = ${@base_contains('DISTRO_FEATURES', 'xattr', '--enable-xattr', '--disable-xattr', d)} EXTRA_OECONF += ${ENABLE_XATTR} (Might need a -native/-nativesdk version?) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] patch: diable xattr as default
On 5/21/13 7:20 PM, Mark Hatle wrote: On 5/21/13 6:54 PM, Saul Wold wrote: There is a optional dependency on xattr (and thus the attr package), disable it by default, to ensure it builds correctly. Signed-off-by: Saul Wold s...@linux.intel.com --- meta/recipes-devtools/patch/patch_2.7.1.bb |2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/patch/patch_2.7.1.bb b/meta/recipes-devtools/patch/patch_2.7.1.bb index 38df034..b131204 100644 --- a/meta/recipes-devtools/patch/patch_2.7.1.bb +++ b/meta/recipes-devtools/patch/patch_2.7.1.bb @@ -9,3 +9,5 @@ SRC_URI[sha256sum] = c05f28668c3474bc63adcd48abae921d15e71c254fbebdbaeda40456d6 LIC_FILES_CHKSUM = file://COPYING;md5=d32239bcb673463ab874e80d47fae504 acpaths = -I ${S}/m4 + +EXTRA_OECONF += --disable-xattr There is an xattr distro feature. It would be better to use: ENABLE_XATTR = ${@base_contains('DISTRO_FEATURES', 'xattr', '--enable-xattr', '--disable-xattr', d)} EXTRA_OECONF += ${ENABLE_XATTR} (Might need a -native/-nativesdk version?) I forgot, PACKAGECONFIG might be better to use then the attr package dependencies can more easily be added. PACKAGECONFIG ?= ${@base_contains('DISTRO_FEATURES', 'xattr', 'xattr', '', d)} PACKAGECONFIG[xattr] = --enable-xattr,--disable-xattr,attr, --Mark ___ 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 1/7] gnupg: Update to 2.0.20
Removed obsolete patch Signed-off-by: Saul Wold s...@linux.intel.com --- .../gnupg/gnupg-2.0.19/GnuPG2-CVE-2012-6085.patch | 63 -- .../gnupg/{gnupg_2.0.19.bb = gnupg_2.0.20.bb} | 8 ++- 2 files changed, 3 insertions(+), 68 deletions(-) delete mode 100644 meta/recipes-support/gnupg/gnupg-2.0.19/GnuPG2-CVE-2012-6085.patch rename meta/recipes-support/gnupg/{gnupg_2.0.19.bb = gnupg_2.0.20.bb} (80%) diff --git a/meta/recipes-support/gnupg/gnupg-2.0.19/GnuPG2-CVE-2012-6085.patch b/meta/recipes-support/gnupg/gnupg-2.0.19/GnuPG2-CVE-2012-6085.patch deleted file mode 100644 index 64c3034..000 --- a/meta/recipes-support/gnupg/gnupg-2.0.19/GnuPG2-CVE-2012-6085.patch +++ /dev/null @@ -1,63 +0,0 @@ -commit 498882296ffac7987c644aaf2a0aa108a2925471 -Author: Werner Koch w...@gnupg.org -Date: Thu Dec 20 09:43:41 2012 +0100 - -gpg: Import only packets which are allowed in a keyblock. - -* g10/import.c (valid_keyblock_packet): New. -(read_block): Store only valid packets. --- - -A corrupted key, which for example included a mangled public key -encrypted packet, used to corrupt the keyring. This change skips all -packets which are not allowed in a keyblock. - -GnuPG-bug-id: 1455 - -(cherry-picked from commit 3a4b96e665fa639772854058737ee3d54ba0694e) - -Upstream-Status: Backport - -Signed-off-by: Saul Wold s...@linux.intel.com - -diff --git a/g10/import.c b/g10/import.c -index ba2439d..ad112d6 100644 a/g10/import.c -+++ b/g10/import.c -@@ -347,6 +347,27 @@ import_print_stats (void *hd) - } - - -+/* Return true if PKTTYPE is valid in a keyblock. */ -+static int -+valid_keyblock_packet (int pkttype) -+{ -+ switch (pkttype) -+{ -+case PKT_PUBLIC_KEY: -+case PKT_PUBLIC_SUBKEY: -+case PKT_SECRET_KEY: -+case PKT_SECRET_SUBKEY: -+case PKT_SIGNATURE: -+case PKT_USER_ID: -+case PKT_ATTRIBUTE: -+case PKT_RING_TRUST: -+ return 1; -+default: -+ return 0; -+} -+} -+ -+ - / - * Read the next keyblock from stream A. - * PENDING_PKT should be initialzed to NULL -@@ -424,7 +445,7 @@ read_block( IOBUF a, PACKET **pending_pkt, KBNODE *ret_root ) - } - in_cert = 1; - default: -- if( in_cert ) { -+ if (in_cert valid_keyblock_packet (pkt-pkttype)) { - if( !root ) - root = new_kbnode( pkt ); - else diff --git a/meta/recipes-support/gnupg/gnupg_2.0.19.bb b/meta/recipes-support/gnupg/gnupg_2.0.20.bb similarity index 80% rename from meta/recipes-support/gnupg/gnupg_2.0.19.bb rename to meta/recipes-support/gnupg/gnupg_2.0.20.bb index 593250a..87acd00 100644 --- a/meta/recipes-support/gnupg/gnupg_2.0.19.bb +++ b/meta/recipes-support/gnupg/gnupg_2.0.20.bb @@ -7,15 +7,13 @@ LIC_FILES_CHKSUM = file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ DEPENDS = ${PTH} libassuan libksba zlib bzip2 readline libgcrypt PTH = pth PTH_libc-uclibc = npth -PR = r5 inherit autotools gettext -SRC_URI = ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2 \ - file://GnuPG2-CVE-2012-6085.patch +SRC_URI = ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2; -SRC_URI[md5sum] = 6a8589381ca1b0c1a921e9955f42b016 -SRC_URI[sha256sum] = efa23a8a925adb51c7d3b708c25b6d000300f5ce37de9bdec6453be7b419c622 +SRC_URI[md5sum] = 9d18ee71bb0b10d40d1c8a393bdd7a89 +SRC_URI[sha256sum] = 6e949b7f062cab8a3cf0910f91ecf04cabaad458c0aeeec66298651b8b04b79a EXTRA_OECONF = --disable-ldap \ --disable-ccid-driver \ -- 1.8.1.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/7] Package Updates
Updates for Milestone 1 Sau! The following changes since commit f45aa6e07318f22ede4614b28ea15cd48f5e4095: packagegroup-core-clutter: use clutter-1.0 packages (2013-05-21 09:14:38 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib sgw/updates http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/updates Saul Wold (7): gnupg: Update to 2.0.20 desktop-file-utils: Update to 0.21 mklibs: Update to 0.1.37 libnl: Update to 3.2.22 mc: Update to 4.8.8 resolvconf: Update to 1.72 cmake: Update to 2.8.11 .../{resolvconf_1.71.bb = resolvconf_1.72.bb} | 4 +- .../cmake/cmake-native_2.8.10.2.bb | 7 --- meta/recipes-devtools/cmake/cmake-native_2.8.11.bb | 5 ++ meta/recipes-devtools/cmake/cmake.inc | 2 - .../cmake/cmake/support-oe-qt4-tools-names.patch | 70 +- .../cmake/{cmake_2.8.10.2.bb = cmake_2.8.11.bb} | 6 +- ...e_0.15.bb = desktop-file-utils-native_0.21.bb} | 10 ++-- ...bs-native_0.1.35.bb = mklibs-native_0.1.37.bb} | 4 +- .../mc/{mc_4.8.7.bb = mc_4.8.8.bb}| 6 +- .../gnupg/gnupg-2.0.19/GnuPG2-CVE-2012-6085.patch | 63 --- .../gnupg/{gnupg_2.0.19.bb = gnupg_2.0.20.bb} | 8 +-- .../libnl/{libnl_3.2.21.bb = libnl_3.2.22.bb} | 5 +- 12 files changed, 37 insertions(+), 153 deletions(-) rename meta/recipes-connectivity/resolvconf/{resolvconf_1.71.bb = resolvconf_1.72.bb} (88%) delete mode 100644 meta/recipes-devtools/cmake/cmake-native_2.8.10.2.bb create mode 100644 meta/recipes-devtools/cmake/cmake-native_2.8.11.bb rename meta/recipes-devtools/cmake/{cmake_2.8.10.2.bb = cmake_2.8.11.bb} (86%) rename meta/recipes-devtools/desktop-file-utils/{desktop-file-utils-native_0.15.bb = desktop-file-utils-native_0.21.bb} (57%) rename meta/recipes-devtools/mklibs/{mklibs-native_0.1.35.bb = mklibs-native_0.1.37.bb} (80%) rename meta/recipes-extended/mc/{mc_4.8.7.bb = mc_4.8.8.bb} (81%) delete mode 100644 meta/recipes-support/gnupg/gnupg-2.0.19/GnuPG2-CVE-2012-6085.patch rename meta/recipes-support/gnupg/{gnupg_2.0.19.bb = gnupg_2.0.20.bb} (80%) rename meta/recipes-support/libnl/{libnl_3.2.21.bb = libnl_3.2.22.bb} (90%) -- 1.8.1.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/7] desktop-file-utils: Update to 0.21
COPYING had formating and Address changes Signed-off-by: Saul Wold s...@linux.intel.com --- ...-utils-native_0.15.bb = desktop-file-utils-native_0.21.bb} | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) rename meta/recipes-devtools/desktop-file-utils/{desktop-file-utils-native_0.15.bb = desktop-file-utils-native_0.21.bb} (57%) diff --git a/meta/recipes-devtools/desktop-file-utils/desktop-file-utils-native_0.15.bb b/meta/recipes-devtools/desktop-file-utils/desktop-file-utils-native_0.21.bb similarity index 57% rename from meta/recipes-devtools/desktop-file-utils/desktop-file-utils-native_0.15.bb rename to meta/recipes-devtools/desktop-file-utils/desktop-file-utils-native_0.21.bb index b971c7e..13f1db6 100644 --- a/meta/recipes-devtools/desktop-file-utils/desktop-file-utils-native_0.15.bb +++ b/meta/recipes-devtools/desktop-file-utils/desktop-file-utils-native_0.21.bb @@ -3,14 +3,14 @@ HOMEPAGE = http://www.freedesktop.org/wiki/Software/desktop-file-utils; DESCRIPTION = command line utilities to work with *.desktop files LICENSE = GPLv2 -LIC_FILES_CHKSUM = file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f +LIC_FILES_CHKSUM = file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 DEPENDS = glib-2.0-native -SRC_URI = http://freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-${PV}.tar.gz; +SRC_URI = http://freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-${PV}.tar.xz; + +SRC_URI[md5sum] = fda5c312c9fb3b8d818fb54f2c34db82 +SRC_URI[sha256sum] = b6c9b860538ef1cffbcdfbc9cb578f85a080ad8c1207c8b3a39e9fd183f9782b inherit autotools native S = ${WORKDIR}/desktop-file-utils-${PV} - -SRC_URI[md5sum] = 2fe8ebe222fc33cd4a959415495b7eed -SRC_URI[sha256sum] = c463d851fb057acd53800cfc4f8ae39dcbcad7f03b4bd547288e95b6de53b022 -- 1.8.1.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/7] mklibs: Update to 0.1.37
Signed-off-by: Saul Wold s...@linux.intel.com --- .../mklibs/{mklibs-native_0.1.35.bb = mklibs-native_0.1.37.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-devtools/mklibs/{mklibs-native_0.1.35.bb = mklibs-native_0.1.37.bb} (80%) diff --git a/meta/recipes-devtools/mklibs/mklibs-native_0.1.35.bb b/meta/recipes-devtools/mklibs/mklibs-native_0.1.37.bb similarity index 80% rename from meta/recipes-devtools/mklibs/mklibs-native_0.1.35.bb rename to meta/recipes-devtools/mklibs/mklibs-native_0.1.37.bb index b9cbd84..c37ea87 100644 --- a/meta/recipes-devtools/mklibs/mklibs-native_0.1.35.bb +++ b/meta/recipes-devtools/mklibs/mklibs-native_0.1.37.bb @@ -10,8 +10,8 @@ SRC_URI = http://ftp.de.debian.org/debian/pool/main/m/mklibs/${BPN}_${PV}.tar.g file://fix_STT_GNU_IFUNC.patch\ -SRC_URI[md5sum] = 3d2a4bd0bbf5ba964b0a1ecdafd1ea9a -SRC_URI[sha256sum] = ccb1023dc1729c5a37ca6c3eca8e4bac3491116763c8820dfce8eea4845c8567 +SRC_URI[md5sum] = 099cc99d51f09ea51e58a56e62a46af7 +SRC_URI[sha256sum] = 9b2ef35618b1c2def1ca7a0a92c2b3029ef7f2080d894b6d1dbb3f313684d3a3 inherit autotools gettext native pythonnative -- 1.8.1.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/7] libnl: Update to 3.2.22
Signed-off-by: Saul Wold s...@linux.intel.com --- meta/recipes-support/libnl/{libnl_3.2.21.bb = libnl_3.2.22.bb} | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) rename meta/recipes-support/libnl/{libnl_3.2.21.bb = libnl_3.2.22.bb} (90%) diff --git a/meta/recipes-support/libnl/libnl_3.2.21.bb b/meta/recipes-support/libnl/libnl_3.2.22.bb similarity index 90% rename from meta/recipes-support/libnl/libnl_3.2.21.bb rename to meta/recipes-support/libnl/libnl_3.2.22.bb index 1e97603..36e98e1 100644 --- a/meta/recipes-support/libnl/libnl_3.2.21.bb +++ b/meta/recipes-support/libnl/libnl_3.2.22.bb @@ -3,7 +3,6 @@ HOMEPAGE = http://www.infradead.org/~tgr/libnl/; SECTION = libs/network PE = 1 -PR = r0 LICENSE = LGPLv2.1 LIC_FILES_CHKSUM = file://COPYING;md5=4fbd65380cdd255951079008b364516c @@ -14,8 +13,8 @@ SRC_URI = http://www.infradead.org/~tgr/${BPN}/files/${BP}.tar.gz \ file://fix-pktloc_syntax_h-race.patch \ file://fix-pc-file.patch -SRC_URI[md5sum] = 6fe7136558a9071e70673dcda38545b3 -SRC_URI[sha256sum] = 2dc80f043116ec8610d9d418f5f5e9283f3d9a3a48b8d51a8cb0146b3f279604 +SRC_URI[md5sum] = 2e1c889494d274aca24ce5f6a748e66e +SRC_URI[sha256sum] = c7c5f267dfeae0c1a530bf96b71fb7c8dbbb07d54beef49b6712d8d6166f629b inherit autotools pkgconfig -- 1.8.1.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/7] resolvconf: Update to 1.72
Signed-off-by: Saul Wold s...@linux.intel.com --- .../resolvconf/{resolvconf_1.71.bb = resolvconf_1.72.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-connectivity/resolvconf/{resolvconf_1.71.bb = resolvconf_1.72.bb} (88%) diff --git a/meta/recipes-connectivity/resolvconf/resolvconf_1.71.bb b/meta/recipes-connectivity/resolvconf/resolvconf_1.72.bb similarity index 88% rename from meta/recipes-connectivity/resolvconf/resolvconf_1.71.bb rename to meta/recipes-connectivity/resolvconf/resolvconf_1.72.bb index d342a6e..a96dbff 100644 --- a/meta/recipes-connectivity/resolvconf/resolvconf_1.71.bb +++ b/meta/recipes-connectivity/resolvconf/resolvconf_1.72.bb @@ -13,8 +13,8 @@ RDEPENDS_${PN} = bash SRC_URI = ${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.gz -SRC_URI[md5sum] = f073ab06b11584c8af86e7f84a56680e -SRC_URI[sha256sum] = f2ec30a0e89330c6cbc3117efd60639da8305782979844ee4a1906e4b0ca230c +SRC_URI[md5sum] = 6bf631213c97f89261d997c78f7b9506 +SRC_URI[sha256sum] = 196e8b5ef0a0282bf99e156113b058e65dd7f889cf4aea16597cddeef7e7cd43 inherit allarch -- 1.8.1.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/7] mc: Update to 4.8.8
Signed-off-by: Saul Wold s...@linux.intel.com --- meta/recipes-extended/mc/{mc_4.8.7.bb = mc_4.8.8.bb} | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) rename meta/recipes-extended/mc/{mc_4.8.7.bb = mc_4.8.8.bb} (81%) diff --git a/meta/recipes-extended/mc/mc_4.8.7.bb b/meta/recipes-extended/mc/mc_4.8.8.bb similarity index 81% rename from meta/recipes-extended/mc/mc_4.8.7.bb rename to meta/recipes-extended/mc/mc_4.8.8.bb index 0e8f3c1..20ae797 100644 --- a/meta/recipes-extended/mc/mc_4.8.7.bb +++ b/meta/recipes-extended/mc/mc_4.8.8.bb @@ -6,12 +6,10 @@ SECTION = console/utils DEPENDS = ncurses glib-2.0 RDEPENDS_${PN} = ncurses-terminfo -PR = r0 - SRC_URI = http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2; -SRC_URI[md5sum] = b113e50682293a953141134969dba785 -SRC_URI[sha256sum] = 4e9c45925b47650dac58d7556a89c3e9b4275e48976b6c13b63c2f8eed3a383b +SRC_URI[md5sum] = 324ff5a192d30d3a3b234c130550eb0a +SRC_URI[sha256sum] = 7b5e6f90e6709d1c1bcb4a2bf6d2a62b9494adef3ff4325ffdb3551c29e42a1c inherit autotools gettext -- 1.8.1.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 7/7] cmake: Update to 2.8.11
Rebased support-oe-qt4-tools-names as some of the changes where Signed-off-by: Saul Wold s...@linux.intel.com --- .../cmake/cmake-native_2.8.10.2.bb | 7 --- meta/recipes-devtools/cmake/cmake-native_2.8.11.bb | 5 ++ meta/recipes-devtools/cmake/cmake.inc | 2 - .../cmake/cmake/support-oe-qt4-tools-names.patch | 70 +- .../cmake/{cmake_2.8.10.2.bb = cmake_2.8.11.bb} | 6 +- 5 files changed, 21 insertions(+), 69 deletions(-) delete mode 100644 meta/recipes-devtools/cmake/cmake-native_2.8.10.2.bb create mode 100644 meta/recipes-devtools/cmake/cmake-native_2.8.11.bb rename meta/recipes-devtools/cmake/{cmake_2.8.10.2.bb = cmake_2.8.11.bb} (86%) diff --git a/meta/recipes-devtools/cmake/cmake-native_2.8.10.2.bb b/meta/recipes-devtools/cmake/cmake-native_2.8.10.2.bb deleted file mode 100644 index 01860a7..000 --- a/meta/recipes-devtools/cmake/cmake-native_2.8.10.2.bb +++ /dev/null @@ -1,7 +0,0 @@ -require cmake.inc -inherit native - -PR = ${INC_PR}.0 - -SRC_URI[md5sum] = 097278785da7182ec0aea8769d06860c -SRC_URI[sha256sum] = ce524fb39da06ee6d47534bbcec6e0b50422e18b62abc4781a4ba72ea2910eb1 diff --git a/meta/recipes-devtools/cmake/cmake-native_2.8.11.bb b/meta/recipes-devtools/cmake/cmake-native_2.8.11.bb new file mode 100644 index 000..dfe103f --- /dev/null +++ b/meta/recipes-devtools/cmake/cmake-native_2.8.11.bb @@ -0,0 +1,5 @@ +require cmake.inc +inherit native + +SRC_URI[md5sum] = be6008f2299613d23fe82ab53ef7472e +SRC_URI[sha256sum] = 20d0d3661797fa82c19e7a75c7315c640e001cb3238331ca170bb0fae27feee5 diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index b2cba5e..6144d51 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc @@ -9,8 +9,6 @@ LICENSE = BSD LIC_FILES_CHKSUM = file://Copyright.txt;md5=bb2fa3a08736b842556f6171bb9e8ae1 \ file://Source/cmake.h;beginline=1;endline=10;md5=341736dae83c9e344b53eeb1bc7d7bc2 -INC_PR = r1 - CMAKE_MAJOR_VERSION = ${@'.'.join(d.getVar('PV',1).split('.')[0:2])} SRC_URI = http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ diff --git a/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch b/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch index 258971b..0e311f7 100644 --- a/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch +++ b/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch @@ -11,36 +11,20 @@ Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Otavio Salvador ota...@ossystems.com.br -Index: cmake-2.8.10.1/Modules/FindQt4.cmake +Index: cmake-2.8.11/Modules/FindQt4.cmake === cmake-2.8.10.1.orig/Modules/FindQt4.cmake -+++ cmake-2.8.10.1/Modules/FindQt4.cmake -@@ -497,7 +497,7 @@ get_filename_component(qt_install_versio - # check for qmake - # Debian uses qmake-qt4 - # macports' Qt uses qmake-mac --find_program(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac -+find_program(QT_QMAKE_EXECUTABLE NAMES qmake qmake2 qmake4 qmake-qt4 qmake-mac - PATHS - ENV QTDIR - [HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir] -@@ -982,13 +982,13 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) - endif() +--- cmake-2.8.11.orig/Modules/FindQt4.cmake cmake-2.8.11/Modules/FindQt4.cmake +@@ -569,7 +569,7 @@ endfunction() - find_program(QT_MOC_EXECUTABLE --NAMES moc-qt4 moc -+NAMES moc-qt4 moc4 moc - PATHS ${QT_BINARY_DIR} - NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH - ) + set(QT4_INSTALLED_VERSION_TOO_OLD FALSE) - find_program(QT_UIC_EXECUTABLE --NAMES uic-qt4 uic -+NAMES uic-qt4 uic4 uic - PATHS ${QT_BINARY_DIR} - NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH - ) -@@ -1000,49 +1000,49 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) +-set(_QT4_QMAKE_NAMES qmake qmake4 qmake-qt4 qmake-mac) ++set(_QT4_QMAKE_NAMES qmake qmake2 qmake4 qmake-qt4 qmake-mac) + _qt4_find_qmake(${_QT4_QMAKE_NAMES} QT_QMAKE_EXECUTABLE QTVERSION) + + if (QT_QMAKE_EXECUTABLE AND QTVERSION) +@@ -1157,19 +1157,19 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) ) find_program(QT_RCC_EXECUTABLE @@ -59,42 +43,16 @@ Index: cmake-2.8.10.1/Modules/FindQt4.cmake find_program(QT_DBUSXML2CPP_EXECUTABLE -NAMES qdbusxml2cpp -+NAMES qdbusxml2cpp4 qdbusxml2cpp - PATHS ${QT_BINARY_DIR} - NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH - ) - - find_program(QT_LUPDATE_EXECUTABLE --NAMES lupdate-qt4 lupdate -+NAMES lupdate-qt4 lupdate4 lupdate ++NAMES qdbusxml2cp4 qdbusxml2cpp PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH ) - - find_program(QT_LRELEASE_EXECUTABLE --NAMES lrelease-qt4 lrelease -+NAMES lrelease-qt4 lrelease4 lrelease - PATHS ${QT_BINARY_DIR} - NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH +@@
Re: [OE-core] [PATCH] patch: diable xattr as default
On 05/21/2013 05:23 PM, Mark Hatle wrote: On 5/21/13 7:20 PM, Mark Hatle wrote: On 5/21/13 6:54 PM, Saul Wold wrote: There is a optional dependency on xattr (and thus the attr package), disable it by default, to ensure it builds correctly. Signed-off-by: Saul Wold s...@linux.intel.com --- meta/recipes-devtools/patch/patch_2.7.1.bb |2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/patch/patch_2.7.1.bb b/meta/recipes-devtools/patch/patch_2.7.1.bb index 38df034..b131204 100644 --- a/meta/recipes-devtools/patch/patch_2.7.1.bb +++ b/meta/recipes-devtools/patch/patch_2.7.1.bb @@ -9,3 +9,5 @@ SRC_URI[sha256sum] = c05f28668c3474bc63adcd48abae921d15e71c254fbebdbaeda40456d6 LIC_FILES_CHKSUM = file://COPYING;md5=d32239bcb673463ab874e80d47fae504 acpaths = -I ${S}/m4 + +EXTRA_OECONF += --disable-xattr There is an xattr distro feature. It would be better to use: ENABLE_XATTR = ${@base_contains('DISTRO_FEATURES', 'xattr', '--enable-xattr', '--disable-xattr', d)} EXTRA_OECONF += ${ENABLE_XATTR} (Might need a -native/-nativesdk version?) I forgot, PACKAGECONFIG might be better to use then the attr package dependencies can more easily be added. PACKAGECONFIG ?= ${@base_contains('DISTRO_FEATURES', 'xattr', 'xattr', '', d)} PACKAGECONFIG[xattr] = --enable-xattr,--disable-xattr,attr, Yup, this is more correct and slap my hand for forgetting the xattr DISTO_FEATURE! V2 coming after some tests. Sau! --Mark ___ 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 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3] base-files: add /run directory from FHS 3 draft specification
This adds the /run directory from the Filesystem Hierarchy Standard 3.0 Draft [1] and refactors the filesystem as follows: - Remove creation of /var/volatile/run - Remove creation of /var/volatile/lock - Remove symbolic link from /var/run to /var/volatile/run - Remove symbolic link from /var/lock to /var/volatile/lock - Add symbolic link from /var/run to /run - Add symbolic link from /var/lock - /run/lock - Add /run to /etc/fstab for sysvinit compatibility The systemd init script has been modified as follows: - Do not create /var/volatile/run - Do not create symbolic link from /run to /var/run if /run doesn't exist A few things have also been cleaned up: - Remove udev workaround to ensure /run exists - Remove clearing of /var/run as it points to a tmpfs anyway - Remove permissions workaround for /var/run/utmp as systemd-update-utmp-runlevel.service starts correctly without it - Remove /var/run from dbus package as it is created on startup - Remove /var/volatile/run/resolvconf/interface from resolvconf package as resolvconf package uses /etc/resolvconf/run/interface [1] http://www.linuxbase.org/betaspecs/fhs/fhs.html#runRuntimeVariableData Signed-off-by: Jonathan Liu net...@gmail.com --- meta/files/fs-perms.txt | 5 ++--- meta/recipes-connectivity/resolvconf/resolvconf_1.71.bb | 3 ++- meta/recipes-core/base-files/base-files/fstab | 1 + meta/recipes-core/base-files/base-files_3.0.14.bb | 12 ++-- meta/recipes-core/dbus/dbus.inc | 9 ++--- meta/recipes-core/initscripts/initscripts-1.0/volatiles | 7 +++ meta/recipes-core/initscripts/initscripts_1.0.bb | 2 +- meta/recipes-core/systemd/systemd/00-create-volatile.conf | 2 -- meta/recipes-core/systemd/systemd/init| 4 meta/recipes-core/systemd/systemd/var-run.conf| 4 meta/recipes-core/systemd/systemd_199.bb | 5 + meta/recipes-core/udev/udev.inc | 6 +- meta/recipes-core/udev/udev/init | 1 - meta/recipes-core/udev/udev/volatiles | 1 - meta/recipes-core/udev/udev_182.bb| 2 +- 15 files changed, 24 insertions(+), 40 deletions(-) delete mode 100644 meta/recipes-core/systemd/systemd/var-run.conf delete mode 100644 meta/recipes-core/udev/udev/volatiles diff --git a/meta/files/fs-perms.txt b/meta/files/fs-perms.txt index becb85c..c829bec 100644 --- a/meta/files/fs-perms.txt +++ b/meta/files/fs-perms.txt @@ -45,15 +45,14 @@ ${oldincludedir}0755rootroottrue0644 rootroot # Items from base-files # Links -${localstatedir}/run linkvolatile/run +${localstatedir}/run link/run ${localstatedir}/log linkvolatile/log -${localstatedir}/lock linkvolatile/lock +${localstatedir}/lock link/run/lock ${localstatedir}/tmp linkvolatile/tmp # Special permissions from base-files # Set 1777 /tmp 01777 rootrootfalse - - - -${localstatedir}/volatile/lock 01777 rootrootfalse - - - ${localstatedir}/volatile/tmp 01777 rootrootfalse - - - # Set 2775 diff --git a/meta/recipes-connectivity/resolvconf/resolvconf_1.71.bb b/meta/recipes-connectivity/resolvconf/resolvconf_1.71.bb index d342a6e..a788bb2 100644 --- a/meta/recipes-connectivity/resolvconf/resolvconf_1.71.bb +++ b/meta/recipes-connectivity/resolvconf/resolvconf_1.71.bb @@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b AUTHOR = Thomas Hood HOMEPAGE = http://packages.debian.org/resolvconf; RDEPENDS_${PN} = bash +PR = r1 SRC_URI = ${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.gz @@ -23,7 +24,7 @@ do_compile () { } do_install () { - install -d ${D}${sysconfdir} ${D}${base_sbindir} ${D}${localstatedir}/volatile/run/resolvconf/interface + install -d ${D}${sysconfdir} ${D}${base_sbindir} install -d ${D}${mandir}/man8 ${D}${docdir}/${P} cp -pPR etc/* ${D}${sysconfdir}/ chown -R root:root ${D}${sysconfdir}/ diff --git a/meta/recipes-core/base-files/base-files/fstab b/meta/recipes-core/base-files/base-files/fstab index f0eed36..dd613a1 100644 --- a/meta/recipes-core/base-files/base-files/fstab +++ b/meta/recipes-core/base-files/base-files/fstab @@ -4,6 +4,7 @@ rootfs /auto defaults 1 1 proc /procproc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 usbdevfs /proc/bus/usbusbdevfs noauto0 0 +tmpfs/run tmpfs mode=0755,nodev,nosuid,strictatime 0 0 tmpfs/var/volatiletmpfs defaults 0 0 tmpfs/media/ram tmpfs defaults
Re: [OE-core] [PATCH v3] base-files: add /run directory from FHS 3 draft specification
On 22 May 2013 09:07, Saul Wold s...@linux.intel.com wrote: On 05/20/2013 08:54 PM, Jonathan Liu wrote: This adds the /run directory from the Filesystem Hierarchy Standard 3.0 Draft [1] and refactors the filesystem as follows: - Remove creation of /var/volatile/run - Remove creation of /var/volatile/lock - Remove symbolic link from /var/run to /var/volatile/run - Remove symbolic link from /var/lock to /var/volatile/lock - Add symbolic link from /var/run to /run - Add symbolic link from /var/lock - /run/lock - Add /run to /etc/fstab for sysvinit compatibility It seems that systemd or some program may still be using /var/volatile/run, I booted a systemd and non-systemd boot and the systemd had a /var/volatile/run dir. This was with your 204 system update Fixed. It was creating it in systemd init. One more nit below. diff --git a/meta/recipes-core/dbus/dbus.**inc b/meta/recipes-core/dbus/dbus.**inc index 2be5bda..45dcf0d 100644 --- a/meta/recipes-core/dbus/dbus.**inc +++ b/meta/recipes-core/dbus/dbus.**inc @@ -12,7 +12,7 @@ DEPENDS_class-nativesdk = nativesdk-expat virtual/nativesdk-libintl RDEPENDS_dbus = ${@base_contains('DISTRO_**FEATURES', 'ptest', 'dbus-ptest-ptest', '', d)} RDEPENDS_class-native = -INC_PR = r6 +INC_PR = r7 SRC_URI = http://dbus.freedesktop.org/**releases/dbus/dbus-${PV}.tar.* *gz http://dbus.freedesktop.org/releases/dbus/dbus-$%7BPV%7D.tar.gz \ file://tmpdir.patch; \ @@ -101,9 +101,9 @@ do_install() { ${D}${sysconfdir}/default/**volatiles/99_dbus - mkdir -p ${D}${localstatedir}/run/dbus ${D}${localstatedir}/lib/dbus + mkdir -p ${D}${localstatedir}/lib/dbus - chown messagebus:messagebus ${D}${localstatedir}/run/dbus ${D}${localstatedir}/lib/dbus + chown messagebus:messagebus ${D}${localstatedir}/lib/dbus chown root:messagebus ${D}${libexecdir}/dbus-daemon-** launch-helper chmod 4755 ${D}${libexecdir}/dbus-daemon-**launch-helper @@ -113,6 +113,9 @@ do_install() { # Remove empty testexec directory as we don't build tests rm -rf ${D}${libdir}/dbus-1.0/test + + # Remove /var/run/dbus as it is created on startup + rm -rf ${D}${localstatedir}/run A nit in the comment. Your removing more than /var/run/dbus here, can you fix the comment. Fixed. Sau! I have submitted V3 patch for your review. Regards, Jonathan ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] patch: use PACKAGECONFIG to ensure correct dependency for xattr
This will enable or disable xattr with the correct dependency on attr as needed. Signed-off-by: Saul Wold s...@linux.intel.com --- meta/recipes-devtools/patch/patch_2.7.1.bb |3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-devtools/patch/patch_2.7.1.bb b/meta/recipes-devtools/patch/patch_2.7.1.bb index 38df034..16e3cc4 100644 --- a/meta/recipes-devtools/patch/patch_2.7.1.bb +++ b/meta/recipes-devtools/patch/patch_2.7.1.bb @@ -9,3 +9,6 @@ SRC_URI[sha256sum] = c05f28668c3474bc63adcd48abae921d15e71c254fbebdbaeda40456d6 LIC_FILES_CHKSUM = file://COPYING;md5=d32239bcb673463ab874e80d47fae504 acpaths = -I ${S}/m4 + +PACKAGECONFIG ?= ${@base_contains('DISTRO_FEATURES', 'xattr', 'xattr', '', d)} +PACKAGECONFIG[xattr] = --enable-xattr,--disable-xattr,attr, -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] busybox: backport sulogin empty root password fix
This allows system maintenance login if the root password is empty. Signed-off-by: Jonathan Liu net...@gmail.com --- .../busybox-sulogin-empty-root-password.patch | 58 ++ meta/recipes-core/busybox/busybox_1.20.2.bb| 3 +- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/busybox/busybox-1.20.2/busybox-sulogin-empty-root-password.patch diff --git a/meta/recipes-core/busybox/busybox-1.20.2/busybox-sulogin-empty-root-password.patch b/meta/recipes-core/busybox/busybox-1.20.2/busybox-sulogin-empty-root-password.patch new file mode 100644 index 000..baad298 --- /dev/null +++ b/meta/recipes-core/busybox/busybox-1.20.2/busybox-sulogin-empty-root-password.patch @@ -0,0 +1,58 @@ +Upstream-Status: Backport +Signed-off-by: Jonathan Liu net...@gmail.com + +From b6dc13c2d3754704b1bf5af4e6b957b48585102f Mon Sep 17 00:00:00 2001 +From: Jonathan Liu net...@gmail.com +Date: Tue, 21 May 2013 17:01:55 +0200 +Subject: [PATCH] sulogin: allow system maintenance login if root password is + empty + +The current password checking is unable to distinguish between the user +entering an empty password or pressing Control-D. As a result, an empty +password always results in normal startup. + +We modify bb_ask to return NULL if Control-D is pressed without entering +a password. The sulogin applet is then modified to only proceed to +normal startup if bb_ask returns NULL. This covers EOF with no password, +interrupt by timeout and ^C. + +Signed-off-by: Jonathan Liu net...@gmail.com +Signed-off-by: Denys Vlasenko vda.li...@googlemail.com +--- + libbb/bb_askpass.c | 4 +++- + loginutils/sulogin.c | 4 ++-- + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/libbb/bb_askpass.c b/libbb/bb_askpass.c +index fe2b506..77c1bcd 100644 +--- a/libbb/bb_askpass.c b/libbb/bb_askpass.c +@@ -65,7 +65,9 @@ char* FAST_FUNC bb_ask(const int fd, int timeout, const char *prompt) + i = 0; + while (1) { + int r = read(fd, ret[i], 1); +- if (r 0) { ++ if ((i == 0 r == 0) /* EOF (^D) with no password */ ++ || r 0 ++ ) { + /* read is interrupted by timeout or ^C */ + ret = NULL; + break; +diff --git a/loginutils/sulogin.c b/loginutils/sulogin.c +index f79802a..65e6384 100644 +--- a/loginutils/sulogin.c b/loginutils/sulogin.c +@@ -83,8 +83,8 @@ int sulogin_main(int argc UNUSED_PARAM, char **argv) + cp = bb_ask(STDIN_FILENO, timeout, + Give root password for system maintenance\n + (or type Control-D for normal startup):); +- +- if (!cp || !*cp) { ++ if (!cp) { ++ /* ^D, ^C, timeout, or read error */ + bb_info_msg(Normal startup); + return 0; + } +-- +1.8.2.3 + diff --git a/meta/recipes-core/busybox/busybox_1.20.2.bb b/meta/recipes-core/busybox/busybox_1.20.2.bb index 1445a5e..91510d6 100644 --- a/meta/recipes-core/busybox/busybox_1.20.2.bb +++ b/meta/recipes-core/busybox/busybox_1.20.2.bb @@ -1,5 +1,5 @@ require busybox.inc -PR = r7 +PR = r8 SRC_URI = http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://B921600.patch \ @@ -33,6 +33,7 @@ SRC_URI = http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://testsuite-du-du-k-works-fix-false-positive.patch \ file://strict-atime.patch \ file://fail_on_no_media.patch \ + file://busybox-sulogin-empty-root-password.patch \ file://inetd.conf \ file://inetd -- 1.8.2.3 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core