Re: [OE-core] [PATCH] cryptodev kernel module recipe
On Oct 18, 2012, at 2:57 AM, Yashpal Dutta yashpal.du...@freescale.com wrote: +-install: ++modules_install: + make -C $(KERNEL_DIR) SUBDIRS=`pwd` modules_install +-@echo Installing cryptodev.h in /usr/include/crypto ... +-@install -D crypto/cryptodev.h /usr/include/crypto/cryptodev.h ++@echo Installing cryptodev.h in $(PREFIX)/usr/include/crypto ... ++@install -D crypto/cryptodev.h $(PREFIX)/usr/include/crypto/cryptodev.h + why is it installing linux headers under /usr/include shouldn't they be under usr/include/linux ? ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] insane: Rationalise phdrs-based QA checks
On Oct 17, 2012, at 1:39 PM, Phil Blundell ph...@gnu.org wrote: On Tue, 2012-10-16 at 20:14 +0100, Phil Blundell wrote: On Tue, 2012-10-16 at 11:29 -0700, Saul Wold wrote: On 10/15/2012 03:32 AM, Phil Blundell wrote: On Sun, 2012-10-14 at 14:45 -0700, Saul Wold wrote: On 10/01/2012 10:29 AM, Phil Blundell wrote: Various different QA checks are based on essentially the same data from the ELF program headers. Calling objdump to extract it repeatedly is inefficient, particularly if the shell is involved. Instead, let's cache the output from objdump inside the qa.elf object and allow it to be reused by multiple tests. Also, using objdump instead of scanelf to check for bad RPATHs (in the same way that the useless-rpaths check was doing already) allows the dependency on pax-utils-native to be dropped. This seems to be failing for a QemuArm build of world, specifically lsbsetup, quilt, sysvinit, and foomatic-filters seems like its failing on symlinks. I wasn't able to complete a build of world successfully due to some unrelated-looking breakage in xserver-xorg, but I did reproduce this problem by building quilt by hand. The attached patch fixes it for me. This is better, but I found another failure: ERROR: Error executing a python function in /intel/distro/meta/recipes-devtools/qemu/qemu_1.2.0.bb: ExecutionError: Execution of '/intel/poky/builds/world/tmp/sysroots/x86_64-linux/usr/bin/armv5te-poky-linux-gnueabi/arm-poky-linux-gnueabi-objdump -p /intel/poky/builds/world/tmp/work/armv5te-poky-linux-gnueabi/qemu-1.2.0-r3/packages-split/qemu/usr/share/qemu/palcode-clipper' failed with exit code 1: /intel/poky/builds/world/tmp/sysroots/x86_64-linux/usr/bin/armv5te-poky-linux-gnueabi/arm-poky-linux-gnueabi-objdump: /intel/poky/builds/world/tmp/work/armv5te-poky-linux-gnueabi/qemu-1.2.0-r3/packages-split/qemu/usr/share/qemu/palcode-clipper: File format not recognized When I run file: /intel/poky/builds/world/tmp/work/armv5te-poky-linux-gnueabi/qemu-1.2.0-r3/packages-split/qemu/usr/share/qemu/palcode-clipper: ELF 64-bit LSB executable, Alpha (unofficial), version 1 (SYSV), statically linked, not stripped I was building qemuarm, but I had a done a qemuppc build earlier also. Well, that's a bit weird. It seems as though you have somehow gotten an Alpha binary installed, which isn't appropriate for either qemuarm or qemuppc. In fact I don't think we support alpha in oe-core at all so it's a bit of a mystery how it would have been built in the first place. On the one hand, this is a genuine problem and it's good that the QA check is diagnosing it. On the other hand, it probably oughtn't to be diagnosing it by means of an objdump failure (and I think there is already a dedicated check for wrong ELF arch anyway). So probably the right thing to do is just trap exceptions around running objdump and ignore any files that it doesn't understand. So, it turns out that: a) qemu is deliberately turning off the wrong ELF architecture check, which implies that it wants to ship these foreign-architecture binaries. It's not clear to me why this is a useful thing to do, but still. b) if binutils is configured for qemux86 then it is quite happy to let you run objdump -p on alpha and sparc binaries, which is what I would have expected. If it is configured for qemuarm then, for reasons which are mysterious to me, you get File format not recognised in that situation. we should add --enable-targets=all --with-64-bit-bfd and that should build all possible BFDs into binutils and then it will be able to dump different architectures. Anyway, we clearly shouldn't get a failure in that situation. The attached patch causes qa.py to trap errors from objdump and just return a null output, which is pretty much what the calling code will expect. p. 0001-qa-Trap-exceptions-when-running-objdump.patch___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 1/2] gtk-immodules-cache: Add initial class to update gtk inputmethod module cache
2012/10/17 Richard Purdie richard.pur...@linuxfoundation.org: On Wed, 2012-10-17 at 17:24 +0200, Samuel Stirtzel wrote: This is used by: openembedded-core/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb meta-openembedded/meta-oe/recipes-support/maliit/maliit-framework_git.bb Signed-off-by: Samuel Stirtzel s.stirt...@googlemail.com --- meta/classes/gtk-immodules-cache.bbclass | 70 ++ 1 file changed, 70 insertions(+) create mode 100644 meta/classes/gtk-immodules-cache.bbclass diff --git a/meta/classes/gtk-immodules-cache.bbclass b/meta/classes/gtk-immodules-cache.bbclass new file mode 100644 index 000..833eefe --- /dev/null +++ b/meta/classes/gtk-immodules-cache.bbclass @@ -0,0 +1,70 @@ +# This class will update the inputmethod module cache for virtual keyboards +# +# Usage: Set GTKIMMODULES_PACKAGES to the packages that needs to update the inputmethod modules + +gtk_immodule_cache_postinst() { +if [ x$D != x ]; then +exit 1 +fi +if [ ! -z `which gtk-query-immodules-2.0` ]; then +gtk-query-immodules-2.0 /etc/gtk-2.0/gtk.immodules +fi +if [ ! -z `which gtk-query-immodules-3.0` ]; then +gtk-query-immodules-3.0 /etc/gtk-3.0/gtk.immodules +fi +} + +gtk_immodule_cache_postrm() { +if [ x$D != x ]; then +exit 1 +fi +if [ ! -z `which gtk-query-immodules-2.0` ]; then +gtk-query-immodules-2.0 /etc/gtk-2.0/gtk.immodules +fi +if [ ! -z `which gtk-query-immodules-3.0` ]; then +gtk-query-immodules-3.0 /etc/gtk-3.0/gtk.immodules +fi +} + +python populate_packages_append () { +gtkimmodules_pkgs = d.getVar('GTKIMMODULES_PACKAGES', True).split() + +for pkg in gtkimmodules_pkgs: +bb.note(adding gtk-immodule-cache postinst and postrm scripts to %s % pkg) + +postinst = d.getVar('pkg_postinst_%s' % pkg, True) or d.getVar('pkg_postinst', True) +if not postinst: +postinst = '#!/bin/sh\n' +postinst += d.getVar('gtk_immodule_cache_postinst', True) +d.setVar('pkg_postinst_%s' % pkg, postinst) + +postrm = d.getVar('pkg_postrm_%s' % pkg, True) or d.getVar('pkg_postrm', True) +if not postrm: +postrm = '#!/bin/sh\n' +postrm += d.getVar('gtk_immodule_cache_postrm', True) +d.setVar('pkg_postrm_%s' % pkg, postrm) +} + +def gtkimmodules_after_parse(d): +def gtkimmodules_check_vars(): +if d.getVar('BB_WORKERCONTEXT', True) is not None: +return + +bb_filename = d.getVar('FILE') +packages = d.getVar('PACKAGES', True) + +# check gtk-immodules package +gtkimmodules_check = d.getVar('GTKIMMODULES_PACKAGES', True) or +if gtkimmodules_check == : +raise bb.build.FuncFailed, \n\n\nERROR: %s inherits gtk-immodule-cache but doesn't set GTKIMMODULES_PACKAGE % bb_filename + +bpn = d.getVar('BPN', 1) +if bpn + -native != d.getVar('PN', 1) and \ +bpn + -cross != d.getVar('PN', 1) and \ +bpn + -nativesdk != d.getVar('PN', 1): +gtkimmodules_check_vars() + +python __anonymous() { +gtkimmodules_after_parse(d) +} + Sorry, but the after_parse code above is horrible. How about something more simple like: python __anonymous() { if not bb.data.inherits_class('native', d) and not bb.data.inherits_class('cross', d): gtkimmodules_check = d.getVar('GTKIMMODULES_PACKAGES') if not gtkimmodules_check: bb_filename = d.getVar('FILE') raise bb.build.FuncFailed, \n\n\nERROR: %s inherits gtk-immodule-cache but doesn't set GTKIMMODULES_PACKAGE % bb_filename } Well this looks better, I'll send a v3. I'd like to know where you got the inspiration for the original as I'd like to simplify that too! It was original from systemd.bbclass: https://github.com/openembedded/meta-oe/blob/master/meta-systemd/classes/systemd.bbclass A quick grep shows this is used on some other classes: meta-kde/classes/kde_exports.bbclass:def kde_exports_after_parse(d): meta-openembedded/meta-systemd/classes/systemd.bbclass:def systemd_after_parse(d): openembedded-core/meta/classes/update-alternatives.bbclass:def update_alternatives_after_parse(d): openembedded-core/meta/classes/update-rc.d.bbclass:def update_rc_after_parse(d): openembedded-core/meta/classes/gtk-immodules-cache.bbclass:def gtkimmodules_after_parse(d): openembedded-core/meta/classes/useradd.bbclass:def update_useradd_after_parse(d): For meta-kde and gtk-immodules-cache I can change this to your suggestion, maybe the others need some work too? -- Regards Samuel ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] cryptodev kernel module recipe
On Oct 17, 2012, at 11:27 PM, Dutta Yashpal-B05456 b05...@freescale.com wrote: -Original Message- From: Khem Raj [mailto:raj.k...@gmail.com] Sent: Thursday, October 18, 2012 11:44 AM To: Dutta Yashpal-B05456 Cc: openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [PATCH] cryptodev kernel module recipe On Oct 18, 2012, at 2:57 AM, Yashpal Dutta yashpal.du...@freescale.com wrote: +-install: ++modules_install: + make -C $(KERNEL_DIR) SUBDIRS=`pwd` modules_install +- @echo Installing cryptodev.h in /usr/include/crypto ... +- @install -D crypto/cryptodev.h /usr/include/crypto/cryptodev.h ++ @echo Installing cryptodev.h in $(PREFIX)/usr/include/crypto ... ++ @install -D crypto/cryptodev.h $(PREFIX)/usr/include/crypto/cryptodev.h + why is it installing linux headers under /usr/include shouldn't they be under usr/include/linux ? [Yash] That is how original cryptodev module makefile is installing the file for packages like openssl. Here is one instance where openssl is referring cryptodev.h: crypto/engine/eng_cryptodev.c:#include crypto/cryptodev.h crypto/evp/openbsd_hw.c:#include crypto/cryptodev.h hmm ok. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 1/2] gtk-immodules-cache: Add initial class to update gtk inputmethod module cache
This is used by: openembedded-core/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb meta-openembedded/meta-oe/recipes-support/maliit/maliit-framework_git.bb Signed-off-by: Samuel Stirtzel s.stirt...@googlemail.com --- meta/classes/gtk-immodules-cache.bbclass | 55 ++ 1 file changed, 55 insertions(+) create mode 100644 meta/classes/gtk-immodules-cache.bbclass diff --git a/meta/classes/gtk-immodules-cache.bbclass b/meta/classes/gtk-immodules-cache.bbclass new file mode 100644 index 000..515d28b --- /dev/null +++ b/meta/classes/gtk-immodules-cache.bbclass @@ -0,0 +1,55 @@ +# This class will update the inputmethod module cache for virtual keyboards +# +# Usage: Set GTKIMMODULES_PACKAGES to the packages that needs to update the inputmethod modules + +gtk_immodule_cache_postinst() { +if [ x$D != x ]; then +exit 1 +fi +if [ ! -z `which gtk-query-immodules-2.0` ]; then +gtk-query-immodules-2.0 /etc/gtk-2.0/gtk.immodules +fi +if [ ! -z `which gtk-query-immodules-3.0` ]; then +gtk-query-immodules-3.0 /etc/gtk-3.0/gtk.immodules +fi +} + +gtk_immodule_cache_postrm() { +if [ x$D != x ]; then +exit 1 +fi +if [ ! -z `which gtk-query-immodules-2.0` ]; then +gtk-query-immodules-2.0 /etc/gtk-2.0/gtk.immodules +fi +if [ ! -z `which gtk-query-immodules-3.0` ]; then +gtk-query-immodules-3.0 /etc/gtk-3.0/gtk.immodules +fi +} + +python populate_packages_append () { +gtkimmodules_pkgs = d.getVar('GTKIMMODULES_PACKAGES', True).split() + +for pkg in gtkimmodules_pkgs: +bb.note(adding gtk-immodule-cache postinst and postrm scripts to %s % pkg) + +postinst = d.getVar('pkg_postinst_%s' % pkg, True) or d.getVar('pkg_postinst', True) +if not postinst: +postinst = '#!/bin/sh\n' +postinst += d.getVar('gtk_immodule_cache_postinst', True) +d.setVar('pkg_postinst_%s' % pkg, postinst) + +postrm = d.getVar('pkg_postrm_%s' % pkg, True) or d.getVar('pkg_postrm', True) +if not postrm: +postrm = '#!/bin/sh\n' +postrm += d.getVar('gtk_immodule_cache_postrm', True) +d.setVar('pkg_postrm_%s' % pkg, postrm) +} + +python __anonymous() { +if not bb.data.inherits_class('native', d) and not bb.data.inherits_class('cross', d): +gtkimmodules_check = d.getVar('GTKIMMODULES_PACKAGES') +if not gtkimmodules_check: +bb_filename = d.getVar('FILE') +raise bb.build.FuncFailed, \n\n\nERROR: %s inherits gtk-immodule-cache but doesn't set GTKIMMODULES_PACKAGE % bb_filename +} + -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] sstate: when warnings about sysroot overwrites, say what the recipe was
Signed-off-by: Ross Burton ross.bur...@intel.com --- meta/classes/sstate.bbclass |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 3fcaa65..b20b19c 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -165,7 +165,7 @@ def sstate_install(ss, d): if realmatch: match.append(f) if match: -bb.warn(The recipe is trying to install files into a shared area when those files already exist. Those files are:\n %s % \n .join(match)) +bb.warn(The recipe %s is trying to install files into a shared area when those files already exist. Those files are:\n %s % (d.getVar(PN, True), \n .join(match))) # Write out the manifest f = open(manifest, w) -- 1.7.10 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3] eglibc: Move perl- and bash-using scripts to separate recipes
On Wed, 2012-10-17 at 23:56 +0100, Phil Blundell wrote: On Tue, 2012-10-16 at 20:33 -0700, Saul Wold wrote: Another edge case? ERROR: Function failed: do_evacuate_scripts (see /srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-arm/build/build/tmp/work/i686-nativesdk-pokysdk-linux/nativesdk-eglibc-initial-2.16-r16+svnr20393/temp/log.do_evacuate_scripts.1600 for further information) ERROR: Logfile of failure stored in: /srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-arm/build/build/tmp/work/i686-nativesdk-pokysdk-linux/nativesdk-eglibc-initial-2.16-r16+svnr20393/temp/log.do_evacuate_scripts.1600 Log data follows: | DEBUG: SITE files ['endian-little', 'bit-32', 'ix86-common', 'common-linux', 'common-glibc', 'i686-linux', 'common'] | DEBUG: Executing shell function do_evacuate_scripts | cp: cannot stat `/srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-arm/build/build/tmp/work/i686-nativesdk-pokysdk-linux/nativesdk-eglibc-initial-2.16-r16+svnr20393/image/opt/poky/1.3+snapshot/sysroots/i686-pokysdk-linux/usr/bin/mtrace': No such file or directory | ERROR: Function failed: do_evacuate_scripts (see /srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-arm/build/build/tmp/work/i686-nativesdk-pokysdk-linux/nativesdk-eglibc-initial-2.16-r16+svnr20393/temp/log.do_evacuate_scripts.1600 for further information) NOTE: recipe nativesdk-eglibc-initial-2.16-r16+svnr20393: task do_evacuate_scripts: Failed NOTE: recipe gupnp-av-0.8.0-r2: task do_compile: Started ERROR: Task 1593 (virtual:nativesdk:/srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-arm/build/meta/recipes-core/eglibc/eglibc-initial_2.16.bb, do_evacuate_scripts) failed with exit code '1' This was a build for the meta-toolchain-gmae, but I also saw this with the multilib build. The issue with meta-toolchain-gmae is that eglibc-package.inc needs to declare an empty do_evacuate_scripts_pn-nativesdk-eglibc-initial(), like it does for pn-eglibc-initial. Something along the lines of: --- a/meta/recipes-core/eglibc/eglibc-package.inc +++ b/meta/recipes-core/eglibc/eglibc-package.inc @@ -121,6 +121,10 @@ do_evacuate_scripts_pn-eglibc-initial () { : } +do_evacuate_scripts_pn-nativesdk-eglibc-initial () { + : +} + addtask evacuate_scripts after do_install before do_populate_sysroot do_package PACKAGE_PREPROCESS_FUNCS += eglibc_package_preprocess Do you have an easy way to reproduce the multilib failure? Its basically the same problem, the mulitlib libc-initial needs to be set too. The reproducer would be something like: local.conf: MACHINE = qemux86 require conf/multilib.conf MULTILIBS = multilib:lib32 DEFAULTTUNE_virtclass-multilib-lib32 = x86 baselib_virtclass-multilib-lib32 = lib32 $ bitbake eglibc The easiest solution is probably to change the do_evacuate_scripts function to check for -initial in PN. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3] eglibc: Move perl- and bash-using scripts to separate recipes
On Thu, 2012-10-18 at 10:59 +0100, Richard Purdie wrote: Its basically the same problem, the mulitlib libc-initial needs to be set too. The reproducer would be something like: local.conf: MACHINE = qemux86 require conf/multilib.conf MULTILIBS = multilib:lib32 DEFAULTTUNE_virtclass-multilib-lib32 = x86 baselib_virtclass-multilib-lib32 = lib32 $ bitbake eglibc The easiest solution is probably to change the do_evacuate_scripts function to check for -initial in PN. Ah, right, got it. Maybe it would be better to declare a dummy do_evacuate_scripts() in eglibc-initial.inc instead. I'll give that a try and see what happens. p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] cryptodev kernel module recipe
On Thu, Oct 18, 2012 at 5:57 AM, Yashpal Dutta yashpal.du...@freescale.com wrote: This is a /dev/crypto device driver, equivalent to those in OpenBSD or FreeBSD. The main idea is to access of existing ciphers in kernel space from userspace, thus enabling re-use of a hardware implementation of a cipher. I always use OCF for an overlapping set of functionality. To make this external module gracefully deal with a situation such as this, maybe a check for OCF in the kernel config ? The same thing could be said about having a kernel with this functionality already integrated (I have several of those as well). That's a more general question about what's the best way to gracefully deal with out of tree modules detecting that they are being built against a kernel that already has the functionality merged. The easy answer is that it's something the distro maintainer needs to know, and manage, and maybe that's the final answer. But I'm more wondering about this with respect to inter-operability of layers, if something in a layer depends/rdepends on this module, it will be pulled in, and won't that limit the mix/match/stacking of the various layers ? I added Richard for comment on the above. But that of course raises the question, why should this be in oe-core versus something like OCF ? This is definitely simpler, but OCF has it's use cases and advantages as well, that are an overlapping set of functionality. I don't have all the answers, just plenty of questions :) Cheers, Bruce Signed-off-by: Yashpal Dutta yashpal.du...@freescale.com --- meta/recipes-kernel/cryptodev/cryptodev_1.5.bb | 18 + .../cryptodev/files/makefile_fixup.patch | 26 2 files changed, 44 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-kernel/cryptodev/cryptodev_1.5.bb create mode 100644 meta/recipes-kernel/cryptodev/files/makefile_fixup.patch diff --git a/meta/recipes-kernel/cryptodev/cryptodev_1.5.bb b/meta/recipes-kernel/cryptodev/cryptodev_1.5.bb new file mode 100644 index 000..5125710 --- /dev/null +++ b/meta/recipes-kernel/cryptodev/cryptodev_1.5.bb @@ -0,0 +1,18 @@ +SECTION = devel +SUMMARY = Linux Cryptodev KERNEL MODULE +DESCRIPTION = The Cryptodev package contains the kernel /dev/crypto module +LICENSE = GPLv2 +LIC_FILES_CHKSUM = file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 + +DEPENDS = virtual/kernel + +inherit module + +SRCREV = 1c24a0aa996630518d47826a2e3fea129ea094c7 + +SRC_URI = git://repo.or.cz/cryptodev-linux.git;protocol=git \ + file://makefile_fixup.patch + +EXTRA_OEMAKE='KERNEL_DIR=${STAGING_KERNEL_DIR} PREFIX=${D}' + +S = ${WORKDIR}/git diff --git a/meta/recipes-kernel/cryptodev/files/makefile_fixup.patch b/meta/recipes-kernel/cryptodev/files/makefile_fixup.patch new file mode 100644 index 000..323aacd --- /dev/null +++ b/meta/recipes-kernel/cryptodev/files/makefile_fixup.patch @@ -0,0 +1,26 @@ +diff --git a/Makefile b/Makefile +index 2be8825..b36d68c 100644 +--- a/Makefile b/Makefile +@@ -1,6 +1,7 @@ + KBUILD_CFLAGS += -I$(src) + KERNEL_DIR = /lib/modules/$(shell uname -r)/build + VERSION = 1.5 ++PREFIX = + + cryptodev-objs = ioctl.o main.o cryptlib.o authenc.o zc.o util.o + +@@ -12,10 +13,10 @@ build: version.h + version.h: Makefile + @echo #define VERSION \$(VERSION)\ version.h + +-install: ++modules_install: + make -C $(KERNEL_DIR) SUBDIRS=`pwd` modules_install +- @echo Installing cryptodev.h in /usr/include/crypto ... +- @install -D crypto/cryptodev.h /usr/include/crypto/cryptodev.h ++ @echo Installing cryptodev.h in $(PREFIX)/usr/include/crypto ... ++ @install -D crypto/cryptodev.h $(PREFIX)/usr/include/crypto/cryptodev.h + + clean: + make -C $(KERNEL_DIR) SUBDIRS=`pwd` clean -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core -- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] Can we trust to sstate-cache?
Today I bumped gcc-linaro from 4.7-r5 to 4.7-r6. First version was plain 2012.10 release while second one was tarball from bzr repository with huge set of ICE related fixes for AArch64 architecture. To do fast clean build I removed TMPDIR and started new build of core-image-minimal target. But then I noticed ugly thing: 0: eglibc-2.16-r18+svnr20393 do_populate_sysroot_setscene (pid 30106) 1: eglibc-2.16-r18+svnr20393 do_package_setscene (pid 30107) 3: eglibc-initial-2.16-r18+svnr20393 do_package_setscene (pid 28921) Why eglibc was taken from sstate-cache instead of being rebuilt (like it was with 'db')? This makes me sad as it shows that I cannot trust sstate-cache so each new build will take hours instead of minutes. Or maybe I am wrong? ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] linux-firmare: upgrade to latest commit
Signed-off-by: Ross Burton ross.bur...@intel.com --- meta/recipes-kernel/linux-firmware/linux-firmware_git.bb |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb index 559f82a..f4eb4cf 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb @@ -19,10 +19,10 @@ LIC_FILES_CHKSUM = file://LICENSE.radeon;md5=e56b405656593a0c97e478513051ea0e \ file://LICENCE.rtlwifi_firmware.txt;md5=00d06cfd3eddd5a2698948ead2ad54a5 \ -SRCREV = e98750f0d68d0037ce5a186f7f863a9c13bf773a +SRCREV = 0d6729f2b0bc6254d3628eb831bc80a36b5a17db PE = 1 PV = 0.0+git${SRCPV} -PR = r4 +PR = r5 SRC_URI = git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git;protocol=git -- 1.7.10 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] meta-systemd base-files issue
On Fri, Oct 12, 2012 at 1:06 AM, Khem Raj raj.k...@gmail.com wrote: On Oct 11, 2012, at 8:36 AM, Andrei Gherzan and...@gherzan.ro wrote: I'm trying to get meta-systemd work with meta-oe and oe-core. The problem seems to be with the fstab from oe-core where /var/volatile is mounted as tmpfs and the directories inside never recreated. So services like dbus or whatever needs /var/log or var/run etc which are all symlinks to volatile/*, will fail. Is this a known issue? Is there any other fix then using a custom stab? its a known issue. Fix is to remove -${localstatedir}/cache linkvolatile/cache -${localstatedir}/run linkvolatile/run -${localstatedir}/log linkvolatile/log -${localstatedir}/lock linkvolatile/lock -${localstatedir}/tmp linkvolatile/tmp from meta/files/fs-perms.txt I did and bug wasn't solved. The idea is that the directories inside volatile are not there as long as tmpfs mounted. P.S.: @Khem Sorry for double send. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Fwd: [oe-commits] Mark Hatle : prelink: Update to latest upstream prelink
On Fri, Aug 17, 2012 at 11:45 PM, Richard Purdie richard.pur...@linuxfoundation.org wrote: On Fri, 2012-08-17 at 23:21 +0200, Andreas Müller wrote: On Fri, Aug 17, 2012 at 7:09 PM, g...@git.openembedded.org wrote: Module: openembedded-core.git Branch: master Commit: 7759c9a2c5dfdc1cae5540a5985632c78abbac89 URL: http://git.openembedded.org/?p=openembedded-core.gita=commit;h=7759c9a2c5dfdc1cae5540a5985632c78abbac89 Author: Mark Hatle mark.ha...@windriver.com Date: Mon Aug 13 14:49:57 2012 -0500 prelink: Update to latest upstream prelink The latest fixes an obscure problem with prelinking on PowerPC, as well as general updated. Signed-off-by: Mark Hatle mark.ha...@windriver.com Signed-off-by: Saul Wold s...@linux.intel.com --- meta/recipes-devtools/prelink/prelink_git.bb |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/prelink/prelink_git.bb b/meta/recipes-devtools/prelink/prelink_git.bb index c94bdf5..610302e 100644 --- a/meta/recipes-devtools/prelink/prelink_git.bb +++ b/meta/recipes-devtools/prelink/prelink_git.bb @@ -8,9 +8,9 @@ and executables, so that far fewer relocations need to be resolved at \ runtime and thus programs come up faster. LICENSE = GPLv2 LIC_FILES_CHKSUM = file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b -SRCREV = 7b47f2f8a15ed13b7905bc120bb2586f3e164f7d +SRCREV = a2d8e30942bd4bc0a5c852b9d9d12f8684c4bb8d PV = 1.0+git${SRCPV} -PR = r9 +PR = r10 # # The cron script attempts to re-prelink the system daily -- on I think reloading is caused by this change. Since latest update I get WARNING: Failed to fetch URL git://git.yoctoproject.org/prelink-cross.git;protocol=git, attempting MIRRORS if available ERROR: Fetcher failure: Fetch command export HOME=/home/Superandy; export SSH_AUTH_SOCK=/tmp/keyring-IAYDEC/ssh; export GIT_CONFIG=/home/Superandy/tmp/oe-core-eglibc/sysroots/x86_64-linux/etc/gitconfig; export PATH=/home/Superandy/data/oe-core/sources/openembedded-core/scripts/native-intercept:/home/Superandy/data/oe-core/sources/openembedded-core/scripts:/home/Superandy/tmp/oe-core-eglibc/sysroots/x86_64-linux/usr/bin/armv7a-vfp-neon-linux:/home/Superandy/tmp/oe-core-eglibc/sysroots/x86_64-linux/usr/bin:/home/Superandy/tmp/oe-core-eglibc/sysroots/x86_64-linux/usr/sbin:/home/Superandy/tmp/oe-core-eglibc/sysroots/x86_64-linux/usr/bin:/home/Superandy/tmp/oe-core-eglibc/sysroots/x86_64-linux/sbin:/home/Superandy/tmp/oe-core-eglibc/sysroots/x86_64-linux//bin:/home/Superandy/oe-core/sources/openembedded-core/scripts:/home/Superandy/oe-core/sources/bitbake/bin:/usr/lib64/qt-3.3/bin:/usr/lib64/ccache:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:./:/home/Superandy/bin:/sbin:/usr/sbin; git remote add --mirror=fetch origin git://git.yoctoproject.org/prelink-cross.git failed with exit code 129, output: STDOUT: STDERR: error: option `mirror' takes no value usage: git remote add [options] name url -f, --fetch fetch the remote branches --tagsimport all tags and associated objects when fetching or do not fetch any tag at all (--no-tags) -t, --track branch branch(es) to track -m, --master branch master branch --mirror no separate remotes --mirror option was changed 2y ago here https://github.com/git/git/commit/a9f5a3558dcf83440c60ae5a2e2b56c80d65bb0b get newer git :) someone reported the same to me today with Ubuntu 11.04 :/ ERROR: Function failed: Fetcher failure for URL: 'git://git.yoctoproject.org/prelink-cross.git;protocol=git'. Unable to fetch URL from any source. ERROR: Logfile of failure stored in: /home/Superandy/tmp/oe-core-eglibc/work/x86_64-linux/prelink-native-1.0+git1+a2d8e30942bd4bc0a5c852b9d9d12f8684c4bb8d-r10/temp/log.do_fetch.25940 ERROR: Task 103 (virtual:native:/home/Superandy/data/oe-core/sources/openembedded-core/meta/recipes-devtools/prelink/prelink_git.bb, do_fetch) failed with exit code '1' NOTE: Tasks Summary: Attempted 307 tasks of which 262 didn't need to be rerun and 1 failed. Any thoughts? You have an incompatible version of git and git-native is in ASSUME_PROVIDED. We should have detected this and built git-native in this case. What version of git do you have? Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] kernel.bbclass: remove explicit version.h target
The compilation routine for the kernel has an explicit call to build version.h, which works fine for most kernels, but the location of it has recently changes. commit d183e6f5 [UAPI: Move linux/version.h] commit 10b63956 [UAPI: Plumb the UAPI Kbuilds into the user header installation and checking] moves the file to include/generated/linux/version.h and then to include/generated/uapi/linux/version.h. As a result kernel builds of 3.7 or bisection builds of intermediate kernel commits will fail with: make[2]: *** No rule to make target `include/linux/version.h'. Stop. Making the explicit version.h build conditional on the version, or via a file test would fix the problem, but it introduces some complexity to the build. Even without an explicit call to build version.h, it is always produced by the kernel build, so it can simply be removed. Note: it isn't clear why the explicit build of version.h was originally required, but the prep phases of the kernel have changed significantly, so it should no longer be required. [YOCTO: #3293] Signed-off-by: Bruce Ashfield bruce.ashfi...@windriver.com --- meta/classes/kernel.bbclass |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 0df8f08..2163c1f 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -85,7 +85,6 @@ KERNEL_IMAGETYPE_FOR_MAKE = ${@(lambda s: s[:-3] if s[-3:] == .gz else s)(d.g kernel_do_compile() { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE - oe_runmake include/linux/version.h CC=${KERNEL_CC} LD=${KERNEL_LD} oe_runmake ${KERNEL_IMAGETYPE_FOR_MAKE} ${KERNEL_ALT_IMAGETYPE} CC=${KERNEL_CC} LD=${KERNEL_LD} if test ${KERNEL_IMAGETYPE_FOR_MAKE}.gz = ${KERNEL_IMAGETYPE}; then gzip -9c ${KERNEL_IMAGETYPE_FOR_MAKE} ${KERNEL_OUTPUT} -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [RFC PATCH 0/1] kernel.bbclass: remove explicit version.h target
Hi all, I'm doing a quick RFC on a patch to get 3.7 based kernels building again. The patch has the details on the kernel commits that have moved version.h around, which breaks our builds due to an explicit reference in kernel.bbclass. I thought about making the call conditional, but as the patch says, this introduces a bit more complexity where it might not be required. Removing the reference to version.h fixes the build, and didn't break any of my older kernel builds (2.6.39, 3.0, 3.2, 3.4) while still producing version.h. I can't locate the original reason that version.h was being directly built, so that's why this is a RFC. I'm hoping someone will yell if this breaks a use case that I don't know about. This is stacked on top of my yocto master branch, since it was a RFC. I can rebase onto oe-core, or master under test as appropriate. Cheers, Bruce The following changes since commit e6e2b9bd66100c078c029ca7e34829cf1dfb5490: documentation: poky-ref-manual - edits to MACHINE type variables. (2012-10-18 12:15:04 +0100) 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 (1): kernel.bbclass: remove explicit version.h target meta/classes/kernel.bbclass |1 - 1 files changed, 0 insertions(+), 1 deletions(-) -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] kernel.bbclass: remove explicit version.h target
On 10/18/2012 10:47 AM, Bruce Ashfield wrote: The compilation routine for the kernel has an explicit call to build version.h, which works fine for most kernels, but the location of it has recently changes. commit d183e6f5 [UAPI: Move linux/version.h] commit 10b63956 [UAPI: Plumb the UAPI Kbuilds into the user header installation and checking] moves the file to include/generated/linux/version.h and then to include/generated/uapi/linux/version.h. As a result kernel builds of 3.7 or bisection builds of intermediate kernel commits will fail with: make[2]: *** No rule to make target `include/linux/version.h'. Stop. Making the explicit version.h build conditional on the version, or via a file test would fix the problem, but it introduces some complexity to the build. Even without an explicit call to build version.h, it is always produced by the kernel build, so it can simply be removed. Note: it isn't clear why the explicit build of version.h was originally required, but the prep phases of the kernel have changed significantly, so it should no longer be required. How far back have you tested with? 3.0? If it works back to 3.0, then I'd argue it's just fine. -- Darren [YOCTO: #3293] Signed-off-by: Bruce Ashfield bruce.ashfi...@windriver.com --- meta/classes/kernel.bbclass |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 0df8f08..2163c1f 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -85,7 +85,6 @@ KERNEL_IMAGETYPE_FOR_MAKE = ${@(lambda s: s[:-3] if s[-3:] == .gz else s)(d.g kernel_do_compile() { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE - oe_runmake include/linux/version.h CC=${KERNEL_CC} LD=${KERNEL_LD} oe_runmake ${KERNEL_IMAGETYPE_FOR_MAKE} ${KERNEL_ALT_IMAGETYPE} CC=${KERNEL_CC} LD=${KERNEL_LD} if test ${KERNEL_IMAGETYPE_FOR_MAKE}.gz = ${KERNEL_IMAGETYPE}; then gzip -9c ${KERNEL_IMAGETYPE_FOR_MAKE} ${KERNEL_OUTPUT} -- Darren Hart Intel Open Source Technology Center Yocto Project - Technical Lead - Linux Kernel ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] kernel.bbclass: remove explicit version.h target
On Thu, 2012-10-18 at 10:47 -0400, Bruce Ashfield wrote: The compilation routine for the kernel has an explicit call to build version.h, which works fine for most kernels, but the location of it has recently changes. commit d183e6f5 [UAPI: Move linux/version.h] commit 10b63956 [UAPI: Plumb the UAPI Kbuilds into the user header installation and checking] moves the file to include/generated/linux/version.h and then to include/generated/uapi/linux/version.h. As a result kernel builds of 3.7 or bisection builds of intermediate kernel commits will fail with: make[2]: *** No rule to make target `include/linux/version.h'. Stop. Making the explicit version.h build conditional on the version, or via a file test would fix the problem, but it introduces some complexity to the build. Even without an explicit call to build version.h, it is always produced by the kernel build, so it can simply be removed. Note: it isn't clear why the explicit build of version.h was originally required, but the prep phases of the kernel have changed significantly, so it should no longer be required. I had a look through the archives. I think this is a throwback to 2.4, we had to build the version.h file to figure out if we had a 2.6 or a 2.4 kernel, then we could do the right thing to build it. Since we don't support 2.4 anymore, this can die! Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] kernel.bbclass: remove explicit version.h target
On 12-10-18 11:12 AM, Richard Purdie wrote: On Thu, 2012-10-18 at 10:47 -0400, Bruce Ashfield wrote: The compilation routine for the kernel has an explicit call to build version.h, which works fine for most kernels, but the location of it has recently changes. commit d183e6f5 [UAPI: Move linux/version.h] commit 10b63956 [UAPI: Plumb the UAPI Kbuilds into the user header installation and checking] moves the file to include/generated/linux/version.h and then to include/generated/uapi/linux/version.h. As a result kernel builds of 3.7 or bisection builds of intermediate kernel commits will fail with: make[2]: *** No rule to make target `include/linux/version.h'. Stop. Making the explicit version.h build conditional on the version, or via a file test would fix the problem, but it introduces some complexity to the build. Even without an explicit call to build version.h, it is always produced by the kernel build, so it can simply be removed. Note: it isn't clear why the explicit build of version.h was originally required, but the prep phases of the kernel have changed significantly, so it should no longer be required. I had a look through the archives. I think this is a throwback to 2.4, we had to build the version.h file to figure out if we had a 2.6 or a 2.4 kernel, then we could do the right thing to build it. Since we don't support 2.4 anymore, this can die! That makes my day. Should I resend, or is the RFC patch enough ? Bruce Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Can we trust to sstate-cache?
On Thu, Oct 18, 2012 at 8:36 AM, Marcin Juszkiewicz marcin.juszkiew...@linaro.org wrote: Today I bumped gcc-linaro from 4.7-r5 to 4.7-r6. First version was plain 2012.10 release while second one was tarball from bzr repository with huge set of ICE related fixes for AArch64 architecture. To do fast clean build I removed TMPDIR and started new build of core-image-minimal target. But then I noticed ugly thing: 0: eglibc-2.16-r18+svnr20393 do_populate_sysroot_setscene (pid 30106) 1: eglibc-2.16-r18+svnr20393 do_package_setscene (pid 30107) 3: eglibc-initial-2.16-r18+svnr20393 do_package_setscene (pid 28921) Why eglibc was taken from sstate-cache instead of being rebuilt (like it was with 'db')? This makes me sad as it shows that I cannot trust sstate-cache so each new build will take hours instead of minutes. Or maybe I am wrong? Did the signatures for eglibc change after making your gcc-linaro change? You can run bitbake -S before and after and see which ones have new stamps. Then you can start using bitbake-diffsigs to back track (or presumably if nothing changed add a proper dependency) -M ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Can we trust to sstate-cache?
On Thu, 2012-10-18 at 15:36 +0200, Marcin Juszkiewicz wrote: Today I bumped gcc-linaro from 4.7-r5 to 4.7-r6. First version was plain 2012.10 release while second one was tarball from bzr repository with huge set of ICE related fixes for AArch64 architecture. To do fast clean build I removed TMPDIR and started new build of core-image-minimal target. But then I noticed ugly thing: 0: eglibc-2.16-r18+svnr20393 do_populate_sysroot_setscene (pid 30106) 1: eglibc-2.16-r18+svnr20393 do_package_setscene (pid 30107) 3: eglibc-initial-2.16-r18+svnr20393 do_package_setscene (pid 28921) Why eglibc was taken from sstate-cache instead of being rebuilt (like it was with 'db')? This makes me sad as it shows that I cannot trust sstate-cache so each new build will take hours instead of minutes. Or maybe I am wrong? In order to try and stop people going entirely insane and to illustrate the kind of controls that are possible, we have some default sstate policy in: http://git.yoctoproject.org/cgit.cgi/poky/tree/meta/lib/oe/sstatesig.py which basically stops the sstate sigs at the native/cross to target boundary. So in your specific case, it wouldn't rebuild eglibc even though you changed gcc and this was expected. You could customise sstatesig.py to change that (remove the isCross() bits). Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gypsy: removed gypsy from meta/recipes-connectivity
I know you've sent http://patchwork.openembedded.org/patch/37763/ to add it to meta-oe, but this patch removed also newer gypsy_0.9.bb and only older gypsy_git.bb was added back. Please fix that. On Thu, Oct 4, 2012 at 12:14 PM, Andrei Dinu andrei.adrianx.d...@intel.com wrote: removed also entry from meta/recipes-gnome/packagegroups/packagegroup-sdk-gmae.inc Signed-off-by: Andrei Dinu andrei.adrianx.d...@intel.com --- meta/recipes-connectivity/gypsy/files/fixups.patch | 21 - meta/recipes-connectivity/gypsy/gypsy.inc | 15 meta/recipes-connectivity/gypsy/gypsy_0.9.bb | 24 meta/recipes-connectivity/gypsy/gypsy_git.bb | 18 --- .../packagegroups/packagegroup-sdk-gmae.inc|1 - 5 files changed, 79 deletions(-) delete mode 100644 meta/recipes-connectivity/gypsy/files/fixups.patch delete mode 100644 meta/recipes-connectivity/gypsy/gypsy.inc delete mode 100644 meta/recipes-connectivity/gypsy/gypsy_0.9.bb delete mode 100644 meta/recipes-connectivity/gypsy/gypsy_git.bb diff --git a/meta/recipes-connectivity/gypsy/files/fixups.patch b/meta/recipes-connectivity/gypsy/files/fixups.patch deleted file mode 100644 index de4d92e..000 --- a/meta/recipes-connectivity/gypsy/files/fixups.patch +++ /dev/null @@ -1,21 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - - docs/reference/Makefile.am |2 ++ - 1 file changed, 2 insertions(+) - gypsy.orig/docs/reference/Makefile.am -+++ gypsy/docs/reference/Makefile.am -@@ -81,10 +81,12 @@ expand_content_files= - # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) - - INCLUDES=-I$(top_srcdir) $(GYPSY_CFLAGS) - GTKDOC_LIBS=$(top_builddir)/gypsy/libgypsy.la $(GYPSY_LIBS) - -+EXTRA_DIST = -+CLEANFILES = - # This includes the standard gtk-doc make rules, copied by gtkdocize. - include $(top_srcdir)/gtk-doc.make - - # Other files to distribute - # e.g. EXTRA_DIST += version.xml.in diff --git a/meta/recipes-connectivity/gypsy/gypsy.inc b/meta/recipes-connectivity/gypsy/gypsy.inc deleted file mode 100644 index 0c1735e..000 --- a/meta/recipes-connectivity/gypsy/gypsy.inc +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = GPS Multiplexing Daemon -DESCRIPTION = Gypsy is a GPS multiplexing daemon which allows \ -multiple clients to access GPS data from multiple GPS sources \ -concurrently. Gypsy also hides the details of parsing NMEA from the \ -client applications, passing the data as simple values for the clients \ -to use. -LICENSE = GPLv2.0 LGPLv2.1 -SECTION = x11 -DEPENDS = glib-2.0 dbus bluez4 dbus-glib - -inherit autotools pkgconfig gtk-doc - -EXTRA_OECONF += --with-distro=debian - -FILES_${PN} += /usr/share/dbus-1/services/ diff --git a/meta/recipes-connectivity/gypsy/gypsy_0.9.bb b/meta/recipes-connectivity/gypsy/gypsy_0.9.bb deleted file mode 100644 index 51207c9..000 --- a/meta/recipes-connectivity/gypsy/gypsy_0.9.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = GPS Multiplexing Daemon -DESCRIPTION = Gypsy is a GPS multiplexing daemon which allows \ -multiple clients to access GPS data from multiple GPS sources \ -concurrently. Gypsy also hides the details of parsing NMEA from the \ -client applications, passing the data as simple values for the clients \ -to use. -LICENSE = GPLv2+ LGPLv2+ -LIC_FILES_CHKSUM = file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ -file://COPYING.lib;md5=7fbc338309ac38fefcd64b04bb903e34 \ - file://src/main.c;beginline=1;endline=25;md5=3fe64e27e61b289b77383a54a982cbdd \ - file://gypsy/gypsy-time.h;beginline=1;endline=24;md5=06432ea19a7b6607428d04d9dadc37fd - -SECTION = x11 -DEPENDS = glib-2.0 dbus bluez4 dbus-glib libxslt - -SRC_URI = http://gypsy.freedesktop.org/releases/gypsy-${PV}.tar.gz; -PR = r1 - -inherit autotools pkgconfig - -FILES_${PN} += /usr/share/dbus-1/system-services/ - -SRC_URI[md5sum] = e2d186df9c2cc3b70a027043e22acf1a -SRC_URI[sha256sum] = 14e1cbe17351f408538e033ca370b4bf51ccf9c88744e236ddfb271904f154d6 diff --git a/meta/recipes-connectivity/gypsy/gypsy_git.bb b/meta/recipes-connectivity/gypsy/gypsy_git.bb deleted file mode 100644 index 867582d..000 --- a/meta/recipes-connectivity/gypsy/gypsy_git.bb +++ /dev/null @@ -1,18 +0,0 @@ -require gypsy.inc - -DEFAULT_PREFERENCE = -1 - -SRCREV = 3652e1f37e82b8e63983e30fda3482cd099a8cf5 -PV = 0.8+git${SRCPV} -PR = r2 - -S = ${WORKDIR}/git - -LICENSE = GPLv2+ LGPLv2+ -LIC_FILES_CHKSUM = file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ -file://COPYING.lib;md5=7fbc338309ac38fefcd64b04bb903e34 \ - file://src/main.c;beginline=1;endline=25;md5=3fe64e27e61b289b77383a54a982cbdd \ - file://gypsy/gypsy-time.h;beginline=1;endline=24;md5=06432ea19a7b6607428d04d9dadc37fd - -SRC_URI =
[OE-core] [PATCH] sstate: add manifest info for shared file matches
Present the manifest file that contains the matches for files being installed to a location that already contains that file. This will help to determine which is the correct recipe to fix when this occurs. [YOCTO #3191] Signed-off-by: Saul Wold s...@linux.intel.com --- meta/classes/sstate.bbclass |9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index d2a120b..140dd59 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -27,7 +27,7 @@ SSTATE_DUPWHITELIST += ${STAGING_LIBDIR_NATIVE}/${MULTIMACH_TARGET_SYS} ${STAGI # Also avoid python issues until we fix the python recipe SSTATE_DUPWHITELIST += ${STAGING_LIBDIR}/python2.7/config/Makefile ${STAGING_LIBDIR}/libpython2.7 ${STAGING_INCDIR}/python2.7/pyconfig.h # Avoid docbook/sgml catalog warnings for now -SSTATE_DUPWHITELIST += ${STAGING_ETCDIR_NATIVE}/sgml ${STAGING_DATADIR_NATIVE}/sgml +#SSTATE_DUPWHITELIST += ${STAGING_ETCDIR_NATIVE}/sgml ${STAGING_DATADIR_NATIVE}/sgml SSTATE_SCAN_FILES ?= *.la *-config *_config SSTATE_SCAN_CMD ?= 'find ${SSTATE_BUILDDIR} \( -name ${@\ -o -name \.join(d.getVar(SSTATE_SCAN_FILES, True).split())} \) -type f' @@ -120,6 +120,7 @@ def sstate_add(ss, source, dest, d): def sstate_install(ss, d): import oe.path +import subprocess sharedfiles = [] shareddirs = [] @@ -164,8 +165,12 @@ def sstate_install(ss, d): break if realmatch: match.append(f) +sstate_search_cmd = grep -rl %s %s | sed -e 's:^.*/::' -e 's:\.populate-sysroot::' % (f, d.expand(${SSTATE_MANIFESTS})) +search_output = subprocess.check_output(sstate_search_cmd, stderr=subprocess.STDOUT, shell=True) +if search_output != None: +match.append(Matched in %s % search_output.rstrip()) if match: -bb.warn(The recipe %s is trying to install files into a shared area when those files already exist. Those files are:\n %s % (d.getVar(PN, True), \n .join(match))) +bb.warn(The recipe %s is trying to install files into a shared area when those files already exist. Those files and their manifest location are:\n %s\nPlease verify which package should provide the above files. % (d.getVar('PN', True), \n .join(match))) # Write out the manifest f = open(manifest, w) -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] insane: Rationalise phdrs-based QA checks
On 10/01/2012 10:29 AM, Phil Blundell wrote: Various different QA checks are based on essentially the same data from the ELF program headers. Calling objdump to extract it repeatedly is inefficient, particularly if the shell is involved. Instead, let's cache the output from objdump inside the qa.elf object and allow it to be reused by multiple tests. Also, using objdump instead of scanelf to check for bad RPATHs (in the same way that the useless-rpaths check was doing already) allows the dependency on pax-utils-native to be dropped. Signed-off-by: Phil Blundell ph...@gnu.org --- meta/classes/insane.bbclass | 41 ++--- meta/lib/oe/qa.py | 17 + 2 files changed, 35 insertions(+), 23 deletions(-) Merged this along with associated patches into 1.4 Thanks for your patience Sau! (Yes, we are taking patches again, RP and I are vetting patches on the list) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 1fb8970..3705fe9 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -17,13 +17,8 @@ # files under exec_prefix -# -# We need to have the scanelf utility as soon as -# possible and this is contained within the pax-utils-native. -# The package.bbclass can help us here. -# inherit package -PACKAGE_DEPENDS += pax-utils-native ${QADEPENDS} +PACKAGE_DEPENDS += ${QADEPENDS} PACKAGEFUNCS += do_package_qa # unsafe-references-in-binaries requires prelink-rtld from @@ -147,21 +142,23 @@ def package_qa_check_rpath(file,name, d, elf, messages): if not elf: return -scanelf = os.path.join(d.getVar('STAGING_BINDIR_NATIVE',True),'scanelf') bad_dirs = [d.getVar('TMPDIR', True) + /work, d.getVar('STAGING_DIR_TARGET', True)] bad_dir_test = d.getVar('TMPDIR', True) -if not os.path.exists(scanelf): -bb.fatal(Can not check RPATH, scanelf (part of pax-utils-native) not found) if not bad_dirs[0] in d.getVar('WORKDIR', True): bb.fatal(This class assumed that WORKDIR is ${TMPDIR}/work... Not doing any check) -output = os.popen(%s -B -F%%r#F '%s' % (scanelf,file)) -txt= output.readline().split() -for line in txt: -for dir in bad_dirs: -if dir in line: -messages.append(package %s contains bad RPATH %s in file %s % (name, line, file)) +phdrs = elf.run_objdump(-p, d) + +import re +rpath_re = re.compile(\s+RPATH\s+(.*)) +for line in phdrs.split(\n): + m = rpath_re.match(line) + if m: + rpath = m.group(1) + for dir in bad_dirs: +if dir in rpath: +messages.append(package %s contains bad RPATH %s in file %s % (name, rpath, file)) QAPATHTEST[useless-rpaths] = package_qa_check_useless_rpaths def package_qa_check_useless_rpaths(file, name, d, elf, messages): @@ -174,15 +171,14 @@ def package_qa_check_useless_rpaths(file, name, d, elf, messages): if not elf: return -objdump = d.getVar('OBJDUMP', True) -env_path = d.getVar('PATH', True) - libdir = d.getVar(libdir, True) base_libdir = d.getVar(base_libdir, True) +phdrs = elf.run_objdump(-p, d) + import re rpath_re = re.compile(\s+RPATH\s+(.*)) -for line in os.popen(LC_ALL=C PATH=%s %s -p '%s' 2 /dev/null % (env_path, objdump, file), r): +for line in phdrs.split(\n): m = rpath_re.match(line) if m: rpath = m.group(1) @@ -443,14 +439,13 @@ def package_qa_hash_style(path, name, d, elf, messages): if not gnu_hash: return -objdump = d.getVar('OBJDUMP', True) -env_path = d.getVar('PATH', True) - sane = False has_syms = False +phdrs = elf.run_objdump(-p, d) + # If this binary has symbols, we expect it to have GNU_HASH too. -for line in os.popen(LC_ALL=C PATH=%s %s -p '%s' 2 /dev/null % (env_path, objdump, path), r): +for line in phdrs.split(\n): if SYMTAB in line: has_syms = True if GNU_HASH in line: diff --git a/meta/lib/oe/qa.py b/meta/lib/oe/qa.py index d380012..9e5ab58 100644 --- a/meta/lib/oe/qa.py +++ b/meta/lib/oe/qa.py @@ -28,6 +28,7 @@ class ELFFile: def __init__(self, name, bits = 0): self.name = name self.bits = bits +self.objdump_output = {} def open(self): self.file = file(self.name, r) @@ -87,3 +88,19 @@ class ELFFile: import struct (a,) = struct.unpack(self.sex+H, self.data[18:20]) return a + +def run_objdump(self, cmd, d): +import bb.process +import sys + +if self.objdump_output.has_key(cmd): +return self.objdump_output[cmd] + +objdump = d.getVar('OBJDUMP', True) +staging_dir = d.getVar('STAGING_BINDIR_TOOLCHAIN', True) + +env = os.environ +env[LC_ALL] = C + +self.objdump_output[cmd] =
Re: [OE-core] [PATCH] gypsy: removed gypsy from meta/recipes-connectivity
On 10/04/2012 03:14 AM, Andrei Dinu wrote: removed also entry from meta/recipes-gnome/packagegroups/packagegroup-sdk-gmae.inc Signed-off-by: Andrei Dinu andrei.adrianx.d...@intel.com --- meta/recipes-connectivity/gypsy/files/fixups.patch | 21 - meta/recipes-connectivity/gypsy/gypsy.inc | 15 meta/recipes-connectivity/gypsy/gypsy_0.9.bb | 24 meta/recipes-connectivity/gypsy/gypsy_git.bb | 18 --- .../packagegroups/packagegroup-sdk-gmae.inc|1 - 5 files changed, 79 deletions(-) delete mode 100644 meta/recipes-connectivity/gypsy/files/fixups.patch delete mode 100644 meta/recipes-connectivity/gypsy/gypsy.inc delete mode 100644 meta/recipes-connectivity/gypsy/gypsy_0.9.bb delete mode 100644 meta/recipes-connectivity/gypsy/gypsy_git.bb Merged into OE-Core Thanks Sau! diff --git a/meta/recipes-connectivity/gypsy/files/fixups.patch b/meta/recipes-connectivity/gypsy/files/fixups.patch deleted file mode 100644 index de4d92e..000 --- a/meta/recipes-connectivity/gypsy/files/fixups.patch +++ /dev/null @@ -1,21 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - - docs/reference/Makefile.am |2 ++ - 1 file changed, 2 insertions(+) - gypsy.orig/docs/reference/Makefile.am -+++ gypsy/docs/reference/Makefile.am -@@ -81,10 +81,12 @@ expand_content_files= - # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) - - INCLUDES=-I$(top_srcdir) $(GYPSY_CFLAGS) - GTKDOC_LIBS=$(top_builddir)/gypsy/libgypsy.la $(GYPSY_LIBS) - -+EXTRA_DIST = -+CLEANFILES = - # This includes the standard gtk-doc make rules, copied by gtkdocize. - include $(top_srcdir)/gtk-doc.make - - # Other files to distribute - # e.g. EXTRA_DIST += version.xml.in diff --git a/meta/recipes-connectivity/gypsy/gypsy.inc b/meta/recipes-connectivity/gypsy/gypsy.inc deleted file mode 100644 index 0c1735e..000 --- a/meta/recipes-connectivity/gypsy/gypsy.inc +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = GPS Multiplexing Daemon -DESCRIPTION = Gypsy is a GPS multiplexing daemon which allows \ -multiple clients to access GPS data from multiple GPS sources \ -concurrently. Gypsy also hides the details of parsing NMEA from the \ -client applications, passing the data as simple values for the clients \ -to use. -LICENSE = GPLv2.0 LGPLv2.1 -SECTION = x11 -DEPENDS = glib-2.0 dbus bluez4 dbus-glib - -inherit autotools pkgconfig gtk-doc - -EXTRA_OECONF += --with-distro=debian - -FILES_${PN} += /usr/share/dbus-1/services/ diff --git a/meta/recipes-connectivity/gypsy/gypsy_0.9.bb b/meta/recipes-connectivity/gypsy/gypsy_0.9.bb deleted file mode 100644 index 51207c9..000 --- a/meta/recipes-connectivity/gypsy/gypsy_0.9.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = GPS Multiplexing Daemon -DESCRIPTION = Gypsy is a GPS multiplexing daemon which allows \ -multiple clients to access GPS data from multiple GPS sources \ -concurrently. Gypsy also hides the details of parsing NMEA from the \ -client applications, passing the data as simple values for the clients \ -to use. -LICENSE = GPLv2+ LGPLv2+ -LIC_FILES_CHKSUM = file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ -file://COPYING.lib;md5=7fbc338309ac38fefcd64b04bb903e34 \ - file://src/main.c;beginline=1;endline=25;md5=3fe64e27e61b289b77383a54a982cbdd \ - file://gypsy/gypsy-time.h;beginline=1;endline=24;md5=06432ea19a7b6607428d04d9dadc37fd - -SECTION = x11 -DEPENDS = glib-2.0 dbus bluez4 dbus-glib libxslt - -SRC_URI = http://gypsy.freedesktop.org/releases/gypsy-${PV}.tar.gz; -PR = r1 - -inherit autotools pkgconfig - -FILES_${PN} += /usr/share/dbus-1/system-services/ - -SRC_URI[md5sum] = e2d186df9c2cc3b70a027043e22acf1a -SRC_URI[sha256sum] = 14e1cbe17351f408538e033ca370b4bf51ccf9c88744e236ddfb271904f154d6 diff --git a/meta/recipes-connectivity/gypsy/gypsy_git.bb b/meta/recipes-connectivity/gypsy/gypsy_git.bb deleted file mode 100644 index 867582d..000 --- a/meta/recipes-connectivity/gypsy/gypsy_git.bb +++ /dev/null @@ -1,18 +0,0 @@ -require gypsy.inc - -DEFAULT_PREFERENCE = -1 - -SRCREV = 3652e1f37e82b8e63983e30fda3482cd099a8cf5 -PV = 0.8+git${SRCPV} -PR = r2 - -S = ${WORKDIR}/git - -LICENSE = GPLv2+ LGPLv2+ -LIC_FILES_CHKSUM = file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ -file://COPYING.lib;md5=7fbc338309ac38fefcd64b04bb903e34 \ - file://src/main.c;beginline=1;endline=25;md5=3fe64e27e61b289b77383a54a982cbdd \ - file://gypsy/gypsy-time.h;beginline=1;endline=24;md5=06432ea19a7b6607428d04d9dadc37fd - -SRC_URI = git://anongit.freedesktop.org/gypsy;protocol=git \ - file://fixups.patch diff --git a/meta/recipes-gnome/packagegroups/packagegroup-sdk-gmae.inc b/meta/recipes-gnome/packagegroups/packagegroup-sdk-gmae.inc index 2289572..a6403fc 100644 --- a/meta/recipes-gnome/packagegroups/packagegroup-sdk-gmae.inc +++
Re: [OE-core] [PATCH] Add packagegroup-core-buildessential
On 09/24/2012 04:54 PM, Colin Walters wrote: [Not heavily tested, but sent for discussion] task-core-sdk is too big - for example, I simply don't want to ship tcl, ever =) Historically distcc caused a large dependency graph explosion because it has a utility which uses gtk+, although that was fixed. packagegroup-core-sdk also includes coreutils, which is a bit confusing; conceptually things dependent on coreutils should pull it in explicitly, or possibly we just declare coreutils to be in the minimal build set. So packagegroup-core-buildessential is intended to be similar to Debian's build-essential package. It's the stuff needed by say 80+% of components, not worth repeating over and over. Signed-off-by: Colin Walters walt...@verbum.org --- .../packagegroup-core-buildessential.bb| 30 ++ .../packagegroups/packagegroup-core-sdk.bb | 17 +--- 2 files changed, 31 insertions(+), 16 deletions(-) create mode 100644 meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb Merged into OE-Core Thanks Sau! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] cpan_build: Unify directory layout for native and target builds
On 09/25/2012 02:33 PM, Phil Blundell wrote: There seems to be no benefit in having them be different and this appears to cause a certain amount of confusion about paths for the native modules. Signed-off-by: Phil Blundell p...@pbcl.net --- previously posted as RFC, no comments so reposting as an actual patch meta/classes/cpan_build.bbclass |7 ++- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/meta/classes/cpan_build.bbclass b/meta/classes/cpan_build.bbclass index 36ffc56..0809602 100644 --- a/meta/classes/cpan_build.bbclass +++ b/meta/classes/cpan_build.bbclass @@ -23,8 +23,9 @@ cpan_build_do_configure () { if [ ${@is_target(d)} == yes ]; then # build for target . ${STAGING_LIBDIR}/perl/config.sh + fi - perl Build.PL --installdirs vendor \ + perl Build.PL --installdirs vendor \ --destdir ${D} \ --install_path lib=${datadir}/perl \ --install_path arch=${libdir}/perl \ @@ -32,10 +33,6 @@ cpan_build_do_configure () { --install_path bin=${bindir} \ --install_path bindoc=${mandir}/man1 \ --install_path libdoc=${mandir}/man3 - else - # build for host - perl Build.PL --installdirs site --destdir ${D} - fi } cpan_build_do_compile () { Merged into OE-Core Thanks Sau! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC PATCH] gettext: Remove spurious-looking dependencies on libxml2-native
On 09/26/2012 03:30 AM, Phil Blundell wrote: These were added in aae5021101224344a2b1a3af5becf74291fbbfe5, ostensibly to resolve some sort of host contamination issue. However, that commit contains no information about what contamination was being observed or how the dependencies help. gettext-native is being configured --with-included-libxml so it shouldn't be using libxml2 from either the host or the sysroot, in which case the dependency would seem to be useless. Using the included copy of libxml2 is in any case preferable to adding a dependency on libxml2-native because the latter brings quite a large stack of other dependencies with it. Signed-off-by: Phil Blundell p...@pbcl.net --- meta/recipes-core/gettext/gettext_0.18.1.1.bb |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-core/gettext/gettext_0.18.1.1.bb b/meta/recipes-core/gettext/gettext_0.18.1.1.bb index a159405..96859aa 100644 --- a/meta/recipes-core/gettext/gettext_0.18.1.1.bb +++ b/meta/recipes-core/gettext/gettext_0.18.1.1.bb @@ -5,9 +5,9 @@ SECTION = libs LICENSE = GPLv3+ LGPL-2.1+ LIC_FILES_CHKSUM = file://COPYING;md5=d32239bcb673463ab874e80d47fae504 -PR = r17 -DEPENDS = libxml2-native gettext-native virtual/libiconv ncurses expat -DEPENDS_virtclass-native = libxml2-native gettext-minimal-native +PR = r18 +DEPENDS = gettext-native virtual/libiconv ncurses expat +DEPENDS_virtclass-native = gettext-minimal-native PROVIDES = virtual/libintl virtual/gettext PROVIDES_virtclass-native = virtual/gettext-native RCONFLICTS_${PN} = proxy-libintl Merged into OE-Core Thanks Sau! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] kernel.bbclass, module.bbclass: Make update-modules optional
On 09/26/2012 05:02 AM, Phil Blundell wrote: The update-modules mechanism is something of a historical relic and it isn't entirely clear that it has a great deal of value nowadays. Also, it causes a problem when building a read-only rootfs since update-modules itself refuses to configure offline. Allow DISTROs to circumvent this whole thing by declaring (via DISTRO_FEATURES) that they don't wish to use update-modules. This is backfilled for existing distributions and will have to be marked as CONSIDERED by those who actually don't want it. Signed-off-by: Phil Blundell p...@pbcl.net --- meta/classes/kernel.bbclass | 24 meta/classes/module.bbclass |2 +- meta/conf/bitbake.conf |2 +- 3 files changed, 18 insertions(+), 10 deletions(-) Merged into OE-Core Thanks Sau! diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index fdef1be..d3af67c 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -398,10 +398,12 @@ python populate_packages_prepend () { dvar = d.getVar('PKGD', True) +use_update_modules = oe.utils.contains('DISTRO_FEATURES', 'update-modules', True, False, d) + # If autoloading is requested, output /etc/modules-load.d/name.conf and append # appropriate modprobe commands to the postinst autoload = d.getVar('module_autoload_%s' % basename, True) -if autoload: +if autoload and use_update_modules: name = '%s/etc/modules-load.d/%s.conf' % (dvar, basename) f = open(name, 'w') for m in autoload.split(): @@ -415,15 +417,16 @@ python populate_packages_prepend () { # Write out any modconf fragment modconf = d.getVar('module_conf_%s' % basename, True) -if modconf: +if modconf and use_update_modules: name = '%s/etc/modprobe.d/%s.conf' % (dvar, basename) f = open(name, 'w') f.write(%s\n % modconf) f.close() -files = d.getVar('FILES_%s' % pkg, True) -files = %s /etc/modules-load.d/%s.conf /etc/modprobe.d/%s.conf % (files, basename, basename) -d.setVar('FILES_%s' % pkg, files) +if use_update_modules: +files = d.getVar('FILES_%s' % pkg, True) +files = %s /etc/modules-load.d/%s.conf /etc/modprobe.d/%s.conf % (files, basename, basename) +d.setVar('FILES_%s' % pkg, files) if vals.has_key(description): old_desc = d.getVar('DESCRIPTION_' + pkg, True) or @@ -441,12 +444,17 @@ python populate_packages_prepend () { module_regex = '^(.*)\.k?o$' module_pattern = 'kernel-module-%s' -postinst = d.getVar('pkg_postinst_modules', True) -postrm = d.getVar('pkg_postrm_modules', True) +use_update_modules = oe.utils.contains('DISTRO_FEATURES', 'update-modules', True, False, d) +if use_update_modules: +postinst = d.getVar('pkg_postinst_modules', True) +postrm = d.getVar('pkg_postrm_modules', True) +else: +postinst = None +postrm = None do_split_packages(d, root='/lib/firmware', file_regex='^(.*)\.bin$', output_pattern='kernel-firmware-%s', description='Firmware for %s', recursive=True, extra_depends='') do_split_packages(d, root='/lib/firmware', file_regex='^(.*)\.fw$', output_pattern='kernel-firmware-%s', description='Firmware for %s', recursive=True, extra_depends='') do_split_packages(d, root='/lib/firmware', file_regex='^(.*)\.cis$', output_pattern='kernel-firmware-%s', description='Firmware for %s', recursive=True, extra_depends='') -do_split_packages(d, root='/lib/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='update-modules kernel-%s' % d.getVar(KERNEL_VERSION, True)) +do_split_packages(d, root='/lib/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='%skernel-%s' % (['', 'update-modules '][use_update_modules], d.getVar(KERNEL_VERSION, True))) # If modules-load.d and modprobe.d are empty at this point, remove them to # avoid warnings. removedirs only raises an OSError if an empty diff --git a/meta/classes/module.bbclass b/meta/classes/module.bbclass index c721202..e8d32eb 100644 --- a/meta/classes/module.bbclass +++ b/meta/classes/module.bbclass @@ -1,4 +1,4 @@ -RDEPENDS += kernel-image update-modules +RDEPENDS_${PN} += kernel-image ${@oe.utils.contains('DISTRO_FEATURES', 'update-modules', 'update-modules', '', d)} DEPENDS += virtual/kernel inherit module-base diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 3496d2b..5196018 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -724,7 +724,7 @@
Re: [OE-core] [PATCH] cryptodev kernel module recipe
On 10/18/2012 02:14 AM, Khem Raj wrote: On Oct 18, 2012, at 2:57 AM, Yashpal Dutta yashpal.du...@freescale.com wrote: +-install: ++modules_install: +make -C $(KERNEL_DIR) SUBDIRS=`pwd` modules_install +- @echo Installing cryptodev.h in /usr/include/crypto ... +- @install -D crypto/cryptodev.h /usr/include/crypto/cryptodev.h ++ @echo Installing cryptodev.h in $(PREFIX)/usr/include/crypto ... ++ @install -D crypto/cryptodev.h $(PREFIX)/usr/include/crypto/cryptodev.h + why is it installing linux headers under /usr/include shouldn't they be under usr/include/linux ? And shouldn't /usr/include be one of those ${*dir} variables? -- Darren Hart Intel Open Source Technology Center Yocto Project - Technical Lead - Linux Kernel ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] module.bbclass: Move do_make_scripts() to module-base
On 09/25/2012 04:55 AM, Phil Blundell wrote: It's sometimes useful to have this function available to recipes which don't wish to use module.bbclass for whatever reason. Signed-off-by: Phil Blundell p...@pbcl.net --- meta/classes/module-base.bbclass | 11 +++ meta/classes/module.bbclass | 11 --- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/meta/classes/module-base.bbclass b/meta/classes/module-base.bbclass index 9379bf8..210c47c 100644 --- a/meta/classes/module-base.bbclass +++ b/meta/classes/module-base.bbclass @@ -26,3 +26,14 @@ KERNEL_AR = ${HOST_PREFIX}ar${KERNEL_ARSUFFIX} ${HOST_AR_KERNEL_ARCH} # kernel modules are generally machine specific PACKAGE_ARCH = ${MACHINE_ARCH} + +# +# Ensure the hostprogs are available for module compilation. Modules that +# inherit this recipe and override do_compile() should be sure to call +# do_make_scripts() or ensure the scripts are built independently. +# +do_make_scripts() { + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + oe_runmake CC=${KERNEL_CC} LD=${KERNEL_LD} AR=${KERNEL_AR} \ + -C ${STAGING_KERNEL_DIR} scripts +} diff --git a/meta/classes/module.bbclass b/meta/classes/module.bbclass index 91628e4..c721202 100644 --- a/meta/classes/module.bbclass +++ b/meta/classes/module.bbclass @@ -3,17 +3,6 @@ DEPENDS += virtual/kernel inherit module-base -# -# Ensure the hostprogs are available for module compilation. Modules that -# inherit this recipe and override do_compile() should be sure to call -# do_make_scripts() or ensure the scripts are built independently. -# -do_make_scripts() { - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake CC=${KERNEL_CC} LD=${KERNEL_LD} AR=${KERNEL_AR} \ - -C ${STAGING_KERNEL_DIR} scripts -} - addtask make_scripts before do_compile do_make_scripts[lockfiles] = ${TMPDIR}/kernel-scripts.lock do_make_scripts[deptask] = do_populate_sysroot Merged into OE-Core Thanks Sau! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] strace: Don't package strace-graph
On 09/26/2012 03:18 AM, Phil Blundell wrote: Commit 9c9ea24b115a9bb87df1323b5f185ce426262aec made strace depend on perl because the strace-graph script needs it. However, this cost of the dependency is large (building all of perl) and the value of the script is marginal. Let's just delete the script instead and remove the dependency again. If anybody wants strace-graph then it should be packaged in its own recipe and that one can be made to depend on perl without disrupting the main strace package. Signed-off-by: Phil Blundell p...@pbcl.net --- meta/recipes-devtools/strace/strace_4.7.bb | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/meta/recipes-devtools/strace/strace_4.7.bb b/meta/recipes-devtools/strace/strace_4.7.bb index 21dd47a..e1a5e82 100644 --- a/meta/recipes-devtools/strace/strace_4.7.bb +++ b/meta/recipes-devtools/strace/strace_4.7.bb @@ -3,11 +3,7 @@ HOMEPAGE = http://strace.sourceforge.net; SECTION = console/utils LICENSE = BSD LIC_FILES_CHKSUM = file://COPYRIGHT;md5=124500c21e856f0912df29295ba104c7 -PR = r1 - -PACKAGES =+ ${PN}-graph -FILES_${PN}-graph = ${bindir}/strace-graph -RDEPENDS_${PN}-graph = perl +PR = r2 SRC_URI = ${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \ file://strace-eglibc-2.16.patch \ @@ -20,4 +16,9 @@ inherit autotools export INCLUDES = -I. -I./linux +do_install_append() { + # We don't ship strace-graph here because it needs perl + rm ${D}${bindir}/strace-graph +} + BBCLASSEXTEND = native Merged into OE-Core Thanks Sau! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Merging AArch64 support
On 10/03/2012 02:51 AM, Marcin Juszkiewicz wrote: Hello guys Now, when AArch64 is buildable from public sources it came a time to work on merging all changes I had to do to get it working with current OE-Core. All changes are available in: git://git.openembedded.org/openembedded-core-contrib hrw/aarch64-support Those are first versions of patches so if anything has to be changed feel free to tell. Probably descriptions needs to be updated etc but I would like to see some kind of review as it was long time since last time I did OE merging stuff. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core Merged the full series of Aarch64 support patches into OE-Core Thanks Sau! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] cryptodev kernel module recipe
On Thu, Oct 18, 2012 at 2:59 PM, Darren Hart dvh...@linux.intel.com wrote: On 10/18/2012 02:14 AM, Khem Raj wrote: On Oct 18, 2012, at 2:57 AM, Yashpal Dutta yashpal.du...@freescale.com wrote: +-install: ++modules_install: +make -C $(KERNEL_DIR) SUBDIRS=`pwd` modules_install +- @echo Installing cryptodev.h in /usr/include/crypto ... +- @install -D crypto/cryptodev.h /usr/include/crypto/cryptodev.h ++ @echo Installing cryptodev.h in $(PREFIX)/usr/include/crypto ... ++ @install -D crypto/cryptodev.h $(PREFIX)/usr/include/crypto/cryptodev.h + why is it installing linux headers under /usr/include shouldn't they be under usr/include/linux ? And shouldn't /usr/include be one of those ${*dir} variables? That's a patch to a Makefile... not a recipe. -M ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] libnss-mdns: fix mDNS resolving speed
On 09/28/2012 08:13 AM, Constantin Musca wrote: We need to fix the hosts: files dns mdns4 nsswitch.conf line because for a .local lookup it does a DNS lookup first which will fail. The recommended solution is: hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4 [YOCTO #2502] Signed-off-by: Constantin Musca constantinx.mu...@intel.com --- .../libnss-mdns/libnss-mdns_0.10.bb| 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb b/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb index a1f2f9a..f7356e4 100644 --- a/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb +++ b/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 DEPENDS = avahi RDEPENDS_${PN} = avahi-daemon -PR = r5 +PR = r6 SRC_URI = http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${PV}.tar.gz; @@ -24,13 +24,13 @@ DEBIANNAME_${PN} = libnss-mdns EXTRA_OECONF = --libdir=${base_libdir} --disable-lynx --enable-avahi pkg_postinst_${PN} () { -if ! grep -q '^hosts:.*\mdns4\' $D/etc/nsswitch.conf; then - sed -e 's/^hosts:.*/ mdns4/' -i $D/etc/nsswitch.conf -fi + sed -e '/^hosts:/s/\s*\mdns4\//' \ + -e 's/\(^hosts:.*\)\(\files\\)\(.*\)\(\dns\\)\(.*\)/\1\2 mdns4_minimal [NOTFOUND=return]\3\4 mdns4\5/' \ + -i $D/etc/nsswitch.conf } pkg_prerm_${PN} () { -if grep -q '^hosts:.*\mdns4\' /etc/nsswitch.conf; then - sed -e '/^hosts:/s/\s\mdns4\//' -i /etc/nsswitch.conf -fi + sed -e '/^hosts:/s/\s*\mdns4\//' \ + -e '/^hosts:/s/\s*mdns4_minimal\s\+\[NOTFOUND=return\]//' \ + -i /etc/nsswitch.conf } Merged into OE-Core Thanks Sau! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] recipe_sanity: Don't bother checking LICENSE
On 10/01/2012 09:03 AM, Phil Blundell wrote: Since e3d7890cace71b0a57d2530bf615a58dcb46d96f or so, base.bbclass has considered invalid LICENSE settings to be a fatal error. This means we will never see them so there is no point checking for that. Signed-off-by: Phil Blundell ph...@gnu.org --- meta/classes/recipe_sanity.bbclass |9 ++--- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/meta/classes/recipe_sanity.bbclass b/meta/classes/recipe_sanity.bbclass index c3bd0d2..bf378ea 100644 --- a/meta/classes/recipe_sanity.bbclass +++ b/meta/classes/recipe_sanity.bbclass @@ -13,7 +13,7 @@ def bad_runtime_vars(cfgdata, d): __note(%s should be %s_${PN} % (var, var), d) __recipe_sanity_reqvars = DESCRIPTION -__recipe_sanity_reqdiffvars = LICENSE +__recipe_sanity_reqdiffvars = def req_vars(cfgdata, d): for var in d.getVar(__recipe_sanity_reqvars, True).split(): if not d.getVar(var, 0): @@ -23,11 +23,6 @@ def req_vars(cfgdata, d): val = d.getVar(var, 0) cfgval = cfgdata.get(var) -# Hardcoding is bad, but I'm lazy. We don't care about license being -# unset if the recipe has no sources! -if var == LICENSE and d.getVar(SRC_URI, True) == cfgdata.get(SRC_URI): -continue - if not val: __note(%s should be set % var, d) elif val == cfgval: @@ -93,7 +88,7 @@ def can_remove_FILESDIR(cfgdata, d): expanded == d.expand(expected)) def can_remove_others(p, cfgdata, d): -for k in [S, PV, PN, DESCRIPTION, LICENSE, DEPENDS, +for k in [S, PV, PN, DESCRIPTION, DEPENDS, SECTION, PACKAGES, EXTRA_OECONF, EXTRA_OEMAKE]: #for k in cfgdata: unexpanded = d.getVar(k, 0) Merged into OE-Core Thanks Sau! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [[PATCH v3]] populate_sdk_base.bbclass: Make it possible to override the create_shar method of populate_sdk_base.
On 10/08/2012 03:43 AM, Martin Ertsaas wrote: From: Thomas Kristensen thkri...@cisco.com If you wish to change the install/unpack method of the sdk, this can now be done by making your own create_shar method, and setting a SDK_PACKAGING_FUNC variable to your new create_shar function. Signed-off-by: Thomas Kristensen thkri...@cisco.com --- meta/classes/populate_sdk_base.bbclass |4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index 1c151d7..762ba12 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass @@ -24,6 +24,8 @@ PID = ${@os.getpid()} EXCLUDE_FROM_WORLD = 1 +SDK_PACKAGING_FUNC ?= create_shar + python () { # If we don't do this we try and run the mapping hooks while parsing which is slow # bitbake should really provide something to let us know this... @@ -56,7 +58,7 @@ fakeroot python do_populate_sdk() { bb.build.exec_func(tar_sdk, d) -bb.build.exec_func(create_shar, d) +bb.build.exec_func(d.getVar(SDK_PACKAGING_FUNC, True), d) } fakeroot populate_sdk_image() { Merged into OE-Core Thanks Sau! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] packagegroup-self-hosted: recommend kernel modules instead of depending on them
On 10/10/2012 02:41 AM, Marcin Juszkiewicz wrote: Requested kernel modules may be integrated in kernel or totally disabled as not needed on target. Signed-off-by: Marcin Juszkiewicz marcin.juszkiew...@linaro.org --- .../packagegroups/packagegroup-self-hosted.bb | 15 +-- 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb index de0a46d..19f5a16 100644 --- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb @@ -4,7 +4,7 @@ SUMMARY = Self-hosting DESCRIPTION = Packages required to run the build system -PR = r11 +PR = r12 LICENSE = MIT inherit packagegroup @@ -37,11 +37,6 @@ RDEPENDS_packagegroup-self-hosted-host-tools = \ genext2fs \ hdparm \ iptables \ -kernel-module-tun \ -kernel-module-iptable-raw \ -kernel-module-iptable-nat \ -kernel-module-iptable-mangle \ -kernel-module-iptable-filter \ lsb \ mc \ parted \ @@ -50,6 +45,14 @@ RDEPENDS_packagegroup-self-hosted-host-tools = \ vte \ +RRECOMMENDS_packagegroup-self-hosted-host-tools = \ +kernel-module-tun \ +kernel-module-iptable-raw \ +kernel-module-iptable-nat \ +kernel-module-iptable-mangle \ +kernel-module-iptable-filter \ + + # eglibc-utils: for rpcgen RDEPENDS_packagegroup-self-hosted-sdk = \ autoconf \ Merged into OE-Core Thanks Sau! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] chkconfig: pass CFLAGS to Makefile
On 10/10/2012 03:16 PM, Joe Slater wrote: The environment CFLAGS is not used by the chkconfig Makefile, so debug and optimization options are ignored. So, we use RPM_OPT_FLAGS to pass CFLAGS into Makefile. Upstream-Status: Inappropriate [configuration] Signed-off-by: Joe Slater jsla...@windriver.com --- .../recipes-extended/chkconfig/chkconfig_1.3.58.bb |7 +-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb b/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb index 17987a6..a27a4ba 100644 --- a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb +++ b/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = file://COPYING;md5=5574c6965ae5f583e55880e397fbb018 DEPENDS = libnewt popt -PR = r1 +PR = r2 SRC_URI = http://fedorahosted.org/releases/c/h/chkconfig/${BPN}-${PV}.tar.bz2; @@ -21,7 +21,10 @@ SRC_URI[sha256sum] = 18b497d25b2cada955c72810e45fcad8280d105f17cf45e2970f182712 inherit autotools gettext -EXTRA_OEMAKE += 'MANDIR=${mandir} BINDIR=${base_sbindir} SBINDIR=${sbindir}' +# Makefile uses RPM_OPT_fLAGS to construct CFLAGS +# +EXTRA_OEMAKE += 'RPM_OPT_FLAGS=${CFLAGS} MANDIR=${mandir} \ + BINDIR=${base_sbindir} SBINDIR=${sbindir}' do_install_append() { mkdir -p ${D}/etc/chkconfig.d Merged into OE-Core Thanks Sau! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] sanity.bbclass: trigger network tests explicitly
On 10/11/2012 04:44 AM, Bogdan Marinescu wrote: The network tests in sanity.bbclass can now be trigerred explicitly by firing the NetworkTest event. This is part of the fix for bug #3026. [YOCTO #3026] Signed-off-by: Bogdan Marinescu bogdan.a.marine...@intel.com --- meta/classes/sanity.bbclass |3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index f2e9a74..3806bc5 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -639,6 +639,9 @@ python check_sanity_eventhandler() { sanity_data.setVar(SANITY_USE_EVENTS, 1) check_sanity(sanity_data) bb.event.fire(bb.event.SanityCheckPassed(), e.data) +elif bb.event.getName(e) == NetworkTest: +sanity_data = copy_data(e) +bb.event.fire(bb.event.NetworkTestFailed() if check_connectivity(sanity_data) else bb.event.NetworkTestPassed(), e.data) return } Merged into OE-Core Thanks Sau! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] cryptodev kernel module recipe
On 10/18/2012 05:57 AM, Yashpal Dutta wrote: This is a /dev/crypto device driver, equivalent to those in OpenBSD or FreeBSD. The main idea is to access of existing ciphers in kernel space from userspace, thus enabling re-use of a hardware implementation of a cipher. Signed-off-by: Yashpal Dutta yashpal.du...@freescale.com --- meta/recipes-kernel/cryptodev/cryptodev_1.5.bb | 18 + .../cryptodev/files/makefile_fixup.patch | 26 2 files changed, 44 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-kernel/cryptodev/cryptodev_1.5.bb create mode 100644 meta/recipes-kernel/cryptodev/files/makefile_fixup.patch diff --git a/meta/recipes-kernel/cryptodev/cryptodev_1.5.bb b/meta/recipes-kernel/cryptodev/cryptodev_1.5.bb new file mode 100644 index 000..5125710 --- /dev/null +++ b/meta/recipes-kernel/cryptodev/cryptodev_1.5.bb @@ -0,0 +1,18 @@ +SECTION = devel +SUMMARY = Linux Cryptodev KERNEL MODULE +DESCRIPTION = The Cryptodev package contains the kernel /dev/crypto module +LICENSE = GPLv2 +LIC_FILES_CHKSUM = file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 + +DEPENDS = virtual/kernel This DEPENDS in inherited from the module.bbclass, no need to duplicate + +inherit module + +SRCREV = 1c24a0aa996630518d47826a2e3fea129ea094c7 + +SRC_URI = git://repo.or.cz/cryptodev-linux.git;protocol=git \ + file://makefile_fixup.patch Tabs to indent, spaces to align. Spaces here please. + +EXTRA_OEMAKE='KERNEL_DIR=${STAGING_KERNEL_DIR} PREFIX=${D}' modules.bbclass already sets KERNEL_PATH and KERNEL_SRC, perhaps you could use one of those? If you just use ${includedir} in your install I believe you can skip PREFIX here and get the /usr part right there. + +S = ${WORKDIR}/git diff --git a/meta/recipes-kernel/cryptodev/files/makefile_fixup.patch b/meta/recipes-kernel/cryptodev/files/makefile_fixup.patch new file mode 100644 index 000..323aacd --- /dev/null +++ b/meta/recipes-kernel/cryptodev/files/makefile_fixup.patch @@ -0,0 +1,26 @@ +diff --git a/Makefile b/Makefile +index 2be8825..b36d68c 100644 +--- a/Makefile b/Makefile +@@ -1,6 +1,7 @@ + KBUILD_CFLAGS += -I$(src) + KERNEL_DIR = /lib/modules/$(shell uname -r)/build + VERSION = 1.5 ++PREFIX = + + cryptodev-objs = ioctl.o main.o cryptlib.o authenc.o zc.o util.o + +@@ -12,10 +13,10 @@ build: version.h + version.h: Makefile + @echo #define VERSION \$(VERSION)\ version.h + +-install: ++modules_install: + make -C $(KERNEL_DIR) SUBDIRS=`pwd` modules_install Current kernels recommend using M= instead of SUBDIRS=: SRC := $(shell pwd) make -C $(KERNEL_SRC) M=$(SRC) modules_install See the hello-mod example in meta-skeleton/recipes-kernel/hello-mod for a minimal example. +-@echo Installing cryptodev.h in /usr/include/crypto ... +-@install -D crypto/cryptodev.h /usr/include/crypto/cryptodev.h ++@echo Installing cryptodev.h in $(PREFIX)/usr/include/crypto ... ++@install -D crypto/cryptodev.h $(PREFIX)/usr/include/crypto/cryptodev.h Use ${includedir} here + + clean: + make -C $(KERNEL_DIR) SUBDIRS=`pwd` clean M= -- Darren Hart Intel Open Source Technology Center Yocto Project - Technical Lead - Linux Kernel ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gtk-doc.bbclass: Run gtkdocize in ${S} not ${B}
On 10/11/2012 02:30 PM, Phil Blundell wrote: Otherwise it will fail if these two directories are not the same. Signed-off-by: Phil Blundell p...@pbcl.net --- meta/classes/gtk-doc.bbclass |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/gtk-doc.bbclass b/meta/classes/gtk-doc.bbclass index 59063b0..eaa1385 100644 --- a/meta/classes/gtk-doc.bbclass +++ b/meta/classes/gtk-doc.bbclass @@ -15,5 +15,5 @@ EXTRA_OECONF_append = \ do_configure_prepend () { - gtkdocize + ( cd ${S} gtkdocize ) } Merged into OE-Core Thanks Sau! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] qt4: use extra variable for more QT_CONFIG_FLAGS fragments
On 10/12/2012 03:48 AM, Martin Jansa wrote: * qt4-embedded was forcing -DQT_KEYPAD_NAVIGATION which depends on feature-completer * separate variable makes it easier to not enable QT_KEYPAD_NAVIGATION in some upper layer where we have disabled feature-completer Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta/recipes-qt/qt4/qt4-embedded.inc | 10 -- meta/recipes-qt/qt4/qt4-x11-free.inc | 6 -- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc index 4a146f7..afca7f8 100644 --- a/meta/recipes-qt/qt4/qt4-embedded.inc +++ b/meta/recipes-qt/qt4/qt4-embedded.inc @@ -10,14 +10,20 @@ QT_BASE_LIB ?= libqt-embedded # Set necessary variables in the profile SRC_URI += file://qte.sh -QT_CONFIG_FLAGS += \ +QT_EMBEDDED_FLAGS ?= \ -embedded $QT_ARCH \ -qtlibinfix ${QT_LIBINFIX} \ + +QT_EMBEDDED_EXTRA_FLAGS ?= \ -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc -plugin-gfx-directfb \ -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb -qt-mouse-linuxinput \ -qt-kbd-tty \ + +QT_EMBEDDED_KEYPAD_FLAGS ?= \ -DQT_KEYPAD_NAVIGATION \ - + + +QT_CONFIG_FLAGS += ${QT_EMBEDDED_FLAGS} ${QT_EMBEDDED_EXTRA_FLAGS} ${QT_EMBEDDED_KEYPAD_FLAGS} require qt4.inc diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc index 404d8b8..20ad30c 100644 --- a/meta/recipes-qt/qt4/qt4-x11-free.inc +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc @@ -12,11 +12,13 @@ INC_PR = r47 QT_GLFLAGS ?= ${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} QT_GLFLAGS_qemux86 = -opengl QT_GLFLAGS_qemuppc = -opengl -QT_CONFIG_FLAGS += -no-xinerama -no-xkb +QT_X11_FLAGS ?= -no-xinerama -no-xkb +QT_CONFIG_FLAGS += ${QT_X11_FLAGS} QT_BASE_LIB ?= libqt # required by kdelibs4 -QT_DISTRO_FLAGS = -accessibility -sm +QT_KDE_FLAGS ?= -accessibility -sm +QT_DISTRO_FLAGS ?= ${QT_KDE_FLAGS} inherit qt4x11 Merged into OE-Core Thanks Sau! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] lttng: support more compatible hosts
On 10/11/2012 07:12 AM, Vladimir Zapolskiy wrote: THis change extends COMAPTIBLE_HOST matchings, which allows to include more hosts with TARGET_OS like linux-gnuspe or linux-gnueabi etc. Signed-off-by: Vladimir Zapolskiy vladimir_zapols...@mentor.com --- meta/recipes-kernel/lttng-2.0/babeltrace_0.12.bb |4 ++-- meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.5.bb |4 ++-- meta/recipes-kernel/lttng-2.0/lttng-tools_2.0.4.bb |4 ++-- meta/recipes-kernel/lttng-2.0/lttng2-ust_2.0.5.bb|4 ++-- meta/recipes-kernel/lttng/lttng-ust_0.16.bb |4 ++-- meta/recipes-support/liburcu/liburcu_0.6.7.bb|5 ++--- 6 files changed, 12 insertions(+), 13 deletions(-) Merged into OE-Core Thanks Sau! diff --git a/meta/recipes-kernel/lttng-2.0/babeltrace_0.12.bb b/meta/recipes-kernel/lttng-2.0/babeltrace_0.12.bb index eaf7eeb..95d65f5 100644 --- a/meta/recipes-kernel/lttng-2.0/babeltrace_0.12.bb +++ b/meta/recipes-kernel/lttng-2.0/babeltrace_0.12.bb @@ -12,7 +12,7 @@ DEPENDS = gtk+ util-linux SRCREV = 0d8f8c2ea27df096269aa76b4baeab26b68b95d4 PV = 0.12+git${SRCPV} -PR = r0 +PR = r1 SRC_URI = git://git.efficios.com/babeltrace.git;protocol=git @@ -25,4 +25,4 @@ do_configure_prepend () { # Due to liburcu not building for MIPS currently this recipe needs to # be limited also. # So here let us first suppport x86/arm/powerpc platforms now. -COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|powerpc.*)-linux' +COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|powerpc.*)-linux.*' diff --git a/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.5.bb b/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.5.bb index 4c78f36..d81e9b8 100644 --- a/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.5.bb +++ b/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.5.bb @@ -12,7 +12,7 @@ inherit module SRCREV = 4d3e89e379fc66480d729abe8daa5c86eb585400 PV = 2.0.pre11+git${SRCREV} -PR = r0 +PR = r1 SRC_URI = git://git.lttng.org/lttng-modules.git;protocol=git \ file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch \ @@ -27,4 +27,4 @@ S = ${WORKDIR}/git # Due to liburcu not building for MIPS currently this recipe needs to # be limited also. # So here let us first suppport x86/arm/powerpc platforms now. -COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|powerpc.*)-linux' +COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|powerpc.*)-linux.*' diff --git a/meta/recipes-kernel/lttng-2.0/lttng-tools_2.0.4.bb b/meta/recipes-kernel/lttng-2.0/lttng-tools_2.0.4.bb index e7f1016..ab0cf15 100644 --- a/meta/recipes-kernel/lttng-2.0/lttng-tools_2.0.4.bb +++ b/meta/recipes-kernel/lttng-2.0/lttng-tools_2.0.4.bb @@ -13,7 +13,7 @@ DEPENDS = liburcu popt lttng2-ust SRCREV = 8c3919ea2dc77fdd47fb1c90e41490a20bb4d478 PV = v2.0.1+git${SRCREV} -PR = r0 +PR = r1 SRC_URI = git://git.lttng.org/lttng-tools.git;protocol=git @@ -29,4 +29,4 @@ FILES_${PN}-dbg += ${libdir}/lttng/libexec/.debug # Due to liburcu not building for MIPS currently this recipe needs to # be limited also. # So here let us first suppport x86/arm/powerpc platforms now. -COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|powerpc.*)-linux' +COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|powerpc.*)-linux.*' diff --git a/meta/recipes-kernel/lttng-2.0/lttng2-ust_2.0.5.bb b/meta/recipes-kernel/lttng-2.0/lttng2-ust_2.0.5.bb index 8f650a4..5e9a529 100644 --- a/meta/recipes-kernel/lttng-2.0/lttng2-ust_2.0.5.bb +++ b/meta/recipes-kernel/lttng-2.0/lttng2-ust_2.0.5.bb @@ -14,7 +14,7 @@ DEPENDS = liburcu util-linux SRCREV = a367ee66aad3ffd21ef64d1b24efc6f862e09562 PV = 2.0.2+git${SRCPV} -PR = r0 +PR = r1 SRC_URI = git://git.lttng.org/lttng-ust.git;protocol=git @@ -27,4 +27,4 @@ do_configure_prepend () { # Due to liburcu not building for MIPS currently this recipe needs to # be limited also. # So here let us first suppport x86/arm/powerpc platforms now. -COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|powerpc.*)-linux' +COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|powerpc.*)-linux.*' diff --git a/meta/recipes-kernel/lttng/lttng-ust_0.16.bb b/meta/recipes-kernel/lttng/lttng-ust_0.16.bb index e954083..3618a2d 100644 --- a/meta/recipes-kernel/lttng/lttng-ust_0.16.bb +++ b/meta/recipes-kernel/lttng/lttng-ust_0.16.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = file://COPYING;md5=e647752e045a8c45b6f583771bd561ef \ DEPENDS = liburcu -PR = r0 +PR = r1 PE = 1 SRC_URI = http://lttng.org/files/ust/releases/ust-${PV}.tar.gz; @@ -28,5 +28,5 @@ inherit autotools # Due to liburcu not building on MIPS currently this recipe needs to # be limited also. # So here let us first suppport x86/arm/powerpc platforms now. -COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|powerpc.*)-linux' +COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|powerpc.*)-linux.*' diff --git a/meta/recipes-support/liburcu/liburcu_0.6.7.bb b/meta/recipes-support/liburcu/liburcu_0.6.7.bb index be73856..361780c 100644 --- a/meta/recipes-support/liburcu/liburcu_0.6.7.bb +++
Re: [OE-core] [PATCH] pulseaudio: add missing switch-on-port-available dependency to the server
On 10/11/2012 08:18 AM, Ross Burton wrote: The PulseAudio server recently added a dependency by default on the switch-if-port-available module, but this was not enforced by the package dependencies so the server won't start. Signed-off-by: Ross Burton ross.bur...@intel.com --- meta/recipes-multimedia/pulseaudio/pulseaudio.inc|3 ++- meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb |2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index 3003eaa..46e84c3 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc @@ -137,7 +137,8 @@ RDEPENDS_pulseaudio-server = \ pulseaudio-module-always-sink \ pulseaudio-module-suspend-on-idle \ pulseaudio-module-position-event-sounds \ -pulseaudio-module-role-cork +pulseaudio-module-role-cork \ +pulseaudio-module-switch-on-port-available RDEPENDS_pulseaudio-module-console-kit =+ consolekit RDEPENDS_pulseaudio-server += \ diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb index 1c2c9f7..a10b953 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb @@ -1,6 +1,6 @@ require pulseaudio.inc -PR = r6 +PR = r7 DEPENDS += libjson gdbm speex libxml-parser-perl-native Merged into OE-Core Thanks Sau! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] cryptodev kernel module recipe
On 10/18/2012 04:06 PM, McClintock Matthew-B29882 wrote: On Thu, Oct 18, 2012 at 2:59 PM, Darren Hart dvh...@linux.intel.com wrote: On 10/18/2012 02:14 AM, Khem Raj wrote: On Oct 18, 2012, at 2:57 AM, Yashpal Dutta yashpal.du...@freescale.com wrote: +-install: ++modules_install: +make -C $(KERNEL_DIR) SUBDIRS=`pwd` modules_install +- @echo Installing cryptodev.h in /usr/include/crypto ... +- @install -D crypto/cryptodev.h /usr/include/crypto/cryptodev.h ++ @echo Installing cryptodev.h in $(PREFIX)/usr/include/crypto ... ++ @install -D crypto/cryptodev.h $(PREFIX)/usr/include/crypto/cryptodev.h + why is it installing linux headers under /usr/include shouldn't they be under usr/include/linux ? And shouldn't /usr/include be one of those ${*dir} variables? That's a patch to a Makefile... not a recipe. Duh hrm. I'm not sure how we deal with this typically. -- Darren Hart Intel Open Source Technology Center Yocto Project - Technical Lead - Linux Kernel ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] sysklogd: fix update-rc.d handling
On 10/11/2012 09:22 AM, Andy Ross wrote: The sysklogd recipe had a cut-n-paste version of the update-rc.d.bbclass code which didn't work, but this was hidden because all images contain the busybox version which does. Building a busybox-free image unmasked the issue and syslogd wouldn't start on first boot. The comments seem to be wrong/stale. AFAICT update-rc.d and update-alternatives work fine with each other, though there is an ordering constraint (alternatives must be specified last, so it wraps update-rc.d). This version builds and works both with and without busybox. Signed-off-by: Andy Ross andy.r...@windriver.com --- meta/recipes-extended/sysklogd/sysklogd.inc | 43 + 1 file changed, 1 insertion(+), 42 deletions(-) diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc index 151babb..1167328 100644 --- a/meta/recipes-extended/sysklogd/sysklogd.inc +++ b/meta/recipes-extended/sysklogd/sysklogd.inc @@ -11,10 +11,7 @@ LIC_FILES_CHKSUM = file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \ file://klogd.c;beginline=2;endline=19;md5=7e87ed0ae6142de079bce738c10c899d \ -# syslog initscript is handled explicitly because order of -# update-rc.d and update-alternatives is important (see below) -DEPENDS_append = update-rc.d update-rc.d-native -RDEPENDS_${PN}_append = update-rc.d +inherit update-rc.d update-alternatives SRC_URI = http://www.infodrom.org/projects/sysklogd/download/sysklogd-${PV}.tar.gz \ file://no-strip-install.patch \ @@ -41,22 +38,6 @@ do_install () { install -m 755 ${WORKDIR}/sysklogd ${D}${sysconfdir}/init.d/syslog } -pkg_preinst_${PN} () { - # all this is needed to avoid sysmlink errors, - # because update-rc.d runs before pkg_postinst - ETC=$D${sysconfdir} - - if [ -e $ETC/init.d/syslog -a ! -L $ETC/init.d/syslog ]; then - echo WARNING: non symlink ${sysconfdir}/init.d/syslog exist - backup to ${sysconfdir}/init.d/syslog.old - mv $ETC/init.d/syslog $ETC/init.d/syslog.old - fi - if [ ! -e $ETC/init.d/syslog ]; then - ln -s dummy $ETC/init.d/syslog - fi -} - -inherit update-alternatives - ALTERNATIVE_PRIORITY = 100 ALTERNATIVE_${PN} = syslogd klogd syslog-init syslog-conf @@ -66,15 +47,6 @@ ALTERNATIVE_LINK_NAME[klogd] = ${base_sbindir}/klogd ALTERNATIVE_LINK_NAME[syslog-init] = ${sysconfdir}/init.d/syslog ALTERNATIVE_LINK_NAME[syslog-conf] = ${sysconfdir}/syslog.conf -pkg_postinst_${PN} () { - if test x$D != x; then - OPT=-r $D - else - OPT=-s - fi - update-rc.d $OPT syslog defaults -} - pkg_prerm_${PN} () { if test x$D = x; then if test $1 = upgrade -o $1 = remove; then @@ -82,16 +54,3 @@ pkg_prerm_${PN} () { fi fiOn 10/11/2012 09:22 AM, Andy Ross wrote: The sysklogd recipe had a cut-n-paste version of the update-rc.d.bbclass code which didn't work, but this was hidden because all images contain the busybox version which does. Building a busybox-free image unmasked the issue and syslogd wouldn't start on first boot. The comments seem to be wrong/stale. AFAICT update-rc.d and update-alternatives work fine with each other, though there is an ordering constraint (alternatives must be specified last, so it wraps update-rc.d). This version builds and works both with and without busybox. Signed-off-by: Andy Ross andy.r...@windriver.com --- meta/recipes-extended/sysklogd/sysklogd.inc | 43 + 1 file changed, 1 insertion(+), 42 deletions(-) Merged into OE-Core Thanks Sau! diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc index 151babb..1167328 100644 --- a/meta/recipes-extended/sysklogd/sysklogd.inc +++ b/meta/recipes-extended/sysklogd/sysklogd.inc @@ -11,10 +11,7 @@ LIC_FILES_CHKSUM = file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \ file://klogd.c;beginline=2;endline=19;md5=7e87ed0ae6142de079bce738c10c899d \ -# syslog initscript is handled explicitly because order of -# update-rc.d and update-alternatives is important (see below) -DEPENDS_append = update-rc.d update-rc.d-native -RDEPENDS_${PN}_append = update-rc.d +inherit update-rc.d update-alternatives SRC_URI = http://www.infodrom.org/projects/sysklogd/download/sysklogd-${PV}.tar.gz \ file://no-strip-install.patch \ @@ -41,22 +38,6 @@ do_install () { install -m 755 ${WORKDIR}/sysklogd ${D}${sysconfdir}/init.d/syslog } -pkg_preinst_${PN} () { - # all this is needed to avoid sysmlink errors, - # because update-rc.d runs before pkg_postinst - ETC=$D${sysconfdir} - - if [ -e $ETC/init.d/syslog -a ! -L $ETC/init.d/syslog ]; then - echo WARNING: non symlink ${sysconfdir}/init.d/syslog exist - backup to
Re: [OE-core] [PATCH] gconf: Avoid error when trying to delete files that don't exist
On 10/17/2012 03:25 PM, Phil Blundell wrote: Use rm -f in do_install_append() so we don't fail if the files we're trying to delete have already been removed. This can happen if the distro policy suppresses both static libs and .la files. Signed-off-by: Phil Blundell p...@pbcl.net --- meta/recipes-gnome/gnome/gconf_3.2.3.bb |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-gnome/gnome/gconf_3.2.3.bb b/meta/recipes-gnome/gnome/gconf_3.2.3.bb index dc3520f..4d77a14 100644 --- a/meta/recipes-gnome/gnome/gconf_3.2.3.bb +++ b/meta/recipes-gnome/gnome/gconf_3.2.3.bb @@ -33,8 +33,8 @@ do_install_append() { install -d ${D}${sysconfdir}/gconf/gconf.xml.system # this stuff is unusable - rm ${D}${libdir}/GConf/*/*.*a - rm ${D}${libdir}/gio/*/*.*a + rm -f ${D}${libdir}/GConf/*/*.*a + rm -f ${D}${libdir}/gio/*/*.*a } # disable dbus-x11 when x11 isn't in DISTRO_FEATURES Merged into OE-Core Thanks Sau! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] sstate: when warnings about sysroot overwrites, say what the recipe was
On 10/18/2012 02:49 AM, Ross Burton wrote: Signed-off-by: Ross Burton ross.bur...@intel.com --- meta/classes/sstate.bbclass |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 3fcaa65..b20b19c 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -165,7 +165,7 @@ def sstate_install(ss, d): if realmatch: match.append(f) if match: -bb.warn(The recipe is trying to install files into a shared area when those files already exist. Those files are:\n %s % \n .join(match)) +bb.warn(The recipe %s is trying to install files into a shared area when those files already exist. Those files are:\n %s % (d.getVar(PN, True), \n .join(match))) # Write out the manifest f = open(manifest, w) Merged into OE-Core Thanks Sau! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] cryptodev kernel module recipe
On Thu, Oct 18, 2012 at 3:16 PM, Darren Hart dvh...@linux.intel.com wrote: On 10/18/2012 05:57 AM, Yashpal Dutta wrote: This is a /dev/crypto device driver, equivalent to those in OpenBSD or FreeBSD. The main idea is to access of existing ciphers in kernel space from userspace, thus enabling re-use of a hardware implementation of a cipher. Signed-off-by: Yashpal Dutta yashpal.du...@freescale.com --- meta/recipes-kernel/cryptodev/cryptodev_1.5.bb | 18 + .../cryptodev/files/makefile_fixup.patch | 26 2 files changed, 44 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-kernel/cryptodev/cryptodev_1.5.bb create mode 100644 meta/recipes-kernel/cryptodev/files/makefile_fixup.patch diff --git a/meta/recipes-kernel/cryptodev/cryptodev_1.5.bb b/meta/recipes-kernel/cryptodev/cryptodev_1.5.bb new file mode 100644 index 000..5125710 --- /dev/null +++ b/meta/recipes-kernel/cryptodev/cryptodev_1.5.bb @@ -0,0 +1,18 @@ +SECTION = devel +SUMMARY = Linux Cryptodev KERNEL MODULE +DESCRIPTION = The Cryptodev package contains the kernel /dev/crypto module +LICENSE = GPLv2 +LIC_FILES_CHKSUM = file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 + +DEPENDS = virtual/kernel This DEPENDS in inherited from the module.bbclass, no need to duplicate + +inherit module + +SRCREV = 1c24a0aa996630518d47826a2e3fea129ea094c7 + +SRC_URI = git://repo.or.cz/cryptodev-linux.git;protocol=git \ + file://makefile_fixup.patch Tabs to indent, spaces to align. Spaces here please. + +EXTRA_OEMAKE='KERNEL_DIR=${STAGING_KERNEL_DIR} PREFIX=${D}' modules.bbclass already sets KERNEL_PATH and KERNEL_SRC, perhaps you could use one of those? cryptodev Makefile does not use these it uses KERNEL_DIR in it's Makefile for whatever reason. Getting an upstream project to change is more difficult. If you just use ${includedir} in your install I believe you can skip PREFIX here and get the /usr part right there. This is more changes to the upstream Makefile + +S = ${WORKDIR}/git diff --git a/meta/recipes-kernel/cryptodev/files/makefile_fixup.patch b/meta/recipes-kernel/cryptodev/files/makefile_fixup.patch new file mode 100644 index 000..323aacd --- /dev/null +++ b/meta/recipes-kernel/cryptodev/files/makefile_fixup.patch @@ -0,0 +1,26 @@ +diff --git a/Makefile b/Makefile +index 2be8825..b36d68c 100644 +--- a/Makefile b/Makefile +@@ -1,6 +1,7 @@ + KBUILD_CFLAGS += -I$(src) + KERNEL_DIR = /lib/modules/$(shell uname -r)/build + VERSION = 1.5 ++PREFIX = + + cryptodev-objs = ioctl.o main.o cryptlib.o authenc.o zc.o util.o + +@@ -12,10 +13,10 @@ build: version.h + version.h: Makefile + @echo #define VERSION \$(VERSION)\ version.h + +-install: ++modules_install: + make -C $(KERNEL_DIR) SUBDIRS=`pwd` modules_install Current kernels recommend using M= instead of SUBDIRS=: SRC := $(shell pwd) make -C $(KERNEL_SRC) M=$(SRC) modules_install See the hello-mod example in meta-skeleton/recipes-kernel/hello-mod for a minimal example. +-@echo Installing cryptodev.h in /usr/include/crypto ... +-@install -D crypto/cryptodev.h /usr/include/crypto/cryptodev.h ++@echo Installing cryptodev.h in $(PREFIX)/usr/include/crypto ... ++@install -D crypto/cryptodev.h $(PREFIX)/usr/include/crypto/cryptodev.h Use ${includedir} here You can't use this bitbake variable in a Makefile... or am I missing something? We are making small changes the Makefile for things like prefix so we can install to locations other than the hosts /usr/include which is hard coded. -M + + clean: + make -C $(KERNEL_DIR) SUBDIRS=`pwd` clean M= Is changing upstream cryptodev is one thing (e.g. SUBDIR= vs. M=), how far do you want a patch to a Makefile to change the way a project builds? -M -- Darren Hart Intel Open Source Technology Center Yocto Project - Technical Lead - Linux Kernel ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] cryptodev kernel module recipe
On 10/18/2012 04:33 PM, McClintock Matthew-B29882 wrote: On Thu, Oct 18, 2012 at 3:16 PM, Darren Hart dvh...@linux.intel.com wrote: On 10/18/2012 05:57 AM, Yashpal Dutta wrote: This is a /dev/crypto device driver, equivalent to those in OpenBSD or FreeBSD. The main idea is to access of existing ciphers in kernel space from userspace, thus enabling re-use of a hardware implementation of a cipher. Signed-off-by: Yashpal Dutta yashpal.du...@freescale.com --- meta/recipes-kernel/cryptodev/cryptodev_1.5.bb | 18 + .../cryptodev/files/makefile_fixup.patch | 26 2 files changed, 44 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-kernel/cryptodev/cryptodev_1.5.bb create mode 100644 meta/recipes-kernel/cryptodev/files/makefile_fixup.patch diff --git a/meta/recipes-kernel/cryptodev/cryptodev_1.5.bb b/meta/recipes-kernel/cryptodev/cryptodev_1.5.bb new file mode 100644 index 000..5125710 --- /dev/null +++ b/meta/recipes-kernel/cryptodev/cryptodev_1.5.bb @@ -0,0 +1,18 @@ +SECTION = devel +SUMMARY = Linux Cryptodev KERNEL MODULE +DESCRIPTION = The Cryptodev package contains the kernel /dev/crypto module +LICENSE = GPLv2 +LIC_FILES_CHKSUM = file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 + +DEPENDS = virtual/kernel This DEPENDS in inherited from the module.bbclass, no need to duplicate + +inherit module + +SRCREV = 1c24a0aa996630518d47826a2e3fea129ea094c7 + +SRC_URI = git://repo.or.cz/cryptodev-linux.git;protocol=git \ + file://makefile_fixup.patch Tabs to indent, spaces to align. Spaces here please. + +EXTRA_OEMAKE='KERNEL_DIR=${STAGING_KERNEL_DIR} PREFIX=${D}' modules.bbclass already sets KERNEL_PATH and KERNEL_SRC, perhaps you could use one of those? cryptodev Makefile does not use these it uses KERNEL_DIR in it's Makefile for whatever reason. Getting an upstream project to change is more difficult. I think this is the second reference to KERNEL_DIR in an external module, perhaps module.bbclass should add that to it's list of predefined names for the STAGING_KERNEL_DIR. Is changing upstream cryptodev is one thing (e.g. SUBDIR= vs. M=), how far do you want a patch to a Makefile to change the way a project builds? Yeah, you're correct about the Makefile changes. I got carried away during a rapid review. -- Darren Hart Intel Open Source Technology Center Yocto Project - Technical Lead - Linux Kernel ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] xserver-xorg: upgrade to 1.11.4
On 09/25/2012 06:48 AM, Ross Burton wrote: gcc-47-warning.patch was integrated, so drop. Add pkgconfig-deps.patch, a backport of a commit to fix bad exposed library dependencies (which resulted in the keyboard driver depending on pixman). Signed-off-by: Ross Burton ross.bur...@intel.com --- .../xserver-xorg-1.11.2/crosscompile.patch | 22 -- .../fix_open_max_preprocessor_error.patch | 15 - .../xserver-xorg-1.11.2/gcc-47-warning.patch | 33 - .../xserver-xorg-1.11.2/macro_tweak.patch | 25 --- .../xserver-xorg-1.11.2/mips64-compiler.patch | 29 .../xserver-xorg-1.11.4/crosscompile.patch | 22 ++ .../fix_open_max_preprocessor_error.patch | 15 + .../xserver-xorg-1.11.4/macro_tweak.patch | 25 +++ .../xserver-xorg-1.11.4/mips64-compiler.patch | 29 .../xserver-xorg-1.11.4/pkgconfig-deps.patch | 70 .../xorg-xserver/xserver-xorg_1.11.2.bb| 13 .../xorg-xserver/xserver-xorg_1.11.4.bb| 13 12 files changed, 174 insertions(+), 137 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/crosscompile.patch delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/fix_open_max_preprocessor_error.patch delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/gcc-47-warning.patch delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/macro_tweak.patch delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/mips64-compiler.patch create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/crosscompile.patch create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/fix_open_max_preprocessor_error.patch create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/macro_tweak.patch create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/mips64-compiler.patch create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.4/pkgconfig-deps.patch delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.4.bb Merged this along with the other xorg related Update to OE-Core Thanks Sau! diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/crosscompile.patch deleted file mode 100644 index 2f98bb8..000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/crosscompile.patch +++ /dev/null @@ -1,22 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -diff --git a/configure.ac b/configure.ac -index b3b752c..600500b 100644 a/configure.ac -+++ b/configure.ac -@@ -523,13 +523,9 @@ dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d, - dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross - dnl compiling, assume default font path uses standard FONTROOTDIR directories. - DEFAULT_FONT_PATH=${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/ --if test $cross_compiling != yes; then -- AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d], -- [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'], -- [case $host_os in -+ case $host_os in - darwin*) DEFAULT_FONT_PATH=${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts ;; -- esac]) --fi -+ esac - AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]), - [ FONTPATH=$withval ], - [ FONTPATH=${DEFAULT_FONT_PATH} ]) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/fix_open_max_preprocessor_error.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/fix_open_max_preprocessor_error.patch deleted file mode 100644 index 2f62972..000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/fix_open_max_preprocessor_error.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Pending - -Index: git/os/osdep.h -=== git.orig/os/osdep.h2008-10-07 18:38:21.0 +0100 -+++ git/os/osdep.h 2008-10-07 18:39:36.0 +0100 -@@ -92,7 +92,7 @@ - * like sysconf(_SC_OPEN_MAX) is not supported. - */ - --#if OPEN_MAX = 256 -+#if 0 - #define MAXSOCKS (OPEN_MAX - 1) - #else - #define MAXSOCKS 256 diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/gcc-47-warning.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/gcc-47-warning.patch deleted file mode 100644 index ed4eaac..000 ---
Re: [OE-core] [PATCH] buildhistory.bbclass: Fix hostname print for 'No changes' case
On 10/11/2012 02:46 PM, Otavio Salvador wrote: Signed-off-by: Otavio Salvador ota...@ossystems.com.br --- meta/classes/buildhistory.bbclass |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index 49f2ea5..0a5753f 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass @@ -403,9 +403,9 @@ END fi # Check if there are new/changed files to commit (other than metadata-revs) repostatus=`git status --porcelain | grep -v metadata-revs$` + HOSTNAME=`hostname 2/dev/null || echo unknown` if [ $repostatus != ] ; then git add . - HOSTNAME=`hostname 2/dev/null || echo unknown` # porcelain output looks like ?? packages/foo/bar # Ensure we commit metadata-revs with the first commit for entry in `echo $repostatus | awk '{print $2}' | awk -F/ '{print $1}' | sort | uniq` ; do Merged into OE-Core Thanks Sau! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gypsy: removed gypsy from meta/recipes-connectivity
On Thu, Oct 18, 2012 at 08:59:19PM +0200, Martin Jansa wrote: I know you've sent http://patchwork.openembedded.org/patch/37763/ to add it to meta-oe, but this patch removed also newer gypsy_0.9.bb and only older gypsy_git.bb was added back. Please fix that. There is also this diff which isn't mentioned in your commit. -SRCREV = 3652e1f37e82b8e63983e30fda3482cd099a8cf5 +SRCREV = be8c9c382d2d1d37b51d29b0843045121ec90213 PV = 0.8+git${SRCPV} PR = r2 @@ -15,4 +15,5 @@ file://gypsy/gypsy-time.h;beginline=1;endline=24;md5=06432ea19a7b6607428d04d9dadc37fd SRC_URI = git://anongit.freedesktop.org/gypsy;protocol=git \ - file://fixups.patch + file://fixups.patch \ + file://0001-gypsy-m4-directory-missing-from-structure.patch On Thu, Oct 4, 2012 at 12:14 PM, Andrei Dinu andrei.adrianx.d...@intel.com wrote: removed also entry from meta/recipes-gnome/packagegroups/packagegroup-sdk-gmae.inc Signed-off-by: Andrei Dinu andrei.adrianx.d...@intel.com --- meta/recipes-connectivity/gypsy/files/fixups.patch | 21 - meta/recipes-connectivity/gypsy/gypsy.inc | 15 meta/recipes-connectivity/gypsy/gypsy_0.9.bb | 24 meta/recipes-connectivity/gypsy/gypsy_git.bb | 18 --- .../packagegroups/packagegroup-sdk-gmae.inc|1 - 5 files changed, 79 deletions(-) delete mode 100644 meta/recipes-connectivity/gypsy/files/fixups.patch delete mode 100644 meta/recipes-connectivity/gypsy/gypsy.inc delete mode 100644 meta/recipes-connectivity/gypsy/gypsy_0.9.bb delete mode 100644 meta/recipes-connectivity/gypsy/gypsy_git.bb diff --git a/meta/recipes-connectivity/gypsy/files/fixups.patch b/meta/recipes-connectivity/gypsy/files/fixups.patch deleted file mode 100644 index de4d92e..000 --- a/meta/recipes-connectivity/gypsy/files/fixups.patch +++ /dev/null @@ -1,21 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - - docs/reference/Makefile.am |2 ++ - 1 file changed, 2 insertions(+) - gypsy.orig/docs/reference/Makefile.am -+++ gypsy/docs/reference/Makefile.am -@@ -81,10 +81,12 @@ expand_content_files= - # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) - - INCLUDES=-I$(top_srcdir) $(GYPSY_CFLAGS) - GTKDOC_LIBS=$(top_builddir)/gypsy/libgypsy.la $(GYPSY_LIBS) - -+EXTRA_DIST = -+CLEANFILES = - # This includes the standard gtk-doc make rules, copied by gtkdocize. - include $(top_srcdir)/gtk-doc.make - - # Other files to distribute - # e.g. EXTRA_DIST += version.xml.in diff --git a/meta/recipes-connectivity/gypsy/gypsy.inc b/meta/recipes-connectivity/gypsy/gypsy.inc deleted file mode 100644 index 0c1735e..000 --- a/meta/recipes-connectivity/gypsy/gypsy.inc +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = GPS Multiplexing Daemon -DESCRIPTION = Gypsy is a GPS multiplexing daemon which allows \ -multiple clients to access GPS data from multiple GPS sources \ -concurrently. Gypsy also hides the details of parsing NMEA from the \ -client applications, passing the data as simple values for the clients \ -to use. -LICENSE = GPLv2.0 LGPLv2.1 -SECTION = x11 -DEPENDS = glib-2.0 dbus bluez4 dbus-glib - -inherit autotools pkgconfig gtk-doc - -EXTRA_OECONF += --with-distro=debian - -FILES_${PN} += /usr/share/dbus-1/services/ diff --git a/meta/recipes-connectivity/gypsy/gypsy_0.9.bb b/meta/recipes-connectivity/gypsy/gypsy_0.9.bb deleted file mode 100644 index 51207c9..000 --- a/meta/recipes-connectivity/gypsy/gypsy_0.9.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = GPS Multiplexing Daemon -DESCRIPTION = Gypsy is a GPS multiplexing daemon which allows \ -multiple clients to access GPS data from multiple GPS sources \ -concurrently. Gypsy also hides the details of parsing NMEA from the \ -client applications, passing the data as simple values for the clients \ -to use. -LICENSE = GPLv2+ LGPLv2+ -LIC_FILES_CHKSUM = file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ - file://COPYING.lib;md5=7fbc338309ac38fefcd64b04bb903e34 \ - file://src/main.c;beginline=1;endline=25;md5=3fe64e27e61b289b77383a54a982cbdd \ - file://gypsy/gypsy-time.h;beginline=1;endline=24;md5=06432ea19a7b6607428d04d9dadc37fd - -SECTION = x11 -DEPENDS = glib-2.0 dbus bluez4 dbus-glib libxslt - -SRC_URI = http://gypsy.freedesktop.org/releases/gypsy-${PV}.tar.gz; -PR = r1 - -inherit autotools pkgconfig - -FILES_${PN} += /usr/share/dbus-1/system-services/ - -SRC_URI[md5sum] = e2d186df9c2cc3b70a027043e22acf1a -SRC_URI[sha256sum] = 14e1cbe17351f408538e033ca370b4bf51ccf9c88744e236ddfb271904f154d6 diff --git a/meta/recipes-connectivity/gypsy/gypsy_git.bb b/meta/recipes-connectivity/gypsy/gypsy_git.bb deleted file mode 100644 index
Re: [OE-core] [PATCH v3] eglibc: Move perl- and bash-using scripts to separate recipes
On Thu, 2012-10-18 at 11:02 +0100, Phil Blundell wrote: Ah, right, got it. Maybe it would be better to declare a dummy do_evacuate_scripts() in eglibc-initial.inc instead. I'll give that a try and see what happens. That seems to work ok in at least the meta-toolchain-gmae case. See attached. p. From 9a58ce3a332a06d022a4473dd061c52f4540a540 Mon Sep 17 00:00:00 2001 From: Phil Blundell ph...@gnu.org Date: Thu, 18 Oct 2012 14:12:25 +0100 Subject: [PATCH] eglibc: Provide dummy do_evacuate_scripts() for all variants of eglibc-initial Otherwise the nativesdk and multilib variants might crash trying to copy a non-existent mtrace script. Signed-off-by: Phil Blundell p...@pbcl.net --- meta/recipes-core/eglibc/eglibc-initial.inc |5 + meta/recipes-core/eglibc/eglibc-package.inc |8 meta/recipes-core/eglibc/eglibc_2.16.bb |2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/meta/recipes-core/eglibc/eglibc-initial.inc b/meta/recipes-core/eglibc/eglibc-initial.inc index f44db0c..1520efd 100644 --- a/meta/recipes-core/eglibc/eglibc-initial.inc +++ b/meta/recipes-core/eglibc/eglibc-initial.inc @@ -73,3 +73,8 @@ eglibcinitial_sstate_postinst() { } do_populate_sysroot[sstate-outputdirs] = ${STAGING_DIR_TCBOOTSTRAP} + +# We don't install any scripts so there is nothing to evacuate +do_evacuate_scripts () { + : +} diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc index 58dd898..79c43f1 100644 --- a/meta/recipes-core/eglibc/eglibc-package.inc +++ b/meta/recipes-core/eglibc/eglibc-package.inc @@ -117,14 +117,6 @@ do_evacuate_scripts () { done } -do_evacuate_scripts_pn-eglibc-initial () { - : -} - -do_evacuate_scripts_pn-nativesdk-eglibc-initial () { - : -} - addtask evacuate_scripts after do_install before do_populate_sysroot do_package PACKAGE_PREPROCESS_FUNCS += eglibc_package_preprocess diff --git a/meta/recipes-core/eglibc/eglibc_2.16.bb b/meta/recipes-core/eglibc/eglibc_2.16.bb index 56a0a38..4d80ff4 100644 --- a/meta/recipes-core/eglibc/eglibc_2.16.bb +++ b/meta/recipes-core/eglibc/eglibc_2.16.bb @@ -1,7 +1,7 @@ require eglibc.inc DEPENDS += gperf-native kconfig-frontends-native -PR = r17 +PR = r18 SRC_URI = http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr21224.tar.bz2 \ file://eglibc-svn-arm-lowlevellock-include-tls.patch \ -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] cpan-base: Add more debug paths to FILES
We seem to be mostly installing modules into vendor_perl nowadays. Make sure that the .debug data from there is captured appropriately. Also, expand ${PERLLIBDIRS} at the point of assignment so we don't call the python again and again. Signed-off-by: Phil Blundell p...@pbcl.net --- meta/classes/cpan-base.bbclass |9 +++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/meta/classes/cpan-base.bbclass b/meta/classes/cpan-base.bbclass index 660c15f..cf697f1 100644 --- a/meta/classes/cpan-base.bbclass +++ b/meta/classes/cpan-base.bbclass @@ -39,8 +39,13 @@ def is_target(d): return yes return no -PERLLIBDIRS = ${@perl_get_libdirs(d)} +PERLLIBDIRS := ${@perl_get_libdirs(d)} +PERLVERSION := ${@get_perl_version(d)} FILES_${PN}-dbg += ${PERLLIBDIRS}/auto/*/.debug \ ${PERLLIBDIRS}/auto/*/*/.debug \ -${PERLLIBDIRS}/auto/*/*/*/.debug +${PERLLIBDIRS}/auto/*/*/*/.debug \ + ${PERLLIBDIRS}/vendor_perl/${PERLVERSION}/auto/*/.debug \ + ${PERLLIBDIRS}/vendor_perl/${PERLVERSION}/auto/*/*/.debug \ + ${PERLLIBDIRS}/vendor_perl/${PERLVERSION}/auto/*/*/*/.debug \ + -- 1.7.9 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] cpan-base: Add more debug paths to FILES
On Thu, Oct 18, 2012 at 11:19:27PM +0100, Phil Blundell wrote: We seem to be mostly installing modules into vendor_perl nowadays. Make sure that the .debug data from there is captured appropriately. Also, expand ${PERLLIBDIRS} at the point of assignment so we don't call the python again and again. Signed-off-by: Phil Blundell p...@pbcl.net --- meta/classes/cpan-base.bbclass |9 +++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/meta/classes/cpan-base.bbclass b/meta/classes/cpan-base.bbclass index 660c15f..cf697f1 100644 --- a/meta/classes/cpan-base.bbclass +++ b/meta/classes/cpan-base.bbclass @@ -39,8 +39,13 @@ def is_target(d): return yes return no -PERLLIBDIRS = ${@perl_get_libdirs(d)} +PERLLIBDIRS := ${@perl_get_libdirs(d)} +PERLVERSION := ${@get_perl_version(d)} FILES_${PN}-dbg += ${PERLLIBDIRS}/auto/*/.debug \ ${PERLLIBDIRS}/auto/*/*/.debug \ -${PERLLIBDIRS}/auto/*/*/*/.debug +${PERLLIBDIRS}/auto/*/*/*/.debug \ + ${PERLLIBDIRS}/vendor_perl/${PERLVERSION}/auto/*/.debug \ + ${PERLLIBDIRS}/vendor_perl/${PERLVERSION}/auto/*/*/.debug \ + ${PERLLIBDIRS}/vendor_perl/${PERLVERSION}/auto/*/*/*/.debug \ + Please don't mix tabs and spaces for indentation. -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] sstate: add manifest info for shared file matches
Present the manifest file that contains the matches for files being installed to a location that already contains that file. This will help to determine which is the correct recipe to fix when this occurs. [YOCTO #3191] Signed-off-by: Saul Wold s...@linux.intel.com --- meta/classes/sstate.bbclass |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index d2a120b..7c00381 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -120,6 +120,7 @@ def sstate_add(ss, source, dest, d): def sstate_install(ss, d): import oe.path +import subprocess sharedfiles = [] shareddirs = [] @@ -164,8 +165,12 @@ def sstate_install(ss, d): break if realmatch: match.append(f) +sstate_search_cmd = grep -rl %s %s | sed -e 's:^.*/::' -e 's:\.populate-sysroot::' % (f, d.expand(${SSTATE_MANIFESTS})) +search_output = subprocess.check_output(sstate_search_cmd, stderr=subprocess.STDOUT, shell=True) +if search_output != None: +match.append(Matched in %s % search_output.rstrip()) if match: -bb.warn(The recipe %s is trying to install files into a shared area when those files already exist. Those files are:\n %s % (d.getVar(PN, True), \n .join(match))) +bb.warn(The recipe %s is trying to install files into a shared area when those files already exist. Those files and their manifest location are:\n %s\nPlease verify which package should provide the above files. % (d.getVar('PN', True), \n .join(match))) # Write out the manifest f = open(manifest, w) -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] libcrypto.so exec stack
Hi, In openssl recipe, it has this: # Avoid binaries being marked as requiring an executable stack (which causes # issues with SELinux on the host) CFLAG_append_virtclass-native = -Wa,--noexecstack Why this is only enabled for native? yocto doesn't support secure kernel? thanks, yao ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/2] gnome-icon-them bugfixes
On 10/16/2012 06:28 AM, Andreas Müller wrote: It caused me a lot headache to load gtk-stock-icons... Andreas Müller (2): gnome-icon-theme: fix icon mapping gnome-icon-theme: remove unused configure variable .../recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) Andreas, I am having some trouble with the patches include, I think thunderbird is trying to encode them in non-ascii, can you resend or point me at a rebased branch. I just made some changes in this also. Also, does sato-icon-theme need the same changes? Thanks Sau! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] tune-cortexa7: add tunes for ARM Cortex-A7
From: Denys Dmytriyenko de...@ti.com http://www.arm.com/products/processors/cortex-a/cortex-a7.php Signed-off-by: Denys Dmytriyenko de...@ti.com --- meta/conf/machine/include/tune-cortexa7.inc | 24 1 file changed, 24 insertions(+) create mode 100644 meta/conf/machine/include/tune-cortexa7.inc diff --git a/meta/conf/machine/include/tune-cortexa7.inc b/meta/conf/machine/include/tune-cortexa7.inc new file mode 100644 index 000..8e41139 --- /dev/null +++ b/meta/conf/machine/include/tune-cortexa7.inc @@ -0,0 +1,24 @@ +DEFAULTTUNE ?= cortexa7-neon + +require conf/machine/include/arm/arch-armv7a.inc + +TUNEVALID[cortexa7] = Enable Cortex-A7 specific processor optimizations +TUNE_CCARGS += ${@bb.utils.contains(TUNE_FEATURES, cortexa7, -mtune=cortex-a7, , d)} + +# Little Endian base configs +AVAILTUNES += cortexa7 cortexa7t cortexa7-neon +TUNE_FEATURES_tune-cortexa7 = ${TUNE_FEATURES_tune-armv7a} cortexa7 +TUNE_FEATURES_tune-cortexa7t = ${TUNE_FEATURES_tune-armv7at} cortexa7 +TUNE_FEATURES_tune-cortexa7-neon = ${TUNE_FEATURES_tune-armv7a-neon} cortexa7 +PACKAGE_EXTRA_ARCHS_tune-cortexa7 = ${PACKAGE_EXTRA_ARCHS_tune-armv7a} +PACKAGE_EXTRA_ARCHS_tune-cortexa7t = ${PACKAGE_EXTRA_ARCHS_tune-armv7at} +PACKAGE_EXTRA_ARCHS_tune-cortexa7-neon = ${PACKAGE_EXTRA_ARCHS_tune-armv7a-neon} + +# VFP Tunes +AVAILTUNES += cortexa7hf cortexa7thf cortexa7hf-neon +TUNE_FEATURES_tune-cortexa7hf ?= ${TUNE_FEATURES_tune-armv7ahf} cortexa7 +TUNE_FEATURES_tune-cortexa7thf ?= ${TUNE_FEATURES_tune-armv7athf} cortexa7 +TUNE_FEATURES_tune-cortexa7hf-neon ?= ${TUNE_FEATURES_tune-armv7ahf-neon} cortexa7 +PACKAGE_EXTRA_ARCHS_tune-cortexa7hf = ${PACKAGE_EXTRA_ARCHS_tune-armv7ahf} +PACKAGE_EXTRA_ARCHS_tune-cortexa7thf = ${PACKAGE_EXTRA_ARCHS_tune-armv7athf} +PACKAGE_EXTRA_ARCHS_tune-cortexa7hf-neon = ${PACKAGE_EXTRA_ARCHS_tune-armv7ahf-neon} -- 1.7.12.3 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] Add more tunes for new ARM processors Cortex-A15 and Cortex-A7
From: Denys Dmytriyenko de...@ti.com The patchset adds 2 more standard tune files for the new ARM MPCore (multicore) processors Cortex-A15 and Cortex-A7, as per: http://www.arm.com/products/processors/cortex-a/cortex-a15.php http://www.arm.com/products/processors/cortex-a/cortex-a7.php Denys Dmytriyenko (2): tune-cortexa15: add tunes for ARM Cortex-A15 tune-cortexa7: add tunes for ARM Cortex-A7 meta/conf/machine/include/tune-cortexa15.inc | 24 meta/conf/machine/include/tune-cortexa7.inc | 24 2 files changed, 48 insertions(+) create mode 100644 meta/conf/machine/include/tune-cortexa15.inc create mode 100644 meta/conf/machine/include/tune-cortexa7.inc -- 1.7.12.3 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] tune-cortexa15: add tunes for ARM Cortex-A15
From: Denys Dmytriyenko de...@ti.com http://www.arm.com/products/processors/cortex-a/cortex-a15.php Signed-off-by: Denys Dmytriyenko de...@ti.com --- meta/conf/machine/include/tune-cortexa15.inc | 24 1 file changed, 24 insertions(+) create mode 100644 meta/conf/machine/include/tune-cortexa15.inc diff --git a/meta/conf/machine/include/tune-cortexa15.inc b/meta/conf/machine/include/tune-cortexa15.inc new file mode 100644 index 000..690e934 --- /dev/null +++ b/meta/conf/machine/include/tune-cortexa15.inc @@ -0,0 +1,24 @@ +DEFAULTTUNE ?= cortexa15-neon + +require conf/machine/include/arm/arch-armv7a.inc + +TUNEVALID[cortexa15] = Enable Cortex-A15 specific processor optimizations +TUNE_CCARGS += ${@bb.utils.contains(TUNE_FEATURES, cortexa15, -mtune=cortex-a15, , d)} + +# Little Endian base configs +AVAILTUNES += cortexa15 cortexa15t cortexa15-neon +TUNE_FEATURES_tune-cortexa15 = ${TUNE_FEATURES_tune-armv7a} cortexa15 +TUNE_FEATURES_tune-cortexa15t = ${TUNE_FEATURES_tune-armv7at} cortexa15 +TUNE_FEATURES_tune-cortexa15-neon = ${TUNE_FEATURES_tune-armv7a-neon} cortexa15 +PACKAGE_EXTRA_ARCHS_tune-cortexa15 = ${PACKAGE_EXTRA_ARCHS_tune-armv7a} +PACKAGE_EXTRA_ARCHS_tune-cortexa15t = ${PACKAGE_EXTRA_ARCHS_tune-armv7at} +PACKAGE_EXTRA_ARCHS_tune-cortexa15-neon = ${PACKAGE_EXTRA_ARCHS_tune-armv7a-neon} + +# VFP Tunes +AVAILTUNES += cortexa15hf cortexa15thf cortexa15hf-neon +TUNE_FEATURES_tune-cortexa15hf ?= ${TUNE_FEATURES_tune-armv7ahf} cortexa15 +TUNE_FEATURES_tune-cortexa15thf ?= ${TUNE_FEATURES_tune-armv7athf} cortexa15 +TUNE_FEATURES_tune-cortexa15hf-neon ?= ${TUNE_FEATURES_tune-armv7ahf-neon} cortexa15 +PACKAGE_EXTRA_ARCHS_tune-cortexa15hf = ${PACKAGE_EXTRA_ARCHS_tune-armv7ahf} +PACKAGE_EXTRA_ARCHS_tune-cortexa15thf = ${PACKAGE_EXTRA_ARCHS_tune-armv7athf} +PACKAGE_EXTRA_ARCHS_tune-cortexa15hf-neon = ${PACKAGE_EXTRA_ARCHS_tune-armv7ahf-neon} -- 1.7.12.3 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/2] gnome-icon-them bugfixes
On Fri, Oct 19, 2012 at 1:13 AM, Saul Wold s...@linux.intel.com wrote: On 10/16/2012 06:28 AM, Andreas Müller wrote: It caused me a lot headache to load gtk-stock-icons... Andreas Müller (2): gnome-icon-theme: fix icon mapping gnome-icon-theme: remove unused configure variable .../recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) Andreas, I am having some trouble with the patches include, I think thunderbird is trying to encode them in non-ascii, can you resend or point me at a rebased branch. I just made some changes in this also. Also, does sato-icon-theme need the same changes? Thanks Sau! Maybe caused by ü in my family name - need to change that :). Will check for sato-icon theme and send a pull request next week. Andreas ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] cryptodev kernel module recipe
On Thu, Oct 18, 2012 at 3:38 PM, Darren Hart dvh...@linux.intel.com wrote: +EXTRA_OEMAKE='KERNEL_DIR=${STAGING_KERNEL_DIR} PREFIX=${D}' modules.bbclass already sets KERNEL_PATH and KERNEL_SRC, perhaps you could use one of those? cryptodev Makefile does not use these it uses KERNEL_DIR in it's Makefile for whatever reason. Getting an upstream project to change is more difficult. I think this is the second reference to KERNEL_DIR in an external module, perhaps module.bbclass should add that to it's list of predefined names for the STAGING_KERNEL_DIR. Fine with me, but not sure how its worth it quite yet... ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core