Re: [OE-core] [PATCH] libpcap: Move pcap-config to -dev package
Op 7 mei 2012, om 08:59 heeft Saul Wold het volgende geschreven: On 05/04/2012 11:57 PM, Koen Kooi wrote: Op 5 mei 2012, om 02:13 heeft Saul Wold het volgende geschreven: pcap-config is a tool used for getting the cflags and ln flags for development [YOCTO #2367] Signed-off-by: Saul Wolds...@linux.intel.com --- meta/recipes-connectivity/libpcap/libpcap.inc |7 ++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/meta/recipes-connectivity/libpcap/libpcap.inc b/meta/recipes-connectivity/libpcap/libpcap.inc index 427078f..7950b2a 100644 --- a/meta/recipes-connectivity/libpcap/libpcap.inc +++ b/meta/recipes-connectivity/libpcap/libpcap.inc @@ -13,7 +13,7 @@ DEPENDS = flex-native bison-native PACKAGECONFIG ??= ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluetooth', '', d)} PACKAGECONFIG[bluetooth] = --enable-bluetooth,--disable-bluetooth,bluez4 -INC_PR = r1 +INC_PR = r2 SRC_URI = http://www.tcpdump.org/release/libpcap-${PV}.tar.gz; @@ -30,3 +30,8 @@ do_configure_prepend () { cat aclocal.m4 acinclude.m4 fi } + +# pcap-config is a dev tool and should not be packaged in the +# core package. +FILES_${PN} = ${libdir}/lib*${SOLIBS} +FILES_${PN}-dev += ${bindir} Change that go ${bindir}/pcap-config to avoid being too greedy during upgrades. Or just inherit 'binconfig' :) It already inherits binconfig! That does not seem to address which package it gets installed in! Ah right, the oe-core binconfig.bbclass lacks changes that the OE-classic one has: koen@dominion:/OE/tentacle/sources/openembedded-core/meta$ diff -u classes/binconfig.bbclass /OE/org.openembedded.dev/classes/binconfig.bbclass --- classes/binconfig.bbclass 2012-01-30 13:43:41.0 +0100 +++ /OE/org.openembedded.dev/classes/binconfig.bbclass 2011-04-28 13:29:17.0 +0200 @@ -1,3 +1,5 @@ +FILES_${PN}-dev += ${bindir}/*-config + # The namespaces can clash here hence the two step replace def get_binconfig_mangle(d): s = -e '' @@ -17,6 +19,8 @@ s += -e 's:OEEXECPREFIX:${STAGING_DIR_HOST}${exec_prefix}:' s += -e 's:-I${WORKDIR}:-I${STAGING_INCDIR}:' s += -e 's:-L${WORKDIR}:-L${STAGING_LIBDIR}:' + if bb.data.getVar(OE_BINCONFIG_EXTRA_MANGLE, d): + s += bb.data.getVar(OE_BINCONFIG_EXTRA_MANGLE, d) return s BINCONFIG_GLOB ?= *-config @@ -45,10 +49,10 @@ SYSROOT_PREPROCESS_FUNCS += binconfig_sysroot_preprocess binconfig_sysroot_preprocess () { - for config in `find ${S} -name '${BINCONFIG_GLOB}'`; do + for config in `find ${D} -name '${BINCONFIG_GLOB}'`; do configname=`basename $config` - install -d ${SYSROOT_DESTDIR}${bindir_crossscripts} - cat $config | sed ${@get_binconfig_mangle(d)} ${SYSROOT_DESTDIR}${bindir_crossscripts}/$configname - chmod u+x ${SYSROOT_DESTDIR}${bindir_crossscripts}/$configname + install -d ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS} + cat $config | sed ${@get_binconfig_mangle(d)} ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/$configname + chmod u+x ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/$configname done } ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] dropping libgdbus from oe-core
Nothing in oe-core depends on it and gdbus was merged to glib in 2010 so nothing new will probably depend on it Cheers, -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] connman: enable TI shared transport plugin when wifi or bluetooth are requested
On Sun, 2012-05-06 at 14:32 +0200, Koen Kooi wrote: Op 6 mei 2012, om 11:17 heeft Richard Purdie het volgende geschreven: On Fri, 2012-05-04 at 09:54 +0200, Koen Kooi wrote: This plugin manages the firmware loading for the TI wl12xx series of bluetooth/wifi/fm chips. The double --enable-tist when both bluetooth and wireless are enabled is ugly, but harmless The background on the plugin: https://bugs.meego.com/show_bug.cgi?id=8418 Signed-off-by: Koen Kooi k...@dominion.thruhere.net --- If accepted into master I'd like to have this in the 'denzil' branch as well. meta/recipes-connectivity/connman/connman.inc |4 ++-- meta/recipes-connectivity/connman/connman_0.79.bb |2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index bfe6620..8b27cfb 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc @@ -28,8 +28,8 @@ EXTRA_OECONF += \ --enable-threads \ --enable-loopback \ --enable-ethernet \ -${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi', '--disable-wifi', d)} \ -${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \ +${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi --enable-tist', '--disable-wifi', d)} \ +${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth --enable-tist', '--disable-bluetooth', d)} \ --enable-dnsproxy \ --enable-ofono \ --enable-tools \ diff --git a/meta/recipes-connectivity/connman/connman_0.79.bb b/meta/recipes-connectivity/connman/connman_0.79.bb index 4c57dab..d7f22b9 100644 --- a/meta/recipes-connectivity/connman/connman_0.79.bb +++ b/meta/recipes-connectivity/connman/connman_0.79.bb @@ -11,4 +11,4 @@ SRC_URI = git://git.kernel.org/pub/scm/network/connman/connman.git \ file://test-set-ipv6-method-api-fix.patch \ file://connman S = ${WORKDIR}/git -PR = r3 +PR = r4 This appears to have broken the build on qemuppc: http://autobuilder.yoctoproject.org:8010/builders/nightly-ppc/builds/369/steps/shell_19/logs/stdio That is really weird, since that's defined in ioctl.h in asm-generic/ by the kernel. Does qemuppc have some options for serial ports disabled in the kernel headers? Since the wl12xx is a regular wifi chip it should work on ppc, like it does on arm and x86. Its defined in ioctls.h which is a key difference. ioctls.h is a set of default ioctl options which most architectures use but architectures have their own custom definitions. PowerPC is one such architecture, using t instead of T for tty operations. It seems the powerpc version never needed a version2 so in theory #ifndef TCGETS2 #define TCGETS2 TCGETS #define termios2 termios #endif would work but google suggests some potential issues which I don't really want to dig into/understand. I'm tempted to disable this plugin on powerpc unless anyone wants to step up with a patch? Using the libc API for this would probably be more portable. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] perl-native: do_compile failed: pod/buildtoc: no pods at pod/buildtoc line 305
Hi, I got this ERROR today when running bitbake perl-native -c compile against today's latest poky master(I got the same issue when I tried the denzil branch). Any one has the same issue? Build Configuration: BB_VERSION= 1.15.2 TARGET_ARCH = i586 TARGET_OS = linux MACHINE = qemux86 DISTRO= poky DISTRO_VERSION= 1.2+snapshot-20120507 TUNE_FEATURES = m32 i586 TARGET_FPU= meta meta-yocto= master:3b78ad8041e0ea232b8363e120595cab85b30507 ... | make all PERL_CORE=1 LIBPERL_A=libperl.so LINKTYPE=dynamic | make[1]: Entering directory `/distro/dcui/t/p2/build/tmp/work/x86_64-linux/perl-native-5.14.2-r0/perl-5.14.2/dist/threads-shared' | cp lib/threads/shared.pm ../../lib/threads/shared.pm | ../../miniperl -I../../lib -I../../lib ../../lib/ExtUtils/xsubpp -typemap ../../lib/ExtUtils/typemap shared.xs shared.xsc mv shared.xsc shared.c | ccache gcc -c -D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing -pipe -fstack-protector -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -DVERSION=\1.37\ -DXS_VERSION=\1.37\ -fPIC -I../.. shared.c | Running Mkbootstrap for threads::shared () | chmod 644 shared.bs | rm -f ../../lib/auto/threads/shared/shared.so | ccache gcc -shared -O2 -L/distro/dcui/t/p2/build/tmp/sysroots/x86_64-linux/usr/lib -L/distro/dcui/t/p2/build/tmp/sysroots/x86_64-linux/lib -L/usr/local/lib -fstack-protector shared.o -o ../../lib/auto/threads/shared/shared.so \ |-lpthread \ | | chmod 755 ../../lib/auto/threads/shared/shared.so | cp shared.bs ../../lib/auto/threads/shared/shared.bs | chmod 644 ../../lib/auto/threads/shared/shared.bs | make[1]: Leaving directory `/distro/dcui/t/p2/build/tmp/work/x86_64-linux/perl-native-5.14.2-r0/perl-5.14.2/dist/threads-shared' | LD_LIBRARY_PATH=/distro/dcui/t/p2/build/tmp/work/x86_64-linux/perl-native-5.14.2-r0/perl-5.14.2:/distro/dcui/t/p2/build/tmp/sysroots/x86_64-linux/usr/bin/../lib/pseudo/lib:/distro/dcui/t/p2/build/tmp/sysroots/x86_64-linux/usr/bin/../lib/pseudo/lib64 ./perl -f -Ilib pod/buildtoc --build-toc -q | pod/buildtoc: no pods at pod/buildtoc line 305. | make: *** [pod/perltoc.pod] Error 255 | ERROR: oe_runmake failed Thanks, -- Dexuan ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] glib-2.0: Fix issues with libelf dependency creeping in
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- diff --git a/meta/recipes-core/glib-2.0/glib-2.0/nolibelf.patch b/meta/recipes-core/glib-2.0/glib-2.0/nolibelf.patch new file mode 100644 index 000..e9b3b26 --- a/dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/nolibelf.patch @@ -0,0 +1,37 @@ +Ideally there would be configureation option for this but there is not. We +can't allow this code since it could detect the host system's libelf with +disasterous effects when cross compiling. + +RP 2012/5/7 + +Upstream-Status: Pending (would need to be made a configure option to disabe) + +Index: glib-2.32.2/configure.ac +=== +--- glib-2.32.2.orig/configure.ac 2012-05-07 08:30:04.481149925 + glib-2.32.2/configure.ac 2012-05-07 08:31:02.185148588 + +@@ -1816,23 +1816,7 @@ + dnl *** check for libelf *** + dnl + +-PKG_CHECK_MODULES([LIBELF], [libelf], [have_libelf=yes], [have_libelf=maybe]) +- +-if test $have_libelf = maybe; then +- AC_CHECK_LIB([elf], [elf_begin], , [have_libelf=no]) +- AC_CHECK_LIB([elf], [elf_getshdrstrndx], , [have_libelf=no]) +- AC_CHECK_LIB([elf], [elf_getshdrnum], , [have_libelf=no]) +- AC_CHECK_HEADER([libelf.h], , [have_libelf=no]) +- +- if test $have_libelf != no; then +-LIBELF_LIBS=-lelf +-have_libelf = yes +- fi +-fi +- +-if test $have_libelf = yes; then +- AC_DEFINE(HAVE_LIBELF, 1, [Define if libelf is available]) +-fi ++have_libelf=no + + dnl + dnl *** platform dependent source checks *** diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.32.2.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.32.2.bb index f303cb4..b9b3356 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.32.2.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.32.2.bb @@ -1,6 +1,7 @@ require glib.inc PE = 1 +PR = r1 DEPENDS += libffi python-argparse-native zlib DEPENDS_virtclass-native += libffi-native python-argparse-native @@ -13,6 +14,7 @@ SRC_URI = ${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://60_wait-longer-for-threads-to-die.patch \ file://glib-2.0_fix_for_x32.patch \ file://nodbus.patch \ + file://nolibelf.patch \ SRC_URI[md5sum] = 5bfdb6197afb90e4dbc7b1bb98f0eae0 SRC_URI[sha256sum] = b1764abf00bac96e0e93e29fb9715ce75f3583579acac40648e18771d43d6136 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] connman: Disable tist plugin on powerpc
This plugin doesn't build on powerpc due to powerpc's terminal ioctl defintions being incompatible with assumptions being made by this module. Until someone has need and can test this on powerpc, disabling is the safest option. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index 8b27cfb..f2da8d9 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc @@ -20,6 +20,9 @@ DEPENDS = dbus glib-2.0 ppp iptables gnutls \ ofono \ +TIST = --enable-tist +TIST_powerpc = + EXTRA_OECONF += \ ac_cv_path_WPASUPPLICANT=${sbindir}/wpa_supplicant \ ac_cv_path_PPPD=${sbindir}/pppd \ @@ -28,8 +31,8 @@ EXTRA_OECONF += \ --enable-threads \ --enable-loopback \ --enable-ethernet \ -${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi --enable-tist', '--disable-wifi', d)} \ -${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth --enable-tist', '--disable-bluetooth', d)} \ +${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi ${TIST}', '--disable-wifi', d)} \ +${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth ${TIST}', '--disable-bluetooth', d)} \ --enable-dnsproxy \ --enable-ofono \ --enable-tools \ ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] connman: enable TI shared transport plugin when wifi or bluetooth are requested
Op 7 mei 2012, om 11:44 heeft Richard Purdie het volgende geschreven: On Sun, 2012-05-06 at 14:32 +0200, Koen Kooi wrote: Op 6 mei 2012, om 11:17 heeft Richard Purdie het volgende geschreven: On Fri, 2012-05-04 at 09:54 +0200, Koen Kooi wrote: This plugin manages the firmware loading for the TI wl12xx series of bluetooth/wifi/fm chips. The double --enable-tist when both bluetooth and wireless are enabled is ugly, but harmless The background on the plugin: https://bugs.meego.com/show_bug.cgi?id=8418 Signed-off-by: Koen Kooi k...@dominion.thruhere.net --- If accepted into master I'd like to have this in the 'denzil' branch as well. meta/recipes-connectivity/connman/connman.inc |4 ++-- meta/recipes-connectivity/connman/connman_0.79.bb |2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index bfe6620..8b27cfb 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc @@ -28,8 +28,8 @@ EXTRA_OECONF += \ --enable-threads \ --enable-loopback \ --enable-ethernet \ -${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi', '--disable-wifi', d)} \ -${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \ +${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi --enable-tist', '--disable-wifi', d)} \ +${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth --enable-tist', '--disable-bluetooth', d)} \ --enable-dnsproxy \ --enable-ofono \ --enable-tools \ diff --git a/meta/recipes-connectivity/connman/connman_0.79.bb b/meta/recipes-connectivity/connman/connman_0.79.bb index 4c57dab..d7f22b9 100644 --- a/meta/recipes-connectivity/connman/connman_0.79.bb +++ b/meta/recipes-connectivity/connman/connman_0.79.bb @@ -11,4 +11,4 @@ SRC_URI = git://git.kernel.org/pub/scm/network/connman/connman.git \ file://test-set-ipv6-method-api-fix.patch \ file://connman S = ${WORKDIR}/git -PR = r3 +PR = r4 This appears to have broken the build on qemuppc: http://autobuilder.yoctoproject.org:8010/builders/nightly-ppc/builds/369/steps/shell_19/logs/stdio That is really weird, since that's defined in ioctl.h in asm-generic/ by the kernel. Does qemuppc have some options for serial ports disabled in the kernel headers? Since the wl12xx is a regular wifi chip it should work on ppc, like it does on arm and x86. Its defined in ioctls.h which is a key difference. ioctls.h is a set of default ioctl options which most architectures use but architectures have their own custom definitions. PowerPC is one such architecture, using t instead of T for tty operations. It seems the powerpc version never needed a version2 so in theory #ifndef TCGETS2 #define TCGETS2 TCGETS #define termios2 termios #endif would work but google suggests some potential issues which I don't really want to dig into/understand. I'm tempted to disable this plugin on powerpc That's fine by me. unless anyone wants to step up with a patch? Using the libc API for this would probably be more portable. I can look into that after the next angstrom point release, which is ~2 weeks away. regards, koen ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] connman: Disable tist plugin on powerpc
Op 7 mei 2012, om 11:52 heeft Richard Purdie het volgende geschreven: This plugin doesn't build on powerpc due to powerpc's terminal ioctl defintions being incompatible with assumptions being made by this module. Until someone has need and can test this on powerpc, disabling is the safest option. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org Acked-by: Koen Kooi k...@circuitco.com --- diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index 8b27cfb..f2da8d9 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc @@ -20,6 +20,9 @@ DEPENDS = dbus glib-2.0 ppp iptables gnutls \ ofono \ +TIST = --enable-tist +TIST_powerpc = + EXTRA_OECONF += \ ac_cv_path_WPASUPPLICANT=${sbindir}/wpa_supplicant \ ac_cv_path_PPPD=${sbindir}/pppd \ @@ -28,8 +31,8 @@ EXTRA_OECONF += \ --enable-threads \ --enable-loopback \ --enable-ethernet \ -${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi --enable-tist', '--disable-wifi', d)} \ -${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth --enable-tist', '--disable-bluetooth', d)} \ +${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi ${TIST}', '--disable-wifi', d)} \ +${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth ${TIST}', '--disable-bluetooth', d)} \ --enable-dnsproxy \ --enable-ofono \ --enable-tools \ ___ 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] [CONSOLIDATED PULL 00/66] Summary Only
On Mon, May 7, 2012 at 12:45 AM, Saul Wold s...@linux.intel.com wrote: Otavio Salvador (1): qt4-graphics-system: set graphic system in profile instead of X11 session Please consider applying it to 1.2.1. -- Otavio Salvador O.S. Systems E-mail: ota...@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] linux-yocto/3.2: configuration and pch merge
Updating the 3.2 SRCREVs to import the following meta/config changes: 6b3d4e0 meta: add mei feature 519abac meta: add usb/uhci-hcd feature a67c5a3 meta/crownbay: use usb features 0855066 meta: add usb/ohci-hcd feature 15f1a99 meta: add usb/ehci-hcd feature 8fa6408 meta: add usb/xhci-hcd feature c724a55 meta: add usb/base feature b55b3a1 sys940x: Cleanup sys940x.scc 93f2e97 sys940x: Use PHYSICAL_START of 0x20 to boot aaa034b sys940x: Add common standard and preempt-rt features e2b1286 sys940x: Add efi-ext to standard and preempt-rt configs d188c21 sys940x: Move emgd-1.10 data to the standard scc file 72d9369 fri2: Cleanup fri2-$KTYPE.scc files re efi-ext.scc dbcb120 fri2: Use emgd-1.10 feature and branch And the following driver fix: f39a0a9 pch_gbe: Do not abort probe on bad MAC Signed-off-by: Darren Hart dvh...@linux.intel.com Signed-off-by: Tom Zanussi tom.zanu...@intel.com Signed-off-by: Bruce Ashfield bruce.ashfi...@windriver.com --- meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb |6 +++--- meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb |4 ++-- meta/recipes-kernel/linux/linux-yocto_3.2.bb | 14 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb index 05674ef..7e01efb 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb @@ -14,9 +14,9 @@ KBRANCH_qemuppc = standard/preempt-rt/qemu-ppc32 LINUX_VERSION ?= 3.2.11 LINUX_KERNEL_TYPE = preempt-rt -SRCREV_machine ?= 32ecb53e9ff759bbd297a10712b62a6575daaf86 -SRCREV_machine_qemuppc ?= 0d5625bb868cc2471d5dd49eb7abe7eb5fe1044b -SRCREV_meta ?= b14a08f5c7b469a5077c10942f4e1aec171faa9d +SRCREV_machine ?= 3ebf4d172cf4a41d2abf09e4036f0850e08064e7 +SRCREV_machine_qemuppc ?= 7cebfe717987f4ffa9ae90558c28f45049847c1c +SRCREV_meta ?= 6b3d4e09aa2531e9649f3f03827b7efbccfcec03 PR = r1 PV = ${LINUX_VERSION}+git${SRCPV} diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb index 4957e33..27de229 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb @@ -11,8 +11,8 @@ KCONFIG_MODE = --allnoconfig LINUX_VERSION ?= 3.2.11 -SRCREV_machine ?= ec236058dc254183dbfb3744bf21f110c37af30b -SRCREV_meta ?= b14a08f5c7b469a5077c10942f4e1aec171faa9d +SRCREV_machine ?= 61960ba8e910d54b5525d5e9b6a7469bc399c246 +SRCREV_meta ?= 6b3d4e09aa2531e9649f3f03827b7efbccfcec03 PR = r0 PV = ${LINUX_VERSION}+git${SRCPV} diff --git a/meta/recipes-kernel/linux/linux-yocto_3.2.bb b/meta/recipes-kernel/linux/linux-yocto_3.2.bb index d81f6b5..51119bb 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.2.bb @@ -17,13 +17,13 @@ KBRANCH_qemuarm = standard/default/arm-versatile-926ejs LINUX_VERSION ?= 3.2.11 -SRCREV_machine_qemuarm ?= dfbba772cbee84125ac1558c904a7dc181445f5f -SRCREV_machine_qemumips ?= 0e0c67635b74199d534f75500e5c1654a1219bc6 -SRCREV_machine_qemuppc ?= 92de4e2f3c6b397c8b363e079cc4d5e9bcadf877 -SRCREV_machine_qemux86 ?= 8ada1bb97415fe959a57a08504be4eb8a656ed30 -SRCREV_machine_qemux86-64 ?= 4ca7e2c5d42e755e1b4c3e1478128f047a8ed2a8 -SRCREV_machine ?= 01e948c2bdf7f5ad9f2b30047a8d3493a1a2880a -SRCREV_meta ?= b14a08f5c7b469a5077c10942f4e1aec171faa9d +SRCREV_machine_qemuarm ?= ba47a1cc9bb6ad576b2ac7adb3036bcfa569fe2e +SRCREV_machine_qemumips ?= 3b2fd654392a2f33aed12748548c04e9b169591b +SRCREV_machine_qemuppc ?= cf3e188cf2a18c48a0e6f9ca54c36e6ac39512ec +SRCREV_machine_qemux86 ?= 46f1007ad22b6790224c66a8dc4e80fdbd21eea1 +SRCREV_machine_qemux86-64 ?= 00e5ec2393bada6723bd9a07ded3d001c02fa727 +SRCREV_machine ?= f4f8ba730e7783e09413872414d0a17c142c816d +SRCREV_meta ?= 6b3d4e09aa2531e9649f3f03827b7efbccfcec03 PR = r1 PV = ${LINUX_VERSION}+git${SRCPV} -- 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] [PATCH 0/1] linux-yocto/3.2: queued config and driver fixes
Richard/Saul, I'm clearning out my queued fixes for the 3.2 kernel before following up with my new functional changes and the 3.4 kernel recipe. These have been brewing for a week, and will be used for async layer releases The following changes since commit 7a49d88d22395afffb211045049a17b906219d82: Hob: Clear the building status if command failed (2012-05-07 11:03:01 +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): linux-yocto/3.2: configuration and pch merge meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb |6 +++--- meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb |4 ++-- meta/recipes-kernel/linux/linux-yocto_3.2.bb | 14 +++--- 3 files changed, 12 insertions(+), 12 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] buildhistory: fix multiple commit of images and packages at the same time
Op 7 mei 2012, om 17:47 heeft Scott Garman het volgende geschreven: On 05/04/2012 11:55 PM, Koen Kooi wrote: Op 4 mei 2012, om 23:25 heeft Scott Garman het volgende geschreven: On 05/04/2012 08:16 AM, Koen Kooi wrote: On Friday 04 May 2012 15:50:16 Koen Kooi wrote: Looks good to me. If this goes in, can it go on the denzil shortlist as well? I hope so, hence I've CC'd Scott Garman who is pulling together a branch for 1.2.1. oe-core or poky? I only care about oe-core. Both. Nothing goes into poky these days unless it comes from one of the appropriate trees. That's not what I was asking. I was asking it scott is doing a poky or oe-core effort. From Scotts emails it seems like a poky effort. Hi Koen, I apologize for having made some confusing comments earlier about rebasing a denzil-next branch on my poky-contrib repo from being based on oe-core to poky. Since then, Richard has given me access to the oe-core-contrib repo, and I am now maintaining two denzil-next branches. This one is based on oe-core: http://git.openembedded.org/openembedded-core-contrib/log/?h=sgarman/denzil-next When is that going to get merged into denzil? I'm in serious need of that connman tests fix, so I have been using http://cgit.openembedded.org/openembedded-core/log/?h=denzil-next locally. The commit just got into master, so I'm hoping to pull it into my denzil-next-testing branch and run some build tests overnight tonight, then merge it if all goes well tomorrow. Merge it into the oe-core 'denzil' branch, right? ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [oe-core][PATCH 0/2] glib-2.0 another upgrade
On 05/02/2012 06:59 AM, Martin Jansa wrote: This depends on previous glib-2.0 upgrade patchset which is already in master-next The following changes since commit 26d822ad059dd4839cc6fee2a65714e73cc146e1: nfs-utils: don't try to unload nfsd module (2012-05-01 14:28:47 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib jansa/pull http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/pull Martin Jansa (1): glib-2.0: upgrade to 2.32.2 Tomas Frydrych (1): site/arm-common: alignment values for guin32, guin64 and unsigned long .../{glib-2.0_2.32.1.bb = glib-2.0_2.32.2.bb} |5 ++--- meta/site/arm-common |3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) rename meta/recipes-core/glib-2.0/{glib-2.0_2.32.1.bb = glib-2.0_2.32.2.bb} (92%) 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] [oe-core][PATCH 0/3] glib-2.0, gobject-introspection, libsoup-2.4 upgrade
On 04/29/2012 02:27 PM, Martin Jansa wrote: Tested on my images and fixed failing recipe, mostly it's about including header files like: glib-2.0/glib/gthread.h:28:2: error: #error Onlyglib.h can be included directly. The following changes since commit 5a1f172d35be610688842a8a9a84f24edb9aeb51: bitbake.conf: use TUNE_PKGARCH instead of TARGET_ARCH in SDK_NAME (2012-04-26 10:59:20 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib jansa/pull2 http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/pull2 Martin Jansa (3): glib-2.0: upgrade to 2.32.1 gobject-introspection: upgrade to 1.32.1 libsoup-2.4: upgrade to 2.38.1 .../glib-2.0/glib-2.0/configure-libtool.patch | 54 ++-- .../glib-2.0/glib-2.0/g_once_init_enter.patch | 24 - .../{glib-2.0_2.30.3.bb = glib-2.0_2.32.1.bb} |6 +-- meta/recipes-core/glib-2.0/glib.inc|2 +- ..._1.31.20.bb = gobject-introspection_1.32.1.bb} | 13 +++-- ...libsoup-2.4_2.36.1.bb = libsoup-2.4_2.38.1.bb} |8 ++-- 6 files changed, 53 insertions(+), 54 deletions(-) delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch rename meta/recipes-core/glib-2.0/{glib-2.0_2.30.3.bb = glib-2.0_2.32.1.bb} (91%) rename meta/recipes-gnome/gnome/{gobject-introspection_1.31.20.bb = gobject-introspection_1.32.1.bb} (52%) rename meta/recipes-support/libsoup/{libsoup-2.4_2.36.1.bb = libsoup-2.4_2.38.1.bb} (55%) 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] sed: Explicitly disable acl for deterministic builds
On 5/4/12 9:15 AM, Koen Kooi wrote: Op 4 mei 2012, om 16:04 heeft Richard Purdie het volgende geschreven: Signed-off-by: Richard Purdierichard.pur...@linuxfoundation.org --- diff --git a/meta/recipes-extended/sed/sed_4.2.1.bb b/meta/recipes-extended/sed/sed_4.2.1.bb index 9fbb6e7..92f59e4 100644 --- a/meta/recipes-extended/sed/sed_4.2.1.bb +++ b/meta/recipes-extended/sed/sed_4.2.1.bb @@ -13,6 +13,8 @@ SRC_URI[sha256sum] = 8773541ce097fdc4c5b9e7da12a82dffbb30cd91f7bc169f52f05f93b7 inherit autotools update-alternatives gettext +EXTRA_OECONF = --disable-acl I'm wondering if ACLs should be a distro flag Missing PR bump ___ 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] dropping libgdbus from oe-core
On Mon, May 7, 2012 at 1:30 AM, Martin Jansa martin.ja...@gmail.com wrote: Nothing in oe-core depends on it and gdbus was merged to glib in 2010 so nothing new will probably depend on it seems good I think, send a patch for removal. Cheers, -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com ___ 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] SetScene tasks hang forever?
On 5/6/12 10:36 , Rich Pixley wrote: On 5/2/12 16:06 , Richard Purdie wrote: On Wed, 2012-05-02 at 14:48 -0500, Mark Hatle wrote: On 5/2/12 2:45 PM, Rich Pixley wrote: On 5/2/12 12:40 , Mark Hatle wrote: On 5/2/12 2:16 PM, Rich Pixley wrote: On 5/2/12 11:40 , Mark Hatle wrote: On 5/2/12 1:21 PM, Rich Pixley wrote: I'm seeing a lot of builds apparently hanging forever, (the ones that work seem to work within seconds - the ones that hang seem to hang for at least 10's of minutes), with: rich@dolphinnice tail -f Log MACHINE = qemux86 DISTRO= DISTRO_VERSION= oe-core.0 TUNE_FEATURES = m32 i586 TARGET_FPU= meta = master:35b5fb2dd2131d4c7dc6635c14c6e08ea6926457 NOTE: Resolving any missing task queue dependencies NOTE: Preparing runqueue NOTE: Executing SetScene Tasks If I run top, I see one processor pinned at 98 - 99% utilization running python, but no other clues. Can anyone point me to doc, explain what's going on here, or point me in the right direction to debug this? The only time I've seen hang-like behavior the system actually opened a devshell and was awaiting input. But based on your log, it doesn't look like that is the case. Run bitbake with -DDD option, you will get considerably more debug information and it might help point out what it thinks it is doing. NOTE: Executing SetScene Tasks DEBUG: Stamp for underlying task 12(virtual:native:/home/rich/projects/webos/openembedded-core/meta/recipes-devtools/opkg/opkg_svn.bb, do_populate_sysroot) is current, so skipping setscene variant DEBUG: Stamp for underlying task 16(virtual:native:/home/rich/projects/webos/openembedded-core/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb, do_populate_sysroot) is current, so skipping setscene variant DEBUG: Stamp for underlying task 20(virtual:native:/home/rich/projects/webos/openembedded-core/meta/recipes-devtools/makedevs/makedevs_1.0.0.bb, do_populate_sysroot) is current, so skipping setscene variant DEBUG: Stamp for underlying task 24(/home/rich/projects/webos/openembedded-core/meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb, do_populate_sysroot) is current, so skipping setscene variant DEBUG: Stamp for underlying task 32(virtual:native:/home/rich/projects/webos/openembedded-core/meta/recipes-devtools/genext2fs/genext2fs_1.4.1.bb, do_populate_sysroot) is current, so skipping setscene variant DEBUG: Stamp for underlying task 36(virtual:native:/home/rich/projects/webos/openembedded-core/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb, do_populate_sysroot) is current, so skipping setscene variant DEBUG: Stamp for underlying task 40(virtual:native:/home/rich/projects/webos/openembedded-core/meta/recipes-devtools/qemu/qemu_0.15.1.bb, do_populate_sysroot) is current, so skipping setscene variant DEBUG: Stamp for underlying task 44(/home/rich/projects/webos/openembedded-core/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb, do_populate_sysroot) is current, so skipping setscene variant And then the spinning hang. Sorry, I don't know how to continue debugging what might be wrong. The only other thing I can suggest is check that your filesystem is real, not a netapp/nfs/network emulated filesystem And if you were continuing a previous build, start a new build directory and retry it. Local file system. I'm building a second time expecting a null build pass. I was able to get a null build pass in the same directory yesterday. Removing my build directory and starting over has been working, but costs me a few hours each time, and this happens frequently enough that I get no other work done. :(. Ya, that is certainly not acceptable. If you could file a bug on the bugzilla.yoctoproject.org someone might be able to help you diagnose this further and hopefully figure out a fix. What would really help is a way to reproduce this... Does it reproduce with a certain set of metadata/sstate perhaps? What is odd about the above logs is that it appears bitbake never executes any task. Its possible something might have crashed somewhere I guess and not realise part of the system had died. Or it could be some kind of circular dependency loop where X needs Y to build and Y needs X so nothing happens. We are supposed to spot and error if that would have happened. Does strace give an idea of which bits of bitbake are alive/looping? I'd probably resort to a few print()/bb.error() in the code at this point to find out what is alive, what is dead and where its looping... I have more info now. What I suspected was looping, (since it took longer than the ~1hr I was willing to wait), isn't actual looping. Given enough time, the builds do complete and I have comparable results on 5 different servers, (all ubuntu-12.04 amd64 and all on btrfs). My initial, full builds of core-image-minimal do build, and they build in ~60min, (~30min if I hand seed the downloads directory). I'm using no mirrors other than the defaults. My second build in
Re: [OE-core] [PATCH 1/1] buildhistory: fix multiple commit of images and packages at the same time
On 05/07/2012 09:03 AM, Koen Kooi wrote: Op 7 mei 2012, om 17:47 heeft Scott Garman het volgende geschreven: On 05/04/2012 11:55 PM, Koen Kooi wrote: Op 4 mei 2012, om 23:25 heeft Scott Garman het volgende geschreven: On 05/04/2012 08:16 AM, Koen Kooi wrote: On Friday 04 May 2012 15:50:16 Koen Kooi wrote: Looks good to me. If this goes in, can it go on the denzil shortlist as well? I hope so, hence I've CC'd Scott Garman who is pulling together a branch for 1.2.1. oe-core or poky? I only care about oe-core. Both. Nothing goes into poky these days unless it comes from one of the appropriate trees. That's not what I was asking. I was asking it scott is doing a poky or oe-core effort. From Scotts emails it seems like a poky effort. Hi Koen, I apologize for having made some confusing comments earlier about rebasing a denzil-next branch on my poky-contrib repo from being based on oe-core to poky. Since then, Richard has given me access to the oe-core-contrib repo, and I am now maintaining two denzil-next branches. This one is based on oe-core: http://git.openembedded.org/openembedded-core-contrib/log/?h=sgarman/denzil-next When is that going to get merged into denzil? I'm in serious need of that connman tests fix, so I have been using http://cgit.openembedded.org/openembedded-core/log/?h=denzil-next locally. The commit just got into master, so I'm hoping to pull it into my denzil-next-testing branch and run some build tests overnight tonight, then merge it if all goes well tomorrow. Merge it into the oe-core 'denzil' branch, right? No. I do not have commit access to the oe-core repository, just the oe-core-contrib repo, where my sgarman/denzil-next branch lives. Richard is on holiday until tomorrow, can you hold on until then and maybe he can help clear up the remaining confusion? Scott -- Scott Garman Embedded Linux Engineer - Yocto Project Intel Open Source Technology Center ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] glib-2.0: Fix issues with libelf dependency creeping in
On Mon, 2012-05-07 at 10:52 +0100, Richard Purdie wrote: Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- diff --git a/meta/recipes-core/glib-2.0/glib-2.0/nolibelf.patch b/meta/recipes-core/glib-2.0/glib-2.0/nolibelf.patch new file mode 100644 index 000..e9b3b26 --- a/dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/nolibelf.patch @@ -0,0 +1,37 @@ +Ideally there would be configureation option for this but there is not. We +can't allow this code since it could detect the host system's libelf with +disasterous effects when cross compiling. Random request - could you guys also CC patches to GNOME stuff to me? I do review patches to GLib fairly actively. As far as removing the libelf support; note this means GResource won't work which in turn means gtk3 won't work (at the moment). Anyways, a patch to add a configuration option is really, really trivial if one has a checkout of git, if someone files a bug with a rationale I can do a patch. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/3] kmod: Add recipes
On Wed, May 2, 2012 at 10:58 PM, Khem Raj raj.k...@gmail.com wrote: kmod is replacement for module-init-tools Signed-off-by: Khem Raj raj.k...@gmail.com --- meta/recipes-kernel/kmod/kmod-native_git.bb | 14 + meta/recipes-kernel/kmod/kmod.inc | 31 +++ meta/recipes-kernel/kmod/kmod/depmod-search.conf | 6 ++ meta/recipes-kernel/kmod/kmod_git.bb | 62 ++ 4 files changed, 113 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-kernel/kmod/kmod-native_git.bb create mode 100644 meta/recipes-kernel/kmod/kmod.inc create mode 100644 meta/recipes-kernel/kmod/kmod/depmod-search.conf create mode 100644 meta/recipes-kernel/kmod/kmod_git.bb diff --git a/meta/recipes-kernel/kmod/kmod-native_git.bb b/meta/recipes-kernel/kmod/kmod-native_git.bb new file mode 100644 index 000..96de8b8 --- /dev/null +++ b/meta/recipes-kernel/kmod/kmod-native_git.bb @@ -0,0 +1,14 @@ +# Copyright (C) 2012 Khem Raj raj.k...@gmail.com +# Released under the MIT license (see COPYING.MIT for the terms) + +require kmod.inc +inherit native + +PR = ${INC_PR}.0 + +do_install_append (){ + for tool in depmod insmod lsmod modinfo modprobe rmmod + do + ln -s kmod ${D}${bindir}/$tool + done +} diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc new file mode 100644 index 000..940a317 --- /dev/null +++ b/meta/recipes-kernel/kmod/kmod.inc @@ -0,0 +1,31 @@ +# Copyright (C) 2012 Khem Raj raj.k...@gmail.com +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = kmod is a set of tools to handle common tasks with Linux kernel modules like \ + insert, remove, list, check properties, resolve dependencies and aliases. +HOMEPAGE = http://packages.profusion.mobi/kmod/; +LICENSE = GPL-2.0+ LGPL-2.1+ +LICENSE_libkmod = LGPL-2.1+ +SECTION = base +PV = 7+git${SRCREV} this version sorts lower than what was in meta-oe, can we bump PE with libkmod fix please? +INC_PR = r0 +DEPENDS += gnome-doc-utils-native +LIC_FILES_CHKSUM = file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ + file://libkmod/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ + +inherit autotools + +SRC_URI = git://git.profusion.mobi/kmod.git;protocol=git;branch=master \ + file://depmod-search.conf \ + + +SRCREV = 02629fa02e96763db7460a930239cc93649a52f8 + +S = ${WORKDIR}/git + +EXTRA_AUTORECONF += --install --symlink +EXTRA_OECONF +=--enable-debug --enable-logging --enable-tools + +do_configure_prepend () { + gtkdocize --docdir ${S}/libkmod/docs || touch ${S}/libkmod/docs/gtk-doc.make +} diff --git a/meta/recipes-kernel/kmod/kmod/depmod-search.conf b/meta/recipes-kernel/kmod/kmod/depmod-search.conf new file mode 100644 index 000..527c0bb --- /dev/null +++ b/meta/recipes-kernel/kmod/kmod/depmod-search.conf @@ -0,0 +1,6 @@ +# +# /etc/depmod.d/depmod.conf +# + +search updates extramodules built-in + diff --git a/meta/recipes-kernel/kmod/kmod_git.bb b/meta/recipes-kernel/kmod/kmod_git.bb new file mode 100644 index 000..928fa88 --- /dev/null +++ b/meta/recipes-kernel/kmod/kmod_git.bb @@ -0,0 +1,62 @@ +# Copyright (C) 2012 Khem Raj raj.k...@gmail.com +# Released under the MIT license (see COPYING.MIT for the terms) + +require kmod.inc + +PR = ${INC_PR}.0 + +PROVIDES_${PN} += module-init-tools-insmod-static module-init-tools-depmod module-init-tools +RPROVIDES_${PN} += module-init-tools-insmod-static module-init-tools-depmod module-init-tools +CONFLICTS_${PN} += module-init-tools-insmod-static module-init-tools-depmod module-init-tools + +# autotools set prefix to /usr, however we want them in /bin and /sbin +bindir = ${base_bindir} +sbindir = ${base_sbindir} +# libdir = ${base_libdir} why is this commented out? it breaks libkmod packaging FILES_libkmod = ${base_libdir}/libkmod*${SOLIBS} doesn't matches anything previous version of this patch had this enabled.. + +SRC_URI += \ + file://depmod-search.conf \ + + +do_install_append () { + install -dm755 ${D}${base_bindir} + install -dm755 ${D}${base_sbindir} + # add symlinks to kmod + ln -s ..${base_bindir}/kmod ${D}${base_bindir}/lsmod.kmod + for tool in {ins,rm,dep}mod mod{info,probe}; do + ln -s ..${base_bindir}/kmod ${D}${base_sbindir}/${tool}.kmod + done + # configuration directories + install -dm755 ${D}${base_libdir}/depmod.d + install -dm755 ${D}${base_libdir}/modprobe.d + install -dm755 ${D}${sysconfdir}/depmod.d + install -dm755 ${D}${sysconfdir}/modprobe.d + + # install depmod.d file for search/ dir + install -Dm644 ${WORKDIR}/depmod-search.conf ${D}${base_libdir}/depmod.d/search.conf +} +
[OE-core] [oe-core][PATCH 0/6] cleanup old stuff
I haven't tried to build world for all archs, but git grep shows that this stuff wasn't used so it should be safe to remove it. The following changes since commit 2929e7d590862d9649458c90804e79a1dce40423: glib-2.0: Fix issues with libelf dependency creeping in (2012-05-07 10:53:24 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib jansa/pull http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/pull Martin Jansa (6): dbus-glib: bump PR to rebuild after glib upgrade evolution-data-server: delete unused patch parallelmake.patch evolution-data-server: delete old 2.20.0 version meta-demoapps: delete from oe-core libgdbus: delete from oe-core libsoup: delete from oe-core .../farsight/farsight2_0.0.9.bb| 23 - .../recipes-connectivity/farsight/libnice_0.0.6.bb | 23 - .../libetpan/files/cxx-is-here.patch | 20 - .../recipes-connectivity/libetpan/libetpan_0.54.bb | 20 - .../loudmouth/loudmouth_1.4.0.bb | 10 - .../openswan/openswan-2.4.7/installflags.patch | 15 - .../openswan-2.4.7/ld-library-path-breakage.patch | 28 - .../openswan-2.4.7/openswan-2.4.7-gentoo.patch | 379 --- .../openswan/openswan_2.4.7.bb | 36 - .../opensync/libopensync-0.37/build-in-src.patch | 20 - .../opensync/libopensync-0.37/cmake.patch | 19 - .../libopensync-0.37/no-python-check.patch | 18 - .../libopensync-plugin-evolution2/0.37-fixes.patch | 25 - .../opensync/libopensync-plugin-evolution2_0.36.bb |8 - .../opensync/libopensync-plugin-file_0.37.bb |2 - .../libopensync-plugin-google-calendar_0.36.bb |2 - .../opensync/libopensync-plugin-irmc_0.36.bb |4 - .../libopensync-plugin-syncml/fixerror.patch | 15 - .../opensync/libopensync-plugin-syncml_0.38.bb |8 - .../opensync/libopensync-plugin-vformat_0.37.bb|4 - .../opensync/libopensync-plugin_0.36.inc | 11 - .../opensync/libopensync_0.37.bb | 26 - .../recipes-connectivity/opensync/libsync_git.bb | 22 - .../opensync/libsyncml/build-in-src.patch | 21 - .../opensync/libsyncml_0.5.4.bb| 17 - .../opensync/msynctool_0.38.bb | 20 - .../telepathy/empathy/no-gnome-doc.patch | 41 - .../telepathy/empathy_2.26.1.bb| 29 - .../telepathy/telepathy-farsight_0.0.7.bb | 16 - .../telepathy/telepathy-gabble/gabble.manager | 33 - .../telepathy/telepathy-gabble_0.7.8.bb| 18 - .../wbxml/files/no-doc-install.patch | 17 - .../recipes-connectivity/wbxml/wbxml2_0.9.2.bb | 24 - .../recipes-gnome/abiword/abiword-2.5.inc | 64 -- .../abiword/abiword-embedded_2.5.2.bb | 12 - meta-demoapps/recipes-gnome/abiword/abiword.inc| 64 -- .../recipes-gnome/abiword/abiword_2.5.2.bb |5 - meta-demoapps/recipes-gnome/abiword/abiword_svn.bb | 10 - .../gcalctool/gcalctool/fix-includedir.patch | 33 - .../recipes-gnome/gcalctool/gcalctool_5.7.32.bb| 13 - .../recipes-gnome/gcalctool/gcalctool_5.8.17.bb| 12 - .../gnome/gnome-settings-daemon/configurefix.patch | 32 - .../gnome-settings-daemon/desktop-moblin.patch | 13 - ...-settings-daemon-2.24.0-catch-deviceadded.patch | 21 - .../gnome-settings-daemon-fix-gthread.patch| 15 - .../gnome-settings-daemon/mojito-cleanup.patch | 76 -- .../gnome/gnome-settings-daemon/mount-plugin.patch | 620 -- .../gnome/gnome-settings-daemon_2.26.1.bb | 25 - .../30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch | 22 - .../recipes-gnome/gnome/gnome-terminal_2.26.3.bb | 16 - .../recipes-gnome/gnome/libgnomecanvas_2.20.0.bb | 14 - .../recipes-gnome/gnome/libgnomekbd_2.26.0.bb | 14 - .../recipes-gnome/libgsf/libgsf_1.14.5.bb | 25 - .../recipes-gnome/libgtkstylus/files/gtkstylus.sh |5 - .../recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb | 24 - .../recipes-gnome/wv/wv-1.2.0/pkgconfig.patch | 15 - meta-demoapps/recipes-gnome/wv/wv_1.2.0.bb | 14 - meta-demoapps/recipes-graphics/clutter/tidy.inc| 20 - .../recipes-graphics/clutter/tidy/autofoo.patch| 13 - .../clutter/tidy/tidy-enable-tests.patch | 22 - meta-demoapps/recipes-graphics/clutter/tidy_git.bb | 14 - .../libxklavier/libxklavier/pkgconfigfix.patch | 17 - .../libxklavier/libxklavier_3.9.bb | 11 - .../pong-clock/pong-clock/pong-clock-no-flicker.c | 410 --- .../recipes-graphics/pong-clock/pong-clock_1.0.bb | 16 - .../recipes-graphics/xorg-app/xbacklight_1.1.bb|4 - .../recipes-graphics/xorg-app/xeyes_1.0.1.bb |4 - .../recipes-graphics/xorg-app/xrdb/60XDefaults.sh |3 - .../recipes-graphics/xorg-app/xrdb_1.0.5.bb|
[OE-core] [oe-core][PATCH 1/6] dbus-glib: bump PR to rebuild after glib upgrade
* some apps had issues in runtime when dbus-glib wasn't rebuilt and reinstalled after glib upgrade, see: http://www.shr-project.org/trac/ticket/1980 Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta/recipes-core/dbus/dbus-glib_0.98.bb |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/recipes-core/dbus/dbus-glib_0.98.bb b/meta/recipes-core/dbus/dbus-glib_0.98.bb index bd9389a..e2c6a0c 100644 --- a/meta/recipes-core/dbus/dbus-glib_0.98.bb +++ b/meta/recipes-core/dbus/dbus-glib_0.98.bb @@ -1,6 +1,6 @@ require dbus-glib.inc -PR = r0 +PR = r1 SRC_URI[md5sum] = 3f7f117dc7c8d899d9acfdcbf9253fb8 SRC_URI[sha256sum] = 297c81d6bb8b1c312e9b0ccfe91eb28ec0672756abb64dfb7bbe2b5f1ae5d111 -- 1.7.8.6 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] kmod: fix upgrade path from module-init-tools
* PROVIDES does not need _${PN} * CONFLICTS should be RCONFLICTS * opkg needs RREPLACES to automatically remove older module-init-tools instead of just reporting it conflicts with kmod SHR root@gjama ~ $ opkg install kmod Installing kmod (7+git02629fa02e96763db7460a930239cc93649a52f8-r0.0) to root... Downloading http://jama.dyndns-home.com/org.openembedded.shr-core//armv4t/kmod_7+git02629fa02e96763db7460a930239cc93649a52f8-r0.0_armv4t.ipk. Removing package module-init-tools-depmod from root... update-alternatives: removing //sbin/depmod as no more alternatives exist for it Removing package module-init-tools from root... update-alternatives: Linking //sbin/insmod to ../bin/busybox update-alternatives: Linking //sbin/modprobe to ../bin/busybox update-alternatives: Linking //sbin/rmmod to ../bin/busybox update-alternatives: removing //sbin/modinfo as no more alternatives exist for it update-alternatives: removing //bin/lsmod as no more alternatives exist for it update-alternatives: Linking //sbin/lsmod to ../bin/busybox Configuring kmod. update-alternatives: Linking //sbin/insmod to /sbin/insmod.kmod update-alternatives: Linking //sbin/modprobe to /sbin/modprobe.kmod update-alternatives: Linking //sbin/rmmod to /sbin/rmmod.kmod update-alternatives: Linking //sbin/modinfo to /sbin/modinfo.kmod update-alternatives: Linking //bin/lsmod to /bin/lsmod.kmod update-alternatives: Linking //sbin/lsmod to /bin/lsmod.kmod update-alternatives: Linking //sbin/depmod to /sbin/depmod.kmod Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta/recipes-kernel/kmod/kmod_git.bb | 10 +++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/kmod/kmod_git.bb b/meta/recipes-kernel/kmod/kmod_git.bb index 8178f1c..28b5a68 100644 --- a/meta/recipes-kernel/kmod/kmod_git.bb +++ b/meta/recipes-kernel/kmod/kmod_git.bb @@ -3,11 +3,15 @@ require kmod.inc -PR = ${INC_PR}.0 +PR = ${INC_PR}.1 -PROVIDES_${PN} += module-init-tools-insmod-static module-init-tools-depmod module-init-tools +PROVIDES += module-init-tools-insmod-static module-init-tools-depmod module-init-tools RPROVIDES_${PN} += module-init-tools-insmod-static module-init-tools-depmod module-init-tools -CONFLICTS_${PN} += module-init-tools-insmod-static module-init-tools-depmod module-init-tools +RCONFLICTS_${PN} += module-init-tools-insmod-static module-init-tools-depmod module-init-tools +RREPLACES_${PN} += module-init-tools-insmod-static module-init-tools-depmod module-init-tools + +# to force user to remove old module-init-tools and replace them with kmod variants +RCONFLICTS_libkmod2 += module-init-tools-insmod-static module-init-tools-depmod module-init-tools # autotools set prefix to /usr, however we want them in /bin and /sbin bindir = ${base_bindir} -- 1.7.8.6 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] openssh: upgrade to 6.0p1
LICENSE checksum changed due to a trivial difference in the credits list. Signed-off-by: Scott Garman scott.a.gar...@intel.com --- .../openssh/{openssh-5.9p1 = openssh-6.0p1}/init |0 .../{openssh-5.9p1 = openssh-6.0p1}/nostrip.patch |0 .../{openssh-5.9p1 = openssh-6.0p1}/ssh_config|0 .../openssh/{openssh-5.9p1 = openssh-6.0p1}/sshd |0 .../{openssh-5.9p1 = openssh-6.0p1}/sshd_config |0 .../openssh/{openssh_5.9p1.bb = openssh_6.0p1.bb} |8 6 files changed, 4 insertions(+), 4 deletions(-) rename meta/recipes-connectivity/openssh/{openssh-5.9p1 = openssh-6.0p1}/init (100%) rename meta/recipes-connectivity/openssh/{openssh-5.9p1 = openssh-6.0p1}/nostrip.patch (100%) rename meta/recipes-connectivity/openssh/{openssh-5.9p1 = openssh-6.0p1}/ssh_config (100%) rename meta/recipes-connectivity/openssh/{openssh-5.9p1 = openssh-6.0p1}/sshd (100%) rename meta/recipes-connectivity/openssh/{openssh-5.9p1 = openssh-6.0p1}/sshd_config (100%) rename meta/recipes-connectivity/openssh/{openssh_5.9p1.bb = openssh_6.0p1.bb} (94%) diff --git a/meta/recipes-connectivity/openssh/openssh-5.9p1/init b/meta/recipes-connectivity/openssh/openssh-6.0p1/init similarity index 100% rename from meta/recipes-connectivity/openssh/openssh-5.9p1/init rename to meta/recipes-connectivity/openssh/openssh-6.0p1/init diff --git a/meta/recipes-connectivity/openssh/openssh-5.9p1/nostrip.patch b/meta/recipes-connectivity/openssh/openssh-6.0p1/nostrip.patch similarity index 100% rename from meta/recipes-connectivity/openssh/openssh-5.9p1/nostrip.patch rename to meta/recipes-connectivity/openssh/openssh-6.0p1/nostrip.patch diff --git a/meta/recipes-connectivity/openssh/openssh-5.9p1/ssh_config b/meta/recipes-connectivity/openssh/openssh-6.0p1/ssh_config similarity index 100% rename from meta/recipes-connectivity/openssh/openssh-5.9p1/ssh_config rename to meta/recipes-connectivity/openssh/openssh-6.0p1/ssh_config diff --git a/meta/recipes-connectivity/openssh/openssh-5.9p1/sshd b/meta/recipes-connectivity/openssh/openssh-6.0p1/sshd similarity index 100% rename from meta/recipes-connectivity/openssh/openssh-5.9p1/sshd rename to meta/recipes-connectivity/openssh/openssh-6.0p1/sshd diff --git a/meta/recipes-connectivity/openssh/openssh-5.9p1/sshd_config b/meta/recipes-connectivity/openssh/openssh-6.0p1/sshd_config similarity index 100% rename from meta/recipes-connectivity/openssh/openssh-5.9p1/sshd_config rename to meta/recipes-connectivity/openssh/openssh-6.0p1/sshd_config diff --git a/meta/recipes-connectivity/openssh/openssh_5.9p1.bb b/meta/recipes-connectivity/openssh/openssh_6.0p1.bb similarity index 94% rename from meta/recipes-connectivity/openssh/openssh_5.9p1.bb rename to meta/recipes-connectivity/openssh/openssh_6.0p1.bb index 749f89e..dba08a1 100644 --- a/meta/recipes-connectivity/openssh/openssh_5.9p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_6.0p1.bb @@ -5,9 +5,9 @@ and for executing commands on a remote machine. HOMEPAGE = http://openssh.org; SECTION = console/network LICENSE = BSD -LIC_FILES_CHKSUM = file://LICENCE;md5=bae9a689be41581503bcf95d8fb42c4e +LIC_FILES_CHKSUM = file://LICENCE;md5=e326045657e842541d3f35aada442507 -PR = r3 +PR = r0 DEPENDS = zlib openssl DEPENDS += ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} @@ -26,8 +26,8 @@ SRC_URI = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar. ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} PAM_SRC_URI = file://sshd -SRC_URI[md5sum] = afe17eee7e98d3b8550cc349834a85d0 -SRC_URI[sha256sum] = 8d3e8b6b6ff04b525a6dfa6fdeb6a99043ccf6c3310cc32eba84c939b0d5 +SRC_URI[md5sum] = 3c9347aa67862881c5da3f3b1c08da7b +SRC_URI[sha256sum] = 589d48e952d6c017e667873486b5df63222f9133d417d0002bd6429d9bd882de inherit useradd update-rc.d -- 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 2/6] runqemu: use modern, single-char name of test(1)
On 03/05/12 10:12, Bernhard Reutner-Fischer wrote: @@ -313,11 +313,11 @@ findimage() { # recently created one is the one we most likely want to boot. filenames=`ls -t $where/*-image*$machine.$extension 2/dev/null | xargs` for name in $filenames; do -if [[ $name =~ core-image-sato-sdk || - $name =~ core-image-sato || - $name =~ core-image-lsb || - $name =~ core-image-basic|| - $name =~ core-image-minimal ]]; then +if [ $name =~ core-image-sato-sdk -o \ + $name =~ core-image-sato -o \ + $name =~ core-image-lsb -o \ + $name =~ core-image-basic-o \ + $name =~ core-image-minimal ]; then ROOTFS=$name return fi This change broke findimage() for me on both bash and dash. Reproducer is 'runqemu qemux86'. Under bash I get: /srv/yocto/poky/scripts/runqemu: line 303: [: too many arguments Undoing this change fixes things for me. Note: this change doesn't revert cleanly. I've filed this as Yocto #2433: https://bugzilla.yoctoproject.org/show_bug.cgi?id=2433 As an aside, when trying (unsuccessfully) to figure out a fix for this I ran across Ubuntu's page on dash[1] which indicates changing || for -o isn't right. Anyone have a strong opinion on that? Cheers, Joshua 1. https://wiki.ubuntu.com/DashAsBinSh -- Joshua Lock Yocto Project Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/6] runqemu: Use OE_TMPDIR
On 05/03/2012 10:12 AM, Bernhard Reutner-Fischer wrote: The error message erroneously talked about TMPDIR. Just use OE_TMPDIR everywhere to make the name of the variable obvious. Signed-off-by: Bernhard Reutner-Fischerrep.dot@gmail.com Bernhard, This change wasn't well-tested and has broken the runqemu script for both bash and dash. :( From what I can tell, the =~ regex operator is a bashism. It's also one that helps a lot with the code readability. So now that we're faced with re-writing the script to avoid using that operator, I'm having second thoughts about whether the runqemu script really needs to be shell-agnostic. The alternative of invoking grep or other commands to process the name patterns does not appeal to me. I can understand why we're trying to ensure our build system doesn't require /bin/sh to be bash, but I think support scripts like runqemu might be a special case. What do other people in the community think of this? The runqemu script isn't trivial, and it has to run in a lot of different contexts. Should we put the time in to make it shell-agnostic, or allow it to require bash? Scott -- Scott Garman Embedded Linux Engineer - Yocto Project Intel Open Source Technology Center ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] sanity.bbclass: check TMPDIR is not too long
Here are the output message: * When the length of TMPDIR is longer than 180: The path length of TMPDIR is too long, this would cause the Argument list too long error, please use a shorter path. // Robert The following changes since commit 2929e7d590862d9649458c90804e79a1dce40423: glib-2.0: Fix issues with libelf dependency creeping in (2012-05-07 10:53:24 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib robert/tmpdir http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/tmpdir Robert Yang (1): sanity.bbclass: check TMPDIR is not too long meta/classes/sanity.bbclass | 11 +++ 1 files changed, 11 insertions(+), 0 deletions(-) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] sanity.bbclass: check TMPDIR is not too long
When the length of TMPDIR is longer than a threshold, there would be an Argument list too long error when building gcc-cross, this is the error from the exec(), the maximum length of argument is defined in /usr/include/linux/limits.h: #define ARG_MAX 131072/* # bytes of args + environ for exec() */ It's hard to determine the threshold of the TMPDIR, here is the experimental value: len(TMPDIR) = 182 Success len(TMPDIR) = 192 Failed So set the maximum length of TMPDIR to 180 seems proper. [YOCTO #2434] Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/classes/sanity.bbclass | 11 +++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 687ddeb..6aaac1e 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -30,6 +30,7 @@ def check_sanity_sstate_dir_change(sstate_dir, data): testmsg = if sstate_dir != : testmsg = check_create_long_filename(sstate_dir, SSTATE_DIR) + return testmsg def check_sanity_tmpdir_change(tmpdir, data): @@ -83,6 +84,12 @@ def check_create_long_filename(filepath, pathname): return Failed to create a file in %s: %s % (pathname, strerror) return +def check_long_path(filepath, pathname): +# The 180 is just an empirical value +if len(filepath) 180: + return The path length of %s is too long, this would cause the \Argument list too long\ error, please use a shorter path.\n % pathname +return + def check_connectivity(d): # URI's to check can be set in the CONNECTIVITY_CHECK_URIS variable # using the same syntax as for SRC_URI. If the variable is not set @@ -353,6 +360,10 @@ def check_sanity(e): tmpdir = data.getVar('TMPDIR', e.data, True) sstate_dir = data.getVar('SSTATE_DIR', e.data, True) +# Check whether the length of TMPDIR is too long to cause the +# argument list too long error +messages = messages + check_long_path(tmpdir, TMPDIR) + # Check saved sanity info last_sanity_version = 0 last_tmpdir = -- 1.7.1 ___ 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] sanity.bbclass: check TMPDIR is not too long
On 05/08/2012 10:50 AM, Robert Yang wrote: When the length of TMPDIR is longer than a threshold, there would be an Argument list too long error when building gcc-cross, this is the error from the exec(), the maximum length of argument is defined in /usr/include/linux/limits.h: #define ARG_MAX 131072/* # bytes of args + environ for exec() */ It's hard to determine the threshold of the TMPDIR, here is the experimental value: len(TMPDIR) = 182 Success len(TMPDIR) = 192 Failed So set the maximum length of TMPDIR to 180 seems proper. [YOCTO #2434] Signed-off-by: Robert Yangliezhi.y...@windriver.com --- meta/classes/sanity.bbclass | 11 +++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 687ddeb..6aaac1e 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -30,6 +30,7 @@ def check_sanity_sstate_dir_change(sstate_dir, data): testmsg = if sstate_dir != : testmsg = check_create_long_filename(sstate_dir, SSTATE_DIR) + Sorry, here has a unexpected blank line, I've removed it and pushed to: git://git.pokylinux.org/poky-contrib robert/tmpdir // Robert return testmsg def check_sanity_tmpdir_change(tmpdir, data): @@ -83,6 +84,12 @@ def check_create_long_filename(filepath, pathname): return Failed to create a file in %s: %s % (pathname, strerror) return +def check_long_path(filepath, pathname): +# The 180 is just an empirical value +if len(filepath) 180: + return The path length of %s is too long, this would cause the \Argument list too long\ error, please use a shorter path.\n % pathname +return + def check_connectivity(d): # URI's to check can be set in the CONNECTIVITY_CHECK_URIS variable # using the same syntax as for SRC_URI. If the variable is not set @@ -353,6 +360,10 @@ def check_sanity(e): tmpdir = data.getVar('TMPDIR', e.data, True) sstate_dir = data.getVar('SSTATE_DIR', e.data, True) +# Check whether the length of TMPDIR is too long to cause the +# argument list too long error +messages = messages + check_long_path(tmpdir, TMPDIR) + # Check saved sanity info last_sanity_version = 0 last_tmpdir = ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gcc-4.6: disable cloog, change syntax to disable ppl
On 05/04/2012 03:17 PM, Andreas Oberritter wrote: * Backported from 523df15bcc21e1749771cca757613f3520243b8e as suggested by Khem. * Original commit message: If build system has those libraries installed gcc configure will pick them up. We want consistent builds so we disable them since we do not (yet) support them Signed-off-by: Andreas Oberrittero...@opendreambox.org --- meta/recipes-devtools/gcc/gcc-4.6.inc |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc b/meta/recipes-devtools/gcc/gcc-4.6.inc index 74843ae..0f56670 100644 --- a/meta/recipes-devtools/gcc/gcc-4.6.inc +++ b/meta/recipes-devtools/gcc/gcc-4.6.inc @@ -1,6 +1,6 @@ require gcc-common.inc -PR = r26 +PR = r27 # Third digit in PV should be incremented after a minor release # happens from this branch on gcc e.g. currently its 4.6.0 @@ -93,7 +93,8 @@ EXTRA_OECONF_BASE = --enable-lto \ --disable-libmudflap \ --with-system-zlib \ --with-linker-hash-style=${LINKER_HASH_STYLE} \ - --without-ppl \ + --with-ppl=no \ + --with-cloog=no \ --enable-cheaders=c_global EXTRA_OECONF_INITIAL = --disable-libmudflap \ 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] [oe-core][PATCH 6/6] libsoup: delete from oe-core
On 05/07/2012 01:06 PM, Martin Jansa wrote: * as suggested here: http://lists.linuxtogo.org/pipermail/openembedded-core/2012-May/022060.html Not so sure about this, there is still at least 1 recipe in meta-oe that uses libsoup, gpe-scap. Sau! Signed-off-by: Martin Jansamartin.ja...@gmail.com --- .../dprintf_conflict_with_eglibc.patch | 1186 .../libsoup/libsoup-2.2.105/fix-for-new-glib.patch | 85 -- meta/recipes-support/libsoup/libsoup_2.2.105.bb| 20 - 3 files changed, 0 insertions(+), 1291 deletions(-) delete mode 100644 meta/recipes-support/libsoup/libsoup-2.2.105/dprintf_conflict_with_eglibc.patch delete mode 100644 meta/recipes-support/libsoup/libsoup-2.2.105/fix-for-new-glib.patch delete mode 100644 meta/recipes-support/libsoup/libsoup_2.2.105.bb diff --git a/meta/recipes-support/libsoup/libsoup-2.2.105/dprintf_conflict_with_eglibc.patch b/meta/recipes-support/libsoup/libsoup-2.2.105/dprintf_conflict_with_eglibc.patch deleted file mode 100644 index 79e2ab8..000 --- a/meta/recipes-support/libsoup/libsoup-2.2.105/dprintf_conflict_with_eglibc.patch +++ /dev/null @@ -1,1186 +0,0 @@ -Upstream-Status: Pending - -diff -rupN libsoup-2.2.105/tests/auth-test.c libsoup-2.2.105.new//tests/auth-test.c libsoup-2.2.105/tests/auth-test.c 2007-12-05 00:13:27.0 +0200 -+++ libsoup-2.2.105.new//tests/auth-test.c 2012-01-16 20:12:09.0 +0200 -@@ -19,7 +19,7 @@ int errors = 0; - gboolean debug = FALSE; - - static void --dprintf (const char *format, ...) -+dprintfsoup (const char *format, ...) - { - va_list args; - -@@ -216,18 +216,18 @@ handler (SoupMessage *msg, gpointer data - - auth = identify_auth (msg); - -- dprintf ( %d %s (using %s)\n, msg-status_code, msg-reason_phrase, -+ dprintfsoup ( %d %s (using %s)\n, msg-status_code, msg-reason_phrase, -auths[auth]); - - if (*expected) { - exp = *expected - '0'; - if (auth != exp) { -- dprintf (expected %s!\n, auths[exp]); -+ dprintfsoup (expected %s!\n, auths[exp]); - errors++; - } - memmove (expected, expected + 1, strlen (expected)); - } else { -- dprintf (expected to be finished\n); -+ dprintfsoup (expected to be finished\n); - errors++; - } - } -@@ -266,10 +266,10 @@ bug271540_sent (SoupMessage *msg, gpoint - int auth = identify_auth (msg); - - if (!*authenticated auth) { -- dprintf (using auth on message %d before authenticating!!??\n, n); -+ dprintfsoup (using auth on message %d before authenticating!!??\n, n); - errors++; - } else if (*authenticated !auth) { -- dprintf (sent unauthenticated message %d after authenticating!\n, n); -+ dprintfsoup (sent unauthenticated message %d after authenticating!\n, n); - errors++; - } - } -@@ -287,12 +287,12 @@ bug271540_authenticate (SoupSession *ses - return; - - if (!*authenticated) { -- dprintf (authenticating message %d\n, n); -+ dprintfsoup (authenticating message %d\n, n); - *username = g_strdup (user1); - *password = g_strdup (realm1); - *authenticated = TRUE; - } else { -- dprintf (asked to authenticate message %d after authenticating!\n, n); -+ dprintfsoup (asked to authenticate message %d after authenticating!\n, n); - errors++; - } - } -@@ -304,7 +304,7 @@ bug271540_finished (SoupMessage *msg, gp - int n = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (msg), #)); - - if (!SOUP_STATUS_IS_SUCCESSFUL (msg-status_code)) { -- dprintf ( got status '%d %s' on message %d!\n, -+ dprintfsoup ( got status '%d %s' on message %d!\n, - msg-status_code, msg-reason_phrase, n); - errors++; - } -@@ -350,10 +350,10 @@ main (int argc, char **argv) - G_CALLBACK (reauthenticate),i); - - for (i = 0; i ntests; i++) { -- dprintf (Test %d: %s\n, i + 1, tests[i].explanation); -+ dprintfsoup (Test %d: %s\n, i + 1, tests[i].explanation); - - uri = g_strconcat (base_uri, tests[i].url, NULL); -- dprintf ( GET %s\n, uri); -+ dprintfsoup ( GET %s\n, uri); - - msg = soup_message_new (SOUP_METHOD_GET, uri); - g_free (uri); -@@ -372,21 +372,21 @@ main (int argc, char **argv) - soup_session_send_message (session, msg); - if (msg-status_code != SOUP_STATUS_UNAUTHORIZED - msg-status_code != SOUP_STATUS_OK) { -- dprintf ( %d %s !\n, msg-status_code, -+
[OE-core] [PATCH 1/1] qt4: move functions from python to shell style
In qt4's do_configure operation, it will refer to some variables that are derived from 'd', however these variable values may be not correct in multilib case since the extraction of these variables happens before the multilib handler. The fix is to move these python style functions back to shell style. This fixes [YOCTO #2355] Signed-off-by: Dongxiao Xu dongxiao...@intel.com --- meta/recipes-qt/qt4/qt4-embedded.inc|2 +- meta/recipes-qt/qt4/qt4-tools-nativesdk.inc |5 ++- meta/recipes-qt/qt4/qt4-x11-free.inc|2 +- meta/recipes-qt/qt4/qt4.inc |5 ++- meta/recipes-qt/qt4/qt4_arch.inc| 36 --- 5 files changed, 24 insertions(+), 26 deletions(-) diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc index 0b304a0..05803d1 100644 --- a/meta/recipes-qt/qt4/qt4-embedded.inc +++ b/meta/recipes-qt/qt4/qt4-embedded.inc @@ -2,7 +2,7 @@ DESCRIPTION = Qt is a versatile cross-platform application framework -- this is SECTION = libs HOMEPAGE = http://qt.nokia.com; DEPENDS += directfb tslib -INC_PR = r45 +INC_PR = r46 QT_BASE_LIB ?= libqt-embedded diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc index efb61bf..a1dd8df 100644 --- a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc +++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc @@ -4,7 +4,7 @@ SECTION = libs HOMEPAGE = http://qt.nokia.com; LICENSE = LGPLv2.1 | GPLv3 -INC_PR = r10 +INC_PR = r11 FILESEXTRAPATHS =. ${FILE_DIRNAME}/qt-${PV}: @@ -40,7 +40,7 @@ EXTRA_OECONF = -prefix ${prefix} \ -verbose -release -fast -static \ -platform ${TARGET_OS}-oe-g++ \ -xplatform ${TARGET_OS}-oe-g++ \ --arch ${@qt_arch(d)} \ +-arch ${QT_ARCH} \ -embedded -no-freetype -no-glib -no-iconv \ -qt3support \ -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include/dbus-1.0 \ @@ -71,6 +71,7 @@ do_configure() { if [ ! -e bin/qmake ]; then ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake fi +set_arch (echo o; echo yes) | CC=${CC} CXX=${CXX} ./configure ${EXTRA_OECONF} || die Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF} } diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc index da98962..29bbfc6 100644 --- a/meta/recipes-qt/qt4/qt4-x11-free.inc +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc @@ -5,7 +5,7 @@ HOMEPAGE = http://qt.nokia.com; SECTION = x11/libs DEPENDS += virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor -INC_PR = r43 +INC_PR = r44 QT_GLFLAGS ?= ${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} QT_GLFLAGS_qemux86 = -opengl diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index 468a46f..4bc6070 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc @@ -4,8 +4,6 @@ DEPENDS += qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gst DEPENDS += ${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} require qt4_arch.inc -QT_ARCH := ${@qt_arch(d)} -QT_ENDIAN = ${@qt_endian(d)} QT_DISTRO_FLAGS ?= -no-accessibility -no-sm QT_DISTRO_FLAGS_linuxstdbase = -sm @@ -200,6 +198,9 @@ do_configure() { unset QMAKESPEC unset QTDIR +set_arch +set_endian + if [ ! -e bin/qmake ]; then ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake fi diff --git a/meta/recipes-qt/qt4/qt4_arch.inc b/meta/recipes-qt/qt4/qt4_arch.inc index bde68dc..c1d35ab 100644 --- a/meta/recipes-qt/qt4/qt4_arch.inc +++ b/meta/recipes-qt/qt4/qt4_arch.inc @@ -2,24 +2,20 @@ inherit siteinfo ARM_INSTRUCTION_SET = arm -def qt_arch(d): -import bb, re -arch = d.getVar('TARGET_ARCH', True) -if re.match(^i.86$, arch): -arch = i386 -elif re.match(^arm.*, arch): -arch = arm -elif arch == x86_64: -arch = x86 -elif arch == mipsel: -arch = mips -return arch +set_arch() { + case ${TARGET_ARCH} in + arm*) QT_ARCH=arm ;; + i*86*)QT_ARCH=i386 ;; + mips*)QT_ARCH=mips ;; + powerpc*) QT_ARCH=powerpc ;; + x86_64*) QT_ARCH=x86_64 ;; + esac +} -def qt_endian(d): -import bb -if d.getVar('SITEINFO_ENDIANNESS', True) == le: -return -little-endian -elif d.getVar('SITEINFO_ENDIANNESS', True) == be: -return -big-endian -else: -assert False +set_endian() { +if [ ${SITEINFO_ENDIANNESS} = le ] ; then +QT_ENDIAN=-little-endian +elif [ ${SITEINFO_ENDIANNESS} = be ] ; then +QT_ENDIAN=-big-endian +fi +} -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org
[OE-core] [PATCH 0/1 v3][PULL] Fix bug 2355
Hi Richard and Saul, This pull request is to fix bug 2355, please help to review and pull. Change from v2: Keep the qt4_arch.inc file and put set_arch() and set_endian() functions there. Thanks, Dongxiao The following changes since commit 2929e7d590862d9649458c90804e79a1dce40423: glib-2.0: Fix issues with libelf dependency creeping in (2012-05-07 10:53:24 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib dxu4/multilib http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/multilib Dongxiao Xu (1): qt4: move functions from python to shell style meta/recipes-qt/qt4/qt4-embedded.inc|2 +- meta/recipes-qt/qt4/qt4-tools-nativesdk.inc |5 ++- meta/recipes-qt/qt4/qt4-x11-free.inc|2 +- meta/recipes-qt/qt4/qt4.inc |5 ++- meta/recipes-qt/qt4/qt4_arch.inc| 36 --- 5 files changed, 24 insertions(+), 26 deletions(-) -- 1.7.4.1 ___ 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] qt4: move functions from python to shell style
-Original Message- From: Paul Eggleton [mailto:paul.eggle...@linux.intel.com] Sent: Tuesday, April 24, 2012 6:51 PM To: Xu, Dongxiao Cc: openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [PATCH 1/1] qt4: move functions from python to shell style Hi Dongxiao, On Monday 23 April 2012 16:53:02 Dongxiao Xu wrote: In qt4's do_configure operation, it will refer to some variables that are derived from 'd', however these variable values may be not correct in multilib case since the extraction of these variables happens before the multilib handler. The fix is to move these python style functions back to shell style. This patch removes qt4_arch.inc without explaining why. Can the fix be made without removing it? Hi Paul, In my new pull request, I keep the qt4_arch.inc file and put common functions there. Thanks for your comments. Thanks, Dongxiao Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core