[OE-core] [PATCH] populate_sdk: verify executable or dynamically linked library
When toolchain directory is changed to execute mode, some non-executable files or empty files are sorted. This will result in some errors. Thus when sorting executable files or dynamically linked library, additional conditions are to exclude non-executable files or empty files. --- meta/classes/populate_sdk_base.bbclass |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index b7ea851..6b3535d 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass @@ -253,7 +253,7 @@ if [ $dl_path = ] ; then echo SDK could not be set up. Relocate script unable to find ld-linux.so. Abort! exit 1 fi -executable_files=$($SUDO_EXEC find $native_sysroot -type f -perm /111) +executable_files=$($SUDO_EXEC find $native_sysroot -type f -perm +111 -exec file '{}' \;| grep \(executable\|dynamically linked\) | cut -f 1 -d ':') tdir=`mktemp -d` if [ x$tdir = x ] ; 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] populate_sdk: verify executable or dynamically linked library
When toolchain directory is changed to execute mode, some non-executable files or empty files are sorted. This will result in some errors. Thus when sorting executable files or dynamically linked library, additional conditions are to exclude non-executable files or empty files. --- meta/classes/populate_sdk_base.bbclass |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index b7ea851..29890e3 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass @@ -253,7 +253,7 @@ if [ $dl_path = ] ; then echo SDK could not be set up. Relocate script unable to find ld-linux.so. Abort! exit 1 fi -executable_files=$($SUDO_EXEC find $native_sysroot -type f -perm /111) +executable_files=$($SUDO_EXEC find $native_sysroot -type f -perm /111 -exec file '{}' \;| grep \(executable\|dynamically linked\) | cut -f 1 -d ':') tdir=`mktemp -d` if [ x$tdir = x ] ; then -- 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] populate_sdk: verify executable or dynamically linked library
On 11/26/2013 4:24 PM, yzhu1 wrote: When toolchain directory is changed to execute mode, some non-executable files or empty files are sorted. This will result in some errors. Thus when sorting executable files or dynamically linked library, additional conditions are to exclude non-executable files or empty files. --- meta/classes/populate_sdk_base.bbclass |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index b7ea851..6b3535d 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass @@ -253,7 +253,7 @@ if [ $dl_path = ] ; then echo SDK could not be set up. Relocate script unable to find ld-linux.so. Abort! exit 1 fi -executable_files=$($SUDO_EXEC find $native_sysroot -type f -perm /111) +executable_files=$($SUDO_EXEC find $native_sysroot -type f -perm +111 -exec file '{}' \;| grep \(executable\|dynamically linked\) | cut -f 1 -d ':') You should not change the -perm option back to use +mode, please refer to: commit 21b079e01873e2fb4d8674541e8c5818ba73554e Author: Stefan Stanacar stefanx.stana...@intel.com Date: Tue Jul 16 14:42:35 2013 +0300 populate_sdk_base.bbclass: use new perm option for find Old way find -perm +mode is no longer supported in newer versions of find (Fedora 19). Man page says: -perm +mode This is no longer supported (and has been deprecated since 2005). Use -perm /mode instead. [YOCTO #4853] Signed-off-by: Stefan Stanacar stefanx.stana...@intel.com Signed-off-by: Saul Wold s...@linux.intel.com Thanks, Jackie tdir=`mktemp -d` if [ x$tdir = x ] ; then ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] populate_sdk: verify executable or dynamically linked library
Please ignore this mail since there is something wrong in the patch. On 11/26/2013 04:24 PM, yzhu1 wrote: When toolchain directory is changed to execute mode, some non-executable files or empty files are sorted. This will result in some errors. Thus when sorting executable files or dynamically linked library, additional conditions are to exclude non-executable files or empty files. --- meta/classes/populate_sdk_base.bbclass |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index b7ea851..6b3535d 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass @@ -253,7 +253,7 @@ if [ $dl_path = ] ; then echo SDK could not be set up. Relocate script unable to find ld-linux.so. Abort! exit 1 fi -executable_files=$($SUDO_EXEC find $native_sysroot -type f -perm /111) +executable_files=$($SUDO_EXEC find $native_sysroot -type f -perm +111 -exec file '{}' \;| grep \(executable\|dynamically linked\) | cut -f 1 -d ':') tdir=`mktemp -d` if [ x$tdir = x ] ; then ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] lsof: add contingency for when EGLIBCVERSION is not set
From: Paul Gortmaker paul.gortma...@windriver.com commit 8c38bc022de209187f31952ae02313dd3104f4c6 (lsof: define linux C library type when using eglibc) tries to avoid the built in tests that determine EGLIBC version (since they are not reliable in cross builds) and handed in the EGLIBCVERSION directly. However this is only happening if EGLIBCVERSION is set. And that is only true if we are sourcing the include file meta/conf/distro/include/tcmode-default.inc -- which we won't be with custom toolchain. So we've been implicitly relying on the broken lsof tests. So, to ensure we don't end up using the broken lsof tests, add a contingency for the case where EGLIBCVERSION is not set. This will be suitable for a single release, since the version will be unchanging. Signed-off-by: Paul Gortmaker paul.gortma...@windriver.com --- meta/recipes-extended/lsof/lsof_4.87.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-extended/lsof/lsof_4.87.bb b/meta/recipes-extended/lsof/lsof_4.87.bb index 5676cd9..582697b 100644 --- a/meta/recipes-extended/lsof/lsof_4.87.bb +++ b/meta/recipes-extended/lsof/lsof_4.87.bb @@ -34,6 +34,9 @@ do_configure () { LINUX_CLIB=`echo ${EGLIBCVERSION} |sed -e 's,\.,,g'` LINUX_CLIB=-DGLIBCV=${LINUX_CLIB} export LINUX_CLIB +else +LINUX_CLIB=-DGLIBCV=215 +export LINUX_CLIB fi yes | ./Configure ${LSOF_OS} } -- 1.8.3 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] xinetd: add status of init.d command
From: Li Wang li.w...@windriver.com CQID: WIND00439690 Signed-off-by: Li Wang li.w...@windriver.com --- meta/recipes-extended/xinetd/xinetd/xinetd.init | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/meta/recipes-extended/xinetd/xinetd/xinetd.init b/meta/recipes-extended/xinetd/xinetd/xinetd.init index 26dbea7..777c2c8 100644 --- a/meta/recipes-extended/xinetd/xinetd/xinetd.init +++ b/meta/recipes-extended/xinetd/xinetd/xinetd.init @@ -2,6 +2,9 @@ # # /etc/init.d/xinetd -- script to start and stop xinetd. +# Source function library. +. /etc/init.d/functions + if test -f /etc/default/xinetd; then . /etc/default/xinetd fi @@ -33,6 +36,10 @@ case $1 in start-stop-daemon --stop --signal 3 --quiet --exec /usr/sbin/xinetd echo . ;; +status) + status /usr/sbin/xinetd; + exit $? + ;; reload) echo -n Reloading internet superserver configuration: xinetd start-stop-daemon --stop --signal 1 --quiet --exec /usr/sbin/xinetd @@ -49,7 +56,7 @@ case $1 in $0 start ;; *) - echo Usage: /etc/init.d/xinetd {start|stop|reload|force-reload|restart} + echo Usage: /etc/init.d/xinetd {start|stop|status|reload|force-reload|restart} exit 1 ;; esac -- 1.8.3 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 1/2] lib/oeqa: targetcontrol.py: add abstraction for running tests on different targets
Add a new module which abstracts the target object used by testimage.bbclass The purpose of this module is to move the deployment of a target from testimage.bbclass, basically abstracting different implementations of how we setup a target and how it runs commands. It allows to select one implementation or another by setting TEST_TARGET (currently to: qemu and simpleremote). QemuTarget is used to start a qemu instance (as it's currently done in testimage.bbclass) SimpleRemoteTarget is meant for a remote machine (by setting TEST_TARGET_IP) that's already up and running with network and ssh. Simply put, it opens the door for running the tests on different types of targets by adding new classes (maybe qemu-nfsroot or remote-special etc.). One could also override BaseTarget which currently uses the existing SSHControl module and add a serial implementation. [ YOCTO #5554 ] Signed-off-by: Stefan Stanacar stefanx.stana...@intel.com --- meta/lib/oeqa/targetcontrol.py | 137 + 1 file changed, 137 insertions(+) create mode 100644 meta/lib/oeqa/targetcontrol.py diff --git a/meta/lib/oeqa/targetcontrol.py b/meta/lib/oeqa/targetcontrol.py new file mode 100644 index 000..dee38ec --- /dev/null +++ b/meta/lib/oeqa/targetcontrol.py @@ -0,0 +1,137 @@ +# Copyright (C) 2013 Intel Corporation +# +# Released under the MIT license (see COPYING.MIT) + +# This module is used by testimage.bbclass for setting up and controlling a target machine. + +import os +import shutil +import subprocess +import bb + +from oeqa.utils.sshcontrol import SSHControl +from oeqa.utils.qemurunner import QemuRunner + + +def get_target_controller(d): +if d.getVar(TEST_TARGET, True) == qemu: +return QemuTarget(d) +elif d.getVar(TEST_TARGET, True) == simpleremote: +return SimpleRemoteTarget(d) +else: +bb.fatal(Please set a valid TEST_TARGET) + + +class BaseTarget(object): + +def __init__(self, d): +self.connection = None +self.ip = None +self.server_ip = None +self.datetime = d.getVar('DATETIME', True) +self.testdir = d.getVar(TEST_LOG_DIR, True) +self.pn = d.getVar(PN, True) + +def deploy(self): + +self.sshlog = os.path.join(self.testdir, ssh_target_log.%s % self.datetime) +sshloglink = os.path.join(self.testdir, ssh_target_log) +if os.path.islink(sshloglink): +os.unlink(sshloglink) +os.symlink(self.sshlog, sshloglink) +bb.note(SSH log file: %s % self.sshlog) + +def run(self, cmd, timeout=None): +return self.connection.run(cmd, timeout) + +def copy_to(self, localpath, remotepath): +return self.connection.copy_to(localpath, remotepath) + +def copy_from(self, remotepath, localpath): +return self.connection.copy_from(remotepath, localpath) + + + +class QemuTarget(BaseTarget): + +def __init__(self, d): + +super(QemuTarget, self).__init__(d) + +self.qemulog = os.path.join(self.testdir, qemu_boot_log.%s % self.datetime) +self.origrootfs = os.path.join(d.getVar(DEPLOY_DIR_IMAGE, True), d.getVar(IMAGE_LINK_NAME, True) + '.ext3') +self.rootfs = os.path.join(self.testdir, d.getVar(IMAGE_LINK_NAME, True) + '-testimage.ext3') + +self.runner = QemuRunner(machine=d.getVar(MACHINE, True), +rootfs=self.rootfs, +tmpdir = d.getVar(TMPDIR, True), +deploy_dir_image = d.getVar(DEPLOY_DIR_IMAGE, True), +display = d.getVar(BB_ORIGENV, False).getVar(DISPLAY, True), +logfile = self.qemulog, +boottime = int(d.getVar(TEST_QEMUBOOT_TIMEOUT, True))) + +def deploy(self): +try: +shutil.copyfile(self.origrootfs, self.rootfs) +except Exception as e: +bb.fatal(Error copying rootfs: %s % e) + +qemuloglink = os.path.join(self.testdir, qemu_boot_log) +if os.path.islink(qemuloglink): +os.unlink(qemuloglink) +os.symlink(self.qemulog, qemuloglink) + +bb.note(rootfs file: %s % self.rootfs) +bb.note(Qemu log file: %s % self.qemulog) +super(QemuTarget, self).deploy() + +def start(self, params=None): +if self.runner.start(params): +self.ip = self.runner.ip +self.server_ip = self.runner.server_ip +self.connection = SSHControl(ip=self.ip, logfile=self.sshlog) +else: +raise bb.build.FuncFailed(%s - FAILED to start qemu - check the task log and the boot log % self.pn) + +def stop(self): +self.runner.stop() +self.connection = None +self.ip = None +self.server_ip = None + +def restart(self, params=None): +if self.runner.restart(params): +self.ip = self.runner.ip +self.server_ip = self.runner.server_ip +self.connection =
[OE-core] [PATCH v2 0/2] Run tests on a remote machine
Hello, These patches add some abstraction on how we control a target, so that we can also run the tests on real hardware. The backend is controlled by setting TEST_TARGET to qemu or simpleremote. (a very simple remote implementation which does not deploy the image but runs the tests on a remote machine via ssh to a specified IP address). Cheers, Stefan Changed in v2: - yay, typos: FunFailed - FuncFailed (there's a gremlin in my computer :)) - small changes in commit messages - one try/except block in targetcontrol.py was too big, scale it down. The following changes since commit 381cd842caa3db5eabf8973305b6979014d9d0a8: linux-firmware: add missing linux-firmware-iwlwifi-7260-7 package (2013-11-25 16:14:48 +) are available in the git repository at: git://git.yoctoproject.org/poky-contrib stefans/hwtest3 http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=stefans/hwtest3 Stefan Stanacar (2): lib/oeqa: targetcontrol.py: add abstraction for running tests on different targets testimage: use the new targetcontrol.py module for running tests meta/classes/testimage-auto.bbclass | 3 +- meta/classes/testimage.bbclass | 104 ++- meta/lib/oeqa/oetest.py | 20 +++--- meta/lib/oeqa/runtime/ping.py | 2 +- meta/lib/oeqa/runtime/smart.py | 4 +- meta/lib/oeqa/targetcontrol.py | 137 meta/lib/oeqa/utils/qemurunner.py | 50 +++-- meta/lib/oeqa/utils/sshcontrol.py | 20 ++ 8 files changed, 224 insertions(+), 116 deletions(-) create mode 100644 meta/lib/oeqa/targetcontrol.py -- 1.8.3.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 2/2] testimage: use the new targetcontrol.py module for running tests
This patch makes the necessary changes for using the targetcontrol.py module so that one can run the same tests on a qemu instance or a remote machine based on the value of TEST_TARGET variable: qemu or simpleremote. The default value is qemu which starts a qemu instance and it's the with what we currently have. With simpleremote, the remote machine must be up with network and ssh and you need to set TEST_TARGET_IP with the IP address of the remote machine (it can still be a qemu instance that was manually started). Basically testimage.bbclass now does something along the lines of: - load tests - deploy (prepare) / start target - run tests. There were a couple of changes necessary for tests and also some cleanups/renames that were needed to adjust this change. (use ip everywhere when refering to target and server_ip when refering to host/build machine) Also two unnecessary and unsed methods were dropped from sshcontrol. [ YOCTO #5554 ] Signed-off-by: Stefan Stanacar stefanx.stana...@intel.com --- meta/classes/testimage-auto.bbclass | 3 +- meta/classes/testimage.bbclass | 104 +--- meta/lib/oeqa/oetest.py | 20 +++ meta/lib/oeqa/runtime/ping.py | 2 +- meta/lib/oeqa/runtime/smart.py | 4 +- meta/lib/oeqa/utils/qemurunner.py | 50 ++--- meta/lib/oeqa/utils/sshcontrol.py | 20 +++ 7 files changed, 87 insertions(+), 116 deletions(-) diff --git a/meta/classes/testimage-auto.bbclass b/meta/classes/testimage-auto.bbclass index 3d0e289..a5b8f7f 100644 --- a/meta/classes/testimage-auto.bbclass +++ b/meta/classes/testimage-auto.bbclass @@ -19,5 +19,4 @@ python do_testimage_auto() { testimage_main(d) } addtask testimage_auto before do_build after do_rootfs -do_testimage_auto[depends] += qemu-native:do_populate_sysroot -do_testimage_auto[depends] += qemu-helper-native:do_populate_sysroot +do_testimage_auto[depends] += ${TESTIMAGEDEPENDS} diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index 5d61c2b..add8009 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass @@ -34,13 +34,19 @@ TEST_SUITES ?= ${DEFAULT_TEST_SUITES} TEST_QEMUBOOT_TIMEOUT ?= 1000 +TEST_TARGET ?= qemu +TEST_TARGET_IP ?= +TEST_SERVER_IP ?= + +TESTIMAGEDEPENDS = +TESTIMAGEDEPENDS_qemuall = qemu-native:do_populate_sysroot qemu-helper-native:do_populate_sysroot + python do_testimage() { testimage_main(d) } addtask testimage do_testimage[nostamp] = 1 -do_testimage[depends] += qemu-native:do_populate_sysroot -do_testimage[depends] += qemu-helper-native:do_populate_sysroot +do_testimage[depends] += ${TESTIMAGEDEPENDS} def get_tests_list(d): @@ -83,15 +89,12 @@ def testimage_main(d): import unittest import os import oeqa.runtime -import re -import shutil import time -from oeqa.oetest import runTests -from oeqa.utils.sshcontrol import SSHControl -from oeqa.utils.qemurunner import QemuRunner +from oeqa.oetest import loadTests, runTests +from oeqa.targetcontrol import get_target_controller -testdir = d.getVar(TEST_LOG_DIR, True) -bb.utils.mkdirhier(testdir) +pn = d.getVar(PN, True) +bb.utils.mkdirhier(d.getVar(TEST_LOG_DIR, True)) # tests in TEST_SUITES become required tests # they won't be skipped even if they aren't suitable for a image (like xorg for minimal) @@ -99,81 +102,46 @@ def testimage_main(d): testslist = get_tests_list(d) testsrequired = [t for t in d.getVar(TEST_SUITES, True).split() if t != auto] +# the robot dance +target = get_target_controller(d) + class TestContext: def __init__(self): self.d = d self.testslist = testslist self.testsrequired = testsrequired self.filesdir = os.path.join(os.path.dirname(os.path.abspath(oeqa.runtime.__file__)),files) +self.target = target # test context tc = TestContext() -# prepare qemu instance -# and boot each supported fs type -machine=d.getVar(MACHINE, True) -#will handle fs type eventually, stick with ext3 for now -#make a copy of the original rootfs and use that for tests -origrootfs=os.path.join(d.getVar(DEPLOY_DIR_IMAGE, True), d.getVar(IMAGE_LINK_NAME,True) + '.ext3') -testrootfs=os.path.join(testdir, d.getVar(IMAGE_LINK_NAME, True) + '-testimage.ext3') +# this is a dummy load of tests +# we are doing that to find compile errors in the tests themselves +# before booting the image try: -shutil.copyfile(origrootfs, testrootfs) +loadTests(tc) except Exception as e: -bb.fatal(Error copying rootfs: %s % e) +bb.fatal(Loading tests failed:\n %s % e) -try: -boottime = int(d.getVar(TEST_QEMUBOOT_TIMEOUT, True)) -except ValueError: -boottime = 1000 - -qemu = QemuRunner(machine=machine, rootfs=testrootfs, -
[OE-core] [PATCH 0/1] Hob: force notebook refresh
The following changes since commit 381cd842caa3db5eabf8973305b6979014d9d0a8: linux-firmware: add missing linux-firmware-iwlwifi-7260-7 package (2013-11-25 16:14:48 +) are available in the git repository at: git://git.yoctoproject.org/poky-contrib vpopa/YOCTO_5596 http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=vpopa/YOCTO_5596 Valentin Popa (1): Hob: force notebook refresh bitbake/lib/bb/ui/crumbs/builddetailspage.py | 1 + 1 file changed, 1 insertion(+) -- 1.8.3.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] Hob: force notebook refresh
Redraw the entire notebook widget after number-of-issues drawable is incremented (because for this case, the notebook widget doesn't refresh it's children automatically). [YOCTO #5596] Signed-off-by: Valentin Popa valentin.p...@intel.com --- bitbake/lib/bb/ui/crumbs/builddetailspage.py | 1 + 1 file changed, 1 insertion(+) diff --git a/bitbake/lib/bb/ui/crumbs/builddetailspage.py b/bitbake/lib/bb/ui/crumbs/builddetailspage.py index 1899956..7fc690e 100755 --- a/bitbake/lib/bb/ui/crumbs/builddetailspage.py +++ b/bitbake/lib/bb/ui/crumbs/builddetailspage.py @@ -185,6 +185,7 @@ class BuildDetailsPage (HobPage): def show_issues(self): self.num_of_issues += 1 self.notebook.show_indicator_icon(Issues, self.num_of_issues) +self.notebook.queue_draw() def reset_issues(self): self.num_of_issues = 0 -- 1.8.3.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/1] Hob: force notebook refresh
Ignore, wrong list. On 11/26/2013 11:22 AM, Valentin Popa wrote: The following changes since commit 381cd842caa3db5eabf8973305b6979014d9d0a8: linux-firmware: add missing linux-firmware-iwlwifi-7260-7 package (2013-11-25 16:14:48 +) are available in the git repository at: git://git.yoctoproject.org/poky-contrib vpopa/YOCTO_5596 http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=vpopa/YOCTO_5596 Valentin Popa (1): Hob: force notebook refresh bitbake/lib/bb/ui/crumbs/builddetailspage.py | 1 + 1 file changed, 1 insertion(+) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] xinetd: add status of init.d command
On 11/26/2013 4:57 PM, jackie.hu...@windriver.com wrote: From: Li Wang li.w...@windriver.com CQID: WIND00439690 Sorry forgot to remove this, I will re-send. Thanks, Jackie Signed-off-by: Li Wang li.w...@windriver.com --- meta/recipes-extended/xinetd/xinetd/xinetd.init | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/meta/recipes-extended/xinetd/xinetd/xinetd.init b/meta/recipes-extended/xinetd/xinetd/xinetd.init index 26dbea7..777c2c8 100644 --- a/meta/recipes-extended/xinetd/xinetd/xinetd.init +++ b/meta/recipes-extended/xinetd/xinetd/xinetd.init @@ -2,6 +2,9 @@ # # /etc/init.d/xinetd -- script to start and stop xinetd. +# Source function library. +. /etc/init.d/functions + if test -f /etc/default/xinetd; then . /etc/default/xinetd fi @@ -33,6 +36,10 @@ case $1 in start-stop-daemon --stop --signal 3 --quiet --exec /usr/sbin/xinetd echo . ;; +status) + status /usr/sbin/xinetd; + exit $? + ;; reload) echo -n Reloading internet superserver configuration: xinetd start-stop-daemon --stop --signal 1 --quiet --exec /usr/sbin/xinetd @@ -49,7 +56,7 @@ case $1 in $0 start ;; *) - echo Usage: /etc/init.d/xinetd {start|stop|reload|force-reload|restart} + echo Usage: /etc/init.d/xinetd {start|stop|status|reload|force-reload|restart} exit 1 ;; esac -- Jackie Huang WIND RIVER | China Development Center MSN:jackiel...@hotmail.com Tel: +86 8477 8594 Mobile: +86 138 1027 4745 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] xinetd: add status of init.d command
From: Li Wang li.w...@windriver.com Signed-off-by: Li Wang li.w...@windriver.com --- meta/recipes-extended/xinetd/xinetd/xinetd.init | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/meta/recipes-extended/xinetd/xinetd/xinetd.init b/meta/recipes-extended/xinetd/xinetd/xinetd.init index 26dbea7..777c2c8 100644 --- a/meta/recipes-extended/xinetd/xinetd/xinetd.init +++ b/meta/recipes-extended/xinetd/xinetd/xinetd.init @@ -2,6 +2,9 @@ # # /etc/init.d/xinetd -- script to start and stop xinetd. +# Source function library. +. /etc/init.d/functions + if test -f /etc/default/xinetd; then . /etc/default/xinetd fi @@ -33,6 +36,10 @@ case $1 in start-stop-daemon --stop --signal 3 --quiet --exec /usr/sbin/xinetd echo . ;; +status) + status /usr/sbin/xinetd; + exit $? + ;; reload) echo -n Reloading internet superserver configuration: xinetd start-stop-daemon --stop --signal 1 --quiet --exec /usr/sbin/xinetd @@ -49,7 +56,7 @@ case $1 in $0 start ;; *) - echo Usage: /etc/init.d/xinetd {start|stop|reload|force-reload|restart} + echo Usage: /etc/init.d/xinetd {start|stop|status|reload|force-reload|restart} exit 1 ;; esac -- 1.8.3 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] tzcode-native: Replace fixed version with PV
From: Yue Tao yue@windriver.com Signed-off-by: Yue Tao yue@windriver.com --- meta/recipes-extended/tzcode/tzcode-native_2013h.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-extended/tzcode/tzcode-native_2013h.bb b/meta/recipes-extended/tzcode/tzcode-native_2013h.bb index 5cdc7ef..b51e303 100644 --- a/meta/recipes-extended/tzcode/tzcode-native_2013h.bb +++ b/meta/recipes-extended/tzcode/tzcode-native_2013h.bb @@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = file://${WORKDIR}/README;md5=0b7570113550eb5d30aa4bd220964b8 # note that we allow for us to use data later than our code version # SRC_URI = ftp://ftp.iana.org/tz/releases/tzcode${PV}.tar.gz;name=tzcode \ - ftp://ftp.iana.org/tz/releases/tzdata2013h.tar.gz;name=tzdata; + ftp://ftp.iana.org/tz/releases/tzdata${PV}.tar.gz;name=tzdata \ + SRC_URI[tzdata.md5sum] = d310abe42cbe87e76ceb69e2c7003c92 SRC_URI[tzdata.sha256sum] = 6b9e17e823eec0e09e12f74b452a70be4face1ef14c2fb1917b7c7e60564de27 -- 1.8.3 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] libpng: upgrade to 1.6.7
The following changes since commit 381cd842caa3db5eabf8973305b6979014d9d0a8: linux-firmware: add missing linux-firmware-iwlwifi-7260-7 package (2013-11-25 16:14:48 +) are available in the git repository at: git://git.yoctoproject.org/poky-contrib vpopa/upgrade_libpng http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=vpopa/upgrade_libpng Valentin Popa (1): libpng: upgrade to 1.6.7 .../0001-configure-lower-automake-requirement.patch | 15 --- .../libpng/{libpng_1.6.6.bb = libpng_1.6.7.bb} | 10 +- 2 files changed, 13 insertions(+), 12 deletions(-) rename meta/recipes-multimedia/libpng/{libpng_1.6.6.bb = libpng_1.6.7.bb} (62%) -- 1.8.3.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] libpng: upgrade to 1.6.7
License is the same. Signed-off-by: Valentin Popa valentin.p...@intel.com --- .../0001-configure-lower-automake-requirement.patch | 15 --- .../libpng/{libpng_1.6.6.bb = libpng_1.6.7.bb} | 10 +- 2 files changed, 13 insertions(+), 12 deletions(-) rename meta/recipes-multimedia/libpng/{libpng_1.6.6.bb = libpng_1.6.7.bb} (62%) diff --git a/meta/recipes-multimedia/libpng/libpng/0001-configure-lower-automake-requirement.patch b/meta/recipes-multimedia/libpng/libpng/0001-configure-lower-automake-requirement.patch index e38e0a8..bbbca89 100644 --- a/meta/recipes-multimedia/libpng/libpng/0001-configure-lower-automake-requirement.patch +++ b/meta/recipes-multimedia/libpng/libpng/0001-configure-lower-automake-requirement.patch @@ -1,10 +1,11 @@ -From a4fd84bdc69e9929a1040f20ea291ee3115bf5b2 Mon Sep 17 00:00:00 2001 -From: Koen Kooi k...@dominion.thruhere.net -Date: Mon, 15 Apr 2013 11:16:20 +0200 +From fff7cbc01e061a235852f385866fe75fb17867e3 Mon Sep 17 00:00:00 2001 +From: Valentin Popa valentin.p...@intel.com +Date: Tue, 26 Nov 2013 12:06:55 +0200 Subject: [PATCH] configure: lower automake requirement We're not using parallel tests in OE-core yet +Signed-off-by: Valentin Popa valentin.p...@intel.com Signed-off-by: Koen Kooi k...@dominion.thruhere.net Upstream-Status: Inapropriate [OE specific build hack] @@ -13,18 +14,18 @@ Upstream-Status: Inapropriate [OE specific build hack] 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 1745d31..7f015fe 100644 +index 28200c3..fab2515 100644 --- a/configure.ac +++ b/configure.ac @@ -27,7 +27,7 @@ AC_CONFIG_MACRO_DIR([scripts]) # dist-xz requires automake 1.11 or later # 1.12.2 fixes a security issue in 1.11.2 and 1.12.1 # 1.13 is required for parallel tests --AM_INIT_AUTOMAKE([1.13 foreign dist-xz color-tests silent-rules]) -+AM_INIT_AUTOMAKE([1.12.2 foreign dist-xz color-tests silent-rules]) +-AM_INIT_AUTOMAKE([1.13 foreign dist-xz color-tests silent-rules subdir-objects]) ++AM_INIT_AUTOMAKE([1.12.2 foreign dist-xz color-tests silent-rules subdir-objects]) # The following line causes --disable-maintainer-mode to be the default to # configure, this is necessary because libpng distributions cannot rely on the # time stamps of the autotools generated files being correct -- -1.8.1.4 +1.8.3.2 diff --git a/meta/recipes-multimedia/libpng/libpng_1.6.6.bb b/meta/recipes-multimedia/libpng/libpng_1.6.7.bb similarity index 62% rename from meta/recipes-multimedia/libpng/libpng_1.6.6.bb rename to meta/recipes-multimedia/libpng/libpng_1.6.7.bb index 376dd53..0f5ae5d 100644 --- a/meta/recipes-multimedia/libpng/libpng_1.6.6.bb +++ b/meta/recipes-multimedia/libpng/libpng_1.6.7.bb @@ -3,9 +3,9 @@ DESCRIPTION = PNG Library HOMEPAGE = http://www.libpng.org/; SECTION = libs LICENSE = Libpng -LIC_FILES_CHKSUM = file://LICENSE;md5=2ebec5fb1db10234542f80fdd7117e25 \ - file://png.h;endline=15;md5=41143e20c803af0a376888699ce0980e \ - file://png.h;beginline=209;endline=323;md5=d30ef0b1dd12d869cb3c6bdb3678e5f4 +LIC_FILES_CHKSUM = file://LICENSE;md5=243135ddedf702158f9170807cbcfb66 \ + file://png.h;endline=15;md5=cb4981447519fe0bb87fbda5e8cd50be \ + file://png.h;beginline=209;endline=323;md5=f6b7821e0ddefaa4d71fdfa1f5a91fb7 DEPENDS = zlib LIBV = 16 @@ -13,8 +13,8 @@ SRC_URI = ${SOURCEFORGE_MIRROR}/project/libpng/libpng${LIBV}/${PV}/libpng-${PV} file://0001-configure-lower-automake-requirement.patch \ -SRC_URI[md5sum] = 3a41dcd58bcac7cc191c2ec80c7fb2ac -SRC_URI[sha256sum] = 0407965a0057af7a9e4cefe27c062f517d9ad701cdfd20aa91afb6a84f214e70 +SRC_URI[md5sum] = 7023a9eacd7b6a3eb95761a2f574d456 +SRC_URI[sha256sum] = 13c9c853a9a600218fff9961658dc4f485ad2ef9b862315b434dd2fdbbe1f945 inherit autotools binconfig pkgconfig -- 1.8.3.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] libav: use CCLD as ld
The libav uses gcc as the ld, but it doesn't use CCLD, it may have problems when target arch is 64 bit since it doesn't use the -m64, the poky's toolchain is fine since use x86_64-poky-linux-gcc without -m64 is default to 64 bit, but external toolchain *may* default to 32 bit (for example, when multilib is enabled and both 64 and 32 bit use the same gcc, then the default arch can be either of them), then there would be errors, the error is just like we run this in poky: $ x86_64-poky-linux-gcc -m32 file.c ld: skipping incompatible /path/to/sysroot/usr/lib64/x86_64-poky-linux/4.8.2/libgcc.a when searching for -lgcc Use CCLD as the ld will fix the problem since CCLD has been set correctly. Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/recipes-multimedia/libav/libav.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-multimedia/libav/libav.inc b/meta/recipes-multimedia/libav/libav.inc index eefee66..4c96f24 100644 --- a/meta/recipes-multimedia/libav/libav.inc +++ b/meta/recipes-multimedia/libav/libav.inc @@ -45,6 +45,7 @@ EXTRA_OECONF = \ \ --enable-avserver \ --enable-avplay \ +--ld=${CCLD} \ --enable-libtheora \ --enable-libvorbis \ --arch=${TARGET_ARCH} \ -- 1.8.3.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] libav: use CCLD as ld
The following changes since commit dd2ea6878a527df53e0eaa1a59d98c7afa6f4078: coreutils 6.9: fix coreutils.texi (2013-11-26 18:33:16 +0800) are available in the git repository at: git://git.pokylinux.org/poky-contrib robert/libav http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/libav Robert Yang (1): libav: use CCLD as ld meta/recipes-multimedia/libav/libav.inc | 1 + 1 file changed, 1 insertion(+) -- 1.8.3.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC PATCH 1/1] lib32-packagegroup-core-nfs: fix qa issue - install files into a shared area when those files already exist
Hi Richard, This issue could be reproduced only by building multilib packagegroup package in the first time. *Step: 1) bitbake packagegroup-core-nfs-server 2) bitbake lib32-packagegroup-core-nfs-server Only the first time to do the build has this issue: ... WARNING: The recipe lib32-packagegroup-core-nfs is trying to install files into a shared area when those files already exist. Those files and their manifest location are: /home/jiahongxu/yocto/build-20131120-yocto-qemux86-64/tmp/deploy/rpm/all/packagegroup-core-nfs-server-1.0-r2.all.rpm Matched in manifest-allarch-packagegroup-core-nfs.deploy-rpm ... *Why was the first build? 1) If not the first time to build lib32-packagegroup-*, the lib32-packagegroup*'s manifest existed, and the current build could remove the existed rpm package by reading and cleaning the manifest. 2) During the first time, its manifest didn't exist, so there was no cleaning operation. But if packagegroup-*'s manifest existed, the existed conflict file check will search it, and report the warning. //Hongxu On 11/22/2013 08:27 PM, Richard Purdie wrote: On Fri, 2013-11-22 at 20:21 +0800, Hongxu Jia wrote: Hi Richard, 1. What is the situation to set PACKAGE_ARCH = ${MACHINE_ARCH} in packagegroup recipe? In this case, MACHINE is qemux86-64, and the packagegroup-core-nfs's RDEPENDS are: packagegroup-core-nfs-server - nfs-utils [style=dashed] packagegroup-core-nfs-server - nfs-utils-client [style=dashed] We check one utility in nfs-utils by invoking file: $ file image/usr/sbin/exportfs image/usr/sbin/exportfs: ELF 64-bit LSB executable, x86-64, version 1 (SYSV), dynamically linked (uses shared libs), for GNU/Linux 2.6.34, not stripped Should we consider the nfs-utils and lib32-nfs-utils are different arch? If the answer is yes, the lib32-packagegroup-core-nfs's RDEPENDS should be: lib32-packagegroup-core-nfs-server - lib32-nfs-utils-client [style=dashed] lib32-packagegroup-core-nfs-server - lib32-nfs-utils [style=dashed] In this situation, I think we should set PACKAGE_ARCH with ${MACHINE_ARCH} in packagegroup-core-nfs recipe. But there are lots of packagegroup packages that didn't have set PACKAGE_ARCH with ${MACHINE_ARCH} in their recipe. After a quick search in oe-core, 7 packagegroup recipes did set and almost 33 didn't, so how about use PACKAGE_ARCH = ${MACHINE_ARCH} by default for packagegroup or just did not inherit allarch in packagegroup.bbclass? 2. What shoud we do if packagegroup packages is allarch? When the packagegroup packages is allarch and multilib is enabled, should we still *do the multilib work* for this allarch recipe? If we do, the override issue happened. In this case, if we don't set PACKAGE_ARCH with ${MACHINE_ARCH}, packagegroup-core-nfs and lib32-packagegroup-core-nfs have different ${WORKDIR}: WORKDIR=${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}/${PN}/${EXTENDPE}${PV}-${PR} MULTIMACH_TARGET_SYS=${PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS} In packagegroup-core-nfs, we have: TARGET_VENDOR=-poky PN=packagegroup-core-nfs In lib32-packagegroup-core-nfs, after the multilib process we have: TARGET_VENDOR=-pokymllib32 PN=lib32-packagegroup-core-nfs So we had better to forbid multilib work for the allarch recipe. Do you have http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=26559c581695f60861483691e08eee06f524287f applied to your tree? I'm hoping this issue does not exist when that patch is applied. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/1] shadow-native: allow for setting password in clear text
On 25/11/13 03:03, ChenQi wrote: ping On 11/16/2013 03:37 PM, qi.c...@windriver.com wrote: From: Chen Qi qi.c...@windriver.com The following changes since commit ea92671d9823e3667d6ced7ac2af20f991da404d: bitbake: cooker: replace w file opening mode with a mode (2013-11-12 17:01:37 +) are available in the git repository at: git://git.pokylinux.org/poky-contrib ChenQi/cleartext-password http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/cleartext-password Chen Qi (1): shadow-native: allow for setting password in clear text .../allow-for-setting-password-in-clear-text.patch | 208 meta/recipes-extended/shadow/shadow.inc|1 + 2 files changed, 209 insertions(+) create mode 100644 meta/recipes-extended/shadow/files/allow-for-setting-password-in-clear-text.patch Could you provide a short example for how this is to be used? An additional patch to user-add in meta-skeleton perhaps? -- Jack Mitchell (j...@embed.me.uk) Embedded Systems Engineer Cambridgeshire, UK http://www.embed.me.uk -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] classes/image: write image manifest
Write a list of installed packages to a .manifest file next to the image, so we can find out what went into the image after it has been constructed without necessarily having to have buildhistory enabled (although that will provide more detail.) We can make use of this for example in the testimage class associated code that checks for installed packages for determining whether or not to run specific tests. Note: this replaces the previous ipk-specific manifest code with something that works for ipk, rpm and deb, and instead of a pruned status file, packages are listed one per line, in the following format: packagename packagearch version Tests for all three backends have shown that the performance impact of this change is negligible (about 1.5s max). Implements [YOCTO #5410] Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com --- meta/classes/image.bbclass| 15 +-- meta/classes/populate_sdk_deb.bbclass | 2 ++ meta/classes/populate_sdk_ipk.bbclass | 2 ++ meta/classes/populate_sdk_rpm.bbclass | 2 ++ meta/classes/rootfs_ipk.bbclass | 14 -- scripts/opkg-query-helper.py | 9 + 6 files changed, 24 insertions(+), 20 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index bc60f0d..8217fb3 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -179,6 +179,9 @@ ROOTFS_POSTPROCESS_COMMAND_prepend = run_intercept_scriptlets; 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)}' +# Write manifest +IMAGE_MANIFEST = ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.manifest +ROOTFS_POSTPROCESS_COMMAND =+ write_image_manifest ; # Set default postinst log file POSTINST_LOGFILE ?= ${localstatedir}/log/postinstall.log @@ -381,6 +384,11 @@ fakeroot do_rootfs () { ${IMAGE_POSTPROCESS_COMMAND} ${MACHINE_POSTPROCESS_COMMAND} + + if [ -n ${IMAGE_LINK_NAME} -a -f ${IMAGE_MANIFEST} ]; then + rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.manifest + ln -s ${IMAGE_NAME}.rootfs.manifest ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.manifest + fi } insert_feed_uris () { @@ -602,12 +610,7 @@ make_zimage_symlink_relative () { } write_image_manifest () { - rootfs_${IMAGE_PKGTYPE}_write_manifest - - if [ -n ${IMAGE_LINK_NAME} ]; then - rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.manifest - ln -s ${IMAGE_NAME}.rootfs.manifest ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.manifest - fi + list_installed_packages ver | sort ${IMAGE_MANIFEST} } # Make login manager(s) enable automatic login. diff --git a/meta/classes/populate_sdk_deb.bbclass b/meta/classes/populate_sdk_deb.bbclass index ebb842b..a63280d 100644 --- a/meta/classes/populate_sdk_deb.bbclass +++ b/meta/classes/populate_sdk_deb.bbclass @@ -84,6 +84,8 @@ list_installed_packages() { echo $pkg $fullpath $pkgarch fi done + elif [ $1 = ver ] ; then + ${DPKG_QUERY_COMMAND} -W -f='${Package} ${PackageArch} ${Version}\n' else ${DPKG_QUERY_COMMAND} -W -f='${Package}\n' fi diff --git a/meta/classes/populate_sdk_ipk.bbclass b/meta/classes/populate_sdk_ipk.bbclass index 04c71af..fc6ed53 100644 --- a/meta/classes/populate_sdk_ipk.bbclass +++ b/meta/classes/populate_sdk_ipk.bbclass @@ -70,6 +70,8 @@ list_installed_packages() { echo $pkg $fullpath $pkgarch fi done + elif [ $1 = ver ] ; then + opkg-cl ${OPKG_ARGS} status | opkg-query-helper.py -v else opkg-cl ${OPKG_ARGS} list_installed | awk '{ print $1 }' fi diff --git a/meta/classes/populate_sdk_rpm.bbclass b/meta/classes/populate_sdk_rpm.bbclass index b010593..67cccaf 100644 --- a/meta/classes/populate_sdk_rpm.bbclass +++ b/meta/classes/populate_sdk_rpm.bbclass @@ -162,6 +162,8 @@ list_installed_packages() { ${RPM_QUERY_CMD} -qa --qf [%{NAME} %{ARCH}\n] | translate_smart_to_oe arch elif [ $1 = file ]; then ${RPM_QUERY_CMD} -qa --qf [%{NAME} %{ARCH} %{PACKAGEORIGIN}\n] | translate_smart_to_oe file + elif [ $1 = ver ]; then + ${RPM_QUERY_CMD} -qa --qf [%{NAME} %{ARCH} %{VERSION}\n] | translate_smart_to_oe arch else ${RPM_QUERY_CMD} -qa --qf [%{NAME} %{ARCH}\n] | translate_smart_to_oe fi diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass index 6ce3e5d..dbe1c79 100644 --- a/meta/classes/rootfs_ipk.bbclass +++ b/meta/classes/rootfs_ipk.bbclass @@ -118,20 +118,6 @@ save_postinsts () { done }
[OE-core] [PATCH 0/1] Image manifest support
The following change since commit 25a75e83550fab0f9d2486b13ec9ab6339b6a8b0: linux-firmware: add missing linux-firmware-iwlwifi-7260-7 package (2013-11-25 16:14:15 +) is available in the git repository at: git://git.openembedded.org/openembedded-core-contrib paule/manifest http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/manifest Paul Eggleton (1): classes/image: write image manifest meta/classes/image.bbclass| 15 +-- meta/classes/populate_sdk_deb.bbclass | 2 ++ meta/classes/populate_sdk_ipk.bbclass | 2 ++ meta/classes/populate_sdk_rpm.bbclass | 2 ++ meta/classes/rootfs_ipk.bbclass | 14 -- scripts/opkg-query-helper.py | 9 + 6 files changed, 24 insertions(+), 20 deletions(-) -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] qemu: add PACKAGECONFIG for vnc, libcurl, nss, uuid, curses, gtk+, libcap-ng
On Sat, 2013-11-02 at 14:52 +0800, Hongxu Jia wrote: Use PACKAGECONFIG to explicitly address vnc, libcurl, nss, uuid, curses, gtk+, libcap-ng dependencies rather than tested by configure. It avoided potential errors while multiple builds shared a common state_cache. Signed-off-by: Hongxu Jia hongxu@windriver.com --- meta/recipes-devtools/qemu/qemu.inc | 19 --- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 1b861d7..be0495a 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -28,10 +28,9 @@ SRC_URI_append_class-native = \ file://fix-libcap-header-issue-on-some-distro.patch \ -EXTRA_OECONF += --target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls --audio-drv-list=oss,alsa --disable-curl --disable-vnc-jpeg --disable-bluez --with-system-pixman --extra-cflags='${CFLAGS}' +EXTRA_OECONF += --target-list=${@get_qemu_target_list(d)} --disable-werror --audio-drv-list=oss,alsa --disable-bluez --with-system-pixman --extra-cflags='${CFLAGS}' -EXTRA_OECONF_class-nativesdk = --target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls \ - --disable-curl \ +EXTRA_OECONF_class-nativesdk = --target-list=${@get_qemu_target_list(d)} --disable-werror \ export LIBTOOL=${HOST_SYS}-libtool @@ -80,9 +79,23 @@ do_install_append() { } # END of qemu-mips workaround +# Disable the following PACKAGECONFIG varflag by default. Such as graphics is +# disabled for qemu-native, if you need to enable some of them for qemu-native, +# set PACKAGECONFIG_pn-qemu-native += varflag1 varflag2 in local.conf PACKAGECONFIG ??= PACKAGECONFIG[virtfs] = --enable-virtfs --enable-attr,--disable-virtfs,libcap attr, PACKAGECONFIG[aio] = --enable-linux-aio,--disable-linux-aio,libaio, +PACKAGECONFIG[vnc-tls] = --enable-vnc --enable-vnc-tls,--disable-vnc-tls, gnutls, +PACKAGECONFIG[vnc-ws] = --enable-vnc --enable-vnc-ws,--disable-vnc-ws, gnutls, +PACKAGECONFIG[vnc-sasl] = --enable-vnc --enable-vnc-sasl,--disable-vnc-sasl,cyrus-sasl, +PACKAGECONFIG[vnc-jpeg] = --enable-vnc --enable-vnc-jpeg,--disable-vnc-jpeg,jpeg, +PACKAGECONFIG[vnc-png] = --enable-vnc --enable-vnc-png,--disable-vnc-png,libpng, +PACKAGECONFIG[libcurl] = --enable-curl,--disable-curl,libcurl, +PACKAGECONFIG[nss] = --enable-smartcard-nss,--disable-smartcard-nss,nss, +PACKAGECONFIG[uuid] = --enable-uuid,--disable-uuid,util-linux, +PACKAGECONFIG[curses] = --enable-curses,--disable-curses,ncurses, +PACKAGECONFIG[gtk+] = --enable-gtk,--disable-gtk,gtk+ libvte, +PACKAGECONFIG[libcap-ng] = --enable-cap-ng,--disable-cap-ng,libcap-ng, # Qemu target will not build in world build for ARM or Mips BROKEN_qemuarm = 1 I merged this however I notice there are yet more floating dependencies since sdl is floating (at least). For sdl, can we add the PACKAGECONFIG option however also add an entry to local.conf.sample which documents how to enable sdl for qemu-native? I suspect that is the option most people are using to make runqemu useful. We may also want to have the option of assuming libsdl-native is provided since otherwise we end up in the tangled world of GL support and we don't want to build our own libsdl-native in most cases. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/3] Package upgrades
Hi, Tests done: * build tested on AB running following nightlies: build-appliance, x86, x86_64, ppc, mips, arm; * checked with dpkg if the packages were installed and their version on a sato image; test --version functionality Thanks, Cristiana The following changes since commit 6ddb9bf0976169fde7eee16d70a83210aa354416: bitbake: perforce: Fix path subdirectory issues (2013-11-24 12:25:37 +) are available in the git repository at: git://git.yoctoproject.org/poky-contrib cvoicu/work http://git.yoctoproject.org/cgit.cgi//log/?h=cvoicu/work Cristiana Voicu (3): apr: upgrade to 1.5.0 apr-util: upgrade to 1.5.3 systemtap: upgrade to 2.4 meta/recipes-kernel/systemtap/systemtap_git.inc|4 ++-- .../apr/{apr-util_1.5.2.bb = apr-util_1.5.3.bb} |4 ++-- .../apr/{apr_1.4.8.bb = apr_1.5.0.bb} |6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) rename meta/recipes-support/apr/{apr-util_1.5.2.bb = apr-util_1.5.3.bb} (92%) rename meta/recipes-support/apr/{apr_1.4.8.bb = apr_1.5.0.bb} (89%) -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] apr-util: upgrade to 1.5.3
Signed-off-by: Cristiana Voicu cristiana.vo...@intel.com --- .../apr/{apr-util_1.5.2.bb = apr-util_1.5.3.bb} |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-support/apr/{apr-util_1.5.2.bb = apr-util_1.5.3.bb} (92%) diff --git a/meta/recipes-support/apr/apr-util_1.5.2.bb b/meta/recipes-support/apr/apr-util_1.5.3.bb similarity index 92% rename from meta/recipes-support/apr/apr-util_1.5.2.bb rename to meta/recipes-support/apr/apr-util_1.5.3.bb index ea0f7fb..3ca1f57 100644 --- a/meta/recipes-support/apr/apr-util_1.5.2.bb +++ b/meta/recipes-support/apr/apr-util_1.5.3.bb @@ -13,8 +13,8 @@ SRC_URI = ${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.gz \ file://configfix.patch \ file://configure_fixes.patch -SRC_URI[md5sum] = eb682cfb8642babba427a4fb391b15e8 -SRC_URI[sha256sum] = a1ec5025373815795d2fa5bfac40c0984675feffc88e049be9a162c408c2f613 +SRC_URI[md5sum] = 71a11d037240b292f824ba1eb537b4e3 +SRC_URI[sha256sum] = 76db34cb508e346e3bf69347c29ed1500bf0b71bcc48d54271ad9d1c25703743 EXTRA_OECONF = --with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ --without-odbc \ -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] apr: upgrade to 1.5.0
The following typo was fixed in the license file: code for the these subcomponents is subject to the terms and conditions of the following licenses. code for these subcomponents is subject to the terms and conditions of the following licenses. Signed-off-by: Cristiana Voicu cristiana.vo...@intel.com --- .../apr/{apr_1.4.8.bb = apr_1.5.0.bb} |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-support/apr/{apr_1.4.8.bb = apr_1.5.0.bb} (89%) diff --git a/meta/recipes-support/apr/apr_1.4.8.bb b/meta/recipes-support/apr/apr_1.5.0.bb similarity index 89% rename from meta/recipes-support/apr/apr_1.4.8.bb rename to meta/recipes-support/apr/apr_1.5.0.bb index d834170..04f7a22 100644 --- a/meta/recipes-support/apr/apr_1.4.8.bb +++ b/meta/recipes-support/apr/apr_1.5.0.bb @@ -4,7 +4,7 @@ SECTION = libs DEPENDS = util-linux LICENSE = Apache-2.0 -LIC_FILES_CHKSUM = file://LICENSE;md5=0c35ff3c4c83b89d2f076e315caac28b \ +LIC_FILES_CHKSUM = file://LICENSE;md5=4dfd4cd216828c8cae5de5a12f3844c8 \ file://include/apr_lib.h;endline=17;md5=ee42fa7575dc40580a9e01c1b75fae96 BBCLASSEXTEND = native @@ -14,8 +14,8 @@ SRC_URI = ${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ file://cleanup.patch \ file://configfix.patch -SRC_URI[md5sum] = ce2ab01a0c3cdb71cf0a6326b8654f41 -SRC_URI[sha256sum] = 61b8d2f8d321c6365ee3d71d0bb41f3a89c44da6124cc5b407a3b8319d660421 +SRC_URI[md5sum] = cc93bd2c12d0d037f68e21cc6385dc31 +SRC_URI[sha256sum] = 17287d36a5917e27281e60d47e7b147bd5ddcd1ca832702c2318f5e0724f1221 inherit autotools lib_package binconfig multilib_header -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] systemtap: upgrade to 2.4
Signed-off-by: Cristiana Voicu cristiana.vo...@intel.com --- meta/recipes-kernel/systemtap/systemtap_git.inc |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc index d8c6408..9da5588 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.inc +++ b/meta/recipes-kernel/systemtap/systemtap_git.inc @@ -1,8 +1,8 @@ LICENSE = GPLv2 LIC_FILES_CHKSUM = file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 -SRCREV = e58138572ebddac9498b93c76770eeca7d45e3b1 -PV = 2.3+git${SRCPV} +SRCREV = aa7b1e00e6cb7058071ead0180de0541b1c6eccf +PV = 2.4+git${SRCPV} SRC_URI = git://sourceware.org/git/systemtap.git \ file://docproc-build-fix.patch \ -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] beecrypt: Add PACKAGECONFIG for cplusplus
Add a PACKGECONFIG to control the building of the beecrypt C++ bindings. The only user of beecrypt in OE-Core is rpm and this doesn't need the C++ bindings so default the option to be off. This means we can lose the icu dependency by default which is a significant performance win. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- diff --git a/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb b/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb index 0a8ff4b..a917201 100644 --- a/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb +++ b/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb @@ -16,8 +16,6 @@ LIC_FILES_CHKSUM = file://COPYING;md5=9894370afd5dfe7d02b8d14319e729a1 \ file://COPYING.LIB;md5=dcf3c825659e82539645da41a7908589 \ file://include/beecrypt/beecrypt.h;endline=20;md5=47a93eef539aac237eef86297a4d71c1 -DEPENDS = icu - PR = r3 inherit autotools multilib_header @@ -29,6 +27,9 @@ do_install_append() { EXTRA_OECONF=--without-python --enable-shared --enable-static --disable-openmp --with-java=no +PACKAGECONFIG = +PACKAGECONFIG[cplusplus] = --with-cplusplus,--without-cplusplus,icu + FILES_${PN} = ${sysconfdir} ${libdir}/*.so.* ${libdir}/${BPN}/*.so.* FILES_${PN}-dev += ${libdir}/${BPN}/*.so ${libdir}/${BPN}/*.la FILES_${PN}-staticdev += ${libdir}/${BPN}/*.a ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/7] alsa-utils-alsaconf: tidy up path setting
* Set FILESEXTRAPATHS instead of FILESPATH * Don't set THISDIR, it's already set by base.bbclass Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com --- meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.27.2.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.27.2.bb b/meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.27.2.bb index a3fa1d0..cacc37c 100644 --- a/meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.27.2.bb +++ b/meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.27.2.bb @@ -1,7 +1,6 @@ require alsa-utils_${PV}.bb -THISDIR := ${@os.path.dirname(bb.data.getVar('FILE', d, True))} -FILESPATH =. ${@base_set_filespath([${THISDIR}/alsa-utils], d)}: +FILESEXTRAPATHS_prepend := ${THISDIR}/alsa-utils: PACKAGES = ${PN} RDEPENDS_${PN} += bash -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/7] squashfs-tools: drop FILESPATHPKG
Drop FILESPATHPKG setting since it seems to be superfluous. Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com --- meta/recipes-devtools/squashfs-tools/squashfs-tools_4.2.bb | 3 --- 1 file changed, 3 deletions(-) diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.2.bb b/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.2.bb index 00b68ab..5de02cd 100644 --- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.2.bb +++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.2.bb @@ -37,9 +37,6 @@ do_install () { install -m 0755 mksquashfs ${D}${sbindir}/ } -# required to share same place with -lzma specific packages -FILESPATHPKG =. squashfs-tools-${PV}: - ARM_INSTRUCTION_SET = arm BBCLASSEXTEND = native -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/7] squashfs-tools: set SUMMARY instead of DESCRIPTION
Also tidy up value a little bit. Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com --- meta/recipes-devtools/squashfs-tools/squashfs-tools_4.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.2.bb b/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.2.bb index 5de02cd..57400cd 100644 --- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.2.bb +++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.2.bb @@ -1,6 +1,6 @@ # Note, we can probably remove the lzma option as it has be replaced with xz, # and I don't think the kernel supports it any more. -DESCRIPTION = Tools to manipulate Squashfs filesystems. +SUMMARY = Tools for manipulating SquashFS filesystems SECTION = base LICENSE = GPL-2 PD LIC_FILES_CHKSUM = file://../COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/7] eee-acpi-scripts: tidy up recipe
* Set SUMMARY instead of DESCRIPTION * Move packaging variables to the end * Fix spacing in LICENSE assignment * Fix indenting Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com --- meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb | 15 --- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb b/meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb index 5f613f6..c2a02aa 100644 --- a/meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb +++ b/meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb @@ -1,15 +1,13 @@ -DESCRIPTION = eeePC specific ACPI scripts +SUMMARY = eeePC specific ACPI scripts HOMEPAGE = http://alioth.debian.org/projects/debian-eeepc/; SECTION = base -LICENSE=GPLv2 +LICENSE = GPLv2 LIC_FILES_CHKSUM = file://debian/copyright;md5=77ef83ab5f4af938a93edb61f7b74f2c SRCREV = 9d4cdedca25b396405f8587f9c4fbf8229e041c2 PV = 1.1.12+git${SRCPV} -RDEPENDS_${PN} = pm-utils - SRC_URI = git://git.debian.org/git/debian-eeepc/eeepc-acpi-scripts.git \ file://remove-doc-check.patch \ file://powerbtn.patch \ @@ -18,9 +16,9 @@ SRC_URI = git://git.debian.org/git/debian-eeepc/eeepc-acpi-scripts.git \ S = ${WORKDIR}/git FILES_${PN} = ${datadir}/acpi-support/ \ - ${datadir}/eeepc-acpi-scripts \ - ${sysconfdir}/default/ \ - ${sysconfdir}/acpi/ + ${datadir}/eeepc-acpi-scripts \ + ${sysconfdir}/default/ \ + ${sysconfdir}/acpi/ do_install () { install -d ${D}${sysconfdir}/default/ @@ -36,3 +34,6 @@ do_install () { install -m 0644 ${WORKDIR}/policy-funcs ${D}${datadir}/acpi-support/ install -m 0644 ${S}/debian/eeepc-acpi-scripts.default* ${D}${sysconfdir}/default/ } + +RDEPENDS_${PN} = pm-utils + -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/7] libpng: set reasonable SUMMARY
Also don't set DESCRIPTION to the same value, it's superfluous. Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com --- meta/recipes-lsb4/libpng/libpng12_1.2.50.bb| 3 +-- meta/recipes-multimedia/libpng/libpng_1.6.6.bb | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/meta/recipes-lsb4/libpng/libpng12_1.2.50.bb b/meta/recipes-lsb4/libpng/libpng12_1.2.50.bb index 95d5fb1..29d581b 100644 --- a/meta/recipes-lsb4/libpng/libpng12_1.2.50.bb +++ b/meta/recipes-lsb4/libpng/libpng12_1.2.50.bb @@ -1,5 +1,4 @@ -SUMMARY = PNG Library -DESCRIPTION = PNG Library +SUMMARY = PNG image format decoding library HOMEPAGE = http://www.libpng.org/; SECTION = libs LICENSE = Libpng diff --git a/meta/recipes-multimedia/libpng/libpng_1.6.6.bb b/meta/recipes-multimedia/libpng/libpng_1.6.6.bb index 376dd53..7bc8141 100644 --- a/meta/recipes-multimedia/libpng/libpng_1.6.6.bb +++ b/meta/recipes-multimedia/libpng/libpng_1.6.6.bb @@ -1,5 +1,4 @@ -SUMMARY = PNG Library -DESCRIPTION = PNG Library +SUMMARY = PNG image format decoding library HOMEPAGE = http://www.libpng.org/; SECTION = libs LICENSE = Libpng -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/7] dropbear: set SUMMARY instead of DESCRIPTION
Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com --- meta/recipes-core/dropbear/dropbear.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc index ee17d9f..5d9623d 100644 --- a/meta/recipes-core/dropbear/dropbear.inc +++ b/meta/recipes-core/dropbear/dropbear.inc @@ -1,4 +1,4 @@ -DESCRIPTION = Dropbear is a lightweight SSH and SCP implementation +SUMMARY = A lightweight SSH and SCP implementation HOMEPAGE = http://matt.ucc.asn.au/dropbear/dropbear.html; SECTION = console/network -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/7] Recipe cleanups
The following changes since commit 4482af07df26644885bae49b98f5d765a5caa68c: qemu: add PACKAGECONFIG for vnc, libcurl, nss, uuid, curses, gtk+, libcap-ng (2013-11-26 12:09:51 +) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib paule/cleanup http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/cleanup Paul Eggleton (7): squashfs-tools: drop FILESPATHPKG squashfs-tools: set SUMMARY instead of DESCRIPTION alsa-utils-alsaconf: tidy up path setting eee-acpi-scripts: tidy up recipe dropbear: set SUMMARY instead of DESCRIPTION libpng: set reasonable SUMMARY Don't set DESCRIPTION to the same value as SUMMARY meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb | 15 --- meta/recipes-connectivity/nfs-utils/libnfsidmap_0.25.bb | 1 - meta/recipes-core/dropbear/dropbear.inc | 2 +- meta/recipes-devtools/cdrtools/cdrtools-native_3.01a17.bb | 1 - .../docbook-dsssl-stylesheets-native_1.79.bb | 1 - meta/recipes-devtools/dosfstools/dosfstools_2.11.bb | 1 - .../linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb| 1 - meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb | 1 - meta/recipes-devtools/sgmlspl/sgmlspl-native_1.03ii.bb| 1 - .../recipes-devtools/squashfs-tools/squashfs-tools_4.2.bb | 5 + meta/recipes-extended/cups/cups.inc | 1 - meta/recipes-extended/grep/grep_2.15.bb | 1 - meta/recipes-extended/shadow/shadow-securetty_4.1.4.3.bb | 1 - meta/recipes-extended/shadow/shadow-sysroot_4.1.4.3.bb| 1 - meta/recipes-extended/shadow/shadow.inc | 1 - meta/recipes-lsb4/libpng/libpng12_1.2.50.bb | 3 +-- meta/recipes-lsb4/perl/libdumpvalue-perl_1.17.bb | 1 - .../alsa/alsa-utils-alsaconf_1.0.27.2.bb | 3 +-- meta/recipes-multimedia/libpng/libpng_1.6.6.bb| 3 +-- meta/recipes-support/libevent/libevent_2.0.21.bb | 1 - 20 files changed, 13 insertions(+), 32 deletions(-) -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 7/7] Don't set DESCRIPTION to the same value as SUMMARY
Setting DESCRIPTION to the same value as SUMMARY doesn't do anything, since the value of DESCRIPTION will be derived from SUMMARY if not specified. Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com --- meta/recipes-connectivity/nfs-utils/libnfsidmap_0.25.bb | 1 - meta/recipes-devtools/cdrtools/cdrtools-native_3.01a17.bb| 1 - .../docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb | 1 - meta/recipes-devtools/dosfstools/dosfstools_2.11.bb | 1 - meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb | 1 - meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb | 1 - meta/recipes-devtools/sgmlspl/sgmlspl-native_1.03ii.bb | 1 - meta/recipes-extended/cups/cups.inc | 1 - meta/recipes-extended/grep/grep_2.15.bb | 1 - meta/recipes-extended/shadow/shadow-securetty_4.1.4.3.bb | 1 - meta/recipes-extended/shadow/shadow-sysroot_4.1.4.3.bb | 1 - meta/recipes-extended/shadow/shadow.inc | 1 - meta/recipes-lsb4/perl/libdumpvalue-perl_1.17.bb | 1 - meta/recipes-support/libevent/libevent_2.0.21.bb | 1 - 14 files changed, 14 deletions(-) diff --git a/meta/recipes-connectivity/nfs-utils/libnfsidmap_0.25.bb b/meta/recipes-connectivity/nfs-utils/libnfsidmap_0.25.bb index f840d8b..fcc9e87 100644 --- a/meta/recipes-connectivity/nfs-utils/libnfsidmap_0.25.bb +++ b/meta/recipes-connectivity/nfs-utils/libnfsidmap_0.25.bb @@ -1,5 +1,4 @@ SUMMARY = NFS id mapping library -DESCRIPTION = NFS id mapping library HOMEPAGE = http://www.citi.umich.edu/projects/nfsv4/linux/; SECTION = libs diff --git a/meta/recipes-devtools/cdrtools/cdrtools-native_3.01a17.bb b/meta/recipes-devtools/cdrtools/cdrtools-native_3.01a17.bb index 2ae3f4a..38de407 100644 --- a/meta/recipes-devtools/cdrtools/cdrtools-native_3.01a17.bb +++ b/meta/recipes-devtools/cdrtools/cdrtools-native_3.01a17.bb @@ -2,7 +2,6 @@ # Copyright (C) 2004-2006, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) SUMMARY = A set of tools for CD recording, including cdrecord -DESCRIPTION = A set of tools for CD recording, including cdrecord HOMEPAGE = http://cdrecord.berlios.de/private/cdrecord.html; SECTION = console/utils LICENSE = GPLv2 CDDL-1.0 LGPLv2.1+ diff --git a/meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb b/meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb index c70e76d..e623690 100644 --- a/meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb +++ b/meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb @@ -1,5 +1,4 @@ SUMMARY = DSSSL stylesheets used to transform SGML and XML DocBook files -DESCRIPTION = DSSSL stylesheets used to transform SGML and XML DocBook files HOMEPAGE= http://docbook.sourceforge.net; # Simple persmissive LICENSE = DSSSL diff --git a/meta/recipes-devtools/dosfstools/dosfstools_2.11.bb b/meta/recipes-devtools/dosfstools/dosfstools_2.11.bb index b7b85f0..a6a7ddc 100644 --- a/meta/recipes-devtools/dosfstools/dosfstools_2.11.bb +++ b/meta/recipes-devtools/dosfstools/dosfstools_2.11.bb @@ -2,7 +2,6 @@ # Copyright (C) 2004-2006, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) SUMMARY = DOS FAT Filesystem Utilities -DESCRIPTION = DOS FAT Filesystem Utilities SECTION = base LICENSE = GPLv2 diff --git a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb index ba9c72e..ea0ffcb 100644 --- a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb +++ b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb @@ -1,5 +1,4 @@ SUMMARY = Convert LinuxDoc SGML source into other formats -DESCRIPTION = Convert LinuxDoc SGML source into other formats HOMEPAGE = http://packages.debian.org/linuxdoc-tools; LICENSE = GPLv3+ LIC_FILES_CHKSUM = file://COPYING;md5=077ef64ec3ac257fb0d786531cf26931 diff --git a/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb b/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb index fbf9e77..fe03b82 100644 --- a/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb +++ b/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb @@ -1,5 +1,4 @@ SUMMARY = Qemu helper scripts -DESCRIPTION = Qemu helper scripts LICENSE = GPLv2 RDEPENDS_${PN} = nativesdk-qemu PR = r9 diff --git a/meta/recipes-devtools/sgmlspl/sgmlspl-native_1.03ii.bb b/meta/recipes-devtools/sgmlspl/sgmlspl-native_1.03ii.bb index 1b612c0..be03fc5 100644 --- a/meta/recipes-devtools/sgmlspl/sgmlspl-native_1.03ii.bb +++
[OE-core] [PATCH] c-ares: added recipe.
Recipe was borrowed from meta-webos-ports. Signed-off-by: Yevhen Kyriukha kirg...@gmail.com --- meta/recipes-support/c-ares/c-ares_1.10.0.bb | 22 ++ 1 file changed, 22 insertions(+) create mode 100644 meta/recipes-support/c-ares/c-ares_1.10.0.bb diff --git a/meta/recipes-support/c-ares/c-ares_1.10.0.bb b/meta/recipes-support/c-ares/c-ares_1.10.0.bb new file mode 100644 index 000..27bedf4 --- /dev/null +++ b/meta/recipes-support/c-ares/c-ares_1.10.0.bb @@ -0,0 +1,22 @@ +DESCRIPTION = c-ares is a C library that resolves names asynchronously. +HOMEPAGE = http://daniel.haxx.se/projects/c-ares/; +SECTION = libs +LICENSE = MIT +LIC_FILES_CHKSUM = file://README;beginline=17;endline=18;md5=b320556568bc067d215a1e34c5b34a14 + +inherit autotools +inherit pkgconfig + +SRC_URI = http://c-ares.haxx.se/download/${BP}.tar.gz; +SRC_URI[md5sum] = 1196067641411a75d3cbebe074fd36d8 +SRC_URI[sha256sum] = 3d701674615d1158e56a59aaede7891f2dde3da0f46a6d3c684e0ae70f52d3db + +EXTRA_OECONF = --enable-shared + +# install private headers to ares subdirectory +do_install_append() { +install -d ${D}/${includedir}/ares +install -m 0644 ares*.h ${D}/${includedir}/ares/ +} + +FILES_${PN}-dev += ${includedir}/ares/*.h -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] beecrypt: Add PACKAGECONFIG for cplusplus
On Tuesday 26 November 2013 14:32:28 Richard Purdie wrote: Add a PACKGECONFIG to control the building of the beecrypt C++ bindings. The only user of beecrypt in OE-Core is rpm and this doesn't need the C++ bindings so default the option to be off. This means we can lose the icu dependency by default which is a significant performance win. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- diff --git a/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb b/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb index 0a8ff4b..a917201 100644 --- a/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb +++ b/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb @@ -16,8 +16,6 @@ LIC_FILES_CHKSUM = file://COPYING;md5=9894370afd5dfe7d02b8d14319e729a1 \ file://COPYING.LIB;md5=dcf3c825659e82539645da41a7908589 \ file://include/beecrypt/beecrypt.h;endline=20;md5=47a93eef539aac237eef86297 a4d71c1 -DEPENDS = icu - PR = r3 inherit autotools multilib_header @@ -29,6 +27,9 @@ do_install_append() { EXTRA_OECONF=--without-python --enable-shared --enable-static --disable-openmp --with-java=no +PACKAGECONFIG = +PACKAGECONFIG[cplusplus] = --with-cplusplus,--without-cplusplus,icu + FILES_${PN} = ${sysconfdir} ${libdir}/*.so.* ${libdir}/${BPN}/*.so.* FILES_${PN}-dev += ${libdir}/${BPN}/*.so ${libdir}/${BPN}/*.la FILES_${PN}-staticdev += ${libdir}/${BPN}/*.a Not just a performance win, but a quick test with core-image-minimal + RPM + package-management in IMAGE_FEATURES showed that this also reduces the size of the final image by over 26MB. A nice optimisation all round :) 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] [PATCH] lsof: add contingency for when EGLIBCVERSION is not set
This change is not useful for oe-core. I suppose it's being sent to be Yocto compliant and no merge is expected. ../Randy On Tue, Nov 26, 2013 at 3:42 AM, jackie.hu...@windriver.com wrote: From: Paul Gortmaker paul.gortma...@windriver.com commit 8c38bc022de209187f31952ae02313dd3104f4c6 (lsof: define linux C library type when using eglibc) tries to avoid the built in tests that determine EGLIBC version (since they are not reliable in cross builds) and handed in the EGLIBCVERSION directly. However this is only happening if EGLIBCVERSION is set. And that is only true if we are sourcing the include file meta/conf/distro/include/tcmode-default.inc -- which we won't be with custom toolchain. So we've been implicitly relying on the broken lsof tests. So, to ensure we don't end up using the broken lsof tests, add a contingency for the case where EGLIBCVERSION is not set. This will be suitable for a single release, since the version will be unchanging. Signed-off-by: Paul Gortmaker paul.gortma...@windriver.com --- meta/recipes-extended/lsof/lsof_4.87.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-extended/lsof/lsof_4.87.bb b/meta/recipes-extended/lsof/lsof_4.87.bb index 5676cd9..582697b 100644 --- a/meta/recipes-extended/lsof/lsof_4.87.bb +++ b/meta/recipes-extended/lsof/lsof_4.87.bb @@ -34,6 +34,9 @@ do_configure () { LINUX_CLIB=`echo ${EGLIBCVERSION} |sed -e 's,\.,,g'` LINUX_CLIB=-DGLIBCV=${LINUX_CLIB} export LINUX_CLIB +else +LINUX_CLIB=-DGLIBCV=215 +export LINUX_CLIB fi yes | ./Configure ${LSOF_OS} } -- 1.8.3 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ../Randy/.. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] linux-yocto/3.10: -rt, ebtables and e1000 fixes
Updating the 3.10 SRCREVs for the following fixes: f47ea28 bridge: enable EBTABLES a9ec82e e1000: prevent oops when adapter is being closed and reset simultaneously a4e1bd7 Revert arm: add dummy swizzle for versatile with qemu Signed-off-by: Bruce Ashfield bruce.ashfi...@windriver.com --- meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto_3.10.bb | 16 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb index d040e3e..d9c5afa 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb @@ -3,9 +3,9 @@ require recipes-kernel/linux/linux-yocto.inc KBRANCH = standard/preempt-rt/base KBRANCH_qemuppc = standard/preempt-rt/qemuppc -SRCREV_machine ?= a9b2df9bd27b137408d627ce1f75f1177eae647e -SRCREV_machine_qemuppc ?= 601746ed79b7ccc79e31166dea9b2906c915a7e3 -SRCREV_meta ?= 41072c6288b1ab468670ebf7b3d411fbc177317c +SRCREV_machine ?= ee9480cd91b2b46325a2da9aa6ae779d8e4163c0 +SRCREV_machine_qemuppc ?= 5c126504c0a2f72d80bae9d96cea7eb9d7854290 +SRCREV_meta ?= f47ea2844543c8ebf4572cfe23e4cfd6cb94d887 SRC_URI = git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb index 0939ce6..a866421 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb @@ -9,8 +9,8 @@ LINUX_VERSION ?= 3.10.19 KMETA = meta -SRCREV_machine ?= 2d96adf459037aec2c0027503c3eddfc20de9ad4 -SRCREV_meta ?= 41072c6288b1ab468670ebf7b3d411fbc177317c +SRCREV_machine ?= a9ec82e355130160f9094e670bd5be0022a84194 +SRCREV_meta ?= f47ea2844543c8ebf4572cfe23e4cfd6cb94d887 PV = ${LINUX_VERSION}+git${SRCPV} diff --git a/meta/recipes-kernel/linux/linux-yocto_3.10.bb b/meta/recipes-kernel/linux/linux-yocto_3.10.bb index c678a8b..d85c6c4 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.10.bb @@ -3,14 +3,14 @@ require recipes-kernel/linux/linux-yocto.inc KBRANCH_DEFAULT = standard/base KBRANCH = ${KBRANCH_DEFAULT} -SRCREV_machine_qemuarm ?= 9aac62bcd594648a7da61fa89e7da14eb2747e31 -SRCREV_machine_qemumips ?= 141675948177bed049477ea53203dd0fc3c105c4 -SRCREV_machine_qemuppc ?= ebcaee076da19ffe0e317089566d22c199f16fad -SRCREV_machine_qemux86 ?= 2d96adf459037aec2c0027503c3eddfc20de9ad4 -SRCREV_machine_qemux86-64 ?= 2d96adf459037aec2c0027503c3eddfc20de9ad4 -SRCREV_machine_qemumips64 ?= 7acc7b9b44fb0b97a50e75387a11a24dfd5c242a -SRCREV_machine ?= 2d96adf459037aec2c0027503c3eddfc20de9ad4 -SRCREV_meta ?= 41072c6288b1ab468670ebf7b3d411fbc177317c +SRCREV_machine_qemuarm ?= 7744145fcc3e4b6b6e308a1b86dc1c8b237b7575 +SRCREV_machine_qemumips ?= 2b8e8c694c38729ce724facdb0ab20751d061a2e +SRCREV_machine_qemuppc ?= 9a7537cb9bcc5c835dae6ac84fbbe7298473f69c +SRCREV_machine_qemux86 ?= a9ec82e355130160f9094e670bd5be0022a84194 +SRCREV_machine_qemux86-64 ?= a9ec82e355130160f9094e670bd5be0022a84194 +SRCREV_machine_qemumips64 ?= 0cd8e958d0ec7e01fd21fc7891da7eed688b0d37 +SRCREV_machine ?= a9ec82e355130160f9094e670bd5be0022a84194 +SRCREV_meta ?= f47ea2844543c8ebf4572cfe23e4cfd6cb94d887 SRC_URI = git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] weston: upgrade to 1.3.1
Signed-off-by: Ross Burton ross.bur...@intel.com --- meta/recipes-graphics/wayland/{weston_1.3.0.bb = weston_1.3.1.bb} |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-graphics/wayland/{weston_1.3.0.bb = weston_1.3.1.bb} (95%) diff --git a/meta/recipes-graphics/wayland/weston_1.3.0.bb b/meta/recipes-graphics/wayland/weston_1.3.1.bb similarity index 95% rename from meta/recipes-graphics/wayland/weston_1.3.0.bb rename to meta/recipes-graphics/wayland/weston_1.3.1.bb index 7a0b3f9..82bcf3b 100644 --- a/meta/recipes-graphics/wayland/weston_1.3.0.bb +++ b/meta/recipes-graphics/wayland/weston_1.3.1.bb @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = file://COPYING;md5=275efac2559a224527bd4fd593d38466 \ SRC_URI = http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://weston.png \ file://weston.desktop -SRC_URI[md5sum] = 29ad994dd5ea07f52d7bffb24c25d9f7 -SRC_URI[sha256sum] = 8e4f5b4736358b63d83c3252567ba7aa49cc0da9e2e2c30f59ddf635159702a0 +SRC_URI[md5sum] = ffe7c3bc0e7eb39a305cbbea8c7766f3 +SRC_URI[sha256sum] = f7141334b141ae1a6435bd03bfdb01b7fb628f39259164f201e7e71c8d815bc7 inherit autotools pkgconfig useradd -- 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/3] linux-yocto/3.4: update to v3.4.69
Bumping the 3.4 kernel to the latest korg -stable release. Signed-off-by: Bruce Ashfield bruce.ashfi...@windriver.com --- meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto_3.4.bb | 14 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb index 438b511..73fd3a9 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb @@ -3,13 +3,13 @@ require recipes-kernel/linux/linux-yocto.inc KBRANCH = standard/preempt-rt/base KBRANCH_qemuppc = standard/preempt-rt/qemuppc -LINUX_VERSION ?= 3.4.59 +LINUX_VERSION ?= 3.4.69 LINUX_KERNEL_TYPE = preempt-rt KMETA = meta -SRCREV_machine ?= 2c997de11fbd934bdfe407b7f529b6561a476ea2 -SRCREV_machine_qemuppc ?= 3d2eb9c9a5c0c0b0048f687b3666b42cca26c7f2 +SRCREV_machine ?= f59ffc4762503e4d6eaa8d934dbf1464d966f51e +SRCREV_machine_qemuppc ?= 60a0fa3cf1a08778b70bf64e19f8733019e9abd7 SRCREV_meta ?= f36797c2df3fbe9491c8ac5977fb691f4a75e9b7 PR = ${INC_PR}.1 diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb index d28da9e..0b43dab 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb @@ -8,11 +8,11 @@ KBRANCH = ${KBRANCH_DEFAULT} LINUX_KERNEL_TYPE = tiny KCONFIG_MODE = --allnoconfig -LINUX_VERSION ?= 3.4.59 +LINUX_VERSION ?= 3.4.69 KMETA = meta -SRCREV_machine ?= ea977edd05ae2ebfa82731e0bee309bdfd08abee +SRCREV_machine ?= 7f4d818b0450a5dc79f81b51dc7d13d0682b1287 SRCREV_meta ?= f36797c2df3fbe9491c8ac5977fb691f4a75e9b7 PR = ${INC_PR}.1 diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb b/meta/recipes-kernel/linux/linux-yocto_3.4.bb index f1bb343..9b8456f 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb @@ -3,17 +3,17 @@ require recipes-kernel/linux/linux-yocto.inc KBRANCH_DEFAULT = standard/base KBRANCH = ${KBRANCH_DEFAULT} -SRCREV_machine_qemuarm ?= e1dd6f40b76b3e9bd0686629004621aeddc6a982 -SRCREV_machine_qemumips ?= 47af1ab871c8dfa4428cec26ec74e96a5b10c566 -SRCREV_machine_qemuppc ?= 65e4b20a87b02cf7bcb3ad3f725a079933828d4d -SRCREV_machine_qemux86 ?= ea977edd05ae2ebfa82731e0bee309bdfd08abee -SRCREV_machine_qemux86-64 ?= ea977edd05ae2ebfa82731e0bee309bdfd08abee -SRCREV_machine ?= ea977edd05ae2ebfa82731e0bee309bdfd08abee +SRCREV_machine_qemuarm ?= 38fe75106c5faa3ea49d0a285769de3d08478f90 +SRCREV_machine_qemumips ?= 67c8918ce3cfd66f19f23b46381993ff488b3fe0 +SRCREV_machine_qemuppc ?= 0e81c96b36e05746ae978a830fe3dbdac8a51e58 +SRCREV_machine_qemux86 ?= 7f4d818b0450a5dc79f81b51dc7d13d0682b1287 +SRCREV_machine_qemux86-64 ?= 7f4d818b0450a5dc79f81b51dc7d13d0682b1287 +SRCREV_machine ?= 7f4d818b0450a5dc79f81b51dc7d13d0682b1287 SRCREV_meta ?= f36797c2df3fbe9491c8ac5977fb691f4a75e9b7 SRC_URI = git://git.yoctoproject.org/linux-yocto-3.4.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta -LINUX_VERSION ?= 3.4.59 +LINUX_VERSION ?= 3.4.69 PR = ${INC_PR}.5 PV = ${LINUX_VERSION}+git${SRCPV} -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] linux/yocto-3.10: merge v3.10.19
Updating the linux-yocto-3.10 SRCREVs to the latest korg -stable release. Signed-off-by: Bruce Ashfield bruce.ashfi...@windriver.com --- meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb | 8 meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto_3.10.bb | 18 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb index c8b9888..d040e3e 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb @@ -3,13 +3,13 @@ require recipes-kernel/linux/linux-yocto.inc KBRANCH = standard/preempt-rt/base KBRANCH_qemuppc = standard/preempt-rt/qemuppc -SRCREV_machine ?= baed5453f830d06075a4480ec0ded8ff785828bc -SRCREV_machine_qemuppc ?= 26a465af89793c7dc5a81661449c5a9f0ad06dee -SRCREV_meta ?= 6ad20f049abd52b515a8e0a4664861cfd331f684 +SRCREV_machine ?= a9b2df9bd27b137408d627ce1f75f1177eae647e +SRCREV_machine_qemuppc ?= 601746ed79b7ccc79e31166dea9b2906c915a7e3 +SRCREV_meta ?= 41072c6288b1ab468670ebf7b3d411fbc177317c SRC_URI = git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta -LINUX_VERSION ?= 3.10.17 +LINUX_VERSION ?= 3.10.19 PV = ${LINUX_VERSION}+git${SRCPV} diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb index 6bd8ae6..0939ce6 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb @@ -5,12 +5,12 @@ KBRANCH = ${KBRANCH_DEFAULT} LINUX_KERNEL_TYPE = tiny KCONFIG_MODE = --allnoconfig -LINUX_VERSION ?= 3.10.17 +LINUX_VERSION ?= 3.10.19 KMETA = meta -SRCREV_machine ?= c03195ed6e3066494e3fb4be69154a57066e845b -SRCREV_meta ?= 6ad20f049abd52b515a8e0a4664861cfd331f684 +SRCREV_machine ?= 2d96adf459037aec2c0027503c3eddfc20de9ad4 +SRCREV_meta ?= 41072c6288b1ab468670ebf7b3d411fbc177317c PV = ${LINUX_VERSION}+git${SRCPV} diff --git a/meta/recipes-kernel/linux/linux-yocto_3.10.bb b/meta/recipes-kernel/linux/linux-yocto_3.10.bb index 1f1a9dc..c678a8b 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.10.bb @@ -3,18 +3,18 @@ require recipes-kernel/linux/linux-yocto.inc KBRANCH_DEFAULT = standard/base KBRANCH = ${KBRANCH_DEFAULT} -SRCREV_machine_qemuarm ?= 5714b747cf0087bb964cbb962db8d3d2041f3177 -SRCREV_machine_qemumips ?= e87d2cb44bc5d10f3619871541849064bf0d79b1 -SRCREV_machine_qemuppc ?= 3e99f981fea427696f63af7fd8e99bf05039efee -SRCREV_machine_qemux86 ?= c03195ed6e3066494e3fb4be69154a57066e845b -SRCREV_machine_qemux86-64 ?= c03195ed6e3066494e3fb4be69154a57066e845b -SRCREV_machine_qemumips64 ?= 8d21f71847640fc052bda1bf1f3792634cae5bb1 -SRCREV_machine ?= c03195ed6e3066494e3fb4be69154a57066e845b -SRCREV_meta ?= 6ad20f049abd52b515a8e0a4664861cfd331f684 +SRCREV_machine_qemuarm ?= 9aac62bcd594648a7da61fa89e7da14eb2747e31 +SRCREV_machine_qemumips ?= 141675948177bed049477ea53203dd0fc3c105c4 +SRCREV_machine_qemuppc ?= ebcaee076da19ffe0e317089566d22c199f16fad +SRCREV_machine_qemux86 ?= 2d96adf459037aec2c0027503c3eddfc20de9ad4 +SRCREV_machine_qemux86-64 ?= 2d96adf459037aec2c0027503c3eddfc20de9ad4 +SRCREV_machine_qemumips64 ?= 7acc7b9b44fb0b97a50e75387a11a24dfd5c242a +SRCREV_machine ?= 2d96adf459037aec2c0027503c3eddfc20de9ad4 +SRCREV_meta ?= 41072c6288b1ab468670ebf7b3d411fbc177317c SRC_URI = git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta -LINUX_VERSION ?= 3.10.17 +LINUX_VERSION ?= 3.10.19 PV = ${LINUX_VERSION}+git${SRCPV} -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/3] linux-yocto: consolidated pull request
Richard/Saul, Small updates to import the latest -stable updates for the 3.10 and 3.4 kernels, as well as some fixes for preempt-rt on qemumarm and minor configuration tweaks. Built and booted locally. Bruce The following changes since commit 1e084f9d755e3458d2f9863382fa3bb7877a146d: qemu: add PACKAGECONFIG for vnc, libcurl, nss, uuid, curses, gtk+, libcap-ng (2013-11-26 12:10:35 +) are available in the git repository at: git://git.pokylinux.org/poky-contrib zedd/kernel http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel Bruce Ashfield (3): linux/yocto-3.10: merge v3.10.19 linux-yocto/3.4: update to v3.4.69 linux-yocto/3.10: -rt, ebtables and e1000 fixes meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb | 8 meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb| 6 +++--- meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto_3.10.bb | 18 +- meta/recipes-kernel/linux/linux-yocto_3.4.bb | 14 +++--- 6 files changed, 28 insertions(+), 28 deletions(-) -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][V2] weston: upgrade to 1.3.1
Signed-off-by: Ross Burton ross.bur...@intel.com --- meta/recipes-graphics/wayland/{weston_1.3.0.bb = weston_1.3.1.bb} |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-graphics/wayland/{weston_1.3.0.bb = weston_1.3.1.bb} (95%) diff --git a/meta/recipes-graphics/wayland/weston_1.3.0.bb b/meta/recipes-graphics/wayland/weston_1.3.1.bb similarity index 95% rename from meta/recipes-graphics/wayland/weston_1.3.0.bb rename to meta/recipes-graphics/wayland/weston_1.3.1.bb index 7a0b3f9..82bcf3b 100644 --- a/meta/recipes-graphics/wayland/weston_1.3.0.bb +++ b/meta/recipes-graphics/wayland/weston_1.3.1.bb @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = file://COPYING;md5=275efac2559a224527bd4fd593d38466 \ SRC_URI = http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://weston.png \ file://weston.desktop -SRC_URI[md5sum] = 29ad994dd5ea07f52d7bffb24c25d9f7 -SRC_URI[sha256sum] = 8e4f5b4736358b63d83c3252567ba7aa49cc0da9e2e2c30f59ddf635159702a0 +SRC_URI[md5sum] = ffe7c3bc0e7eb39a305cbbea8c7766f3 +SRC_URI[sha256sum] = f7141334b141ae1a6435bd03bfdb01b7fb628f39259164f201e7e71c8d815bc7 inherit autotools pkgconfig useradd -- 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/4] fontconfig: upgrade to 2.11.0
Drop sysroot patch as a rewritten form has been accepted upstream. Update license checksums - Google added to COPYING, and the fccache license has moved. Signed-off-by: Ross Burton ross.bur...@intel.com --- ...Add-sysroot-option-to-fc-cache-and-fc-cat.patch | 731 .../fontconfig/fontconfig/sysroot-arg.patch| 32 + .../{fontconfig_2.10.2.bb = fontconfig_2.11.0.bb} | 14 +- 3 files changed, 37 insertions(+), 740 deletions(-) delete mode 100644 meta/recipes-graphics/fontconfig/files/Add-sysroot-option-to-fc-cache-and-fc-cat.patch create mode 100644 meta/recipes-graphics/fontconfig/fontconfig/sysroot-arg.patch rename meta/recipes-graphics/fontconfig/{fontconfig_2.10.2.bb = fontconfig_2.11.0.bb} (76%) diff --git a/meta/recipes-graphics/fontconfig/files/Add-sysroot-option-to-fc-cache-and-fc-cat.patch b/meta/recipes-graphics/fontconfig/files/Add-sysroot-option-to-fc-cache-and-fc-cat.patch deleted file mode 100644 index f0b3b7f..000 --- a/meta/recipes-graphics/fontconfig/files/Add-sysroot-option-to-fc-cache-and-fc-cat.patch +++ /dev/null @@ -1,731 +0,0 @@ -Upstream-Status: Pending - -From a5eeeafb623a5508d2745f89aaf69118799f7e5c Mon Sep 17 00:00:00 2001 -From: Laurentiu Palcu laurentiu.pa...@intel.com -Date: Mon, 28 Jan 2013 11:42:56 +0200 -Subject: [PATCH] Add sysroot option to fc-cache and fc-cat - -Whether one needs to generate the font cache offline and then deploy the -image to a target or do some testing in a separate rootfs, the sysroot -option will facilitate that. - -Suppose you've got a rootfs in the following directory: -/path/to/test/rootfs. In order to contain the fc-cache generation to -that particular directory, the following command can be used: - -fc-cache --sysroot=/path/to/test/rootfs - -That will make fc-cache to prepend the sysroot directory to all paths -during scanning. For example, instead of searching /etc/fonts/ directory -for configuration files, it will look in /path/to/test/rootfs/etc/fonts. -The paths found in fonts.conf will also be prepended with the sysroot. - -However, the generated cache files will not contain any references to -sysroot. This way, one can generate the font cache offline and then deploy -the image to target. Or, simply, use it for various tests without -polluting the system/user cache files. - -In order to inspect the cache generated using the sysroot option, one -has to use fc-cat like below (for example): - -fc-cat --sysroot=/path/to/test/rootfs -/path/to/test/rootfs/var/cache/fontconfig/* - -Signed-off-by: Laurentiu Palcu laurentiu.pa...@intel.com - fc-cache/fc-cache.c | 63 --- - fc-cat/fc-cat.c | 77 +++--- - fc-lang/fc-lang.c |1 + - fontconfig/fontconfig.h |6 - src/fccache.c | 85 +++ - src/fccfg.c | 52 + - src/fcfreetype.c|4 +++ - src/fcstr.c | 27 +++ - 8 files changed, 285 insertions(+), 30 deletions(-) - -diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c -index 9fb383b..a91e1f1 100644 a/fc-cache/fc-cache.c -+++ b/fc-cache/fc-cache.c -@@ -68,6 +68,7 @@ const struct option longopts[] = { - {force, 0, 0, 'f'}, - {really-force, 0, 0, 'r'}, - {system-only, 0, 0, 's'}, -+{sysroot, 1, 0, 'y'}, - {version, 0, 0, 'V'}, - {verbose, 0, 0, 'v'}, - {help, 0, 0, 'h'}, -@@ -85,26 +86,28 @@ usage (char *program, int error) - { - FILE *file = error ? stderr : stdout; - #if HAVE_GETOPT_LONG --fprintf (file, usage: %s [-frsvVh] [--force|--really-force] [--system-only] [--verbose] [--version] [--help] [dirs]\n, -+fprintf (file, usage: %s [-frsvVh] [-y SYSROOT] [--force|--really-force] [--system-only] [--sysroot=SYSROOT] [--verbose] [--version] [--help] [dirs]\n, -program); - #else --fprintf (file, usage: %s [-frsvVh] [dirs]\n, -+fprintf (file, usage: %s [-frsvVh] [-y SYSROOT] [dirs]\n, -program); - #endif - fprintf (file, Build font information caches in [dirs]\n -(all directories in font configuration by default).\n); - fprintf (file, \n); - #if HAVE_GETOPT_LONG --fprintf (file, -f, --force scan directories with apparently valid caches\n); --fprintf (file, -r, --really-force erase all existing caches, then rescan\n); --fprintf (file, -s, --system-onlyscan system-wide directories only\n); --fprintf (file, -v, --verbosedisplay status information while busy\n); --fprintf (file, -V, --versiondisplay font config version and exit\n); --fprintf (file, -h, --help display this help and exit\n); -+fprintf (file, -f, --force scan directories with apparently valid caches\n); -+fprintf (file, -r, --really-forceerase all existing caches, then rescan\n); -+fprintf (file, -s,
[OE-core] [PATCH 2/4] pango: upgrade to 1.32.6
Drop automake macro patch, merged upstream. Signed-off-by: Ross Burton ross.bur...@intel.com --- .../pango/pango-1.32.5/obsolete_automake_macros.patch | 15 --- .../{pango-1.32.5 = pango}/multilib-fix-clean.patch |0 .../pango/{pango-1.32.5 = pango}/no-tests.patch |0 meta/recipes-graphics/pango/pango_1.32.5.bb | 17 - meta/recipes-graphics/pango/pango_1.32.6.bb | 12 5 files changed, 12 insertions(+), 32 deletions(-) delete mode 100644 meta/recipes-graphics/pango/pango-1.32.5/obsolete_automake_macros.patch rename meta/recipes-graphics/pango/{pango-1.32.5 = pango}/multilib-fix-clean.patch (100%) rename meta/recipes-graphics/pango/{pango-1.32.5 = pango}/no-tests.patch (100%) delete mode 100644 meta/recipes-graphics/pango/pango_1.32.5.bb create mode 100644 meta/recipes-graphics/pango/pango_1.32.6.bb diff --git a/meta/recipes-graphics/pango/pango-1.32.5/obsolete_automake_macros.patch b/meta/recipes-graphics/pango/pango-1.32.5/obsolete_automake_macros.patch deleted file mode 100644 index 3f229b5..000 --- a/meta/recipes-graphics/pango/pango-1.32.5/obsolete_automake_macros.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Accepted [https://bugzilla.gnome.org/show_bug.cgi?id=691263] - -Signed-off-by: Marko Lindqvist cazf...@gmail.com -diff -Nurd pango-1.32.5/configure.ac pango-1.32.5/configure.ac pango-1.32.5/configure.ac 2012-12-07 04:43:25.0 +0200 -+++ pango-1.32.5/configure.ac 2013-01-07 03:25:42.734109587 +0200 -@@ -54,7 +54,7 @@ - dnl usage of GNU Make specific features. - AM_INIT_AUTOMAKE(1.9 gnits dist-xz no-dist-gzip -Wno-portability) - m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) --AM_CONFIG_HEADER([config.h]) -+AC_CONFIG_HEADERS([config.h]) - - - PANGO_VERSION_MAJOR=pango_version_major() diff --git a/meta/recipes-graphics/pango/pango-1.32.5/multilib-fix-clean.patch b/meta/recipes-graphics/pango/pango/multilib-fix-clean.patch similarity index 100% rename from meta/recipes-graphics/pango/pango-1.32.5/multilib-fix-clean.patch rename to meta/recipes-graphics/pango/pango/multilib-fix-clean.patch diff --git a/meta/recipes-graphics/pango/pango-1.32.5/no-tests.patch b/meta/recipes-graphics/pango/pango/no-tests.patch similarity index 100% rename from meta/recipes-graphics/pango/pango-1.32.5/no-tests.patch rename to meta/recipes-graphics/pango/pango/no-tests.patch diff --git a/meta/recipes-graphics/pango/pango_1.32.5.bb b/meta/recipes-graphics/pango/pango_1.32.5.bb deleted file mode 100644 index 6219940..000 --- a/meta/recipes-graphics/pango/pango_1.32.5.bb +++ /dev/null @@ -1,17 +0,0 @@ -require pango.inc - -LIC_FILES_CHKSUM = file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 - -PR = r2 - -GNOME_COMPRESS_TYPE=xz - -SRC_URI += file://no-tests.patch \ -file://multilib-fix-clean.patch \ -file://obsolete_automake_macros.patch \ - - -SRC_URI[archive.md5sum] = 8e846804d6e219bc795a26a4a39b5bfd -SRC_URI[archive.sha256sum] = 7d7bc99c3d9b580cb4fe787fe47824e56e39534b9040e1c8a2a159248d8e5821 - -#PARALLEL_MAKE = diff --git a/meta/recipes-graphics/pango/pango_1.32.6.bb b/meta/recipes-graphics/pango/pango_1.32.6.bb new file mode 100644 index 000..9c5c1cd --- /dev/null +++ b/meta/recipes-graphics/pango/pango_1.32.6.bb @@ -0,0 +1,12 @@ +require pango.inc + +LIC_FILES_CHKSUM = file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 + +GNOME_COMPRESS_TYPE=xz + +SRC_URI += file://no-tests.patch \ +file://multilib-fix-clean.patch \ + + +SRC_URI[archive.md5sum] = 1af2e3a0ac5a258eff5ceddb6ed60ebd +SRC_URI[archive.sha256sum] = 8e9a3eadebf30a31640f2b3ae0fb455cf92d10d1cad246d0ffe72ec595905174 -- 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-1.0: upgrade to 1.16.2
Signed-off-by: Ross Burton ross.bur...@intel.com --- meta/recipes-graphics/clutter/clutter-1.0_1.16.0.bb |8 meta/recipes-graphics/clutter/clutter-1.0_1.16.2.bb |8 2 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 meta/recipes-graphics/clutter/clutter-1.0_1.16.0.bb create mode 100644 meta/recipes-graphics/clutter/clutter-1.0_1.16.2.bb diff --git a/meta/recipes-graphics/clutter/clutter-1.0_1.16.0.bb b/meta/recipes-graphics/clutter/clutter-1.0_1.16.0.bb deleted file mode 100644 index d9dfa59..000 --- a/meta/recipes-graphics/clutter/clutter-1.0_1.16.0.bb +++ /dev/null @@ -1,8 +0,0 @@ -require clutter-1.0.inc - -LIC_FILES_CHKSUM = file://COPYING;md5=4fbd65380cdd255951079008b364516c - -SRC_URI[archive.md5sum] = 873c97b825c366e13e1f281e8e1f549b -SRC_URI[archive.sha256sum] = a213c7859051d6d19b5550c7e433757a35aa8e2b61a43d2eae83dd87912ea8ae - -SRC_URI += file://install-examples.patch diff --git a/meta/recipes-graphics/clutter/clutter-1.0_1.16.2.bb b/meta/recipes-graphics/clutter/clutter-1.0_1.16.2.bb new file mode 100644 index 000..584f9d0 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-1.0_1.16.2.bb @@ -0,0 +1,8 @@ +require clutter-1.0.inc + +LIC_FILES_CHKSUM = file://COPYING;md5=4fbd65380cdd255951079008b364516c + +SRC_URI[archive.md5sum] = 976614a2f7e60af088a0a460fe9d267e +SRC_URI[archive.sha256sum] = 0cb7e88c80f43fc7fb869fc6d34c42e98aa1a0ef7aa02e6aeef1b099ad33df42 + +SRC_URI += file://install-examples.patch -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/4] librsvg: upgrade to 2.40.1
Signed-off-by: Ross Burton ross.bur...@intel.com --- meta/recipes-gnome/librsvg/librsvg/local-m4.patch | 32 .../{librsvg_2.40.0.bb = librsvg_2.40.1.bb} | 17 +-- 2 files changed, 8 insertions(+), 41 deletions(-) delete mode 100644 meta/recipes-gnome/librsvg/librsvg/local-m4.patch rename meta/recipes-gnome/librsvg/{librsvg_2.40.0.bb = librsvg_2.40.1.bb} (78%) diff --git a/meta/recipes-gnome/librsvg/librsvg/local-m4.patch b/meta/recipes-gnome/librsvg/librsvg/local-m4.patch deleted file mode 100644 index e523076..000 --- a/meta/recipes-gnome/librsvg/librsvg/local-m4.patch +++ /dev/null @@ -1,32 +0,0 @@ -This patch is required to make autoreconf use the local macros (so that it can -autoreconf without vala being installed). - -Upstream-Status: Backport -Signed-off-by: Ross Burton ross.bur...@intel.com - -From 6c3b8eee243204678574e162b7d480f6f83b71e6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Germ=C3=A1n=20Poo-Caama=C3=B1o?= g...@gnome.org -Date: Tue, 29 Oct 2013 13:05:39 -0700 -Subject: [PATCH] build: Use local macros to detect vala - -Fixes build when vala 0.19 is present. - Makefile.am |2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index d95f008..e881100 100644 a/Makefile.am -+++ b/Makefile.am -@@ -3,7 +3,7 @@ SUBDIRS = . gdk-pixbuf-loader tests tools doc - NULL = - BUILT_SOURCES = - --ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -+ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4 - - lib_LTLIBRARIES = librsvg-@RSVG_API_MAJOR_VERSION@.la - --- -1.7.10.4 - diff --git a/meta/recipes-gnome/librsvg/librsvg_2.40.0.bb b/meta/recipes-gnome/librsvg/librsvg_2.40.1.bb similarity index 78% rename from meta/recipes-gnome/librsvg/librsvg_2.40.0.bb rename to meta/recipes-gnome/librsvg/librsvg_2.40.1.bb index de262f0..4fc0e72 100644 --- a/meta/recipes-gnome/librsvg/librsvg_2.40.0.bb +++ b/meta/recipes-gnome/librsvg/librsvg_2.40.1.bb @@ -15,11 +15,10 @@ inherit autotools pkgconfig gnomebase gtk-doc pixbufcache GNOME_COMPRESS_TYPE = xz SRC_URI += file://gtk-option.patch \ -file://local-m4.patch \ file://vapigen.m4 -SRC_URI[archive.md5sum] = e16a84e9a86a18e5ca6ba95c512db6c6 -SRC_URI[archive.sha256sum] = 8f7db31df235813dbd035888035cf862d682e7cc5706c4e7ec05750d3f64a2f9 +SRC_URI[archive.md5sum] = a31eb5d66c3fe94d888a6b17a287ea42 +SRC_URI[archive.sha256sum] = 8813b4fe776d5e7acbce28bacbaed30ccb0cec3734eb3632c711a16ebe2961d7 EXTRA_OECONF = --disable-introspection --disable-vala @@ -29,13 +28,13 @@ PACKAGECONFIG[gdkpixbuf] = --enable-pixbuf-loader,--disable-pixbuf-loader,gdk-p # GTK+ test application (rsvg-view) PACKAGECONFIG[gtk] = --with-gtk3,--without-gtk3,gtk+3 -# 2.40.1 should ship the tarball with local m4 macros, but until then drop a -# vapigen in there so we don't need to build vala to configure. +# The tarball doesn't ship with macros, so drop a vapigen in there so we don't +# need to build vala to configure. do_configure_prepend() { - if test ! -e ${S}/m4/vapigen.m4; then - mkdir --parents ${S}/m4 - mv ${WORKDIR}/vapigen.m4 ${S}/m4/ - fi + if test ! -e ${S}/m4/vapigen.m4; then + mkdir --parents ${S}/m4 + mv ${WORKDIR}/vapigen.m4 ${S}/m4/ + fi } do_install_append() { -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/3] apr: upgrade to 1.5.0
On Tue, 2013-11-26 at 14:39 +0200, Cristiana Voicu wrote: The following typo was fixed in the license file: code for the these subcomponents is subject to the terms and conditions of the following licenses. code for these subcomponents is subject to the terms and conditions of the following licenses. Signed-off-by: Cristiana Voicu cristiana.vo...@intel.com --- .../apr/{apr_1.4.8.bb = apr_1.5.0.bb} |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-support/apr/{apr_1.4.8.bb = apr_1.5.0.bb} (89%) Unfortunately this upgrade showed regressions on the autobuilder: http://autobuilder.yoctoproject.org/main/builders/build-appliance/builds/21/steps/BuildImages_1/logs/stdio http://autobuilder.yoctoproject.org/main/builders/nightly-world/builds/20/steps/BuildImages/logs/stdio Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] allarch: Disable icecc for allarch recipes
* Fix icecc.bbclass failing with: ERROR: recipe-name NULL prefix when it's used with empty TARGET_PREFIX. * Allarch recipes cannot use compiler at all (even the local one) so there is no point of using icecc for them. Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta/classes/icecc.bbclass | 8 1 file changed, 8 insertions(+) diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass index 49dbd77..ef8761a 100644 --- a/meta/classes/icecc.bbclass +++ b/meta/classes/icecc.bbclass @@ -90,6 +90,10 @@ def create_path(compilers, bb, d): return staging def use_icc(bb,d): +# allarch recipes don't use compiler +if icc_is_allarch(bb, d): +return no + package_tmp = d.expand('${PN}') system_class_blacklist = [ none ] @@ -124,6 +128,10 @@ def use_icc(bb,d): return yes +def icc_is_allarch(bb, d): +return \ +bb.data.inherits_class(allarch, d); + def icc_is_kernel(bb, d): return \ bb.data.inherits_class(kernel, d); -- 1.8.4.3 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [meta-oe][PATCHv2] icecc: Disable icecc for allarch recipes
* Fix icecc.bbclass failing with: ERROR: recipe-name NULL prefix when it's used with empty TARGET_PREFIX. * Allarch recipes cannot use compiler at all (even the local one) so there is no point of using icecc for them. Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta/classes/icecc.bbclass | 8 1 file changed, 8 insertions(+) diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass index 49dbd77..ef8761a 100644 --- a/meta/classes/icecc.bbclass +++ b/meta/classes/icecc.bbclass @@ -90,6 +90,10 @@ def create_path(compilers, bb, d): return staging def use_icc(bb,d): +# allarch recipes don't use compiler +if icc_is_allarch(bb, d): +return no + package_tmp = d.expand('${PN}') system_class_blacklist = [ none ] @@ -124,6 +128,10 @@ def use_icc(bb,d): return yes +def icc_is_allarch(bb, d): +return \ +bb.data.inherits_class(allarch, d); + def icc_is_kernel(bb, d): return \ bb.data.inherits_class(kernel, d); -- 1.8.4.3 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] kernel and boost will recompile every time
Hello. I know the kernel will recompile every time for recent update, and I found the boost will also do like that, even I have sstate cache in my own server. How to debug this problem? -- Nanjing Jilong Yi Qingliang niqingliang2...@gmail.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/1] shadow-native: allow for setting password in clear text
On 11/26/2013 07:50 PM, Jack Mitchell wrote: On 25/11/13 03:03, ChenQi wrote: ping On 11/16/2013 03:37 PM, qi.c...@windriver.com wrote: From: Chen Qi qi.c...@windriver.com The following changes since commit ea92671d9823e3667d6ced7ac2af20f991da404d: bitbake: cooker: replace w file opening mode with a mode (2013-11-12 17:01:37 +) are available in the git repository at: git://git.pokylinux.org/poky-contrib ChenQi/cleartext-password http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/cleartext-password Chen Qi (1): shadow-native: allow for setting password in clear text .../allow-for-setting-password-in-clear-text.patch | 208 meta/recipes-extended/shadow/shadow.inc|1 + 2 files changed, 209 insertions(+) create mode 100644 meta/recipes-extended/shadow/files/allow-for-setting-password-in-clear-text.patch Could you provide a short example for how this is to be used? An additional patch to user-add in meta-skeleton perhaps? OK. I'll send out a patch for useradd example in meta-skeleton. I'll also modify the local.conf.sample.extended to include this information. //Chen Qi ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] kernel and boost will recompile every time
On Wed, Nov 27, 2013 at 09:51:22AM +0800, Yi Qingliang wrote: Hello. I know the kernel will recompile every time for recent update, and I found the boost will also do like that, even I have sstate cache in my own server. How to debug this problem? kernel rebuilding was fixed few days ago, do you have latest revision? You can use scripts/sstate-diff-machines.sh to store the signatures and then compare them when you notice something unexpectedly rebuilding. -- 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] kernel and boost will recompile every time
On Wednesday, November 27, 2013 03:03:36 AM Martin Jansa wrote: On Wed, Nov 27, 2013 at 09:51:22AM +0800, Yi Qingliang wrote: Hello. I know the kernel will recompile every time for recent update, and I found the boost will also do like that, even I have sstate cache in my own server. How to debug this problem? kernel rebuilding was fixed few days ago, do you have latest revision? You can use scripts/sstate-diff-machines.sh to store the signatures and then compare them when you notice something unexpectedly rebuilding. thanks, I will try -- Nanjing Jilong Yi Qingliang niqingliang2...@gmail.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] qemu: add PACKAGECONFIG for vnc, libcurl, nss, uuid, curses, gtk+, libcap-ng
On 11/26/2013 08:19 PM, Richard Purdie wrote: On Sat, 2013-11-02 at 14:52 +0800, Hongxu Jia wrote: Use PACKAGECONFIG to explicitly address vnc, libcurl, nss, uuid, curses, gtk+, libcap-ng dependencies rather than tested by configure. It avoided potential errors while multiple builds shared a common state_cache. Signed-off-by: Hongxu Jia hongxu@windriver.com --- meta/recipes-devtools/qemu/qemu.inc | 19 --- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 1b861d7..be0495a 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -28,10 +28,9 @@ SRC_URI_append_class-native = \ file://fix-libcap-header-issue-on-some-distro.patch \ -EXTRA_OECONF += --target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls --audio-drv-list=oss,alsa --disable-curl --disable-vnc-jpeg --disable-bluez --with-system-pixman --extra-cflags='${CFLAGS}' +EXTRA_OECONF += --target-list=${@get_qemu_target_list(d)} --disable-werror --audio-drv-list=oss,alsa --disable-bluez --with-system-pixman --extra-cflags='${CFLAGS}' -EXTRA_OECONF_class-nativesdk = --target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls \ - --disable-curl \ +EXTRA_OECONF_class-nativesdk = --target-list=${@get_qemu_target_list(d)} --disable-werror \ export LIBTOOL=${HOST_SYS}-libtool @@ -80,9 +79,23 @@ do_install_append() { } # END of qemu-mips workaround +# Disable the following PACKAGECONFIG varflag by default. Such as graphics is +# disabled for qemu-native, if you need to enable some of them for qemu-native, +# set PACKAGECONFIG_pn-qemu-native += varflag1 varflag2 in local.conf PACKAGECONFIG ??= PACKAGECONFIG[virtfs] = --enable-virtfs --enable-attr,--disable-virtfs,libcap attr, PACKAGECONFIG[aio] = --enable-linux-aio,--disable-linux-aio,libaio, +PACKAGECONFIG[vnc-tls] = --enable-vnc --enable-vnc-tls,--disable-vnc-tls, gnutls, +PACKAGECONFIG[vnc-ws] = --enable-vnc --enable-vnc-ws,--disable-vnc-ws, gnutls, +PACKAGECONFIG[vnc-sasl] = --enable-vnc --enable-vnc-sasl,--disable-vnc-sasl,cyrus-sasl, +PACKAGECONFIG[vnc-jpeg] = --enable-vnc --enable-vnc-jpeg,--disable-vnc-jpeg,jpeg, +PACKAGECONFIG[vnc-png] = --enable-vnc --enable-vnc-png,--disable-vnc-png,libpng, +PACKAGECONFIG[libcurl] = --enable-curl,--disable-curl,libcurl, +PACKAGECONFIG[nss] = --enable-smartcard-nss,--disable-smartcard-nss,nss, +PACKAGECONFIG[uuid] = --enable-uuid,--disable-uuid,util-linux, +PACKAGECONFIG[curses] = --enable-curses,--disable-curses,ncurses, +PACKAGECONFIG[gtk+] = --enable-gtk,--disable-gtk,gtk+ libvte, +PACKAGECONFIG[libcap-ng] = --enable-cap-ng,--disable-cap-ng,libcap-ng, # Qemu target will not build in world build for ARM or Mips BROKEN_qemuarm = 1 I merged this however I notice there are yet more floating dependencies since sdl is floating (at least). For sdl, can we add the PACKAGECONFIG option however also add an entry to local.conf.sample which documents how to enable sdl for qemu-native? Got it, I will work on it. //Hongxu I suspect that is the option most people are using to make runqemu useful. We may also want to have the option of assuming libsdl-native is provided since otherwise we end up in the tangled world of GL support and we don't want to build our own libsdl-native in most cases. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/5] cronie: fix init.d/crond status return value
Signed-off-by: Yue Tao yue@windriver.com --- meta/recipes-extended/cronie/cronie/crond.init |7 ++- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/meta/recipes-extended/cronie/cronie/crond.init b/meta/recipes-extended/cronie/cronie/crond.init index c8dffef..53b8514 100755 --- a/meta/recipes-extended/cronie/cronie/crond.init +++ b/meta/recipes-extended/cronie/cronie/crond.init @@ -43,11 +43,8 @@ case $1 in fi ;; status) -if [ -n `/bin/pidof $CROND` ] ; then -echo crond is running. -else -echo crond is not running. -fi +status crond +exit $? ;; restart) $0 stop sleep 1 $0 start -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/5] eglibc: add support for /etc/ld.so.conf.d/*.conf
From: Ming Liu ming@windriver.com There are advantages in changing the contents of ld.so.conf to include /etc/ld.so.conf.d/*.conf instead of directly listing directories in it, just like most distributions are doing the same. Signed-off-by: Ming Liu ming@windriver.com --- meta/recipes-core/eglibc/eglibc-package.inc |7 ++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc index 3adf1a9..b46cc3b 100644 --- a/meta/recipes-core/eglibc/eglibc-package.inc +++ b/meta/recipes-core/eglibc/eglibc-package.inc @@ -33,7 +33,7 @@ RPROVIDES_${PN}-pcprofile = glibc-pcprofile RPROVIDES_${PN}-dbg = glibc-dbg libc_baselibs = ${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so ${base_libdir}/libc.so.* ${base_libdir}/libc-*.so ${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so ${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so ${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so ${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so ${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so ${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so ${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so ${base_libdir}/libnss_files*.so.* ${base_libdir}/libnss_files-*.so ${base_libdir}/libnss_compat*.so.* ${base_libdir}/libnss_compat-*.so ${base_libdir}/libnss_dns*.so.* ${base_libdir}/libnss_dns-*.so ${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so ${base_libdir}/libanl*.so.* ${base_libdir}/libanl-*.so ${base_libdir}/libBrokenLocale*.so.* ${base_libdir}/libBrokenLocale-*.so -FILES_${PN} = ${libc_baselibs} ${libexecdir}/* ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf', '', d)} +FILES_${PN} = ${libc_baselibs} ${libexecdir}/* ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf ${sysconfdir}/ld.so.conf.d', '', d)} FILES_ldd = ${bindir}/ldd FILES_libsegfault = ${base_libdir}/libSegFault* FILES_libcidn = ${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.* @@ -97,6 +97,11 @@ do_install_append () { if [ -d ${D}${sysconfdir} ]; then rmdir ${D}${sysconfdir} fi + else + if [ -f ${D}${sysconfdir}/ld.so.conf ]; then + echo 'include ld.so.conf.d/*.conf' ${D}${sysconfdir}/ld.so.conf + mkdir -p ${D}${sysconfdir}/ld.so.conf.d + fi fi } -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/5] bind: add init.d/bind status command
Signed-off-by: Yue Tao yue@windriver.com --- .../bind-add-init-bind-status-command.patch| 45 meta/recipes-connectivity/bind/bind_9.8.1.bb |3 +- 2 files changed, 47 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-connectivity/bind/bind-9.8.1/bind-add-init-bind-status-command.patch diff --git a/meta/recipes-connectivity/bind/bind-9.8.1/bind-add-init-bind-status-command.patch b/meta/recipes-connectivity/bind/bind-9.8.1/bind-add-init-bind-status-command.patch new file mode 100644 index 000..8ed3c56 --- /dev/null +++ b/meta/recipes-connectivity/bind/bind-9.8.1/bind-add-init-bind-status-command.patch @@ -0,0 +1,45 @@ +--- a/init.d b/init.d +@@ -2,6 +2,8 @@ + + PATH=/sbin:/bin:/usr/sbin:/usr/bin + ++. /etc/init.d/functions ++ + # for a chrooted server: -u bind -t /var/lib/named + # Don't modify this line, change or create /etc/default/bind9. + OPTIONS= +@@ -104,6 +106,12 @@ umount_chroot_conf() { + fi + } + ++rhstatus() { ++ [ -x /usr/sbin/rndc ] /usr/sbin/rndc status; ++ status /usr/sbin/named; ++ return $? ++} ++ + case $1 in + start) + echo -n Starting domain name service: named +@@ -172,6 +180,11 @@ case $1 in + echo . + ;; + ++status) ++ rhstatus; ++ exit $? ++;; ++ + reload) + /usr/sbin/rndc reload + ;; +@@ -183,7 +196,7 @@ case $1 in + ;; + + *) +- echo Usage: /etc/init.d/bind {start|stop|reload|restart|force-reload} 2 ++ echo Usage: /etc/init.d/bind {start|stop|reload|restart|status|force-reload} 2 + exit 1 + ;; + esac diff --git a/meta/recipes-connectivity/bind/bind_9.8.1.bb b/meta/recipes-connectivity/bind/bind_9.8.1.bb index 5919c21..2f72554 100644 --- a/meta/recipes-connectivity/bind/bind_9.8.1.bb +++ b/meta/recipes-connectivity/bind/bind_9.8.1.bb @@ -6,7 +6,7 @@ LICENSE = ISC BSD LIC_FILES_CHKSUM = file://COPYRIGHT;md5=0fbe2a3ab3c68ac3fea3cad13093877c DEPENDS = openssl libcap -PR = r5 +PR = r6 SRC_URI = ftp://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \ file://conf.patch \ @@ -19,6 +19,7 @@ SRC_URI = ftp://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \ file://bind-CVE-2013-2266.patch \ file://bind-Fix-CVE-2012-4244.patch \ file://mips1-not-support-opcode.diff \ + file://bind-add-init-bind-status-command.patch \ SRC_URI[md5sum] = cf31117c5d35af34d4c0702970ad9fb7 -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/5] tcf-agent: add init.d/tcf-agent status command
From: Li Wang li.w...@windriver.com Signed-off-by: Li Wang li.w...@windriver.com --- .../tcf-agent/tcf-agent/tcf-agent.init | 75 meta/recipes-devtools/tcf-agent/tcf-agent_git.bb |4 +- 2 files changed, 78 insertions(+), 1 deletions(-) create mode 100755 meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.init diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.init b/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.init new file mode 100755 index 000..6303280 --- /dev/null +++ b/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.init @@ -0,0 +1,75 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: tcf-agent +# Default-Start: 3 5 +# Default-Stop: 0 1 2 6 +# Short-Description: Target Communication Framework agent +### END INIT INFO + +DAEMON_PATH=/usr/sbin/tcf-agent +DAEMON_NAME=`basename $DAEMON_PATH` + +. /etc/init.d/functions + +test -x $DAEMON_PATH || exit 0 + +PATH=/sbin:/usr/sbin:/bin:/usr/bin +export PATH + +RETVAL=0 + +case $1 in +start) +echo -n Starting $DAEMON_NAME: +$DAEMON_PATH -d -L- -l0 +RETVAL=$? +if [ $RETVAL -eq 0 ] ; then +echo OK +touch /var/lock/subsys/$DAEMON_NAME +else +echo FAIL +fi +;; + +stop) +echo -n Stopping $DAEMON_NAME: +count=0 +while [ -n `/bin/pidof $DAEMON_PATH` -a $count -lt 10 ] ; do +killproc $DAEMON_PATH /dev/null +sleep 1 +RETVAL=$? +if [ $RETVAL != 0 -o -n `/bin/pidof $DAEMON_PATH` ] ; then +sleep 3 +fi +count=`expr $count + 1` +done +rm -f /var/lock/subsys/$DAEMON_NAME +if [ -n `/bin/pidof $DAEMON_PATH` ] ; then +echo FAIL +else +echo OK +fi +;; + +restart) +$0 stop +sleep 1 +$0 start +;; + +status) +status $DAEMON_NAME +RETVAL=$? +;; + +condrestart) +[ -f /var/lock/subsys/$DAEMON_NAME ] $0 restart +;; + +*) +echo usage: $0 { start | stop | status | restart | condrestart | status } +;; +esac + +exit $RETVAL + diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb index 09b153e..e7779cd 100644 --- a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb +++ b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb @@ -11,7 +11,7 @@ PR = r2 SRC_URI = git://git.eclipse.org/gitroot/tcf/org.eclipse.tcf.agent.git \ file://fix_ranlib.patch \ - file://fix_tcf-agent.init.patch \ + file://tcf-agent.init \ DEPENDS = util-linux openssl @@ -42,5 +42,7 @@ do_compile() { do_install() { oe_runmake install INSTALLROOT=${D} + install -d ${D}${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/tcf-agent.init ${D}${sysconfdir}/init.d/tcf-agent } -- 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/5] file: avoid to handle special character
From: Li Wang li.w...@windriver.com avoid to handle special character '@' in filename and directory. Signed-off-by: Li Wang li.w...@windriver.com --- .../file/file/avoid_handle_special_character.patch | 36 meta/recipes-devtools/file/file_5.15.bb|1 + 2 files changed, 37 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-devtools/file/file/avoid_handle_special_character.patch diff --git a/meta/recipes-devtools/file/file/avoid_handle_special_character.patch b/meta/recipes-devtools/file/file/avoid_handle_special_character.patch new file mode 100644 index 000..4be4ad0 --- /dev/null +++ b/meta/recipes-devtools/file/file/avoid_handle_special_character.patch @@ -0,0 +1,36 @@ +--- a/doc/Makefile.am b/doc/Makefile.am +@@ -12,21 +12,21 @@ + + file.1: Makefile file.man + @rm -f $@ +- sed -e s@__CSECTION__@1@g \ +- -e s@__FSECTION__@${fsect}@g \ +- -e s@__VERSION__@${VERSION}@g \ +- -e s@__MAGIC__@${MAGIC}@g $(srcdir)/file.man $@ ++ sed -e s#__CSECTION__#1#g \ ++ -e s#__FSECTION__#${fsect}#g \ ++ -e s#__VERSION__#${VERSION}#g \ ++ -e s#__MAGIC__#${MAGIC}#g $(srcdir)/file.man $@ + + magic.${fsect}: Makefile magic.man + @rm -f $@ +- sed -e s@__CSECTION__@1@g \ +- -e s@__FSECTION__@${fsect}@g \ +- -e s@__VERSION__@${VERSION}@g \ +- -e s@__MAGIC__@${MAGIC}@g $(srcdir)/magic.man $@ ++ sed -e s#__CSECTION__#1#g \ ++ -e s#__FSECTION__#${fsect}#g \ ++ -e s#__VERSION__#${VERSION}#g \ ++ -e s#__MAGIC__#${MAGIC}#g $(srcdir)/magic.man $@ + + libmagic.3: Makefile libmagic.man + @rm -f $@ +- sed -e s@__CSECTION__@1@g \ +- -e s@__FSECTION__@${fsect}@g \ +- -e s@__VERSION__@${VERSION}@g \ +- -e s@__MAGIC__@${MAGIC}@g $(srcdir)/libmagic.man $@ ++ sed -e s#__CSECTION__#1#g \ ++ -e s#__FSECTION__#${fsect}#g \ ++ -e s#__VERSION__#${VERSION}#g \ ++ -e s#__MAGIC__#${MAGIC}#g $(srcdir)/libmagic.man $@ diff --git a/meta/recipes-devtools/file/file_5.15.bb b/meta/recipes-devtools/file/file_5.15.bb index aecbbe5..0697838 100644 --- a/meta/recipes-devtools/file/file_5.15.bb +++ b/meta/recipes-devtools/file/file_5.15.bb @@ -12,6 +12,7 @@ DEPENDS = zlib file-native DEPENDS_class-native = zlib-native SRC_URI = ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \ + file://avoid_handle_special_character.patch \ file://dump \ file://filesystems -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core