Re: [OE-core] [PATCH 1/1] libsdl: Add libSDL.so into Sato image
Something like that, yeah. I don't think you want/need to do anything with RDEPENDS since that should all be automatic. Thanks for your suggestion, Phil. I have modified my patches as below. Could you help to review it? If SDL can use GLES as well as GL then it might be worth adding support for both. They should probably be separate DISTRO_FEATUREs (and possibly we should have separate features again for GLES1.1 versus GLES2.0). It seems libsdl 1.2 could not support GLES. Libsdl 1.3 supports GLES but it is still under construction. Patch 1 Libsdl: add target version http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/?h=jxu49/oe-contribid=e141a00db49c6c2aa631b065b4a1391c9abe0277 diff --git a/meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.11.bb similarity index 73% rename from meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb rename to meta/recipes-graphics/libsdl/libsdl_1.2.11.bb index e64a62e..7c1c507 100644 --- a/meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.11.bb @@ -1,17 +1,25 @@ -DESCRIPTION = Simple DirectMedia Layer - native Edition +SUMMARY = Simple DirectMedia Layer +DESCRIPTION = Simple DirectMedia Layer is a cross-platform multimedia \ +library designed to provide low level access to audio, keyboard, mouse, \ +joystick, 3D hardware via OpenGL, and 2D video framebuffer. HOMEPAGE = http://www.libsdl.org; +BUGTRACKER = http://bugzilla.libsdl.org/; + SECTION = libs -LICENSE = LGPLv2.1 -DEPENDS = libx11-nativesdk libxext-nativesdk libxrandr-nativesdk libxrender-nativesdk -RDEPENDS_${PN} = libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk -PR = r5 +LICENSE = LGPLv2.1 LIC_FILES_CHKSUM = file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4 +DEPENDS = virtual/libx11 libxext libxrandr libxrender +DEPENDS_virtclass-nativesdk = libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk + +PR = r6 + SRC_URI = http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://acinclude.m4 \ file://configure_tweak.patch;patch=1 \ file://kernel-asm-page.patch;patch=1 + S = ${WORKDIR}/SDL-${PV} SRC_URI[md5sum] = 418b42956b7cd103bfab1b9077ccc149 @@ -34,3 +42,5 @@ PARALLEL_MAKE = do_configure_prepend() { cp ${WORKDIR}/acinclude.m4 ${S}/acinclude.m4 } + +BBCLASSEXTEND = nativesdk Patch 2 Libsdl: enable opengl for libsdl http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/?h=jxu49/oe-contribid=a6139bd9b26c792ab0c00b57c374e9ac8dade33d diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.11.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.11.bb index 7c1c507..f08077d 100644 --- a/meta/recipes-graphics/libsdl/libsdl_1.2.11.bb +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.11.bb @@ -10,10 +10,10 @@ SECTION = libs LICENSE = LGPLv2.1 LIC_FILES_CHKSUM = file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4 -DEPENDS = virtual/libx11 libxext libxrandr libxrender +DEPENDS = ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} virtual/libx11 libxext libxrandr libxrender DEPENDS_virtclass-nativesdk = libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk -PR = r6 +PR = r7 SRC_URI = http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://acinclude.m4 \ @@ -33,7 +33,8 @@ EXTRA_OECONF = --disable-static --disable-debug --disable-cdrom --enable-thread --disable-mintaudio --disable-nasm --enable-video-x11 --disable-video-dga \ --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs \ --disable-video-xbios --disable-video-gem --disable-video-dummy \ ---disable-video-opengl --enable-input-events --enable-pthreads \ +--enable-input-events --enable-pthreads \ + ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \ --disable-video-svga \ --disable-video-picogui --disable-video-qtopia --enable-dlopen p. Best Regards, Jiajun ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Questions about the layer structure in OpenEmbedded-Core
2011/8/12 George C. Huntington, III george.huntington...@gmail.com: that graphic is nice, could it be included in the wiki? Well I would not mind, but I've noticed the graphic has still flaws: The distros would unlikely impact on the hardware specific code (or would they?), and I don't know if/how they affect the yocto layer. In this case I should investigate further before this image can be used as an overview. Regards Samuel ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Questions about the layer structure in OpenEmbedded-Core
2011/8/12 Koen Kooi k...@dominion.thruhere.net: Op 12 aug. 2011, om 12:47 heeft Paul Eggleton het volgende geschreven: There's also: https://github.com/ebutera/meta-igep http://gitorious.org/schnitzeltony-oe-meta/meta-freescale http://gitorious.org/schnitzeltony-oe-meta/meta-gumstix https://github.com/koenkooi/meta-ettus and likely much more I'd guess there is no list for third party components/repositories, or am I wrong? 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 1/1] libsdl: Add libSDL.so into Sato image
On Mon, 2011-08-15 at 15:09 +0800, Xu, Jiajun wrote: Something like that, yeah. I don't think you want/need to do anything with RDEPENDS since that should all be automatic. Thanks for your suggestion, Phil. I have modified my patches as below. Could you help to review it? Looks good to me. Thanks. p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Questions about the layer structure in OpenEmbedded-Core
On Monday 15 August 2011 10:06:33 Samuel Stirtzel wrote: 2011/8/12 Koen Kooi k...@dominion.thruhere.net: There's also: https://github.com/ebutera/meta-igep http://gitorious.org/schnitzeltony-oe-meta/meta-freescale http://gitorious.org/schnitzeltony-oe-meta/meta-gumstix https://github.com/koenkooi/meta-ettus and likely much more I'd guess there is no list for third party components/repositories, or am I wrong? I had intended the list to cover all available layers. However for layers that refer to other projects/manufacturers/products where the layer is not an official one, I think it's fine to list it there but important to mark it unofficial. BTW I plan to add the above to the list some time today if I get time to do so. 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
[OE-core] [PATCH 2/4] qt4-native: restore build of uic3, qdbuscpp2xml and qdbusxml2cpp
These tools are required to build some external utilities (such as those found in KDE). We avoid building qdbus and qdbusviewer as these are not required. Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com --- meta/recipes-qt/qt4/qt4-native.inc |5 - 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/meta/recipes-qt/qt4/qt4-native.inc b/meta/recipes-qt/qt4/qt4-native.inc index 3baea20..7ed6a63 100644 --- a/meta/recipes-qt/qt4/qt4-native.inc +++ b/meta/recipes-qt/qt4/qt4-native.inc @@ -54,8 +54,11 @@ TOBUILD = \ src/gui \ src/testlib \ src/qt3support \ + src/tools/uic3 \ tools/linguist/lrelease \ tools/linguist/lupdate \ + tools/qdbus/qdbuscpp2xml \ + tools/qdbus/qdbusxml2cpp \ do_compile() { @@ -67,7 +70,7 @@ do_compile() { do_install() { install -d ${D}${bindir}/ install -m 0755 bin/qmake ${D}${bindir}/qmake2 - for i in moc uic rcc lrelease lupdate; do + for i in moc uic uic3 rcc lrelease lupdate qdbuscpp2xml qdbusxml2cpp; do install -m 0755 bin/${i} ${D}${bindir}/${i}4 done -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/4] qt4: replace qt4-tools-native with qt4-native
Installs native versions of the Qt libraries in addition to the tools, allowing compilation of external native tools that require Qt libs. PROVIDES qt4-tools-native so it should be a drop-in replacement. Developed with reference to the corresponding qt4-native changes in OE. Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com --- .../qt4/{qt4-tools-native.inc = qt4-native.inc} | 20 ++-- ...4-tools-native_4.7.3.bb = qt4-native_4.7.3.bb} |2 +- 2 files changed, 15 insertions(+), 7 deletions(-) rename meta/recipes-qt/qt4/{qt4-tools-native.inc = qt4-native.inc} (87%) rename meta/recipes-qt/qt4/{qt4-tools-native_4.7.3.bb = qt4-native_4.7.3.bb} (92%) diff --git a/meta/recipes-qt/qt4/qt4-tools-native.inc b/meta/recipes-qt/qt4/qt4-native.inc similarity index 87% rename from meta/recipes-qt/qt4/qt4-tools-native.inc rename to meta/recipes-qt/qt4/qt4-native.inc index c4a58ed..3baea20 100644 --- a/meta/recipes-qt/qt4/qt4-tools-native.inc +++ b/meta/recipes-qt/qt4/qt4-native.inc @@ -1,7 +1,8 @@ -DESCRIPTION = Native tools for Qt/[X11|Mac|Embedded] version 4.x +DESCRIPTION = Native version of Qt/[X11|Mac|Embedded] DEPENDS = zlib-native dbus-native SECTION = libs HOMEPAGE = http://qt.nokia.com; +PROVIDES = qt4-tools-native LICENSE = LGPLv2.1 | GPLv3 LIC_FILES_CHKSUM = file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \ @@ -25,11 +26,11 @@ EXTRA_OECONF = -prefix ${prefix} \ -no-libjpeg -no-libpng -no-libmng -no-libtiff \ -no-accessibility \ -no-cups \ --no-exceptions \ -no-nas-sound \ -no-nis -no-openssl \ --verbose -release -static \ +-verbose -release \ -embedded -no-freetype -no-glib -no-iconv \ +-exceptions -xmlpatterns \ -qt3support # yank default -e, otherwise we get the following error: @@ -44,12 +45,15 @@ TOBUILD = \ src/tools/moc \ src/corelib \ src/sql \ - src/dbus \ - src/qt3support \ src/xml \ + src/network \ src/tools/uic \ src/tools/rcc \ - src/network \ + src/xmlpatterns \ + src/dbus \ + src/gui \ + src/testlib \ + src/qt3support \ tools/linguist/lrelease \ tools/linguist/lupdate \ @@ -73,4 +77,8 @@ do_install() { cp -f ${WORKDIR}/g++.conf ${WORKDIR}/linux.conf ${D}${datadir}/qt4/mkspecs/common/ install -m 0644 tools/porting/src/q3porting.xml ${D}${datadir}/qt4/ + + for i in ${TOBUILD}; do + cd ${S}/$i oe_runmake install INSTALL_ROOT=${D} + done } diff --git a/meta/recipes-qt/qt4/qt4-tools-native_4.7.3.bb b/meta/recipes-qt/qt4/qt4-native_4.7.3.bb similarity index 92% rename from meta/recipes-qt/qt4/qt4-tools-native_4.7.3.bb rename to meta/recipes-qt/qt4/qt4-native_4.7.3.bb index 8d292af..5c84d4d 100644 --- a/meta/recipes-qt/qt4/qt4-tools-native_4.7.3.bb +++ b/meta/recipes-qt/qt4/qt4-native_4.7.3.bb @@ -1,4 +1,4 @@ -require qt4-tools-native.inc +require qt4-native.inc PR = ${INC_PR}.1 -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/4] qt4-native, Qt QA fixes
Bring over qt4-native from OE and tidy up some QA warnings. The following changes since commit d126e22f6b3f27196144f87e22b36ebccd6dea65: rt-tests: use an explicit commit ID (2011-08-12 17:51:18 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib paule/qt4-fixes4 http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/qt4-fixes4 Paul Eggleton (4): qt4: replace qt4-tools-native with qt4-native qt4-native: restore build of uic3, qdbuscpp2xml and qdbusxml2cpp qt4: package QML plugins and correct their install directory qt4: delete unpackaged uic3 to avoid unpackaged file warning meta/recipes-qt/qt4/qt4-embedded.inc |2 +- .../qt4/{qt4-tools-native.inc = qt4-native.inc} | 25 ++- ...4-tools-native_4.7.3.bb = qt4-native_4.7.3.bb} |2 +- meta/recipes-qt/qt4/qt4-x11-free.inc |2 +- meta/recipes-qt/qt4/qt4.inc| 15 +-- 5 files changed, 33 insertions(+), 13 deletions(-) rename meta/recipes-qt/qt4/{qt4-tools-native.inc = qt4-native.inc} (82%) rename meta/recipes-qt/qt4/{qt4-tools-native_4.7.3.bb = qt4-native_4.7.3.bb} (92%) -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/4] qt4: package QML plugins and correct their install directory
QML components from Qt were installed to ${prefix} before and never got packaged. This is now fixed and QML components are now installed into ${libdir}/${QT_DIR_NAME}/imports and packaged into qt4-*-qml-plugins package. Additionally qmlviewer and the examples/demos are now dependent upon these plugins as needed. Originally based on OE commit 4adf97be8c5b5f71ad92095a19968af534baa9e2 by Simon Busch morp...@gravedo.de Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com --- meta/recipes-qt/qt4/qt4-embedded.inc |2 +- meta/recipes-qt/qt4/qt4-x11-free.inc |2 +- meta/recipes-qt/qt4/qt4.inc | 14 +++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc index 9b7e071..d464a1d 100644 --- a/meta/recipes-qt/qt4/qt4-embedded.inc +++ b/meta/recipes-qt/qt4/qt4-embedded.inc @@ -3,7 +3,7 @@ SECTION = libs LICENSE = LGPLv2.1 | GPLv3 HOMEPAGE = http://qt.nokia.com; DEPENDS += directfb tslib -INC_PR = r28 +INC_PR = r29 QT_BASE_NAME ?= qt4-embedded QT_BASE_LIB ?= libqt-embedded diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc index b8633de..234cb89 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 = r25 +INC_PR = r26 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 881b445..815ebc2 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc @@ -98,7 +98,8 @@ OTHER_PACKAGES = \ ${QT_BASE_NAME}-pixeltool \ ${QT_BASE_NAME}-qmlviewer \ ${QT_BASE_NAME}-xmlpatterns \ - ${QT_BASE_NAME}-qt3to4 + ${QT_BASE_NAME}-qt3to4 \ + ${QT_BASE_NAME}-qml-plugins PACKAGES += ${LIB_PACKAGES} ${DEV_PACKAGES} ${DBG_PACKAGES} ${OTHER_PACKAGES} PACKAGES_DYNAMIC = ${QT_BASE_NAME}-plugin-* ${QT_BASE_NAME}-translation-* ${QT_BASE_NAME}-fonts-* @@ -122,11 +123,15 @@ RRECOMMENDS_${QT_BASE_NAME}-demos += \ ${QT_BASE_NAME}-examples \ ${QT_BASE_NAME}-plugin-sqldriver-sqlite \ ${QT_BASE_NAME}-plugin-imageformat-jpeg \ +${QT_BASE_NAME}-qml-plugins \ ${QT_BASE_NAME}-assistant \ ${PN}-doc RRECOMMENDS_${QT_BASE_NAME}-examples += \ ${QT_BASE_NAME}-plugin-sqldriver-sqlite \ -${QT_BASE_NAME}-plugin-imageformat-jpeg +${QT_BASE_NAME}-plugin-imageformat-jpeg \ +${QT_BASE_NAME}-qml-plugins +RRECOMMENDS_${QT_BASE_NAME}-qmlviewer += \ +${QT_BASE_NAME}-qml-plugins FILES_${QT_BASE_NAME}-tools= ${bindir}/qttracereplay ${bindir}/qdoc* FILES_${QT_BASE_NAME}-tools-dbg= ${bindir}/.debug/qttracereplay ${bindir}/.debug/qdoc* @@ -160,7 +165,8 @@ FILES_${QT_BASE_NAME}-makeqpf-dbg = ${bindir}/.debug/makeqpf FILES_${QT_BASE_NAME}-mkspecs = ${datadir}/${QT_DIR_NAME}/mkspecs/* FILES_${QT_BASE_NAME}-xmlpatterns = ${bindir}/xmlpatterns* FILES_${QT_BASE_NAME}-xmlpatterns-dbg = ${bindir}/.debug/xmlpatterns* - +FILES_${QT_BASE_NAME}-qml-plugins = ${libdir}/${QT_DIR_NAME}/imports/* ${libdir}/${QT_DIR_NAME}/plugins/qmltooling/* +FILES_${QT_BASE_NAME}-qml-plugins-dbg = ${libdir}/${QT_DIR_NAME}/imports/*/*/*/.debug/* ${libdir}/${QT_DIR_NAME}/imports/*/.debug do_configure() { unset QMAKESPEC @@ -183,6 +189,7 @@ do_configure() { echo Libraries=${libdir} $QT_CONF_PATH echo Binaries=${bindir} $QT_CONF_PATH echo Plugins=${libdir}/${QT_DIR_NAME}/plugins $QT_CONF_PATH + echo Imports=${libdir}/${QT_DIR_NAME}/imports $QT_CONF_PATH echo Data=${datadir}/${QT_DIR_NAME} $QT_CONF_PATH echo Translations=${datadir}/${QT_DIR_NAME}/translations $QT_CONF_PATH echo Settings=${sysconfdir}/${QT_DIR_NAME} $QT_CONF_PATH @@ -200,6 +207,7 @@ do_configure() { -docdir ${docdir}/${QT_DIR_NAME} \ -headerdir ${includedir}/${QT_DIR_NAME} \ -plugindir ${libdir}/${QT_DIR_NAME}/plugins \ + -importdir ${libdir}/${QT_DIR_NAME}/imports \ -translationdir ${datadir}/${QT_DIR_NAME}/translations \ -examplesdir ${bindir}/${QT_DIR_NAME}/examples \ -demosdir ${bindir}/${QT_DIR_NAME}/demos \ -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/4] qt4: delete unpackaged uic3 to avoid unpackaged file warning
All the other utilities get deleted as they should not be packaged, delete this one as well. Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com --- meta/recipes-qt/qt4/qt4.inc |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index 815ebc2..ba6fad5 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc @@ -279,6 +279,7 @@ do_install() { # These are host binaries, we should only use them in staging rm ${D}/${bindir}/qmake rm ${D}/${bindir}/uic + rm ${D}/${bindir}/uic3 rm ${D}/${bindir}/moc rm ${D}/${bindir}/rcc rm ${D}/${bindir}/lrelease -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] The Skeleton initscript doesn't work on minimal image
Testing: 1) Edit meta/recipes-core/images/core-image-minimal.bb, add service to the IMAGE_INSTALL 2) Edit build/conf/local.conf, add /path/to/poky/meta-skeleton to the BBLAYERS. 3) $ bitbake core-image-minimal(or sato) 3) start qemu, and run /etc/init.d/skeleton start(or status stop ..), it works well // Robert The following changes since commit 30381645eefe4e3222fd3ce45823f143ce2fa82c: rt-tests: use an explicit commit ID (2011-08-12 21:07:02 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib robert/initscripts http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/initscripts Robert Yang (1): The Skeleton initscript doesn't work on minimal image .../initscripts/initscripts-1.0/functions |5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/4] qt4-native, Qt QA fixes
Op 15 aug. 2011, om 12:12 heeft Paul Eggleton het volgende geschreven: Bring over qt4-native from OE and tidy up some QA warnings. The following changes since commit d126e22f6b3f27196144f87e22b36ebccd6dea65: rt-tests: use an explicit commit ID (2011-08-12 17:51:18 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib paule/qt4-fixes4 http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/qt4-fixes4 Paul Eggleton (4): qt4: replace qt4-tools-native with qt4-native qt4-native: restore build of uic3, qdbuscpp2xml and qdbusxml2cpp qt4: package QML plugins and correct their install directory qt4: delete unpackaged uic3 to avoid unpackaged file warning From a quick look these look good to, I hope to be able to do an actual test later this week ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [OC-core][PATCH 0/1] libx11-diet: Fix bug 1050
From: Xiaofeng Yan xiaofeng@windriver.com Hi Richard, I just disable dolt according to your suggestion. Pull URL: git://git.pokylinux.org/poky-contrib.git Branch: xiaofeng/libx11-diet Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/libx11-diet Thanks, Xiaofeng Yan xiaofeng@windriver.com --- Xiaofeng Yan (1): libx11-diet: Fix bug 1050 meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb |5 +++-- 1 files changed, 3 insertions(+), 2 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] libx11-diet: Fix bug 1050
From: Xiaofeng Yan xiaofeng@windriver.com [YOCTO #1050] I got do_compile failure during building qemux86 image | ../../../doltlibtool: line 17: /distro/dcui/0704/pc1/build/tmp/work/i586-poky-linux/libx11-diet-1.3-r2/libX11-1.3/modules/im/ximcp/../../../libtool: No such file or directory This is due to not found libtool, but i586-poky-linux-libtool in libX11-1.3 So I disable dolt for solving this problem. Signed-off-by: Xiaofeng Yan xiaofeng@windriver.com --- meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb |5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb index a4929d2..487e796 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb +++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb @@ -5,13 +5,14 @@ this version. LIC_FILES_CHKSUM = file://COPYING;md5=597df7e9217e89ccaeb749f48ce2aeb0 -PR = r2 +PR = r3 SRC_URI += file://x11_disable_makekeys.patch \ file://include_fix.patch \ file://X18NCMSstubs.diff \ file://fix-disable-xlocale.diff \ -file://fix-utf8-wrong-define.patch +file://fix-utf8-wrong-define.patch \ +file://nodolt.patch DEPENDS += bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ libxdmcp xf86bigfontproto kbproto inputproto xproto-native -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] TypeError: 'bool' object is unsubscriptable ?
Since this morning I'm getting errors like this: NOTE: Resolving any missing task queue dependencies NOTE: preferred version 1.0.0d of openssl-native not available (for item openssl-native) NOTE: versions of openssl-native available: 0.9.8m 0.9.8r 1.0.0c NOTE: Preparing runqueue NOTE: Executing SetScene Tasks NOTE: Executing RunQueue Tasks NOTE: Running task 4 of 133 (ID: 19, /OE/tentacle/sources/openembedded-core/meta/recipes-devtools/quilt/quilt-native_0.48.bb, do_configure) NOTE: Running task 16 of 133 (ID: 49, /OE/tentacle/sources/openembedded-core/meta/recipes-devtools/libtool/libtool-native_2.4.bb, do_unpack) NOTE: Running task 18 of 133 (ID: 77, virtual:native:/OE/tentacle/sources/openembedded-core/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb, do_unpack) NOTE: Running task 20 of 133 (ID: 21, virtual:native:/OE/tentacle/sources/openembedded-core/meta/recipes-support/sqlite/sqlite3_3.7.7.1.bb, do_unpack) NOTE: package quilt-native-0.48-r0: task do_configure: Started ERROR: Build of do_configure failed ERROR: Traceback (most recent call last): File /OE/tentacle/sources/bitbake/lib/bb/build.py, line 366, in exec_task return _exec_task(fn, task, d, quieterr) File /OE/tentacle/sources/bitbake/lib/bb/build.py, line 323, in _exec_task exec_func(task, localdata) File /OE/tentacle/sources/bitbake/lib/bb/build.py, line 171, in exec_func exec_func_shell(func, d, runfile, cwd=adir) File /usr/lib/python2.6/contextlib.py, line 34, in __exit__ self.gen.throw(type, value, traceback) File /OE/tentacle/sources/bitbake/lib/bb/utils.py, line 400, in fileslocked yield File /OE/tentacle/sources/bitbake/lib/bb/build.py, line 171, in exec_func exec_func_shell(func, d, runfile, cwd=adir) File /OE/tentacle/sources/bitbake/lib/bb/build.py, line 239, in exec_func_shell if bb.msg.loggerVerbose[1]: TypeError: 'bool' object is unsubscriptable This is with a clean build from scratch in the portion that builds pseudo-native. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] TypeError: 'bool' object is unsubscriptable ?
On Mon, 2011-08-15 at 12:48 +0200, Koen Kooi wrote: Since this morning I'm getting errors like this: NOTE: Resolving any missing task queue dependencies NOTE: preferred version 1.0.0d of openssl-native not available (for item openssl-native) NOTE: versions of openssl-native available: 0.9.8m 0.9.8r 1.0.0c NOTE: Preparing runqueue NOTE: Executing SetScene Tasks NOTE: Executing RunQueue Tasks NOTE: Running task 4 of 133 (ID: 19, /OE/tentacle/sources/openembedded-core/meta/recipes-devtools/quilt/quilt-native_0.48.bb, do_configure) NOTE: Running task 16 of 133 (ID: 49, /OE/tentacle/sources/openembedded-core/meta/recipes-devtools/libtool/libtool-native_2.4.bb, do_unpack) NOTE: Running task 18 of 133 (ID: 77, virtual:native:/OE/tentacle/sources/openembedded-core/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb, do_unpack) NOTE: Running task 20 of 133 (ID: 21, virtual:native:/OE/tentacle/sources/openembedded-core/meta/recipes-support/sqlite/sqlite3_3.7.7.1.bb, do_unpack) NOTE: package quilt-native-0.48-r0: task do_configure: Started ERROR: Build of do_configure failed ERROR: Traceback (most recent call last): File /OE/tentacle/sources/bitbake/lib/bb/build.py, line 366, in exec_task return _exec_task(fn, task, d, quieterr) File /OE/tentacle/sources/bitbake/lib/bb/build.py, line 323, in _exec_task exec_func(task, localdata) File /OE/tentacle/sources/bitbake/lib/bb/build.py, line 171, in exec_func exec_func_shell(func, d, runfile, cwd=adir) File /usr/lib/python2.6/contextlib.py, line 34, in __exit__ self.gen.throw(type, value, traceback) File /OE/tentacle/sources/bitbake/lib/bb/utils.py, line 400, in fileslocked yield File /OE/tentacle/sources/bitbake/lib/bb/build.py, line 171, in exec_func exec_func_shell(func, d, runfile, cwd=adir) File /OE/tentacle/sources/bitbake/lib/bb/build.py, line 239, in exec_func_shell if bb.msg.loggerVerbose[1]: TypeError: 'bool' object is unsubscriptable This is with a clean build from scratch in the portion that builds pseudo-native. Should be fixed now, sorry. Picked the wrong version of patch :/. Cheers, Richard ___ 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/12] Various Fixes
On Sun, 2011-08-14 at 16:30 -0700, Saul Wold wrote: Richard, Please review Lianhao's patch to LDD Scripts, the rest of these patches seem correct to me. Sau! The following changes since commit d126e22f6b3f27196144f87e22b36ebccd6dea65: rt-tests: use an explicit commit ID (2011-08-12 17:51:18 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib sgw/stage http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage Khem Raj (1): intltool: Use nativeperl binary for PERL instead of 'perl' Lianhao Lu (4): utils.bbclass/multilib.class: Added misc supporting functions. eglibc: Modify ldd script according to multilib config. Lin Tong (1): valgrind: supporting on Linux kernel 3.x Noor Ahsan (1): bluez4: Added new recipe 4.96 and removed 4.82 version Phil Blundell (5): pixman: remove spurious dependency on libx11 libx11: skip self if x11 not in DISTRO_FEATURES cairo: only use x11 if selected in DISTRO_FEATURES dbus: only use x11 if DISTRO_FEATURES has selected it default-distrovars: add x11 to default DISTRO_FEATURES I merged these apart from: image: populate site config files into roootfs. meta-toolchain/environment: Use site config in rootfs. which are going to need rethinking. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 03/12] utils.bbclass/multilib.class: Added misc supporting functions.
On Sun, 2011-08-14 at 16:30 -0700, Saul Wold wrote: From: Lianhao Lu lianhao...@intel.com 1. Added variable MULTILIB_VARIANTS to store all the instance variants for multilib extend. 2. Added function all_multilib_tune_values to collect the variable values for all multilib instance. 3. multilib bbclass handler will save the orignal value of all variables defined in MULTILIB_SAVE_VARNAME. Signed-off-by: Lianhao Lu lianhao...@intel.com --- meta/classes/multilib.bbclass |7 ++- meta/classes/utils.bbclass| 29 + meta/conf/bitbake.conf|1 + meta/conf/multilib.conf |3 +++ 4 files changed, 39 insertions(+), 1 deletions(-) I've taken this however we have a lot of different lists of the mulitlib pieces floating around in different variables now and I'm hoping we can consolidate these a bit... 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 0/2] Populate site config files content to rootfs
On Thu, 2011-08-11 at 22:31 +0800, Lianhao Lu wrote: This series of patches fixed the bug #892. Currently, the site config files used in the cross compiling environment generated by meta-toolchain partly come from SITECONFIG_SYSROOT_CACHE, where each package will put their own site config cache file during their populate-sysroot task. However, there is no way to guarantee the meta-toolchain to collect these site config cache files after all other packages have finished their populate-sysroot tasks. Since we now encourage users to use the same rootfs for both running and cross-compiling, by populating the site config files' content into rootfs and having the CONFIG_SITE pointing to the rootfs, we can gurantee the cross compiling environment not missing any site config cache files' content. I'm afraid I'm not very keen on this patch since it complicates the situation and I'm not sure its an improvement. We strive very hard never to add files to a rootfs which aren't packaged and this approach breaks that (and always adds them to certain image types which again, I worry about). Can't we use the no_cache option to siteinfo_get_files() to address this bug, yet leave the cache files where they are currently located as part of the toolchain? Ultimately we could specific extra cache files to add (such as eglibc) and ensure we have the correct dependencies to ensure the caches are generated. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] TypeError: 'bool' object is unsubscriptable ?
Op 15 aug. 2011, om 13:46 heeft Richard Purdie het volgende geschreven: On Mon, 2011-08-15 at 12:48 +0200, Koen Kooi wrote: Since this morning I'm getting errors like this: NOTE: Resolving any missing task queue dependencies NOTE: preferred version 1.0.0d of openssl-native not available (for item openssl-native) NOTE: versions of openssl-native available: 0.9.8m 0.9.8r 1.0.0c NOTE: Preparing runqueue NOTE: Executing SetScene Tasks NOTE: Executing RunQueue Tasks NOTE: Running task 4 of 133 (ID: 19, /OE/tentacle/sources/openembedded-core/meta/recipes-devtools/quilt/quilt-native_0.48.bb, do_configure) NOTE: Running task 16 of 133 (ID: 49, /OE/tentacle/sources/openembedded-core/meta/recipes-devtools/libtool/libtool-native_2.4.bb, do_unpack) NOTE: Running task 18 of 133 (ID: 77, virtual:native:/OE/tentacle/sources/openembedded-core/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb, do_unpack) NOTE: Running task 20 of 133 (ID: 21, virtual:native:/OE/tentacle/sources/openembedded-core/meta/recipes-support/sqlite/sqlite3_3.7.7.1.bb, do_unpack) NOTE: package quilt-native-0.48-r0: task do_configure: Started ERROR: Build of do_configure failed ERROR: Traceback (most recent call last): File /OE/tentacle/sources/bitbake/lib/bb/build.py, line 366, in exec_task return _exec_task(fn, task, d, quieterr) File /OE/tentacle/sources/bitbake/lib/bb/build.py, line 323, in _exec_task exec_func(task, localdata) File /OE/tentacle/sources/bitbake/lib/bb/build.py, line 171, in exec_func exec_func_shell(func, d, runfile, cwd=adir) File /usr/lib/python2.6/contextlib.py, line 34, in __exit__ self.gen.throw(type, value, traceback) File /OE/tentacle/sources/bitbake/lib/bb/utils.py, line 400, in fileslocked yield File /OE/tentacle/sources/bitbake/lib/bb/build.py, line 171, in exec_func exec_func_shell(func, d, runfile, cwd=adir) File /OE/tentacle/sources/bitbake/lib/bb/build.py, line 239, in exec_func_shell if bb.msg.loggerVerbose[1]: TypeError: 'bool' object is unsubscriptable This is with a clean build from scratch in the portion that builds pseudo-native. Should be fixed now, sorry. Picked the wrong version of patch :/. Thanks! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] libx11: skip self if x11 not in DISTRO_FEATURES
Although, it is already mergerd by Richard, I really like this patch series (after testing it). * Phil Blundell ph...@gnu.org [110812 17:57]: This stops (most) x11 packages leaking into a non-x11 distro by mistake. Will you submit this to meta-oe also? This question might apply to a few of the other patches also. Cheers, Anders Signed-off-by: Phil Blundell ph...@gnu.org --- meta/recipes-graphics/xorg-lib/libx11.inc |5 + 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc index c156ce6..455753f 100644 --- a/meta/recipes-graphics/xorg-lib/libx11.inc +++ b/meta/recipes-graphics/xorg-lib/libx11.inc @@ -42,3 +42,8 @@ do_compile() { # Multiple libx11 derivatives from from this file and are selected by virtual/libx11 # A world build should only build the correct version, not all of them. EXCLUDE_FROM_WORLD = 1 + +python () { + if not oe.utils.contains ('DISTRO_FEATURES', 'x11', True, False, d): + raise bb.parse.SkipPackage(X11 not enabled for this DISTRO) +} -- Anders Darander ChargeStorm AB Tel: +46 702 44 84 36 Laxholmstorget 3Email: and...@chargestorm.se 602 21 Norrköping Web: www.chargestorm.se ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] qt4.inc: revise RRECOMMENDS
using ${QT_BASE_NAME}-dbg as RRECOMMENDS is not correct in qt4-x11-free case, because ${QT_BASE_NAME}-dbg i.e. qt4-dbg does not exist this patch fix it by using ${PN} Signed-off-by: Yu Ke ke...@intel.com --- meta/recipes-qt/qt4/qt4.inc |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index 881b445..4d26c64 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc @@ -51,7 +51,7 @@ python __anonymous () { ${includedir}/${QT_DIR_NAME}/%(incname)s ${libdir}/pkgconfig/%(name)s${QT_LIBINFIX}.pc % locals(), d) bb.data.setVar(FILES_%s-dbg % pkg, ${libdir}/.debug/lib%(name)s${QT_LIBINFIX}.so.* % locals(), d) -bb.data.setVar(RRECOMMENDS_%s-dbg % pkg, ${QT_BASE_NAME}-dbg, d) +bb.data.setVar(RRECOMMENDS_%s-dbg % pkg, ${PN}-dbg, d) lib_packages.append(pkg) dev_packages.append(%s-dev % pkg) dbg_packages.append(%s-dbg % pkg) @@ -68,7 +68,7 @@ python __anonymous () { ${includedir}/${QT_DIR_NAME}/%(incname)s ${libdir}/pkgconfig/%(name)s.pc % locals(), d) bb.data.setVar(FILES_%s-dbg % pkg, ${libdir}/.debug/lib%(name)s.so.* % locals(), d) -bb.data.setVar(RRECOMMENDS_%s-dbg % pkg, ${QT_BASE_NAME}-dbg, d) +bb.data.setVar(RRECOMMENDS_%s-dbg % pkg, ${PN}-dbg, d) lib_packages.append(pkg) dev_packages.append(%s-dev % pkg) dbg_packages.append(%s-dbg % pkg) -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] qt4.inc: expand the package name for multilib case, fix bug 1344
in the qt4.inc python annomyous code, there is case where package name is set to ${QT_BASE_LIB}-tool, and FILE_${QT_BASE_LIB}-tool is set to xxx. here QT_BASE_NAME=qt4. multilib.bbclass will try to rename the FILE_qt4_tool to FILE_lib64_qt4_tool. unfortunately, there is only FILE_${QT_BASE}-tool, no FILE_qt4-tool, so FILE_lib64_qt4_tool will not be defined. to fix this issue, this patch expand the QT_BASE_LIB when assigning the package name. FIX [YOCTO #1344] Signed-off-by: Yu Ke ke...@intel.com --- meta/recipes-qt/qt4/qt4.inc |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index 4d26c64..1f4e012 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc @@ -40,7 +40,7 @@ python __anonymous () { dev_packages = [] dbg_packages = [] for name in bb.data.getVar(QT_LIB_NAMES, d, 1).split(): -pkg = ${QT_BASE_LIB} + name.lower().replace(qt, ).replace(_, -) + 4 +pkg = bb.data.getVar(QT_BASE_LIB,d, True) + name.lower().replace(qt, ).replace(_, -) + 4 # NOTE: the headers for QtAssistantClient are different incname = name.replace(QtAssistantClient, QtAssistant) bb.data.setVar(FILES_%s % pkg, ${libdir}/lib%(name)s${QT_LIBINFIX}.so.* % locals(), d) @@ -59,7 +59,7 @@ python __anonymous () { dbg_packages.append(%s-dbg % name) for name in bb.data.getVar(QT_EXTRA_LIBS, d, 1).split(): -pkg = ${QT_BASE_LIB} + name.lower().replace(qt, ).replace(_, -) + 4 +pkg = bb.data.getVar(QT_BASE_LIB,d, True) + name.lower().replace(qt, ).replace(_, -) + 4 bb.data.setVar(FILES_%s % pkg, ${libdir}/lib%(name)s.so.* % locals(), d) bb.data.setVar(FILES_%s-dev % pkg, ${libdir}/lib%(name)s.prl ${libdir}/lib%(name)s.a -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] two qt fix
The following changes since commit d126e22f6b3f27196144f87e22b36ebccd6dea65: Darren Hart (1): rt-tests: use an explicit commit ID are available in the git repository at: git://git.pokylinux.org/poky-contrib kyu3/bug-1344 http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kyu3/bug-1344 Yu Ke (2): qt4.inc: revise RRECOMMENDS qt4.inc: expand the package name for multilib case meta/recipes-qt/qt4/qt4.inc |8 1 files changed, 4 insertions(+), 4 deletions(-) ___ 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] gcc-cross-intermediate: revise the 64bithack.patch for multilib case
On 2011/8/14 23:18, Khem Raj wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 08/14/2011 06:32 AM, Yu Ke wrote: current gcc-cross-intermediate has build failure in qemux86-64 lib64 multilib case. the reason is that it still use lib instead of lib64 while do_install use the libdir i.e. lib64 so this patch fix this issue by making gcc honour the libdir. I think similar patch should be done to ppc and mips as well. According to Kumar, current ppc works just fine in multilib 64bit case. so ppc may not need this kind of patch. I am not sure how is mips. Since i am not familar with mips, i'd like to leave it to other mips expert. Regards Ke ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] qemu: Make qemu buildable inside qemux86/qemuppc target
From: Zhai Edwin edwin.z...@intel.com It requires libx11 and libGL(if enabled GL) for building, which introduce extra dependence in qemuppc target. Futhermore, qemu's GL code is x86-oriented, thus some hacks needed for building in qemupcc. For simplicity, just make qemu GL's code for native only, so that qemu building is okay in world build. [YOCTO #1011] got fixed. Signed-off-by: Zhai Edwin edwin.z...@intel.com --- meta/recipes-devtools/qemu/qemu.inc |5 ++--- meta/recipes-devtools/qemu/qemu_0.14.0.bb | 27 ++- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 85476d6..e5414ff 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -1,7 +1,7 @@ DESCRIPTION = open source processor emulator HOMEPAGE = http://qemu.org; LICENSE = GPLv2 LGPLv2.1 -DEPENDS = zlib alsa-lib qemugl +DEPENDS = zlib alsa-lib virtual/libx11 # QEMU_TARGETS is overridable variable QEMU_TARGETS ?= arm i386 mips mipsel mips64 mips64el ppc sh4 x86_64 @@ -40,7 +40,7 @@ do_configure_prepend_virtclass-native() { do_configure() { ${S}/configure --prefix=${prefix} --sysconfdir=${sysconfdir} --disable-strip ${EXTRA_OECONF} -chmod a+x ${S}/target-i386/beginend_funcs.sh +test ! -e ${S}/target-i386/beginend_funcs.sh || chmod a+x ${S}/target-i386/beginend_funcs.sh } do_install () { @@ -50,7 +50,6 @@ do_install () { install -m 0755 ${WORKDIR}/powerpc_rom.bin ${D}${datadir}/qemu } -SRC_URI_append_virtclass-nativesdk = file://glflags.patch DEPENDS_virtclass-native = zlib-native alsa-lib-native DEPENDS_virtclass-nativesdk = zlib-nativesdk libsdl-nativesdk qemugl-nativesdk RDEPENDS_virtclass-nativesdk = libsdl-nativesdk diff --git a/meta/recipes-devtools/qemu/qemu_0.14.0.bb b/meta/recipes-devtools/qemu/qemu_0.14.0.bb index de12f62..dc9b695 100644 --- a/meta/recipes-devtools/qemu/qemu_0.14.0.bb +++ b/meta/recipes-devtools/qemu/qemu_0.14.0.bb @@ -11,22 +11,39 @@ FILESDIR = ${WORKDIR} SRC_URI = \ http://download.savannah.gnu.org/releases/qemu/qemu-${PV}.tar.gz \ file://powerpc_rom.bin \ -file://qemu-git-qemugl-host.patch \ file://no-strip.patch \ -file://fix-nogl.patch \ -file://qemugl-allow-glxcontext-release.patch \ file://linker-flags.patch \ -file://init-info.patch \ file://qemu-vmware-vga-depth.patch \ -file://enable-i386-linux-user.patch \ file://fix-configure-checks.patch \ file://fallback-to-safe-mmap_min_addr.patch \ file://spice-qxl-locking-fix-for-qemu-kvm.patch \ file://Detect-and-use-GCC-atomic-builtins-for-locking.patch \ file://larger_default_ram_size.patch \ + + +SRC_URI_append_virtclass-native = \ +file://qemu-git-qemugl-host.patch \ +file://fix-nogl.patch \ +file://qemugl-allow-glxcontext-release.patch \ +file://init-info.patch \ +file://enable-i386-linux-user.patch \ file://qemugl-fix.patch \ file://opengl-sdl-fix.patch \ + +SRC_URI_append_virtclass-nativesdk = \ +file://qemu-git-qemugl-host.patch \ +file://fix-nogl.patch \ +file://qemugl-allow-glxcontext-release.patch \ +file://init-info.patch \ +file://enable-i386-linux-user.patch \ +file://qemugl-fix.patch \ +file://opengl-sdl-fix.patch \ +file://glflags.patch \ + + +#SRC_URI_append_virtclass-nativesdk = file://glflags.patch + SRC_URI[md5sum] = f9d145d5c09de9f0984ffe9bd1229970 SRC_URI[sha256sum] = ba21e84d7853217830e167daecdbff481189c6a0bb600ac7fb7201453108 -- 1.7.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] distro-tracking: Update info for gpgme, libassuan, apr... after last upgrade.
From: Zhai Edwin edwin.z...@intel.com Signed-off-by: Zhai Edwin edwin.z...@intel.com --- .../conf/distro/include/distro_tracking_fields.inc | 48 ++- 1 files changed, 25 insertions(+), 23 deletions(-) diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc index 3a3991d..c7e5db5 100644 --- a/meta/conf/distro/include/distro_tracking_fields.inc +++ b/meta/conf/distro/include/distro_tracking_fields.inc @@ -199,18 +199,19 @@ RECIPE_INTEL_SECTION_pn-libgpg-error = base libs RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libgpg-error = 2 months RECIPE_LATEST_RELEASE_DATE_pn-libgpg-error = 07/2010 RECIPE_COMMENTS_pn-libgpg-error = +RECIPE_MANUAL_CHECK_DATE_pn-libgpg-error = July 28, 2011 RECIPE_LAST_UPDATE_pn-libgpg-error = Nov 18, 2010 RECIPE_MAINTAINER_pn-libgpg-error = Zhai Edwin edwin.z...@intel.com RECIPE_STATUS_pn-gpgme = green RECIPE_DEPENDENCY_CHECK_pn-gpgme = not done -RECIPE_LATEST_VERSION_pn-gpgme = 1.3.0 +RECIPE_LATEST_VERSION_pn-gpgme = 1.3.1 RECIPE_INTEL_SECTION_pn-gpgme = base libs -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-gpgme = 6 months -RECIPE_LATEST_RELEASE_DATE_pn-gpgme = 01/2010 +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-gpgme = 5 months +RECIPE_LATEST_RELEASE_DATE_pn-gpgme = 06/2011 RECIPE_COMMENTS_pn-gpgme = -RECIPE_MANUAL_CHECK_DATE_pn-gpgme = Jun 28, 2011 -RECIPE_LAST_UPDATE_pn-gpgme = Jul 21, 2010 +RECIPE_MANUAL_CHECK_DATE_pn-gpgme = Jul 28, 2011 +RECIPE_LAST_UPDATE_pn-gpgme = Jul 28, 2011 RECIPE_MAINTAINER_pn-gpgme = Zhai Edwin edwin.z...@intel.com RECIPE_STATUS_pn-expat = green @@ -299,13 +300,13 @@ RECIPE_MAINTAINER_pn-liboil = Zhai Edwin edwin.z...@intel.com RECIPE_STATUS_pn-libassuan = green RECIPE_DEPENDENCY_CHECK_pn-libassuan = not done -RECIPE_LATEST_VERSION_pn-libassuan = 2.0.1 +RECIPE_LATEST_VERSION_pn-libassuan = 2.0.2 RECIPE_NO_OF_PATCHES_pn-libassuan = 0 RECIPE_INTEL_SECTION_pn-libassuan = base libs -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libassuan = 7 months -RECIPE_LATEST_RELEASE_DATE_pn-libassuan = 08/2010 +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libassuan = 10 months +RECIPE_LATEST_RELEASE_DATE_pn-libassuan = 06/2011 RECIPE_COMMENTS_pn-libassuan = -RECIPE_LAST_UPDATE_pn-libassuan = Nov 19, 2010 +RECIPE_LAST_UPDATE_pn-libassuan = Jul 28, 2011 RECIPE_MAINTAINER_pn-libassuan = Zhai Edwin edwin.z...@intel.com RECIPE_STATUS_pn-db = green @@ -1151,13 +1152,13 @@ RECIPE_LAST_UPDATE_pn-libgdbus = Jan 4, 2011 RECIPE_MAINTAINER_pn-libgdbus = Scott Garman scott.a.gar...@intel.com RECIPE_STATUS_pn-apr = green -RECIPE_LATEST_VERSION_pn-apr = 1.4.2 -RECIPE_LAST_UPDATE_pn-apr = Dec 17, 2010 +RECIPE_LATEST_VERSION_pn-apr = 1.4.5 +RECIPE_LAST_UPDATE_pn-apr = Jul 28, 2011 RECIPE_MAINTAINER_pn-apr = Zhai Edwin edwin.z...@intel.com RECIPE_STATUS_pn-apr-util = green -RECIPE_LATEST_VERSION_pn-apr-util = 1.3.10 -RECIPE_LAST_UPDATE_pn-apr-util = Dec 29, 2010 +RECIPE_LATEST_VERSION_pn-apr-util = 1.3.12 +RECIPE_LAST_UPDATE_pn-apr-util = Jul 28, 2011 RECIPE_MAINTAINER_pn-apr-util = Zhai Edwin edwin.z...@intel.com RECIPE_STATUS_pn-apt = red @@ -1839,6 +1840,7 @@ RECIPE_LATEST_VERSION_pn-sed = 4.2.1 RECIPE_INTEL_SECTION_pn-sed = base utils RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-sed = 2 months RECIPE_LATEST_RELEASE_DATE_pn-sed = 06/2009 +RECIPE_MANUAL_CHECK_DATE_pn-sed = Jul 28, 2011 RECIPE_COMMENTS_pn-sed = Qing maintains GPLv2 sed, while Dongxiao maintains GPLv3 sed RECIPE_STATUS_pn-aspell = red @@ -1847,8 +1849,8 @@ RECIPE_LAST_UPDATE_pn-aspell = Aug 16, 2010 RECIPE_MAINTAINER_pn-aspell = Mei Lei lei@intel.com RECIPE_STATUS_pn-parted = green -RECIPE_LATEST_VERSION_pn-parted = 2.3 -RECIPE_LAST_UPDATE_pn-parted = Dec 30, 2010 +RECIPE_LATEST_VERSION_pn-parted = 3.0 +RECIPE_LAST_UPDATE_pn-parted = Jul 28, 2011 RECIPE_MAINTAINER_pn-parted = Zhai Edwin edwin.z...@intel.com RECIPE_STATUS_pn-resolvconf = green @@ -5157,13 +5159,13 @@ RECIPE_MAINTAINER_pn-libglade = Zhai Edwin edwin.z...@intel.com RECIPE_STATUS_pn-libsoup-2.4 = green DISTRO_PN_ALIAS_pn-libsoup-2.4 = Meego=libsoup Fedora=libsoup OpenSuSE=libsoup Ubuntu=libsoup2.4 Mandriva=libsoup Debian=libsoup2.4 RECIPE_DEPENDENCY_CHECK_pn-libsoup-2.4 = not done -RECIPE_LATEST_VERSION_pn-libsoup-2.4 = 2.32.1 +RECIPE_LATEST_VERSION_pn-libsoup-2.4 = 2.34.2 RECIPE_NO_OF_PATCHES_pn-libsoup-2.4 = 0 RECIPE_INTEL_SECTION_pn-libsoup-2.4 = graphic UX -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libsoup-2.4 = 2 month -RECIPE_LATEST_RELEASE_DATE_pn-libsoup-2.4 = 11/2010 +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libsoup-2.4 = 1 month +RECIPE_LATEST_RELEASE_DATE_pn-libsoup-2.4 = 08/2011 RECIPE_COMMENTS_pn-libsoup-2.4 = -RECIPE_LAST_UPDATE_pn-libsoup-2.4 = Nov 19, 2010 +RECIPE_LAST_UPDATE_pn-libsoup-2.4 = Jul 28, 2011 RECIPE_MAINTAINER_pn-libsoup-2.4 = Zhai Edwin edwin.z...@intel.com RECIPE_STATUS_pn-libxslt = green @@ -5564,14 +5566,14 @@ RECIPE_NO_UPDATE_REASON_pn-groff = 1.18.1.4 is latest GPLv2 Version no 1.21
[OE-core] [PATCH 0/2] building qemu inside qemuppc/x86, Edwin, Aug 15, 2011
From: Zhai Edwin edwin.z...@intel.com This patch makes qemu can be built inside qemuppc/x86, so that world build is happy. Also add some distro-trackings update. Pls. help to review and pull. Thanks, Edwin The following changes since commit d31d5e5b34c889809af408aed7d4f353d0133750: gnome-doc-utils: respect python-dir setting EXTRA_OECONF (2011-08-11 21:23:58 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib gzhai/master2 http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=gzhai/master2 Zhai Edwin (2): distro-tracking: Update info for gpgme, libassuan, apr... after last upgrade. qemu: Make qemu buildable inside qemux86/qemuppc target .../conf/distro/include/distro_tracking_fields.inc | 48 ++- meta/recipes-devtools/qemu/qemu.inc|5 +- meta/recipes-devtools/qemu/qemu_0.14.0.bb | 27 +-- 3 files changed, 49 insertions(+), 31 deletions(-) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] Extend target version for libsdl and enable openGL for it
Some targets need to run 3D games, which requires libsdl. Enable libsdl for target and add a flag to check in build time if openGL needed to be built. The following changes since commit d126e22f6b3f27196144f87e22b36ebccd6dea65: rt-tests: use an explicit commit ID (2011-08-12 17:51:18 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib jxu49/oe-contrib http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jxu49/oe-contrib Jiajun Xu (2): libsdl: add target version libsdl: enable opengl for libsdl ...libsdl-nativesdk_1.2.11.bb = libsdl_1.2.11.bb} | 23 ++- 1 files changed, 17 insertions(+), 6 deletions(-) rename meta/recipes-graphics/libsdl/{libsdl-nativesdk_1.2.11.bb = libsdl_1.2.11.bb} (64%) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] libsdl: enable opengl for libsdl
To enable opengl for libsdl, we need DEPENDS on virtual/libgl. Add a check for opengl in DISTRO_FEATURES and when it's set, --enable-video-opengl and virtual/libgl will be added into EXTRA_CONF and DEPENDS. Signed-off-by: Jiajun Xu jiajun...@intel.com Acked-by: Phil Blundell ph...@gnu.org --- meta/recipes-graphics/libsdl/libsdl_1.2.11.bb |7 --- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.11.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.11.bb index 7c1c507..f08077d 100644 --- a/meta/recipes-graphics/libsdl/libsdl_1.2.11.bb +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.11.bb @@ -10,10 +10,10 @@ SECTION = libs LICENSE = LGPLv2.1 LIC_FILES_CHKSUM = file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4 -DEPENDS = virtual/libx11 libxext libxrandr libxrender +DEPENDS = ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} virtual/libx11 libxext libxrandr libxrender DEPENDS_virtclass-nativesdk = libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk -PR = r6 +PR = r7 SRC_URI = http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://acinclude.m4 \ @@ -33,7 +33,8 @@ EXTRA_OECONF = --disable-static --disable-debug --disable-cdrom --enable-thread --disable-mintaudio --disable-nasm --enable-video-x11 --disable-video-dga \ --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs \ --disable-video-xbios --disable-video-gem --disable-video-dummy \ ---disable-video-opengl --enable-input-events --enable-pthreads \ +--enable-input-events --enable-pthreads \ + ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \ --disable-video-svga \ --disable-video-picogui --disable-video-qtopia --enable-dlopen -- 1.7.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] libsdl: add target version
Rename libsdl-nativesdk to libsdl to enable target version. libsdl is needed in some graphics testing. Signed-off-by: Jiajun Xu jiajun...@intel.com Acked-by: Phil Blundell ph...@gnu.org --- ...libsdl-nativesdk_1.2.11.bb = libsdl_1.2.11.bb} | 20 +++- 1 files changed, 15 insertions(+), 5 deletions(-) rename meta/recipes-graphics/libsdl/{libsdl-nativesdk_1.2.11.bb = libsdl_1.2.11.bb} (73%) diff --git a/meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.11.bb similarity index 73% rename from meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb rename to meta/recipes-graphics/libsdl/libsdl_1.2.11.bb index e64a62e..7c1c507 100644 --- a/meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.11.bb @@ -1,17 +1,25 @@ -DESCRIPTION = Simple DirectMedia Layer - native Edition +SUMMARY = Simple DirectMedia Layer +DESCRIPTION = Simple DirectMedia Layer is a cross-platform multimedia \ +library designed to provide low level access to audio, keyboard, mouse, \ +joystick, 3D hardware via OpenGL, and 2D video framebuffer. HOMEPAGE = http://www.libsdl.org; +BUGTRACKER = http://bugzilla.libsdl.org/; + SECTION = libs -LICENSE = LGPLv2.1 -DEPENDS = libx11-nativesdk libxext-nativesdk libxrandr-nativesdk libxrender-nativesdk -RDEPENDS_${PN} = libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk -PR = r5 +LICENSE = LGPLv2.1 LIC_FILES_CHKSUM = file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4 +DEPENDS = virtual/libx11 libxext libxrandr libxrender +DEPENDS_virtclass-nativesdk = libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk + +PR = r6 + SRC_URI = http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://acinclude.m4 \ file://configure_tweak.patch;patch=1 \ file://kernel-asm-page.patch;patch=1 + S = ${WORKDIR}/SDL-${PV} SRC_URI[md5sum] = 418b42956b7cd103bfab1b9077ccc149 @@ -34,3 +42,5 @@ PARALLEL_MAKE = do_configure_prepend() { cp ${WORKDIR}/acinclude.m4 ${S}/acinclude.m4 } + +BBCLASSEXTEND = nativesdk -- 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] gcc-cross-intermediate: revise the 64bithack.patch for multilib case
On 2011/8/15 1:31, Koen Kooi wrote: Op 14 aug. 2011, om 15:32 heeft Yu Ke het volgende geschreven: current gcc-cross-intermediate has build failure in qemux86-64 lib64 multilib case. the reason is that it still use lib instead of lib64 while do_install use the libdir i.e. lib64 so this patch fix this issue by making gcc honour the libdir. CC: Kumar Galaga...@kernel.crashing.org CC: Richard Purdierichard.pur...@linuxfoundation.org Signed-off-by: Yu Keke...@intel.com --- meta/recipes-devtools/gcc/gcc-4.6.inc |2 +- meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch | 16 +--- wouldn't gcc 4.5 need a similar change? yes, gcc 4.5 should also has this change. I will sent out another patch for this. just curious question, what is gcc 4.5 for, since gcc 4.6 is already there? Regards Ke ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] libx11: skip self if x11 not in DISTRO_FEATURES
On Mon, 2011-08-15 at 14:23 +0200, Anders Darander wrote: Although, it is already mergerd by Richard, I really like this patch series (after testing it). * Phil Blundell ph...@gnu.org [110812 17:57]: This stops (most) x11 packages leaking into a non-x11 distro by mistake. Will you submit this to meta-oe also? This question might apply to a few of the other patches also. I hadn't planned to (in fact, I hadn't previously realised that meta-oe had its own copy of those files). If you think that would be a good idea then you're obviously welcome to do so, though. p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] libx11: skip self if x11 not in DISTRO_FEATURES
* Phil Blundell ph...@gnu.org [110815 15:07]: On Mon, 2011-08-15 at 14:23 +0200, Anders Darander wrote: Although, it is already mergerd by Richard, I really like this patch series (after testing it). * Phil Blundell ph...@gnu.org [110812 17:57]: This stops (most) x11 packages leaking into a non-x11 distro by mistake. Will you submit this to meta-oe also? This question might apply to a few of the other patches also. I hadn't planned to (in fact, I hadn't previously realised that meta-oe had its own copy of those files). If you think that would be a good idea then you're obviously welcome to do so, though. Ok, then I'll submit such a patch. I didn't really this either, until just before lunch, when I found the reason that e.g. libxcb and libx11 still was being built... The short-term solution is to get a similar patch applied to meta-oe. The long-term solution, any volunteers?, would be to convert the qt4-recipes in meta-to bbappends (if they still are needed). Cheers, Anders -- Anders Darander ChargeStorm AB Tel: +46 702 44 84 36 Laxholmstorget 3Email: and...@chargestorm.se 602 21 Norrköping Web: www.chargestorm.se ___ 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] gcc-cross-intermediate: revise the 64bithack.patch for multilib case
On Mon, 2011-08-15 at 20:48 +0800, Yu Ke wrote: On 2011/8/15 1:31, Koen Kooi wrote: Op 14 aug. 2011, om 15:32 heeft Yu Ke het volgende geschreven: current gcc-cross-intermediate has build failure in qemux86-64 lib64 multilib case. the reason is that it still use lib instead of lib64 while do_install use the libdir i.e. lib64 so this patch fix this issue by making gcc honour the libdir. CC: Kumar Galaga...@kernel.crashing.org CC: Richard Purdierichard.pur...@linuxfoundation.org Signed-off-by: Yu Keke...@intel.com --- meta/recipes-devtools/gcc/gcc-4.6.inc |2 +- meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch | 16 +--- wouldn't gcc 4.5 need a similar change? yes, gcc 4.5 should also has this change. I will sent out another patch for this. Please take a look at: http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=rpurdie/ml4id=4de8e0e9c286ff64f1b7fd2e695fe2d62fdadfbd I've updated the patch header and ensured that whichever compiler options are used, the compiler works as expected and also applied this to mips and pcc. Could you also please open a bug about target gcc multilib as mentioned in the patch header (targeted at post 1.1). just curious question, what is gcc 4.5 for, since gcc 4.6 is already there? Some people are still using gcc 4.5 for various reasons. It is getting to the point we should probably move that to meta-oe though? 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] libx11: skip self if x11 not in DISTRO_FEATURES
On Monday 15 August 2011 14:15:47 Anders Darander wrote: The short-term solution is to get a similar patch applied to meta-oe. The long-term solution, any volunteers?, would be to convert the qt4-recipes in meta-to bbappends (if they still are needed). I already did this a few weeks ago. The only Qt 4 thing left that is a full recipe in meta-oe is qmake2 (for the target). 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
Re: [OE-core] [PATCH] libx11: skip self if x11 not in DISTRO_FEATURES
* Paul Eggleton paul.eggle...@linux.intel.com [110815 15:24]: On Monday 15 August 2011 14:15:47 Anders Darander wrote: The short-term solution is to get a similar patch applied to meta-oe. The long-term solution, any volunteers?, would be to convert the qt4-recipes in meta-to bbappends (if they still are needed). s/qt4*/libx11/ in this section. I already did this a few weeks ago. The only Qt 4 thing left that is a full recipe in meta-oe is qmake2 (for the target). My apologies... You're of course right, and that change is something I appreciate (it makes my life a lot simpler). I've been struggling with a few other qt4-related issues (one or two RFC-patches will be submitted shortly), that's why I mistakenly wrote qt4. I meant libx11 (in xorg-lib) in my last e-mail. Cheers, Anders -- Anders Darander ChargeStorm AB Tel: +46 702 44 84 36 Laxholmstorget 3Email: and...@chargestorm.se 602 21 Norrköping Web: www.chargestorm.se ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] libx11: skip self if x11 not in DISTRO_FEATURES
On Monday 15 August 2011 14:32:59 Anders Darander wrote: I've been struggling with a few other qt4-related issues (one or two RFC-patches will be submitted shortly), that's why I mistakenly wrote qt4. I meant libx11 (in xorg-lib) in my last e-mail. Ah yes, I realised this after sending, no worries :) I definitely agree, anything that's a duplicated recipe in meta-oe ought to be turned into a bbappend. In addition, any newer version in meta-oe of recipes in oe-core ought to just be pushed up to oe-core unless there is a really good reason to do otherwise. 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
Re: [OE-core] [PATCH 0/2] Extend target version for libsdl and enable openGL for it
On Mon, 2011-08-15 at 21:04 +0800, Jiajun Xu wrote: Some targets need to run 3D games, which requires libsdl. Enable libsdl for target and add a flag to check in build time if openGL needed to be built. The following changes since commit d126e22f6b3f27196144f87e22b36ebccd6dea65: rt-tests: use an explicit commit ID (2011-08-12 17:51:18 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib jxu49/oe-contrib http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jxu49/oe-contrib Jiajun Xu (2): libsdl: add target version libsdl: enable opengl for libsdl Merged to master, thanks Jiajun! 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 0/2] two qt fix
On Mon, 2011-08-15 at 20:33 +0800, Yu Ke wrote: The following changes since commit d126e22f6b3f27196144f87e22b36ebccd6dea65: Darren Hart (1): rt-tests: use an explicit commit ID are available in the git repository at: git://git.pokylinux.org/poky-contrib kyu3/bug-1344 http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kyu3/bug-1344 Yu Ke (2): qt4.inc: revise RRECOMMENDS qt4.inc: expand the package name for multilib case Merged to master, thanks. Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/4] qt4-native, Qt QA fixes
On Mon, 2011-08-15 at 11:12 +0100, Paul Eggleton wrote: Bring over qt4-native from OE and tidy up some QA warnings. The following changes since commit d126e22f6b3f27196144f87e22b36ebccd6dea65: rt-tests: use an explicit commit ID (2011-08-12 17:51:18 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib paule/qt4-fixes4 http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/qt4-fixes4 Paul Eggleton (4): qt4: replace qt4-tools-native with qt4-native qt4-native: restore build of uic3, qdbuscpp2xml and qdbusxml2cpp qt4: package QML plugins and correct their install directory qt4: delete unpackaged uic3 to avoid unpackaged file warning Merged to master, thanks. Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Machine specific sysroot issue
On Sun, 2011-08-14 at 20:50 +0100, Paul Eggleton wrote: I've brought over the Opie recipes from OE in preparation for creating a separate layer, and after making a few changes everything compiles OK; however I'm finding that the change to machine-specific sysroots is causing some problems. libopie2, a non-machine specific package, among other things installs a file called include.pro into ${OPIEDIR}, which is configured to be ${STAGING_DIR_HOST}. In OE-classic ${STAGING_DIR_HOST} is not machine-specific, so if you build libopie2 for machine A then build some other package that needs include.pro for machine B, then everything is fine. In the OE-core case with machine-specific sysroots it's looking for the file in the sysroot for the current machine, which if you've been building for several different machines may not be where it has actually been installed. What's the correct way to fix this? Is libopie2 now installing this file in the wrong place? It sounds like its being installed to the right location but that opie isn't looking for it in the right place later. How does opie know where to look for the file? 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 0/1] The Skeleton initscript doesn't work on minimal image
On Mon, 2011-08-15 at 18:18 +0800, Robert Yang wrote: Testing: 1) Edit meta/recipes-core/images/core-image-minimal.bb, add service to the IMAGE_INSTALL 2) Edit build/conf/local.conf, add /path/to/poky/meta-skeleton to the BBLAYERS. 3) $ bitbake core-image-minimal(or sato) 3) start qemu, and run /etc/init.d/skeleton start(or status stop ..), it works well // Robert The following changes since commit 30381645eefe4e3222fd3ce45823f143ce2fa82c: rt-tests: use an explicit commit ID (2011-08-12 21:07:02 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib robert/initscripts http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/initscripts Robert Yang (1): The Skeleton initscript doesn't work on minimal image Merged to master, thanks. Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [OC-core][PATCH 0/1] libx11-diet: Fix bug 1050
On Mon, 2011-08-15 at 18:27 +0800, Xiaofeng Yan wrote: From: Xiaofeng Yan xiaofeng@windriver.com Hi Richard, I just disable dolt according to your suggestion. Pull URL: git://git.pokylinux.org/poky-contrib.git Branch: xiaofeng/libx11-diet Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/libx11-diet Thanks, Xiaofeng Yan xiaofeng@windriver.com --- Xiaofeng Yan (1): libx11-diet: Fix bug 1050 Merged to master, thanks. Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Machine specific sysroot issue
On Monday 15 August 2011 15:15:01 Richard Purdie wrote: It sounds like its being installed to the right location but that opie isn't looking for it in the right place later. How does opie know where to look for the file? Same way it gets installed, it looks for it in ${OPIEDIR}. It's just that the second time around if the machine is not the same, ${OPIEDIR} is not the same either. -- 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
Re: [OE-core] [PATCH 1/1] gcc-cross-intermediate: revise the 64bithack.patch for multilib case
On 2011/8/15 21:16, Richard Purdie wrote: On Mon, 2011-08-15 at 20:48 +0800, Yu Ke wrote: On 2011/8/15 1:31, Koen Kooi wrote: Op 14 aug. 2011, om 15:32 heeft Yu Ke het volgende geschreven: current gcc-cross-intermediate has build failure in qemux86-64 lib64 multilib case. the reason is that it still use lib instead of lib64 while do_install use the libdir i.e. lib64 so this patch fix this issue by making gcc honour the libdir. CC: Kumar Galaga...@kernel.crashing.org CC: Richard Purdierichard.pur...@linuxfoundation.org Signed-off-by: Yu Keke...@intel.com --- meta/recipes-devtools/gcc/gcc-4.6.inc |2 +- meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch | 16 +--- wouldn't gcc 4.5 need a similar change? yes, gcc 4.5 should also has this change. I will sent out another patch for this. Please take a look at: http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=rpurdie/ml4id=4de8e0e9c286ff64f1b7fd2e695fe2d62fdadfbd Thanks. it is more comprehensive. just a small issue, the parentheses looks mismatching in ++MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir) ../$(shell basename $(base_libdir) I've updated the patch header and ensured that whichever compiler options are used, the compiler works as expected and also applied this to mips and pcc. Could you also please open a bug about target gcc multilib as mentioned in the patch header (targeted at post 1.1). done. http://bugzilla.yoctoproject.org/show_bug.cgi?id=1369 just curious question, what is gcc 4.5 for, since gcc 4.6 is already there? Some people are still using gcc 4.5 for various reasons. It is getting to the point we should probably move that to meta-oe though? 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
Re: [OE-core] [PATCH 2/2] qemu: Make qemu buildable inside qemux86/qemuppc target
On Mon, 2011-08-15 at 20:40 +0800, edwin.z...@intel.com wrote: From: Zhai Edwin edwin.z...@intel.com It requires libx11 and libGL(if enabled GL) for building, which introduce extra dependence in qemuppc target. Futhermore, qemu's GL code is x86-oriented, thus some hacks needed for building in qemupcc. For simplicity, just make qemu GL's code for native only, so that qemu building is okay in world build. [YOCTO #1011] got fixed. Signed-off-by: Zhai Edwin edwin.z...@intel.com --- meta/recipes-devtools/qemu/qemu.inc |5 ++--- meta/recipes-devtools/qemu/qemu_0.14.0.bb | 27 ++- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 85476d6..e5414ff 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -1,7 +1,7 @@ DESCRIPTION = open source processor emulator HOMEPAGE = http://qemu.org; LICENSE = GPLv2 LGPLv2.1 -DEPENDS = zlib alsa-lib qemugl +DEPENDS = zlib alsa-lib virtual/libx11 # QEMU_TARGETS is overridable variable QEMU_TARGETS ?= arm i386 mips mipsel mips64 mips64el ppc sh4 x86_64 @@ -40,7 +40,7 @@ do_configure_prepend_virtclass-native() { do_configure() { ${S}/configure --prefix=${prefix} --sysconfdir=${sysconfdir} --disable-strip ${EXTRA_OECONF} -chmod a+x ${S}/target-i386/beginend_funcs.sh +test ! -e ${S}/target-i386/beginend_funcs.sh || chmod a+x ${S}/target-i386/beginend_funcs.sh } do_install () { @@ -50,7 +50,6 @@ do_install () { install -m 0755 ${WORKDIR}/powerpc_rom.bin ${D}${datadir}/qemu } -SRC_URI_append_virtclass-nativesdk = file://glflags.patch DEPENDS_virtclass-native = zlib-native alsa-lib-native DEPENDS_virtclass-nativesdk = zlib-nativesdk libsdl-nativesdk qemugl-nativesdk RDEPENDS_virtclass-nativesdk = libsdl-nativesdk diff --git a/meta/recipes-devtools/qemu/qemu_0.14.0.bb b/meta/recipes-devtools/qemu/qemu_0.14.0.bb index de12f62..dc9b695 100644 --- a/meta/recipes-devtools/qemu/qemu_0.14.0.bb +++ b/meta/recipes-devtools/qemu/qemu_0.14.0.bb @@ -11,22 +11,39 @@ FILESDIR = ${WORKDIR} SRC_URI = \ http://download.savannah.gnu.org/releases/qemu/qemu-${PV}.tar.gz \ file://powerpc_rom.bin \ -file://qemu-git-qemugl-host.patch \ file://no-strip.patch \ -file://fix-nogl.patch \ -file://qemugl-allow-glxcontext-release.patch \ file://linker-flags.patch \ -file://init-info.patch \ file://qemu-vmware-vga-depth.patch \ -file://enable-i386-linux-user.patch \ file://fix-configure-checks.patch \ file://fallback-to-safe-mmap_min_addr.patch \ file://spice-qxl-locking-fix-for-qemu-kvm.patch \ file://Detect-and-use-GCC-atomic-builtins-for-locking.patch \ file://larger_default_ram_size.patch \ + + +SRC_URI_append_virtclass-native = \ +file://qemu-git-qemugl-host.patch \ +file://fix-nogl.patch \ +file://qemugl-allow-glxcontext-release.patch \ +file://init-info.patch \ +file://enable-i386-linux-user.patch \ file://qemugl-fix.patch \ file://opengl-sdl-fix.patch \ + +SRC_URI_append_virtclass-nativesdk = \ +file://qemu-git-qemugl-host.patch \ +file://fix-nogl.patch \ +file://qemugl-allow-glxcontext-release.patch \ +file://init-info.patch \ +file://enable-i386-linux-user.patch \ +file://qemugl-fix.patch \ +file://opengl-sdl-fix.patch \ +file://glflags.patch \ + + +#SRC_URI_append_virtclass-nativesdk = file://glflags.patch + SRC_URI[md5sum] = f9d145d5c09de9f0984ffe9bd1229970 SRC_URI[sha256sum] = ba21e84d7853217830e167daecdbff481189c6a0bb600ac7fb7201453108 The patch is fine but could we change this to something like: # Only use the GL passthrough patches for native/nativesdk versions $QEMUGLPATCHES = \ file://qemu-git-qemugl-host.patch \ file://fix-nogl.patch \ file://qemugl-allow-glxcontext-release.patch \ file://init-info.patch \ file://enable-i386-linux-user.patch \ file://qemugl-fix.patch \ file://opengl-sdl-fix.patch \ SRC_URI_append_virtclass-native = \ ${QEMUGLPATCHES} \ SRC_URI_append_virtclass-nativesdk = \ ${QEMUGLPATCHES} \ file://glflags.patch \ which is just a little bit neater. Also, no need for the commented out line. 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/2] distro-tracking: Update info for gpgme, libassuan, apr... after last upgrade.
On Mon, 2011-08-15 at 20:40 +0800, edwin.z...@intel.com wrote: From: Zhai Edwin edwin.z...@intel.com Signed-off-by: Zhai Edwin edwin.z...@intel.com --- .../conf/distro/include/distro_tracking_fields.inc | 48 ++- 1 files changed, 25 insertions(+), 23 deletions(-) Merged to master, thanks. Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Machine specific sysroot issue
Op 15 aug. 2011, om 16:23 heeft Paul Eggleton het volgende geschreven: On Monday 15 August 2011 15:15:01 Richard Purdie wrote: It sounds like its being installed to the right location but that opie isn't looking for it in the right place later. How does opie know where to look for the file? Same way it gets installed, it looks for it in ${OPIEDIR}. It's just that the second time around if the machine is not the same, ${OPIEDIR} is not the same either. That sounds like an expanded version is getting stored somewhere where it shouldn't ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC] Performance Issue: Build time increases
On Fri, 2011-08-12 at 19:06 +0800, Robert Yang wrote: Hi folks, The build time of core-image-sato increases about 5 ~ 10 minutes than the following commit: commit 5af197b55a4b779f1ec93186f0723026949ba2b5 Author: Liping Ke liping...@intel.com Date: Fri Jun 3 08:22:40 2011 +0800 cache: Implement multiple extra cache fields request support On my host, 1) the build time of 5af197b55a4b779f1ec93186f0723026949ba2b5 is: real208m26.133s user241m29.280s sys 47m0.630s 2) and: 068839698fe192d8846c0ed4db65861448e8e524 is: real217m39.687s user255m34.150s sys 48m21.510s I use the bisect build method to find out which patch causes the time increases, but the build time is not stable on my host(Ubuntu 11.04 64bit), e.g., the build time of 1) is 208m at the first build, then git co other_commit and build it, after about 10 builds, then go back to build 5af197b55a4b779f1ec, the build time will increases about 8 minutes, I have stopped the X and cron, at. This may have relationship with the linux distribution and disk. So I have to restart the build, reboot the machine by two days, and go on the build. It would be better if anyone has other good method. I think that for the next release(e.g., yocto 1.2), we can find a clean and stable machine(for the distribution, maybe RHEL is more stable than Ubuntu) to check the build time weekly, so that we can notice the performance issue early. I think we really need to get to the bottom of why the build times are so variable. Do we need to start doing these on a clean distro install? is a fresh boot good enough? is there a way we can clear out the VM caches and get reproducible times? reformat the build partition? If that really is just because of the nature of a chaotic system, can we get some better representation of build time to use as a benchmark? We could really do with finding a faster test (which would hopefully still be representative)... 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] qt3: fix bug 1348
On Fri, 2011-08-12 at 18:18 +0800, Xiaofeng Yan wrote: From: Xiaofeng Yan xiaofeng@windriver.com [YOCTO #1348] The variable is different when building qt-x11-free-native and qt-x11-free. The different cause this bug. $ bitbake qt-x11-free-native -e | grep ^TARGET_OS TARGET_OS=linux $ bitbake qt-x11-free -e | grep ^TARGET_OS TARGET_OS=linux-gnueabi So I add a task function before do_configure for linking ${TARGET_OS} to linux-g++. Signed-off-by: Xiaofeng Yan xiaofeng@windriver.com --- recipes-qt3/qt3/qt-x11-free-common.inc |8 +++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/recipes-qt3/qt3/qt-x11-free-common.inc b/recipes-qt3/qt3/qt-x11-free-common.inc index e486c52..9e6cc81 100644 --- a/recipes-qt3/qt3/qt-x11-free-common.inc +++ b/recipes-qt3/qt3/qt-x11-free-common.inc @@ -3,7 +3,7 @@ SECTION = x11/libs PRIORITY = optional LICENSE = GPL | QPL HOMEPAGE = http://www.trolltech.com; -PR = r0 +PR = r1 S = ${WORKDIR}/qt-x11-free-${PV} @@ -24,6 +24,12 @@ EXTRA_ENV = 'QMAKE=${STAGING_BINDIR_NATIVE}/qmake -after INCPATH+=${STAGING_INC AR=${TARGET_PREFIX}ar cqs \ MOC=${STAGING_BINDIR_NATIVE}/moc3 UIC=${STAGING_BINDIR_NATIVE}/uic3 MAKE=make -e' +do_configure_prepend() { +if [ ! -L ${QMAKE_MKSPEC_PATH}/${TARGET_OS}-oe-g++ ]; then +ln -sf ${QMAKE_MKSPEC_PATH}/linux-g++ ${QMAKE_MKSPEC_PATH}/${TARGET_OS}-oe-g++ +fi +} + do_configure() { echo yes | ./configure -prefix ${prefix} ${QT_CONFIG_FLAGS} -no-fast \ -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql Thanks, this looks like a better fix to me. I've merged this with an updated commit message. The commit message summary needs to state what the problem is, not just a bug number. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Machine specific sysroot issue
On Monday 15 August 2011 15:30:53 Koen Kooi wrote: Same way it gets installed, it looks for it in ${OPIEDIR}. It's just that the second time around if the machine is not the same, ${OPIEDIR} is not the same either. That sounds like an expanded version is getting stored somewhere where it shouldn't How could that be the case? If it stayed the same I could understand it... It's pretty straightforward; OPIEDIR is set to STAGING_DIR_HOST, but STAGING_DIR_HOST is now ${STAGING_DIR}/${MACHINE}, thus if you change the machine, STAGING_DIR_HOST also changes. In OE-dev (and Poky prior to machine- specific sysroots) STAGING_DIR_HOST was ${STAGING_DIR}/${BASEPKG_HOST_SYS}, thus there was no problem. 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
Re: [OE-core] Machine specific sysroot issue
Op 15 aug. 2011, om 16:42 heeft Paul Eggleton het volgende geschreven: On Monday 15 August 2011 15:30:53 Koen Kooi wrote: Same way it gets installed, it looks for it in ${OPIEDIR}. It's just that the second time around if the machine is not the same, ${OPIEDIR} is not the same either. That sounds like an expanded version is getting stored somewhere where it shouldn't How could that be the case? If it stayed the same I could understand it... It's pretty straightforward; OPIEDIR is set to STAGING_DIR_HOST, but STAGING_DIR_HOST is now ${STAGING_DIR}/${MACHINE}, thus if you change the machine, STAGING_DIR_HOST also changes. In OE-dev (and Poky prior to machine- specific sysroots) STAGING_DIR_HOST was ${STAGING_DIR}/${BASEPKG_HOST_SYS}, thus there was no problem. if a recipe (or upstream code) does something like echo $OPIEDIR foo.config And after you stage foo.config it will point to the old sysroot when changing machine. In other words: something in opie isn't relocatable. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Machine specific sysroot issue
On Sun, 2011-08-14 at 20:50 +0100, Paul Eggleton wrote: libopie2, a non-machine specific package, among other things installs a file called include.pro into ${OPIEDIR}, which is configured to be ${STAGING_DIR_HOST}. In OE-classic ${STAGING_DIR_HOST} is not machine-specific, so if you build libopie2 for machine A then build some other package that needs include.pro for machine B, then everything is fine. In the OE-core case with machine-specific sysroots it's looking for the file in the sysroot for the current machine, which if you've been building for several different machines may not be where it has actually been installed. I can't immediately think why this should be behaving differently to any other library (eglibc for example). It's quite normal for those packages to be architecture-specific and not machine-specific. What I think is meant to happen when you change MACHINE is that populate_sysroot will rerun (because ${MACHINE} is factored into the stamp for that task) but it will use all the previously cached build artifacts from sstate and hence you won't end up having to rebuild everything. It sounds as if that isn't happening in this case for some reason, though I can't immediately think what libopie2 might be doing to defeat it. Is it just include.pro that goes wrong, or does the whole of libopie2 go missing from the sysroot when you change MACHINE? p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libproxy: remove dependency on X libs
Nothing in the source refers to libX11 or libXmu so there would appear to be no good reason for them to be in DEPENDS. It looks as though these are perhaps a relic from an earlier version which did need those libraries. Signed-off-by: Phil Blundell ph...@gnu.org --- meta/recipes-support/libproxy/libproxy_0.4.6.bb |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/recipes-support/libproxy/libproxy_0.4.6.bb b/meta/recipes-support/libproxy/libproxy_0.4.6.bb index 5ee4979..d907c55 100644 --- a/meta/recipes-support/libproxy/libproxy_0.4.6.bb +++ b/meta/recipes-support/libproxy/libproxy_0.4.6.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = file://COPYING;md5=7d704a7b1b116e8783edcdb44ff4 \ file://utils/proxy.c;beginline=1;endline=18;md5=55152a1006d7dafbef32baf9c30a99c0 -DEPENDS = virtual/libx11 xmu gconf +DEPENDS = gconf SRC_URI = http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz; -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libxcb: enable native/nativesdk builds as was done previously in meta-oe
Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- meta/recipes-graphics/xcb/libxcb.inc |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/meta/recipes-graphics/xcb/libxcb.inc b/meta/recipes-graphics/xcb/libxcb.inc index 5044917..015065e 100644 --- a/meta/recipes-graphics/xcb/libxcb.inc +++ b/meta/recipes-graphics/xcb/libxcb.inc @@ -5,6 +5,8 @@ the protocol, improved threading support, and extensibility. HOMEPAGE = http://xcb.freedesktop.org; BUGTRACKER = https://bugs.freedesktop.org/enter_bug.cgi?product=XCB; +BBCLASSEXTEND = native nativesdk + SECTION = x11/libs LICENSE = MIT-X -- 1.7.2.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Machine specific sysroot issue
On Monday 15 August 2011 16:03:44 Phil Blundell wrote: I can't immediately think why this should be behaving differently to any other library (eglibc for example). It's quite normal for those packages to be architecture-specific and not machine-specific. What I think is meant to happen when you change MACHINE is that populate_sysroot will rerun (because ${MACHINE} is factored into the stamp for that task) but it will use all the previously cached build artifacts from sstate and hence you won't end up having to rebuild everything. It sounds as if that isn't happening in this case for some reason, though I can't immediately think what libopie2 might be doing to defeat it. Is it just include.pro that goes wrong, or does the whole of libopie2 go missing from the sysroot when you change MACHINE? Actually it's just include.pro - everything else gets copied to the sysroot for the new machine just fine. I've sort of figured this out. include.pro is getting installed to the sysroot and not ${D} in do_install (and it's the only file handled this way). I'm guessing that because of this it never gets picked up by sstate. 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
Re: [OE-core] [PATCH 1/1] gcc-cross-intermediate: revise the 64bithack.patch for multilib case
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 08/15/2011 05:41 AM, Yu Ke wrote: On 2011/8/14 23:18, Khem Raj wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 08/14/2011 06:32 AM, Yu Ke wrote: current gcc-cross-intermediate has build failure in qemux86-64 lib64 multilib case. the reason is that it still use lib instead of lib64 while do_install use the libdir i.e. lib64 so this patch fix this issue by making gcc honour the libdir. I think similar patch should be done to ppc and mips as well. According to Kumar, current ppc works just fine in multilib 64bit case. so ppc may not need this kind of patch. I am not sure how is mips. Since i am not familar with mips, i'd like to leave it to other mips expert. I guess since mips multilib is not yet there and /lib is used by o32 abi even in multilib case things would be simple for mips. Would using gcc defaults for x86_64 work ? It might break backward compatibility in non multilib case Regards Ke -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iEUEARECAAYFAk5JQCAACgkQuwUzVZGdMxQdLwCY1ijPd8bFknmc8OLI9/OUVTZf FACfToqH6QXmIRNIuZkIAkYHSSiFaro= =pfvK -END PGP SIGNATURE- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Machine specific sysroot issue
On Mon, 2011-08-15 at 16:49 +0100, Paul Eggleton wrote: Actually it's just include.pro - everything else gets copied to the sysroot for the new machine just fine. I've sort of figured this out. include.pro is getting installed to the sysroot and not ${D} in do_install (and it's the only file handled this way). Oh right. Yeah, libopie2 certainly shouldn't be doing that. Any sort of direct poking at the sysroot is basically a bad idea nowadays, and if include.pro is an important file then presumably you want it in the -dev package anyway. p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Machine specific sysroot issue
On Mon, 2011-08-15 at 16:49 +0100, Paul Eggleton wrote: On Monday 15 August 2011 16:03:44 Phil Blundell wrote: I can't immediately think why this should be behaving differently to any other library (eglibc for example). It's quite normal for those packages to be architecture-specific and not machine-specific. What I think is meant to happen when you change MACHINE is that populate_sysroot will rerun (because ${MACHINE} is factored into the stamp for that task) but it will use all the previously cached build artifacts from sstate and hence you won't end up having to rebuild everything. It sounds as if that isn't happening in this case for some reason, though I can't immediately think what libopie2 might be doing to defeat it. Is it just include.pro that goes wrong, or does the whole of libopie2 go missing from the sysroot when you change MACHINE? Actually it's just include.pro - everything else gets copied to the sysroot for the new machine just fine. I've sort of figured this out. include.pro is getting installed to the sysroot and not ${D} in do_install (and it's the only file handled this way). I'm guessing that because of this it never gets picked up by sstate. This is the problem. You want to install the file into ${D} and then all should be well... Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] cmake.bbclass, perlnative.bbclass: arrange for cmake to find perl-native
When CMake is looking for perl, it only searches in the specific directories that it's told about and ignores ${PATH}. If perlnative is in use, ensure that the appropriate installation path is added to the list of places that cmake will look for perl, otherwise it won't ever be found. Signed-off-by: Phil Blundell ph...@gnu.org --- meta/classes/cmake.bbclass |3 ++- meta/classes/perlnative.bbclass |1 + 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass index 89a154f..ab23bed 100644 --- a/meta/classes/cmake.bbclass +++ b/meta/classes/cmake.bbclass @@ -25,6 +25,7 @@ OECMAKE_C_FLAGS_RELEASE ?= ${SELECTED_OPTIMIZATION} ${CPPFLAGS} -DNDEBUG OECMAKE_CXX_FLAGS_RELEASE ?= ${SELECTED_OPTIMIZATION} ${CXXFLAGS} -DNDEBUG OECMAKE_RPATH ?= +OECMAKE_PERLNATIVE_DIR ??= cmake_do_generate_toolchain_file() { cat ${WORKDIR}/toolchain.cmake EOF @@ -41,7 +42,7 @@ set( CMAKE_CXX_FLAGS_RELEASE ${OECMAKE_CXX_FLAGS_RELEASE} CACHE STRING CXXFLA # only search in the paths provided so cmake doesnt pick # up libraries and tools from the native build machine -set( CMAKE_FIND_ROOT_PATH ${STAGING_DIR_HOST} ${STAGING_DIR_NATIVE} ${CROSS_DIR} ) +set( CMAKE_FIND_ROOT_PATH ${STAGING_DIR_HOST} ${STAGING_DIR_NATIVE} ${CROSS_DIR} ${OECMAKE_PERLNATIVE_DIR}) set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY ) set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY ) set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY ) diff --git a/meta/classes/perlnative.bbclass b/meta/classes/perlnative.bbclass index 522344d..2211b72 100644 --- a/meta/classes/perlnative.bbclass +++ b/meta/classes/perlnative.bbclass @@ -1,2 +1,3 @@ PATH_prepend = ${STAGING_BINDIR_NATIVE}/perl-native: DEPENDS += perl-native +OECMAKE_PERLNATIVE_DIR = ${STAGING_BINDIR_NATIVE}/perl-native -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] fontconfig-2.8.0/fix_pkgconfig.patch
Does anybody know where this patch came from or what it is supposed to be achieving? As far as I have been able to tell with some limited git archaeology, it seems to have originated from Poky in the fontconfig-2.6.0 sort of timeframe but that's about all I have been able to find out. The actual content of the patch is: -Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ @FREETYPE_LIBS@ @ICONV_LIBS@ +Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ -L{libdir} -lfreetype @ICONV_LIBS@ ... which, as far as I can tell, is just completely bogus. The added -L{libdir} is causing cmake to blow up if it tries to inspect the private libs for fontconfig to anything that depends on it: it's arguably a bug in cmake that it can't tolerate {} there, but it seems fairly clear that this patch in its current form can't be producing any useful effect. p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2] bluez4: Added new recipe 4.96 and removed 4.82 version
On 08/12/2011 01:04 AM, Noor, Ahsan wrote: From: Noor Ahsannoor_ah...@mentor.com * Added new recipe 4.96 and removed 4.82 version and its files. Signed-off-by: Noor Ahsannoor_ah...@mentor.com --- .../bluez/bluez4-4.82/bluetooth.conf | 16 .../fix-dfutool-usb-declaration-mismatch.patch | 20 - .../bluez/bluez4-4.82/hid2hci_usb_init.patch | 35 - .../bluez/bluez4-4.82/sbc-thumb.patch | 14 .../bluez/bluez4-4.96/bluetooth.conf | 16 meta/recipes-connectivity/bluez/bluez4_4.82.bb | 75 meta/recipes-connectivity/bluez/bluez4_4.96.bb | 73 +++ 7 files changed, 89 insertions(+), 160 deletions(-) diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/bluetooth.conf b/meta/recipes-connectivity/bluez/bluez4-4.82/bluetooth.conf deleted file mode 100644 index ca5e9e4..000 --- a/meta/recipes-connectivity/bluez/bluez4-4.82/bluetooth.conf +++ /dev/null @@ -1,16 +0,0 @@ -!-- This configuration file specifies the required security policies - for Bluetooth core daemon to work. -- - -!DOCTYPE busconfig PUBLIC -//freedesktop//DTD D-BUS Bus Configuration 1.0//EN - http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd; -busconfig - -!-- ../system.conf have denied everything, so we just punch some holes -- - -policy context=default -allow own=org.bluez/ -allow send_destination=org.bluez/ -allow send_interface=org.bluez.Agent/ -/policy - -/busconfig diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch b/meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch deleted file mode 100644 index 27dead0..000 --- a/meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch +++ /dev/null @@ -1,20 +0,0 @@ -# bluez4: add compile patch fixing some usb declaration mismatch -# Author: Michael 'Mickey' Lauermic...@vanille-media.de -# Date: Thu Jan 29 16:52:21 2009 + -# -# Acquired from OpenEmbedded -Upstream-Status: Pending - -Index: bluez-4.27/tools/dfutool.c -=== bluez-4.27.orig/tools/dfutool.c -+++ bluez-4.27/tools/dfutool.c -@@ -59,7 +59,7 @@ - #endif - - #ifdef NEED_USB_GET_BUSSES --static inline struct usb_bus *usb_get_busses(void) -+inline struct usb_bus *usb_get_busses(void) - { - return usb_busses; - } diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch b/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch deleted file mode 100644 index e8a58e5..000 --- a/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch +++ /dev/null @@ -1,35 +0,0 @@ -# Signed-off-by: Khem Rajraj.k...@gmail.com -# -# Use the new usb1 API for usb_init() and check for fails from -# usb_init (). Currently we see a crash on a system which does -# not have USB because usb_init() fails and it cleans up all initialized -# data (e.g. ctx) which is used in subsequent calls to libusb -# We return immediately if usb_init() fails for some reason. - -Upstream-Status: Inappropriate [not used] - -Index: bluez-4.24/tools/hid2hci.c -=== bluez-4.24.orig/tools/hid2hci.c2008-10-25 23:40:34.0 -0700 -+++ bluez-4.24/tools/hid2hci.c 2008-12-29 22:06:04.0 -0800 -@@ -337,7 +337,7 @@ - int main(int argc, char *argv[]) - { - struct device_info dev[16]; -- int i, opt, num, quiet = 0, mode = HCI; -+ int i, ret, opt, num, quiet = 0, mode = HCI; - - while ((opt = getopt_long(argc, argv, +01qh, main_options, NULL)) != -1) { - switch (opt) { -@@ -361,8 +361,9 @@ - argc -= optind; - argv += optind; - optind = 0; -- -- usb_init(); -+ ret = libusb_init(); -+ if (ret 0) -+ return ret; - - num = find_devices(mode, dev, sizeof(dev) / sizeof(dev[0])); - if (num= 0) { diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch b/meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch deleted file mode 100644 index 881cb9c..000 --- a/meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch +++ /dev/null @@ -1,14 +0,0 @@ -# Acquired from OpenEmbedded -Upstream-Status: Inappropriate [embedded specific] - bluez/sbc/sbc_math.h~ 2008-03-05 20:18:03.0 + -+++ bluez/sbc/sbc_math.h 2008-10-27 13:39:27.0 + -@@ -59,7 +59,7 @@ - - #define SBC_FIXED_0(val) { val = 0; } - #define MUL(a, b)((a) * (b)) --#ifdef __arm__ -+#if defined(__arm__) !defined(__thumb__) - #define MULA(a, b, res) ({\ - int tmp = res; \ - __asm__(\ diff --git a/meta/recipes-connectivity/bluez/bluez4-4.96/bluetooth.conf
Re: [OE-core] [PATCH v2 BUG #1236 0/2] Unify ldd/ldconfig for all multilib eglibcs
On 08/12/2011 04:08 AM, Lianhao Lu wrote: This is rebase of original patch for bug #1236 to the latest oe-core master. The original pull request is at: http://lists.linuxtogo.org/pipermail/openembedded-core/2011-August/007365.html The following changes since commit a92d56058b21913570bb17ae416c3b00afce055e: Kumar Gala (1): gnome-doc-utils: respect python-dir setting EXTRA_OECONF are available in the git repository at: git://git.yoctoproject.org/poky-contrib llu/bug1236-oecore http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=llu/bug1236-oecore Lianhao Lu (2): utils.bbclass/multilib.class: Added misc supporting functions. eglibc: Modify ldd script according to multilib config. meta/classes/multilib.bbclass |7 ++- meta/classes/utils.bbclass | 29 +++ meta/conf/bitbake.conf |1 + meta/conf/multilib.conf|3 + .../eglibc/eglibc-2.13/multilib_readlib.patch | 17 ++ meta/recipes-core/eglibc/eglibc-ld.inc | 54 meta/recipes-core/eglibc/eglibc.inc|1 + meta/recipes-core/eglibc/eglibc_2.13.bb| 13 - 8 files changed, 123 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-core/eglibc/eglibc-2.13/multilib_readlib.patch create mode 100644 meta/recipes-core/eglibc/eglibc-ld.inc ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core 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] intltool: Use nativeperl binary for PERL instead of 'perl'
On 08/12/2011 08:31 AM, Khem Raj wrote: License is GPLv2 change it. Defining PERL for native intltool is not needed anymore Signed-off-by: Khem Rajraj.k...@gmail.com --- .../intltool/intltool-0.40.6/use-nativeperl.patch | 20 meta/recipes-devtools/intltool/intltool.inc|3 +-- meta/recipes-devtools/intltool/intltool_0.40.6.bb |9 +++-- 3 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-devtools/intltool/intltool-0.40.6/use-nativeperl.patch diff --git a/meta/recipes-devtools/intltool/intltool-0.40.6/use-nativeperl.patch b/meta/recipes-devtools/intltool/intltool-0.40.6/use-nativeperl.patch new file mode 100644 index 000..5f5fed3 --- /dev/null +++ b/meta/recipes-devtools/intltool/intltool-0.40.6/use-nativeperl.patch @@ -0,0 +1,20 @@ +OE has perl binary as 'nativeperl' in native sysroot so we look for it +in order to avoid intltool searching and finding perl from /usr/bin +on build system which may not have all the modules that it needs. + +Signed-off-by: Khem Rajraj.k...@gmail.com + +Upstream-Status: Inappropriate [OE specific] +Index: intltool-0.40.6/intltool.m4 +=== +--- intltool-0.40.6.orig/intltool.m4 2009-02-14 14:12:28.0 -0800 intltool-0.40.6/intltool.m42011-08-09 08:07:16.427347846 -0700 +@@ -110,7 +110,7 @@ + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) + fi + +-AC_PATH_PROG(INTLTOOL_PERL, perl) ++AC_PATH_PROG(INTLTOOL_PERL, nativeperl) + if test -z $INTLTOOL_PERL; then +AC_MSG_ERROR([perl not found]) + fi diff --git a/meta/recipes-devtools/intltool/intltool.inc b/meta/recipes-devtools/intltool/intltool.inc index 1e778b6..7e11fc9 100644 --- a/meta/recipes-devtools/intltool/intltool.inc +++ b/meta/recipes-devtools/intltool/intltool.inc @@ -1,6 +1,6 @@ DESCRIPTION = Utility scripts for internationalizing XML SECTION = devel -LICENSE = GPL +LICENSE = GPLv2 URLV=${@'.'.join(bb.data.getVar('PV',d,1).split('.')[0:2])} SRC_URI = ${GNOME_MIRROR}/intltool/${URLV}/intltool-${PV}.tar.bz2 @@ -13,5 +13,4 @@ RRECOMMENDS_${PN}_virtclass-native = inherit autotools pkgconfig perlnative -export PERL_virtclass-native = /usr/bin/env perl BBCLASSEXTEND = native diff --git a/meta/recipes-devtools/intltool/intltool_0.40.6.bb b/meta/recipes-devtools/intltool/intltool_0.40.6.bb index c7938e5..931122d 100644 --- a/meta/recipes-devtools/intltool/intltool_0.40.6.bb +++ b/meta/recipes-devtools/intltool/intltool_0.40.6.bb @@ -1,9 +1,14 @@ require intltool.inc LICENSE=GPLv2 LIC_FILES_CHKSUM = file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f -PR = r3 +PR = r4 -SRC_URI_append = file://intltool-nowarn-0.40.0.patch +SRC_URI_append = file://intltool-nowarn-0.40.0.patch \ + ${NATIVEPATCHES} \ + + +NATIVEPATCHES = +NATIVEPATCHES_virtclass-native = file://use-nativeperl.patch SRC_URI[md5sum] = 69bc0353323112f42ad4f9cf351bc3e5 SRC_URI[sha256sum] = 4d1e5f8561f09c958e303d4faa885079a5e173a61d28437d0013ff5efc9e3b64 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] pixman: remove spurious dependency on libx11
On 08/12/2011 08:56 AM, Phil Blundell wrote: Nothing in pixman actually uses libx11, so no need to DEPEND on it. Signed-off-by: Phil Blundellph...@gnu.org --- meta/recipes-graphics/xorg-lib/pixman_0.22.0.bb |2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/xorg-lib/pixman_0.22.0.bb b/meta/recipes-graphics/xorg-lib/pixman_0.22.0.bb index e5472c0..1a33a18 100644 --- a/meta/recipes-graphics/xorg-lib/pixman_0.22.0.bb +++ b/meta/recipes-graphics/xorg-lib/pixman_0.22.0.bb @@ -13,8 +13,6 @@ LIC_FILES_CHKSUM = file://COPYING;md5=14096c769ae0cbb5fcb94ec468be11b3 \ file://pixman/pixman-arm-neon-asm.h;endline=24;md5=9a9cc1e51abbf1da58f4d9528ec9d49b \ -DEPENDS = virtual/libx11 - PE = 1 PR = r0 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] cairo: only use x11 if selected in DISTRO_FEATURES
On 08/12/2011 08:58 AM, Phil Blundell wrote: This makes it possible to build cairo-using apps without X11. Signed-off-by: Phil Blundellph...@gnu.org --- meta/recipes-graphics/cairo/cairo.inc |5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc index 72aaa03..c983a89 100644 --- a/meta/recipes-graphics/cairo/cairo.inc +++ b/meta/recipes-graphics/cairo/cairo.inc @@ -10,10 +10,11 @@ HOMEPAGE = http://cairographics.org; BUGTRACKER = http://bugs.freedesktop.org; SECTION = libs LICENSE = MPL-1 LGPLv2.1 -DEPENDS = virtual/libx11 libsm libpng fontconfig libxrender pixman glib-2.0 +X11DEPENDS = virtual/libx11 libsm libxrender +DEPENDS = libpng fontconfig pixman glib-2.0 ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)} #check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points require cairo-fpu.inc -EXTRA_OECONF += ${@get_cairo_fpu_setting(bb, d)} +EXTRA_OECONF += ${@get_cairo_fpu_setting(bb, d)} ${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)} inherit autotools pkgconfig 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] dbus: only use x11 if DISTRO_FEATURES has selected it
On 08/12/2011 08:59 AM, Phil Blundell wrote: This makes it possible to include dbus in a non-X11-equipped DISTRO. Signed-off-by: Phil Blundellph...@gnu.org --- meta/recipes-core/dbus/dbus.inc |7 --- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index 6b76cba..a8ecda8 100644 --- a/meta/recipes-core/dbus/dbus.inc +++ b/meta/recipes-core/dbus/dbus.inc @@ -5,7 +5,8 @@ SECTION = base LICENSE = AFL-2 | GPLv2+ LIC_FILES_CHKSUM = file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ file://dbus/dbus.h;firstline=6;endline=20;md5=6eea2e0c7750dd8e620dcb1437312fa5 -DEPENDS = expat virtual/libintl virtual/libx11 libsm +X11DEPENDS = virtual/libx11 libsm +DEPENDS = expat virtual/libintl ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)} DEPENDS_virtclass-native = expat-native virtual/libintl-native DEPENDS_virtclass-nativesdk = expat-nativesdk virtual/libintl-nativesdk virtual/libx11 @@ -22,7 +23,7 @@ CONFFILES_${PN} = ${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session DEBIANNAME_${PN} = dbus-1 -PACKAGES =+ ${PN}-lib ${PN}-x11 ${PN}-systemd +PACKAGES =+ ${PN}-lib ${PN}-systemd ${@base_contains('DISTRO_FEATURES', 'x11', '${PN}-x11', '', d)} FILES_${PN}-x11 = ${bindir}/dbus-launch RDEPENDS_${PN}-x11 = ${PN} @@ -73,7 +74,7 @@ pkg_postinst_dbus() { fi } -EXTRA_OECONF_X = --with-x +EXTRA_OECONF_X = ${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)} EXTRA_OECONF_X_virtclass-native = --without-x EXTRA_OECONF = --disable-tests \ 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] default-distrovars: add x11 to default DISTRO_FEATURES
On 08/12/2011 09:00 AM, Phil Blundell wrote: Signed-off-by: Phil Blundellph...@gnu.org --- meta/conf/distro/include/default-distrovars.inc |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc index 2ef25e4..ce51c2c 100644 --- a/meta/conf/distro/include/default-distrovars.inc +++ b/meta/conf/distro/include/default-distrovars.inc @@ -16,7 +16,7 @@ DISTRO_FEATURES_LIBC ?= ipv4 ipv6 libc-backtrace libc-big-macros libc-bsd libc- libc-memusage libc-nis libc-nsswitch libc-rcmd libc-rtld-debug libc-spawn libc-streams libc-sunrpc \ libc-utmp libc-utmpx libc-wordexp libc-posix-clang-wchar libc-posix-regexp libc-posix-regexp-glibc \ libc-posix-wchar-io -DISTRO_FEATURES ?= alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g ${DISTRO_FEATURES_LIBC} +DISTRO_FEATURES ?= alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g x11 ${DISTRO_FEATURES_LIBC} IMAGE_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 V2] bluez4: Added new recipe 4.96 and removed 4.82 version
Op 15 aug. 2011 om 19:02 heeft Saul Wold s...@linux.intel.com het volgende geschreven: On 08/12/2011 01:04 AM, Noor, Ahsan wrote: From: Noor Ahsannoor_ah...@mentor.com * Added new recipe 4.96 and removed 4.82 version and its files. Signed-off-by: Noor Ahsannoor_ah...@mentor.com --- .../bluez/bluez4-4.82/bluetooth.conf | 16 .../fix-dfutool-usb-declaration-mismatch.patch | 20 - .../bluez/bluez4-4.82/hid2hci_usb_init.patch | 35 - .../bluez/bluez4-4.82/sbc-thumb.patch | 14 .../bluez/bluez4-4.96/bluetooth.conf | 16 meta/recipes-connectivity/bluez/bluez4_4.82.bb | 75 meta/recipes-connectivity/bluez/bluez4_4.96.bb | 73 +++ 7 files changed, 89 insertions(+), 160 deletions(-) diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/bluetooth.conf b/meta/recipes-connectivity/bluez/bluez4-4.82/bluetooth.conf deleted file mode 100644 index ca5e9e4..000 --- a/meta/recipes-connectivity/bluez/bluez4-4.82/bluetooth.conf +++ /dev/null @@ -1,16 +0,0 @@ -!-- This configuration file specifies the required security policies - for Bluetooth core daemon to work. -- - -!DOCTYPE busconfig PUBLIC -//freedesktop//DTD D-BUS Bus Configuration 1.0//EN - http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd; -busconfig - -!-- ../system.conf have denied everything, so we just punch some holes -- - -policy context=default -allow own=org.bluez/ -allow send_destination=org.bluez/ -allow send_interface=org.bluez.Agent/ -/policy - -/busconfig diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch b/meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch deleted file mode 100644 index 27dead0..000 --- a/meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch +++ /dev/null @@ -1,20 +0,0 @@ -# bluez4: add compile patch fixing some usb declaration mismatch -# Author: Michael 'Mickey' Lauermic...@vanille-media.de -# Date: Thu Jan 29 16:52:21 2009 + -# -# Acquired from OpenEmbedded -Upstream-Status: Pending - -Index: bluez-4.27/tools/dfutool.c -=== bluez-4.27.orig/tools/dfutool.c -+++ bluez-4.27/tools/dfutool.c -@@ -59,7 +59,7 @@ - #endif - - #ifdef NEED_USB_GET_BUSSES --static inline struct usb_bus *usb_get_busses(void) -+inline struct usb_bus *usb_get_busses(void) - { -return usb_busses; - } diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch b/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch deleted file mode 100644 index e8a58e5..000 --- a/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch +++ /dev/null @@ -1,35 +0,0 @@ -# Signed-off-by: Khem Rajraj.k...@gmail.com -# -# Use the new usb1 API for usb_init() and check for fails from -# usb_init (). Currently we see a crash on a system which does -# not have USB because usb_init() fails and it cleans up all initialized -# data (e.g. ctx) which is used in subsequent calls to libusb -# We return immediately if usb_init() fails for some reason. - -Upstream-Status: Inappropriate [not used] - -Index: bluez-4.24/tools/hid2hci.c -=== bluez-4.24.orig/tools/hid2hci.c2008-10-25 23:40:34.0 -0700 -+++ bluez-4.24/tools/hid2hci.c2008-12-29 22:06:04.0 -0800 -@@ -337,7 +337,7 @@ - int main(int argc, char *argv[]) - { -struct device_info dev[16]; --int i, opt, num, quiet = 0, mode = HCI; -+int i, ret, opt, num, quiet = 0, mode = HCI; - -while ((opt = getopt_long(argc, argv, +01qh, main_options, NULL)) != -1) { -switch (opt) { -@@ -361,8 +361,9 @@ -argc -= optind; -argv += optind; -optind = 0; -- --usb_init(); -+ret = libusb_init(); -+if (ret 0) -+return ret; - -num = find_devices(mode, dev, sizeof(dev) / sizeof(dev[0])); -if (num= 0) { diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch b/meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch deleted file mode 100644 index 881cb9c..000 --- a/meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch +++ /dev/null @@ -1,14 +0,0 @@ -# Acquired from OpenEmbedded -Upstream-Status: Inappropriate [embedded specific] - bluez/sbc/sbc_math.h~2008-03-05 20:18:03.0 + -+++ bluez/sbc/sbc_math.h2008-10-27 13:39:27.0 + -@@ -59,7 +59,7 @@ - - #define SBC_FIXED_0(val) { val = 0; } - #define MUL(a, b)((a) * (b)) --#ifdef __arm__ -+#if defined(__arm__) !defined(__thumb__) - #define MULA(a, b, res) ({\ -int tmp = res;\ -__asm__(\
Re: [OE-core] fontconfig-2.8.0/fix_pkgconfig.patch
On Mon, Aug 15, 2011 at 9:48 AM, Phil Blundell ph...@gnu.org wrote: Does anybody know where this patch came from or what it is supposed to be achieving? As far as I have been able to tell with some limited git archaeology, it seems to have originated from Poky in the fontconfig-2.6.0 sort of timeframe but that's about all I have been able to find out. The actual content of the patch is: -Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ @FREETYPE_LIBS@ @ICONV_LIBS@ +Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ -L{libdir} -lfreetype @ICONV_LIBS@ it could be that it was needed to pacify libtool in a cross env but may not be needed now that libtool knows sysroot. ... which, as far as I can tell, is just completely bogus. The added -L{libdir} is causing cmake to blow up if it tries to inspect the private libs for fontconfig to anything that depends on it: it's arguably a bug in cmake that it can't tolerate {} there, but it seems fairly clear that this patch in its current form can't be producing any useful effect. p. ___ 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] fontconfig-2.8.0/fix_pkgconfig.patch
On Mon, 2011-08-15 at 17:48 +0100, Phil Blundell wrote: Does anybody know where this patch came from or what it is supposed to be achieving? As far as I have been able to tell with some limited git archaeology, it seems to have originated from Poky in the fontconfig-2.6.0 sort of timeframe but that's about all I have been able to find out. The actual content of the patch is: -Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ @FREETYPE_LIBS@ @ICONV_LIBS@ +Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ -L{libdir} -lfreetype @ICONV_LIBS@ ... which, as far as I can tell, is just completely bogus. The added -L{libdir} is causing cmake to blow up if it tries to inspect the private libs for fontconfig to anything that depends on it: it's arguably a bug in cmake that it can't tolerate {} there, but it seems fairly clear that this patch in its current form can't be producing any useful effect. The 2.6.0-2.8.0 upgrade seems to have lost the $ character but that was a year ago. I have some vague memory about autotools doing something nasty to @bar@ replacements containing shell variables like ${libdir} so this could have been to work around that as otherwise you end up with libdir hardcoded in to the file in an expanded form. Assuming autotools does put something sensible into the file, it can likely be dropped now. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] qemu: change default kernel to 3.0.x
The explicit setting of version preference to 2.6.37 is no longer required. All of the qemu targets have been built and boot tested on 3.0.1 for core-image-minimal and core-image-sato and are safe for wider build/boot testing. Signed-off-by: Bruce Ashfield bruce.ashfi...@windriver.com --- meta/conf/machine/include/qemu.inc |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc index 4cab6f3..9ef242f 100644 --- a/meta/conf/machine/include/qemu.inc +++ b/meta/conf/machine/include/qemu.inc @@ -12,7 +12,6 @@ RDEPENDS_kernel-base = # Use a common kernel recipe for all QEMU machines PREFERRED_PROVIDER_virtual/kernel ?= linux-yocto -PREFERRED_VERSION_linux-yocto ?= 2.6.37+git% #PREFERRED_PROVIDER_linux-libc-headers ?= linux-libc-headers-yocto EXTRA_IMAGEDEPENDS += qemu-native qemu-helper-native -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] linux-yocto: bump version string to 3.0.1
There was some confusion around the 3.0 version string in the linux-yocto recipe when the merged version was 3.0.1. Bumping the version string should clarify what version will be fetched. Signed-off-by: Bruce Ashfield bruce.ashfi...@windriver.com --- meta/recipes-kernel/linux/linux-yocto_3.0.bb |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto_3.0.bb b/meta/recipes-kernel/linux/linux-yocto_3.0.bb index ba352e2..132ee0f 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb @@ -11,7 +11,7 @@ KMACHINE_qemuarm = yocto/standard/arm-versatile-926ejs KBRANCH = ${KMACHINE} KMETA = meta -LINUX_VERSION ?= 3.0 +LINUX_VERSION ?= 3.0.1 LINUX_VERSION_EXTENSION ?= -yocto-${LINUX_KERNEL_TYPE} SRCREV_machine_qemuarm = 36b4cdddcafc711f0ec9ad97882f23a6443c61b2 @@ -22,7 +22,7 @@ SRCREV_machine_qemux86-64 = d0b814813bce09971c5cbb0d22bacb8842146fa0 SRCREV_machine = ad13129a87957656c18584793abcee51de0e196a SRCREV_meta = 7782fc673afd6a1c742409896ae787560d96fce8 -PR = r0 +PR = r1 PV = ${LINUX_VERSION}+git${SRCPV} SRCREV_FORMAT = meta_machine -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/3] linux-yocto: consolidated pull request
Richard/Saul, We've had some good mileage on the 3.0.x kernel. I've been building and booting these boards for weeks now and the meta-intel based BSPs have all been switching over and all of Darren's -rt work was done on top of 3.0. So the big part of this pull request is the removal of the explicit version preference to 2.6.37. We still have the old versions(s) as fallbacks, but it does seem to be time to acknowledge that 3.0.x should be the default kernel. As for the timing of the merge, I'll leave this up to you. The following changes since commit a21ff559e7c93e9da61104f4a33e42e6004189fd: Fixup remaining bb.msg.domain users (2011-08-15 17:31:52 +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 (3): linux-yocto: bump version string to 3.0.1 qemu: change default kernel to 3.0.x linux-yocto: meta SRCREV bump meta/conf/machine/include/qemu.inc |1 - meta/recipes-kernel/linux/linux-yocto_3.0.bb |6 +++--- 2 files changed, 3 insertions(+), 4 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] kernels
On Thu, Jul 21, 2011 at 1:36 PM, Bruce Ashfield bruce.ashfi...@gmail.com wrote: On Thu, Jul 21, 2011 at 1:23 PM, Anders Darander and...@chargestorm.se wrote: On 20 jul 2011, at 22:18, Bruce Ashfield bruce.ashfi...@gmail.com wrote: On Wed, Jul 20, 2011 at 11:45 AM, Koen Kooi k...@dominion.thruhere.net wrote: Op 20 jul 2011, om 17:42 heeft Bruce Ashfield het volgende geschreven: On Fri, Jul 15, 2011 at 11:36 AM, Bruce Ashfield bruce.ashfi...@gmail.com wrote: On Fri, Jul 15, 2011 at 11:02 AM, Phil Blundell ph...@gnu.org wrote: On Fri, 2011-07-15 at 09:51 -0400, Bruce Ashfield wrote: On Fri, Jul 15, 2011 at 9:21 AM, Phil Blundell p...@pbcl.net wrote: The other day I was working on a BSP layer for a fairly generic i586 system and I was struck by the fact that we don't appear to have any vanilla kernel recipes in oe-core. I had sort of expected that, to get a standard bzImage out, I would just need to ship an appropriate defconfig in my layer and everything else would just work. Hmm. Perhaps it isn't documented clearly enough as such, but the linux-yocto kernel base can work in this mode, since that was a design goal of 1.0. You pick a branch, throw in a config fragment (or defconfig if you really want) and build. The base branches in the tree are generic enough to sort a range of boards out of the box, and should form a base. Okay, cool. I'll give it a go and see how I get on. Is there a description anywhere of what the functional differences are between the code in linux-yocto git and the upstream kernel.org tree? It varies, and the variables are many, so I can answer this in several ways. Following up on my own email. I'm just about to push out the 3.0 kernel support / changes, so I'm seeing the light at the end of the tunnel and recalled that this is still hanging a bit. Is there anything tangible you wanted me to do here ? Create an example ? Write a short howto .. or something else ? A guide to make your own setup that isn't based on linux-yocto but which does work with the linux-yocto bbclass? That's reasonable. Once I get the imminent kernel uprev out the door, I'll focus on something along these lines. That sounds good. Upon re-reading the email, I wasn't really sure if the intent was a guide on how to supply your own configuration, or whether it was intended to be about how to integrate a custom BSP-kernel (preferably both tarball and directly from a local git repo). If it was the first, then I hope that later on we'll be able to derive a guide for developing a custom BSP-layer (it's the kernel part I'm interested in). It was more the first in this case, but it can actually encompass the second. What would be covered here would be a special case of developing a custom layer. Taking some arbitrary source, configuration, patches, git trees and creating a kernel repo that would work with the linux-yocto tools and recipes. The second topic of creating a custom BSP layer, doesn't (and shouldn't normally) have to go so far. A simple branch reference, or reference to a tree based on a known linux-yocto is all you need to build with linux-yocto for most custom BSPs. As for the source of that custom BSP (tarball or git) that would be covered in how to create that custom branch reference. bumping this old thread (by replying to myself), this hasn't been forgotten, and I spent considerable time on some docs last week. I've got a few small sections remaining to complete (but important sections), and I'll have some reasonable docs that I can send out in the next day or so. Cheers, Bruce Preferably first a guide on how to get a custom BSP kernel built from git, and later on, when there both are time available as well as some more stabilization, how to base my own BSP kernel on linux-yocto (eg. using linux-yocto as the upstream repo). It's unfortunately not always that likely that the BSP for some products will be mainlined... I experience this every day as well .. bsp patches that will largely live forever, so I completely understand. The structure of the repos is created to manage just this sort of nagging patch and any crimes they may have committed. So this topic can be explicitly called out and worked on. The basics are covered in the existing guides, but it sounds like some end to end use cases might be in order. Bruce Cheers, Anders ___ 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 -- 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
Re: [OE-core] [PATCH V2] bluez4: Added new recipe 4.96 and removed 4.82 version
Saul Wold wrote on 2011-08-16: On 08/12/2011 01:04 AM, Noor, Ahsan wrote: From: Noor Ahsannoor_ah...@mentor.com * Added new recipe 4.96 and removed 4.82 version and its files. Signed-off-by: Noor Ahsannoor_ah...@mentor.com Merged into OE-Core The patch causes a failure: NOTE: package bluez-hcidump-2.0-r0: task do_compile: Failed I reported http://bugzilla.pokylinux.org/show_bug.cgi?id=1371 for this. Thanks, -- Dexuan ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] rpm: configure with staging native path for magic file
* Remove hardcoded system path for path-magic file in order to avoid potential mistmatch between host and yocto native tools as reported in yocto mailing list: error: magic_load(ms, /usr/share/misc/magic) failed: File 5.4 supports only version 7 magic files. `/usr/share/misc/magic.mgc' is version 8 * Another solution is to update meta/recipes-devtools/file/file_5.04.bb to a newer version ie. file_5.07.bb Signed-off-by: Adrian Alonso aalons...@gmail.com --- meta/recipes-devtools/rpm/rpm_5.4.0.bb |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb b/meta/recipes-devtools/rpm/rpm_5.4.0.bb index c0e3208..948ed84 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb @@ -45,7 +45,7 @@ LIC_FILES_CHKSUM = file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 DEPENDS = bzip2 zlib db openssl elfutils expat libpcre attr acl popt ${extrarpmdeps} extrarpmdeps = python perl extrarpmdeps_virtclass-native = -PR = r19 +PR = r20 # rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed # in order to extract the distribution SRPM into a format we can extract... @@ -120,7 +120,7 @@ EXTRA_OECONF = --verbose \ ${WITH_DB} \ ${WITH_Z} \ --with-file \ - --with-path-magic=/usr/share/misc/magic \ + --with-path-magic=${STAGING_DIR_NATIVE}/usr/share/misc/magic.mgc \ --without-lua \ --without-tcl \ --with-syck=internal \ -- 1.7.6 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 Bug #892 2/2] meta-toolchain/environment: Collected site config files in runtime.
[YOCTO #892] Use the new cached site config files generation mechanism in toolchain-script.bbclass. Signed-off-by: Lianhao Lu lianhao...@intel.com --- meta/classes/populate_sdk.bbclass |2 +- meta/recipes-core/meta/meta-environment.bb|7 +++ meta/recipes-core/meta/meta-toolchain-gmae.bb |2 ++ meta/recipes-core/meta/meta-toolchain.bb |4 +--- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/meta/classes/populate_sdk.bbclass b/meta/classes/populate_sdk.bbclass index 0f3591b..69780e5 100644 --- a/meta/classes/populate_sdk.bbclass +++ b/meta/classes/populate_sdk.bbclass @@ -47,7 +47,7 @@ fakeroot do_populate_sdk() { ln -s /etc/ld.so.cache ${SDK_OUTPUT}/${SDKPATHNATIVE}/etc/ld.so.cache # Setup site file for external use - toolchain_create_sdk_siteconfig ${SDK_OUTPUT}/${SDKPATH}/site-config-${MULTIMACH_TARGET_SYS} ${CONFIG_SITE} + toolchain_create_sdk_siteconfig ${SDK_OUTPUT}/${SDKPATH}/site-config-${MULTIMACH_TARGET_SYS} toolchain_create_sdk_env_script diff --git a/meta/recipes-core/meta/meta-environment.bb b/meta/recipes-core/meta/meta-environment.bb index 114727c..39ba96c 100644 --- a/meta/recipes-core/meta/meta-environment.bb +++ b/meta/recipes-core/meta/meta-environment.bb @@ -2,13 +2,12 @@ DESCRIPTION = Package of environment files for SDK LIC_FILES_CHKSUM = file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 LICENSE = MIT -PR = r6 +PR = r7 EXCLUDE_FROM_WORLD = 1 inherit toolchain-scripts -# get target config site before inheritting cross-canadian -TARGET_CONFIG_SITE := ${@siteinfo_get_files(d)} +TOOLCHAIN_NEED_CONFIGSITE_CACHE += zlib REAL_MULTIMACH_TARGET_SYS = ${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS} SDK_DIR = ${WORKDIR}/sdk @@ -23,7 +22,7 @@ do_generate_content() { rm -rf ${SDK_OUTPUT} mkdir -p ${SDK_OUTPUT}/${SDKPATH} -toolchain_create_sdk_siteconfig ${SDK_OUTPUT}/${SDKPATH}/site-config-${REAL_MULTIMACH_TARGET_SYS} ${TARGET_CONFIG_SITE} +toolchain_create_sdk_siteconfig ${SDK_OUTPUT}/${SDKPATH}/site-config-${REAL_MULTIMACH_TARGET_SYS} toolchain_create_sdk_env_script_for_installer ${REAL_MULTIMACH_TARGET_SYS} diff --git a/meta/recipes-core/meta/meta-toolchain-gmae.bb b/meta/recipes-core/meta/meta-toolchain-gmae.bb index 4f5501e..512810b 100644 --- a/meta/recipes-core/meta/meta-toolchain-gmae.bb +++ b/meta/recipes-core/meta/meta-toolchain-gmae.bb @@ -3,3 +3,5 @@ TOOLCHAIN_TARGET_TASK = ${TOOLCHAIN_TARGET_GMAETASK} TOOLCHAIN_OUTPUTNAME = ${SDK_NAME}-toolchain-gmae-${DISTRO_VERSION} PROVIDES = meta-toolchain-sdk require meta-toolchain.bb + +TOOLCHAIN_NEED_CONFIGSITE_CACHE += zlib diff --git a/meta/recipes-core/meta/meta-toolchain.bb b/meta/recipes-core/meta/meta-toolchain.bb index 164d717..1058c68 100644 --- a/meta/recipes-core/meta/meta-toolchain.bb +++ b/meta/recipes-core/meta/meta-toolchain.bb @@ -1,12 +1,10 @@ DESCRIPTION = Meta package for building a installable toolchain LICENSE = MIT -PR = r5 +PR = r6 LIC_FILES_CHKSUM = file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 IMAGETEST ?= dummy inherit populate_sdk imagetest-${IMAGETEST} - -CONFIG_SITE := ${@siteinfo_get_files(d)} -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 Bug #892 1/2] toolchain-script.bbclass: Collected cached site config in runtime.
[YOCTO #892] Modify the function toolchain_create_sdk_siteconfig to collect the cached site config files which are specified by TOOLCHAIN_NEED_CONFIGSITE_CACHE in runtime. Also added task dependency to ensure the cached site config files are generated. Signed-off-by: Lianhao Lu lianhao...@intel.com --- meta/classes/siteinfo.bbclass |4 +++- meta/classes/toolchain-scripts.bbclass | 24 +--- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass index a61b5e5..02294c4 100644 --- a/meta/classes/siteinfo.bbclass +++ b/meta/classes/siteinfo.bbclass @@ -118,7 +118,7 @@ python () { bb.fatal(Please add your architecture to siteinfo.bbclass) } -def siteinfo_get_files(d): +def siteinfo_get_files(d, no_cache = False): sitedata = siteinfo_data(d) sitefiles = for path in d.getVar(BBPATH, True).split(:): @@ -127,6 +127,8 @@ def siteinfo_get_files(d): if os.path.exists(filename): sitefiles += filename + +if no_cache: return sitefiles + # Now check for siteconfig cache files path_siteconfig = bb.data.getVar('SITECONFIG_SYSROOTCACHE', d, 1) if os.path.isdir(path_siteconfig): diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass index f7b52be..6fc67f8 100644 --- a/meta/classes/toolchain-scripts.bbclass +++ b/meta/classes/toolchain-scripts.bbclass @@ -101,17 +101,28 @@ toolchain_create_sdk_env_script_for_installer () { echo 'export POKY_SDK_VERSION=${SDK_VERSION}' $script } +#we get the cached site config in the runtime +TOOLCHAIN_CONFIGSITE_NOCACHE := ${@siteinfo_get_files(d, True)} +TOOLCHAIN_CONFIGSITE_SYSROOTCACHE := ${STAGING_DATADIR}/${TARGET_SYS}_config_site.d +TOOLCHAIN_NEED_CONFIGSITE_CACHE = eglibc ncurses + #This function create a site config file toolchain_create_sdk_siteconfig () { local siteconfig=$1 - shift - local files=$@ rm -f $siteconfig touch $siteconfig - for sitefile in ${files} ; do + + for sitefile in ${TOOLCHAIN_CONFIGSITE_NOCACHE} ; do cat $sitefile $siteconfig done + + #get cached site config + for sitefile in ${TOOLCHAIN_NEED_CONFIGSITE_CACHE}; do + if [ -r ${TOOLCHAIN_CONFIGSITE_SYSROOTCACHE}/${sitefile}_config ]; then + cat ${TOOLCHAIN_CONFIGSITE_SYSROOTCACHE}/${sitefile}_config $siteconfig + fi + done } #This function create a version information file @@ -124,3 +135,10 @@ toolchain_create_sdk_version () { echo 'Metadata Revision: ${METADATA_REVISION}' $versionfile echo 'Timestamp: ${DATETIME}' $versionfile } + +python __anonymous () { +deps = bb.data.getVarFlag('do_configure', 'depends', d) or +for dep in (bb.data.getVar('TOOLCHAIN_NEED_CONFIGSITE_CACHE', d, True) or ).split(): +deps += %s:do_populate_sysroot % dep +bb.data.setVarFlag('do_configure', 'depends', deps, d) +} -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 Bug #892 0/2] Collected cached siteconfig in the runtime
These 2 patches are trying to fix the bug #892. It collected the cached site config files name in the runtime for meta-toolchain and meta-environment, and also added task dependencies to ensure the caches are generated. The variable TOOLCHAIN_NEED_CONFIGSITE_CACHE specifies what site config files are needed from the cache used for the toolchain. The following changes since commit 13db5f420ca9bff98561f80d78958278734ad1f4: Zhai Edwin (1): distro-tracking: Update info for gpgme, libassuan, apr... after last upgrade. are available in the git repository at: git://git.yoctoproject.org/poky-contrib llu/bug892 http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=llu/bug892 Lianhao Lu (2): toolchain-script.bbclass: Collected cached site config in runtime. meta-toolchain/environment: Collected site config files in runtime. meta/classes/populate_sdk.bbclass |2 +- meta/classes/siteinfo.bbclass |4 +++- meta/classes/toolchain-scripts.bbclass| 24 +--- meta/recipes-core/meta/meta-environment.bb|7 +++ meta/recipes-core/meta/meta-toolchain-gmae.bb |2 ++ meta/recipes-core/meta/meta-toolchain.bb |4 +--- 6 files changed, 31 insertions(+), 12 deletions(-) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2] bluez4: Added new recipe 4.96 and removed 4.82 version
On Tue, Aug 16, 2011 at 10:40:38AM +0800, Cui, Dexuan wrote: Saul Wold wrote on 2011-08-16: On 08/12/2011 01:04 AM, Noor, Ahsan wrote: From: Noor Ahsannoor_ah...@mentor.com * Added new recipe 4.96 and removed 4.82 version and its files. Signed-off-by: Noor Ahsannoor_ah...@mentor.com Merged into OE-Core The patch causes a failure: NOTE: package bluez-hcidump-2.0-r0: task do_compile: Failed I reported http://bugzilla.pokylinux.org/show_bug.cgi?id=1371 for this. You need patch from this commit http://git.openembedded.org/cgit.cgi/meta-openembedded/commit/?id=852ac4b589adb186191ad70a2fa3472d5b351ec4 or upgrade to 2.1 Regards, -- 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] dbus: only use x11 if DISTRO_FEATURES has selected it
Hi, I was trying to take advantage of the new x11 DISTRO_FEATURE and ran into some trouble with the dbus package. When building with meta-oe, gconf depends on dbus-x11, and just about everything depends on gconf. So when I disable x11, I can only build my images with 'bitbake -I dbus-x11'. As it turns out, the files shipped in dbus-x11 are still built even when the --without-x option is used. Perhaps it would be better to allow them to be packaged, even without x11 support? James ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core