Re: [OE-core] [RFC] .la files cleanup
On 10/03/2011 06:55 PM, Phil Blundell wrote: On Mon, 2011-10-03 at 14:58 +0400, Dmitry Eremin-Solenikov wrote: My proposal would be to include a special task or a do_install_append() part that will remove specified .la files. (like ${libdir}/xorg/modules/*/.la, ${libdir}/matchbox-panel/*.la, etc.). I see this usually done in do_install or in special do_install_append parts, but I think it would be better to handle this globally. I guess the ideal solution would be to find a way to stop libtool from installing these things in the first place. It isn't totally obvious to me that the .la files are a net benefit even for real shared libraries, and for plugins I think they are probably a net loss in most/all cases. When this issue last came up it seemed that Richard's preferred fix was to just ship the .la files in FILES_${PN}-dev, and I guess that approach does at least have the merit of simplicity. See: http://lists.linuxtogo.org/pipermail/openembedded-core/2011-July/005533.html I see... Then I'd drop some local patches dropping .la files and just push them into -dev packages. RP, is that suitable for you? -- With best wishes Dmitry ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/7] Qt4 upgrade/fixes
On 09/30/2011 08:57 PM, Richard Purdie wrote: On Fri, 2011-09-30 at 17:33 +0100, Paul Eggleton wrote: This is a pull request for Eric Bénard's qt4_upgrade branch, including an update of Qt to 4.7.4 (preserving 4.7.3 until other layers such as meta-oe, meta-yocto etc. can sync up) as well as several important bug fixes. The patches look good; if was to be really picky though I would say that the two demo/doc patches in the series ought to be merged into one patch, and there are a few typos in the commit messages. I'm also relying on others to review the correctness of the armv6-vfp no-neon patch as I have no knowledge of this area. The following changes since commit c54c1280fc0d06a53e23339c3913ec88eead13d9: base.bbclass: Drop unneeded dependency (2011-09-30 11:34:44 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib paule/qt4_upgrade http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/qt4_upgrade Denis Carikli (3): qt4.inc: remove the optional documentation package from the demo's RRECOMMENDS qt4(embedded and x11): disable neon for armv6-vfp qt4.inc: package qtdemo's docs in a separate package Eric Bénard (3): qt4e-demo-image: improve image qt4: fix generated sdk qt4: update to latest version 4.7.4 Otavio Salvador (1): qt4: fix translation support Thanks Paul. I fixed the typos and queued this on master-next. It seems, during 4.7.3 - 4.7.4 addition, fix-translation patch got lost. Richard please reaply the qt4: fix translation support after s/4.7.3/4.7.4/ . I can provide a patch if you'd like. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core -- With best wishes Dmitry ___ 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: packaging fixup
Improve packaging: * Add phrasebook packages to DYNAMIC_PACKAGES * Correct phrasebook packages generation * Include more files into -dbg packages * Package fontdir and fonts README. Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- meta/recipes-qt/qt4/qt4-embedded.inc |2 +- meta/recipes-qt/qt4/qt4-x11-free.inc |2 +- meta/recipes-qt/qt4/qt4.inc | 13 - 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc index 53e1297..79473c9 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 = r34 +INC_PR = r35 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 f76a97f..f391028 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 = r31 +INC_PR = r32 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 eb01a1b..d6382f5 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc @@ -50,7 +50,7 @@ python __anonymous () { ${libdir}/lib%(name)s${QT_LIBINFIX}.so ${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(FILES_%s-dbg % pkg, ${libdir}/.debug/lib%(name)s${QT_LIBINFIX}.so* % locals(), d) bb.data.setVar(RRECOMMENDS_%s-dbg % pkg, ${PN}-dbg, d) lib_packages.append(pkg) dev_packages.append(%s-dev % pkg) @@ -67,7 +67,7 @@ python __anonymous () { ${libdir}/lib%(name)s.so ${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(FILES_%s-dbg % pkg, ${libdir}/.debug/lib%(name)s.so* % locals(), d) bb.data.setVar(RRECOMMENDS_%s-dbg % pkg, ${PN}-dbg, d) lib_packages.append(pkg) dev_packages.append(%s-dev % pkg) @@ -104,7 +104,7 @@ OTHER_PACKAGES = \ #We prepend so ${QT_BASE_NAME}-demos-doc comes before ${PN}-doc,so the packaging of FILES_ get done before. PACKAGES =+ ${QT_BASE_NAME}-demos-doc PACKAGES += ${LIB_PACKAGES} ${DEV_PACKAGES} ${DBG_PACKAGES} ${OTHER_PACKAGES} -PACKAGES_DYNAMIC = ${QT_BASE_NAME}-plugin-* ${QT_BASE_NAME}-translation-* ${QT_BASE_NAME}-fonts-* +PACKAGES_DYNAMIC = ${QT_BASE_NAME}-plugin-* ${QT_BASE_NAME}-translation-* ${QT_BASE_NAME}-phrasebook-* ${QT_BASE_NAME}-fonts-* ALLOW_EMPTY_${PN} = 1 ALLOW_EMPTY_${QT_BASE_NAME}-fonts = 1 @@ -157,6 +157,7 @@ FILES_${QT_BASE_NAME}-fonts-ttf-dejavu = ${libdir}/fonts/DejaVu*.ttf FILES_${QT_BASE_NAME}-fonts-pfa= ${libdir}/fonts/*.pfa FILES_${QT_BASE_NAME}-fonts-pfb= ${libdir}/fonts/*.pfb FILES_${QT_BASE_NAME}-fonts-qpf= ${libdir}/fonts/*.qpf +FILES_${QT_BASE_NAME}-fonts= ${libdir}/fonts/README ${libdir}/fonts/fontdir FILES_${QT_BASE_NAME}-linguist = ${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/lconvert ${bindir}/qm2ts FILES_${QT_BASE_NAME}-linguist-dbg = ${bindir}/.debug/*linguist* ${bindir}/.debug/lrelease ${bindir}/.debug/lupdate ${bindir}/.debug/lconvert ${bindir}/.debug/qm2ts FILES_${QT_BASE_NAME}-pixeltool= ${bindir}/pixeltool @@ -171,7 +172,7 @@ 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 +FILES_${QT_BASE_NAME}-qml-plugins-dbg = ${libdir}/${QT_DIR_NAME}/imports/*/*/*/.debug/* ${libdir}/${QT_DIR_NAME}/imports/*/.debug ${libdir}/${QT_DIR_NAME}/plugins/qmltooling/.debug do_configure() { unset QMAKESPEC @@ -233,8 +234,10 @@ python populate_packages_prepend() { phrasebook_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/', d) phrasebook_name = bb.data.expand('${QT_BASE_NAME
[OE-core] [PATCH 1/2] qt4: Fix translation support
From: Otavio Salvador ota...@ossystems.com.br The translation support was disable in build. The fix-translation.patch was imported from OpenEmbedded to fix a linking issue in phonon translation support. [Dmitry Eremin-Solenikov: ported to apply to qt 4.7.4 build, bumped PR] Signed-off-by: Otavio Salvador ota...@ossystems.com.br Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- meta/recipes-qt/qt4/qt-4.7.4.inc |9 ++--- .../recipes-qt/qt4/qt-4.7.4/fix-translations.patch | 32 meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb |2 +- meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb |2 +- 4 files changed, 38 insertions(+), 7 deletions(-) create mode 100644 meta/recipes-qt/qt4/qt-4.7.4/fix-translations.patch diff --git a/meta/recipes-qt/qt4/qt-4.7.4.inc b/meta/recipes-qt/qt4/qt-4.7.4.inc index 5c06bbe..bc33b6b 100644 --- a/meta/recipes-qt/qt4/qt-4.7.4.inc +++ b/meta/recipes-qt/qt4/qt-4.7.4.inc @@ -13,6 +13,7 @@ SRC_URI = http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}. file://0009-support-2bpp.patch \ file://0001-Added-Openembedded-crossarch-option.patch \ file://blacklist-diginotar-certs.diff \ + file://fix-translations.patch \ file://g++.conf \ file://linux.conf \ file://fix-qtbug-20925.patch \ @@ -27,7 +28,9 @@ FILES_${QT_BASE_NAME}-tools+= ${bindir}/qml do_configure_prepend() { for pro in $(find ${S} -name *.pro) ; do -sed -i 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' $pro +sed -i \ +-e 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' \ +-e 's:qtPrepareTool(LRELEASE, lrelease):LRELEASE = ${OE_QMAKE_LRELEASE}:g' $pro done sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf @@ -39,10 +42,6 @@ do_configure_prepend() { ${S}/configure } -do_configure_append() { -sed -e '/QMAKE_TARGET /d' -e '/TARGET /d' -i ${S}/translations/Makefile -} - QT_GLFLAGS ?= QT_CONFIG_FLAGS += -xmlpatterns -no-rpath -qt3support -reduce-relocations -silent ${QT_GLFLAGS} diff --git a/meta/recipes-qt/qt4/qt-4.7.4/fix-translations.patch b/meta/recipes-qt/qt4/qt-4.7.4/fix-translations.patch new file mode 100644 index 000..906d4e3 --- /dev/null +++ b/meta/recipes-qt/qt4/qt-4.7.4/fix-translations.patch @@ -0,0 +1,32 @@ +fix phony translation linking error + + | .../usr/lib/crt1.o: In function `_start': + | .../../sysdeps/i386/elf/start.S:115: undefined reference to `main' + | collect2: ld returned 1 exit status + +Upstream-Status: Pending + +Signed-off-by: Otavio Salvador ota...@ossystems.com.br + +diff --git a/translations/translations.pro b/translations/translations.pro +index cdaf04a..24fa668 100644 +--- a/translations/translations.pro b/translations/translations.pro +@@ -20,7 +20,7 @@ updateqm.name = LRELEASE ${QMAKE_FILE_IN} + updateqm.CONFIG += no_link + QMAKE_EXTRA_COMPILERS += updateqm + +-isEmpty(vcproj) { ++!isEmpty(vcproj) { + QMAKE_LINK = @: IGNORE THIS LINE + OBJECTS_DIR = + win32:CONFIG -= embed_manifest_exe +@@ -30,7 +30,7 @@ isEmpty(vcproj) { + phony_src.input = PHONY_DEPS + phony_src.output = phony.c + phony_src.variable_out = GENERATED_SOURCES +-phony_src.commands = echo int main() { return 0; } phony.c ++phony_src.commands = echo \int main() { return 0; }\ phony.c + phony_src.name = CREATE phony.c + phony_src.CONFIG += combine + QMAKE_EXTRA_COMPILERS += phony_src diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb b/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb index 9d893f9..34061cb 100644 --- a/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb +++ b/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb @@ -1,7 +1,7 @@ require qt-${PV}.inc require qt4-embedded.inc -PR = ${INC_PR}.2 +PR = ${INC_PR}.3 QT_CONFIG_FLAGS_append_armv6-vfp = -no-neon diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb index 2f39ec0..0290313 100644 --- a/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb +++ b/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb @@ -1,7 +1,7 @@ require qt4-x11-free.inc require qt-${PV}.inc -PR = ${INC_PR}.2 +PR = ${INC_PR}.3 QT_CONFIG_FLAGS_append_armv6-vfp = -no-neon -- 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] meta-micro problems
On 09/28/2011 05:32 PM, Paul Eggleton wrote: On Wednesday 28 September 2011 13:51:52 Dmitry Eremin-Solenikov wrote: If you wish, I can retry this with smaller layer set. But if the bug will still arise, I simply have no knowledge/time to look deeper into bb without additional input/pointers from bb gurus. That's OK, I can spend time looking into it. It sounds like a bug in bitbake if metadata can influence it to behave this way. If we can produce a simplified test case I think it will be easier to fix. I have rechecked things on my test box, meta-micro still causes fails for me on rebuild. Setup: I use setup-scripts from angstrom, change bblayers.conf to contain only oe-core and meta-micro, switched DISTRO to micro, changed PARALLEL_MAKE to -j 4, BB_NUMBER_THREADS to 4, machine is qemuarm Then: 1) bitbake pseudo-native succeeds 2) next bitbake pseudo-native fails. Usually in rm_work of any of the packages (automake-native,openssl-native,python-native are few to name). -- With best wishes Dmitry ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/5] kernel.bbclass: blacklist 'perf-dbg' as well for the modules metapackage
Sorry to bother all of you, what about this patchset? -- With best wishes Dmitry ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] meta-micro problems
On 09/28/2011 02:16 PM, Paul Eggleton wrote: Hi Dmitry, On Friday 16 September 2011 19:17:17 Dmitry Eremin-Solenikov wrote: While trying to use a meta-micro, I've stumbled upon a problem. Each run, bitbake keeps running all tasks over and over. Sometimes this leads to failures (http://bugs.lumag.spb.ru/show_bug.cgi?id=33). Sometimes it doesn't. I've narrowed a simple test case. Attached the log of one of the executions of bitbake quilt-native. stamps dir has all necessary stamps, but tasks keep being executed over and over. Layers enabled: meta-micro meta-handhelds meta-opie openembedded-core/meta Did you manage to figure out the cause of this? Does it still happen when meta- opie is removed? It would be useful to try to narrow down what causes the problem as I'd be surprised if all of these layers need to be present to trigger the bug. No, I did another few attempts and then stopped caring about this bug. Just switched to distro-less oe-core. If you wish, I can retry this with smaller layer set. But if the bug will still arise, I simply have no knowledge/time to look deeper into bb without additional input/pointers from bb gurus. Also, did you not have the meta-oe layer enabled? Both meta-opie and meta- handheld normally require it... No, I didn't have meta-oe enabled. No errors during parsing and start of task execution. -- With best wishes Dmitry ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] meta-micro problems
On 09/28/2011 05:32 PM, Paul Eggleton wrote: On Wednesday 28 September 2011 13:51:52 Dmitry Eremin-Solenikov wrote: If you wish, I can retry this with smaller layer set. But if the bug will still arise, I simply have no knowledge/time to look deeper into bb without additional input/pointers from bb gurus. That's OK, I can spend time looking into it. It sounds like a bug in bitbake if metadata can influence it to behave this way. If we can produce a simplified test case I think it will be easier to fix. In my test setup I could no longer reproduce this. I'll try reproducing this on my main builder. -- With best wishes Dmitry ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/5] kernel.bbclass: respect MACHINE_KERNEL_PR
On 9/28/11, Koen Kooi k...@dominion.thruhere.net wrote: Op 28 sep. 2011 om 09:54 heeft Richard Purdie richard.pur...@linuxfoundation.org het volgende geschreven: On Tue, 2011-09-27 at 18:40 -0500, Koen Kooi wrote: Op 27 sep. 2011 om 08:52 heeft Bruce Ashfield bruce.ashfi...@gmail.com het volgende geschreven: On Sat, Sep 17, 2011 at 6:18 PM, Dmitry Eremin-Solenikov dbarysh...@gmail.com wrote: MACHINE_KERNEL_PR was introduced long ago in org.oe.dev. It's present in meta-oe kernel.bbclass. Several machines depend on this functionality. I don' t have a big problem with this, since the change is obviously harmless if it doesn't need to be used. But similar to my comment on patch 3/5, is there any history/technical reasons we can capture here ? I did a quick search to dig up a bit on this myself, but a summary would definitely help, since I see that this has a long and sometimes twisting history. Is it as simple as ? A machine.conf or local.conf can increase MACHINE_KERNEL_PR to force rebuilds for kernel and external modules It is that simple :) I have reservations about this patch given we soon plan to stop needing to bump PR values. This patch is actually a perfect example of how brain dead the current manual PR bumping is and why we need something better. I don't want half the code in the repo to be a mass of PR values which need to be incremented manually under weird and wonderful circumstances which is where the direction things are currently going... I'd like to hold off on this one. This patch improves the current situation and I don't foresee the autoPR code working soon As another point for this patch: I'd like to ask Koen to drop kernel.bbclass from meta-oe. After do_uboot_mkimage this is the only significant difference. And unfortunately this feature is already used on several machines. Quick grep return the following results. Koen, could you comment on this? $ grep MACHINE_KERNEL_PR */{,*/}c* -r meta-openpandora/conf/machine/include/omap3.inc:MACHINE_KERNEL_PR = r101 meta-openpandora/conf/machine/omap3-pandora.conf:MACHINE_KERNEL_PR = r3 meta-texasinstruments/conf/machine/include/davinci.inc:MACHINE_KERNEL_PR = r51 meta-texasinstruments/conf/machine/include/omap3.inc:MACHINE_KERNEL_PR = r105 meta-texasinstruments/conf/machine/include/ti814x.inc:MACHINE_KERNEL_PR = r1 meta-texasinstruments/conf/machine/include/ti816x.inc:MACHINE_KERNEL_PR = r2 meta-smartphone/meta-nokia/conf/machine/nokia900.conf:MACHINE_KERNEL_PR = r68 meta-smartphone/meta-palm/conf/machine/include/palmpre.inc:MACHINE_KERNEL_PR = r0 meta-texasinstruments/recipes-ti/c6accel/ti-c6accel.inc:PR = ${MACHINE_KERNEL_PR} meta-texasinstruments/recipes-ti/codec-engine/ti-codec-engine.inc:PR = ${MACHINE_KERNEL_PR} meta-texasinstruments/recipes-ti/codec-engine/ti-codecs-omap3530_4.00.00.00.bb:PR=${MACHINE_KERNEL_PR} openembedded-core/meta/classes/kernel.bbclass:machine_kernel_pr = bb.data.getVar('MACHINE_KERNEL_PR', d, True) -- With best wishes Dmitry ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] meta-micro problems
On 09/28/2011 05:32 PM, Paul Eggleton wrote: On Wednesday 28 September 2011 13:51:52 Dmitry Eremin-Solenikov wrote: If you wish, I can retry this with smaller layer set. But if the bug will still arise, I simply have no knowledge/time to look deeper into bb without additional input/pointers from bb gurus. That's OK, I can spend time looking into it. It sounds like a bug in bitbake if metadata can influence it to behave this way. If we can produce a simplified test case I think it will be easier to fix. I was too early to say that it works. Got the same issues again on my main builder. I'll run some more tests. E.g. main builder has my meta-micro FEED_ARCH patch commited. That might be one of the problems. Cheers, Paul ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 01/10] default-provider: also define a default provider for gconf-native
Please delay this patch for a while. Now I get the following warning in my build logs (If someone can tell me where the problem lies, that would help). ERROR: Trying to resolve runtime dependency gconf resulted in conflicting PREFERRED_PROVIDER entries being found. The providers found were: ['/home/users/mitya/OE/setup-scripts/sources/openembedded-core/meta/recipes-gnome/gnome/gconf-dbus_705.bb', 'virtual:native:/home/users/mitya/OE/setup-scripts/sources/openembedded-core/meta/recipes-gnome/gnome/gconf-dbus_705.bb'] The PREFERRED_PROVIDER entries resulting in this conflict were: ['PREFERRED_PROVIDER_gconf = gconf-dbus', 'PREFERRED_PROVIDER_gconf-native = gconf-dbus-native'] NOTE: multiple providers are available for runtime gconf (gconf-dbus-native, gconf-dbus, gconf) NOTE: consider defining a PREFERRED_PROVIDER entry to match gconf On 09/23/2011 11:46 PM, Dmitry Eremin-Solenikov wrote: Signed-off-by: Dmitry Eremin-Solenikovdbarysh...@gmail.com --- meta/conf/distro/include/default-providers.inc |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index d51ac64..6e281cc 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc @@ -22,6 +22,7 @@ VIRTUAL-RUNTIME_update-alternatives ?= update-alternatives-cworth PREFERRED_PROVIDER_dbus-glib ?= dbus-glib PREFERRED_PROVIDER_dbus-glib-native ?= dbus-glib-native PREFERRED_PROVIDER_gconf ?= gconf-dbus +PREFERRED_PROVIDER_gconf-native ?= gconf-dbus-native PREFERRED_PROVIDER_gdk-pixbuf ?= gdk-pixbuf PREFERRED_PROVIDER_libgcc ?= libgcc PREFERRED_PROVIDER_libgcc-nativesdk ?= libgcc-nativesdk ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] qt3 vs qt4 issues
On 09/26/2011 04:36 PM, Richard Purdie wrote: On Mon, 2011-09-26 at 16:30 +0400, Dmitry Eremin-Solenikov wrote: On 09/25/2011 06:50 PM, Koen Kooi wrote: Op 25 sep. 2011, om 13:33 heeft Richard Purdie het volgende geschreven: I've been looking at the qt3 failures on the autobuilder. It seems there is some kind of contamination between the qt4 builds and the qt3 builds and I'm not sure what is or isn't expected to work there. We're doing the following in the build: a) Build core-image-lsb (includes qt4, builds qt4+qt4-native) b) Wipe out tmp c) Add in meta-qt3 layer d) Enable sstate from build in a) e) Build core-image-lsb-qt3 which adds in qt3 f) Bitbake determines it needs to install qt4 for the image but nothing depends on the native qt4 tools so these are not installed g) This will build qt3+qt3-native with qt4 in the sysroot but no qt4-native h) We see build failures as qt3 seems to want to find bits of qt4-native If qt4 and qt4-native are present, qt3 works If qt4 and qt4-native are not present, qt3 works If qt4 is present but qt4-native is not, qt3 fails How do we fix this? I suspect qt3 is missing bits of the tool renaming we do for qt4 and qt2 (moc, uic, lrelease, etc) Most probably it's true. However for qt3 it can be harder, as qt4 already provides uic3, etc. If there is overlap, the files could be installed into subdirectories under bin and then inserted into PATH by the appropriate .bbclass files... For qt2/opie we just install uic/moc as uic2/moc2 and the select appropriate tools by passing OE_xxx_MOC (I don't remember xxx ATM) environment variable to qmake/make. -- With best wishes Dmitry ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 11/17] eglibc: fix packaging of some of nativesdk packages
On 09/22/2011 04:04 PM, Martin Jansa wrote: Hi, after this patch PKGSUFFIX is probably evaluated too late and this: # PREFERRED_PROVIDER_glibc-thread-db=eglibc-thread-db PREFERRED_PROVIDER_glibc-thread-db=eglibc-thread-db # RPROVIDES_eglibc-thread-db${PKGSUFFIX}=glibc-thread-db${PKGSUFFIX} RPROVIDES_eglibc-thread-db=glibc-thread-db The strange thing is that if I remove the PKGSUFFIX lines for eglibc-thread-db/eglibc-extra-nss, and put the following lines in, everyghing is working for me. RPROVIDES_eglibc-extra-nss = glibc-extra-nss RPROVIDES_eglibc-thread-db = glibc-thread-db RPROVIDES_eglibc-extra-nss-nativesdk = glibc-extra-nss-nativesdk RPROVIDES_eglibc-thread-db-nativesdk = glibc-thread-db-nativesdk Also the following lines seem to work: RPROVIDES_${PN}-extra-nss = glibc${PKGSUFFIX}-extra-nss RPROVIDES_${PN}-thread-db = glibc${PKGSUFFIX}-thread-db Could you please test that it works for you? doesn't seem to work as expected and gdb pulls whole external-csl-toolchain as glibc-thread-db provider for RRECOMMENDS_gdb_append_linux-gnueabi = glibc-thread-db and btw: ERROR: external-poky-toolchain: Recipe file does not have license file information (LIC_FILES_CHKSUM) ERROR: Licensing Error: LIC_FILES_CHKSUM does not match, please fix and sign of this behavior is also qemu-native pulled to build and warnings like this also for virtual/libc virtual/linux-libc-headers ERROR: Multiple .bb files are due to be built which each provide virtual/libiconv (/OE/shr-core/openembedded-core/meta/recipes-core/eglibc/eglibc_2.13.bb /OE/shr-core/openembedded-core/meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb). Regards, ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 02/10] bitbake.conf: change ccache path to use MULTIMACH_HOST_SYS
Currently if I build packages for several targets (e.g. for armv5te tosa and for armv7a beagleboard) oe will use single ccache dir for both of those targets: build/ccache/arm-oe-linux-gnueabi. However those targets use different opcodes, different features and binaries created for one of those targets wont't run on the lower one. So use MULTIMACH_HOST_SYS for ccache dir, so that it uses something like build/ccache/armv5te-oe-linux-gnueabi dir. Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- meta/conf/bitbake.conf |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index b7bcc23..730439c 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -407,7 +407,7 @@ export PATH CCACHE = ${@bb.which(bb.data.getVar('PATH', d, 1), 'ccache') and 'ccache '} TOOLCHAIN_OPTIONS = --sysroot=${STAGING_DIR_TARGET} -export CCACHE_DIR = ${TMPDIR}/ccache/${HOST_SYS}/${PN} +export CCACHE_DIR = ${TMPDIR}/ccache/${MULTIMACH_HOST_SYS}/${PN} export CC = ${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS} export CXX = ${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS} export F77 = ${CCACHE}${HOST_PREFIX}g77 ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS} -- 1.7.2.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 01/10] default-provider: also define a default provider for gconf-native
Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- meta/conf/distro/include/default-providers.inc |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index d51ac64..6e281cc 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc @@ -22,6 +22,7 @@ VIRTUAL-RUNTIME_update-alternatives ?= update-alternatives-cworth PREFERRED_PROVIDER_dbus-glib ?= dbus-glib PREFERRED_PROVIDER_dbus-glib-native ?= dbus-glib-native PREFERRED_PROVIDER_gconf ?= gconf-dbus +PREFERRED_PROVIDER_gconf-native ?= gconf-dbus-native PREFERRED_PROVIDER_gdk-pixbuf ?= gdk-pixbuf PREFERRED_PROVIDER_libgcc ?= libgcc PREFERRED_PROVIDER_libgcc-nativesdk ?= libgcc-nativesdk -- 1.7.2.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 03/10] bash-completion: new recipe
Add a bash-completion recipe. Largely based on the one from oe-dev repo. Changes: 1) Version bump to most recent bash-completion upstream tarball 2) Dropped custom profile.d script in favour of upstream one. Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- .../bash-completion/bash-completion_20060301.bb| 28 1 files changed, 28 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-extended/bash-completion/bash-completion_20060301.bb diff --git a/meta/recipes-extended/bash-completion/bash-completion_20060301.bb b/meta/recipes-extended/bash-completion/bash-completion_20060301.bb new file mode 100644 index 000..9e8ede2 --- /dev/null +++ b/meta/recipes-extended/bash-completion/bash-completion_20060301.bb @@ -0,0 +1,28 @@ +DESCRIPTION = Programmable Completion for Bash +SECTION = console/utils +RDEPENDS_${PN} = bash +LICENSE = GPLv2 +LIC_FILES_CHKSUM = file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f +PR = r0 + +SRC_URI = http://www.caliban.org/files/bash/bash-completion-${PV}.tar.gz; +S = ${WORKDIR}/bash_completion + +do_configure() { + : +} + +do_compile() { + : +} + +do_install() { + install -d ${D}${sysconfdir}/profile.d + install -m 0755 bash_completion.sh ${D}${sysconfdir}/profile.d + install -m 0755 bash_completion ${D}${sysconfdir} + install -d ${D}${sysconfdir}/bash_completion.d/ + install -m 0755 contrib/* ${D}${sysconfdir}/bash_completion.d/ +} + +SRC_URI[md5sum] = 9bca1cf97e8f8c73e3ef560cc9dead21 +SRC_URI[sha256sum] = 29b78834b975b29810f0bf1f15e5d3a6c003a137cfac7fea671bfaf8f58f5c0d -- 1.7.2.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 05/10] eglibc: fix packaging of some of nativesdk packages, V2
eglibc.inc contains packaging rules that depend on PKGSUFFIX expansion. However that variable wasn't expanded properly in some case. E.g. PACKAGES = ... nscd${PKGSUFFIX} ... FILES_nscd${PKGSUFFIX} = ${sbindir}/nscd* would be expanded to PACKAGES = ... nscd-nativesdk ... FILES_nscd = ${sbindir}/nscd* Thus leading to empty -nativesdk packages and missing files. To overcome that use python code blob to properly define PKGSUFFIX variable. As a change from V1, fix the glibc-thread-db related problem by using ${PN} instead of eglibc-XXX-nativesdk for extra-nss and thread-db packages. Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- meta/recipes-core/eglibc/eglibc-locale.inc | 13 + meta/recipes-core/eglibc/eglibc-package.inc | 13 + meta/recipes-core/eglibc/eglibc_2.12.bb |2 +- meta/recipes-core/eglibc/eglibc_2.13.bb |2 +- 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc b/meta/recipes-core/eglibc/eglibc-locale.inc index d9720e4..ef3699c 100644 --- a/meta/recipes-core/eglibc/eglibc-locale.inc +++ b/meta/recipes-core/eglibc/eglibc-locale.inc @@ -26,10 +26,15 @@ BINARY_LOCALE_ARCHES ?= arm.* i[3-6]86 x86_64 powerpc mips # set 0 for qemu emulation of native localedef for locale generation LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = 1 -PR = r18 - -PKGSUFFIX = -PKGSUFFIX_virtclass-nativesdk = -nativesdk +PR = r19 + +python __anonymous () { +import bb +if bb.data.inherits_class(nativesdk, d): +bb.data.setVar(PKGSUFFIX, -nativesdk, d) +else: +bb.data.setVar(PKGSUFFIX, , d) +} PROVIDES = virtual/libc-locale${PKGSUFFIX} diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc index 519a49c..8e9582c 100644 --- a/meta/recipes-core/eglibc/eglibc-package.inc +++ b/meta/recipes-core/eglibc/eglibc-package.inc @@ -17,8 +17,13 @@ python __anonymous () { # Set this to zero if you don't want ldconfig in the output package USE_LDCONFIG ?= 1 -PKGSUFFIX = -PKGSUFFIX_virtclass-nativesdk = -nativesdk +python __anonymous () { +import bb +if bb.data.inherits_class(nativesdk, d): +bb.data.setVar(PKGSUFFIX, -nativesdk, d) +else: +bb.data.setVar(PKGSUFFIX, , d) +} PACKAGES = ${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} ldd${PKGSUFFIX} ${PN}-utils eglibc-extra-nss${PKGSUFFIX} eglibc-thread-db${PKGSUFFIX} ${PN}-pic ${PN}-dev ${PN}-doc libcidn${PKGSUFFIX} libmemusage${PKGSUFFIX} libsegfault${PKGSUFFIX} ${PN}-pcprofile libsotruss${PKGSUFFIX} @@ -28,8 +33,8 @@ RPROVIDES_${PN}-utils = glibc${PKGSUFFIX}-utils RPROVIDES_${PN}-pic = glibc${PKGSUFFIX}-pic RPROVIDES_${PN}-dev = glibc${PKGSUFFIX}-dev RPROVIDES_${PN}-doc = glibc${PKGSUFFIX}-doc -RPROVIDES_eglibc-extra-nss${PKGSUFFIX} = glibc-extra-nss${PKGSUFFIX} -RPROVIDES_eglibc-thread-db${PKGSUFFIX} = glibc-thread-db${PKGSUFFIX} +RPROVIDES_${PN}-extra-nss = glibc${PKGSUFFIX}-extra-nss +RPROVIDES_${PN}-thread-db = glibc${PKGSUFFIX}-thread-db RPROVIDES_${PN}-pcprofile = glibc${PKGSUFFIX}-pcprofile RPROVIDES_${PN}-dbg = glibc-dbg${PKGSUFFIX} libc_baselibs = ${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so ${base_libdir}/libc.so.* ${base_libdir}/libc-*.so ${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so ${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so ${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so ${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so ${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so ${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so ${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so ${base_libdir}/libnss_files*.so.* ${base_libdir}/libnss_files-*.so ${base_libdir}/libnss_compat*.so.* ${base_libdir}/libnss_compat-*.so ${base_libdir}/libnss_dns*.so.* ${base_libdir}/libnss_dns-*.so ${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so ${base_libdir}/libanl*.so.* ${base_libdir}/libanl-*.so ${base_libdir}/libBrokenLocale*.so.* ${base_libdir}/libBrokenLocale-*.so diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bb b/meta/recipes-core/eglibc/eglibc_2.12.bb index 4220219..e4305a8 100644 --- a/meta/recipes-core/eglibc/eglibc_2.12.bb +++ b/meta/recipes-core/eglibc/eglibc_2.12.bb @@ -1,7 +1,7 @@ require eglibc.inc DEPENDS += gperf-native -PR = r27 +PR = r28 SRCREV = 14158 diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb index fc8ac64..c549d9d 100644 --- a/meta/recipes-core/eglibc/eglibc_2.13.bb +++ b/meta/recipes-core/eglibc/eglibc_2.13.bb @@ -3,7 +3,7 @@ require eglibc.inc SRCREV = 14157 DEPENDS += gperf-native -PR = r17 +PR = r18 PR_append = +svnr${SRCPV} EGLIBC_BRANCH=eglibc-2_13 -- 1.7.2.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 04/10] dbus-glib: include bash-completion stuff
Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- meta/recipes-core/dbus/dbus-glib.inc |4 +++- meta/recipes-core/dbus/dbus-glib_0.92.bb |2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/dbus/dbus-glib.inc b/meta/recipes-core/dbus/dbus-glib.inc index 704dc04..7688a0f 100644 --- a/meta/recipes-core/dbus/dbus-glib.inc +++ b/meta/recipes-core/dbus/dbus-glib.inc @@ -19,7 +19,9 @@ EXTRA_OECONF = --with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-in --with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool EXTRA_OECONF_virtclass-native = --with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml -FILES_${PN} = ${libdir}/lib*.so.* +FILES_${PN} = ${libdir}/lib*.so.* \ + ${sysconfdir}/bash_completion.d/dbus-bash-completion.sh \ + ${libexecdir}/dbus-bash-completion-helper FILES_${PN}-dev += ${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool FILES_${PN}-dev += ${bindir}/dbus-binding-tool diff --git a/meta/recipes-core/dbus/dbus-glib_0.92.bb b/meta/recipes-core/dbus/dbus-glib_0.92.bb index 72bea89..c7266d4 100644 --- a/meta/recipes-core/dbus/dbus-glib_0.92.bb +++ b/meta/recipes-core/dbus/dbus-glib_0.92.bb @@ -1,6 +1,6 @@ require dbus-glib.inc -PR = r0 +PR = r1 SRC_URI[md5sum] = b595b36890c4f9f8f5d5dec131c495f8 SRC_URI[sha256sum] = 5a7fd4cf937cdcb7f2eed61341b70ee0f2607450a50db381618598adf60dd40e -- 1.7.2.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 06/10] icecc-create-env-native: provide the script right in the tree
There is no point in downloading a tarball with no clear upstream (other than icecc itself) and then patching it. Rather put new script in the source tree. Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- .../icecc-create-env-native/icecc-create-env | 192 .../icecc-create-env-native/icecc-lto-update.patch | 103 --- .../icecc-create-env-native_0.1.bb |8 +- 3 files changed, 194 insertions(+), 109 deletions(-) create mode 100755 meta/recipes-devtools/icecc-create-env/icecc-create-env-native/icecc-create-env delete mode 100644 meta/recipes-devtools/icecc-create-env/icecc-create-env-native/icecc-lto-update.patch diff --git a/meta/recipes-devtools/icecc-create-env/icecc-create-env-native/icecc-create-env b/meta/recipes-devtools/icecc-create-env/icecc-create-env-native/icecc-create-env new file mode 100755 index 000..7e4dbc4 --- /dev/null +++ b/meta/recipes-devtools/icecc-create-env/icecc-create-env-native/icecc-create-env @@ -0,0 +1,192 @@ +#! /usr/bin/env bash +# icecc -- A simple distributed compiler system +# +# Copyright (C) 2004 by the Icecream Authors +# GPL + +target_files= + +is_contained () +{ + case $target_files in +* $1 * ) return 0 ;; +*=$1 * ) return 0;; +* ) return 1 ;; + esac +} + +add_file () +{ + local name=$1 + local path=$1; + if test -n $2; then +name=$2 + fi + test -z $name return + # ls -H isn't really the same as readlink, but + # readlink is not portable enough. + path=`ls -H $path` + toadd=$name=$path + is_contained $toadd return + if test -z $silent; then + echo adding file $toadd + fi + target_files=$target_files $toadd + if test -x $path; then +# Only call ldd when it makes sense +if file -L $path | grep 'ELF' /dev/null 21; then + if ! file -L $path | grep 'static' /dev/null 21; then + # ldd now outputs ld as /lib/ld-linux.so.xx on current nptl based glibc + # this regexp parse the outputs like: + # ldd /usr/bin/gcc + # linux-gate.so.1 = (0xe000) + # libc.so.6 = /lib/tls/libc.so.6 (0xb7e81000) + # /lib/ld-linux.so.2 (0xb7fe8000) + # covering both situations ( with = and without ) + for lib in `ldd $path | sed -n 's,^[^/]*\(/[^ ]*\).*,\1,p'`; do + test -f $lib || continue + # Check wether the same library also exists in the parent directory, + # and prefer that on the assumption that it is a more generic one. + local baselib=`echo $lib | sed 's,\(/[^/]*\)/.*\(/[^/]*\)$,\1\2,'` + test -f $baselib lib=$baselib + add_file $lib +done + fi +fi + fi +} + +# backward compat +if test $1 = --respect-path; then + shift +fi + +#add a --silent switch to avoid broken pipe errors when calling this scipt from within OE +if test $1 = --silent; then + silent=1 + shift +fi + + +added_gcc=$1 +shift +added_gxx=$1 +shift +added_as=$1 +shift +archive_name=$1 + +if test -z $added_gcc || test -z $added_gxx ; then + echo usage: $0 gcc_path g++_path + exit 1 +fi + +if ! test -x $added_gcc ; then + echo '$added_gcc' is no executable. + exit 1 +fi + +if ! test -x $added_gxx ; then + echo '$added_gcc' is no executable. + exit 1 +fi + + + +add_file $added_gcc /usr/bin/gcc +add_file $added_gxx /usr/bin/g++ + +if test -z $added_as ; then + add_file /usr/bin/as /usr/bin/as +else + if ! test -x $added_as ; then + echo '$added_as' is no executable. + exit 1 + fi + + add_file $added_as /usr/bin/as +fi + +add_file `$added_gcc -print-prog-name=cc1` /usr/bin/cc1 +add_file `$added_gxx -print-prog-name=cc1plus` /usr/bin/cc1plus +specfile=`$added_gcc -print-file-name=specs` +if test -n $specfile test -e $specfile; then + add_file $specfile +fi + +ltofile=`$added_gcc -print-prog-name=lto1` +pluginfile=${ltofile%lto1}liblto_plugin.so +if test -r $pluginfile +then + add_file $pluginfile ${pluginfile#*usr} + add_file $pluginfile /usr${pluginfile#*usr} +fi + +tempdir=`mktemp -d /tmp/iceccenvXX` +new_target_files= +for i in $target_files; do + case $i in + *=/*) +target=`echo $i | cut -d= -f1` +path=`echo $i | cut -d= -f2` +;; + *) +path=$i +target=$i +;; + esac + mkdir -p $tempdir/`dirname $target` + cp -p $path $tempdir/$target + if test -f $tempdir/$target -a -x $tempdir/$target; then +strip -s $tempdir/$target 2/dev/null + fi + target=`echo $target | cut -b2-` + new_target_files=$new_target_files $target +done + +#sort the files +target_files=`for i in $new_target_files; do echo $i; done | sort` + +#test if an archive name was supplied +#if not use the md5 of all files as the archive name +if test -z $archive_name; then + md5sum=NONE + for file in /usr/bin/md5sum /bin/md5 /usr/bin/md5; do +if test -x $file; then + md5sum=$file + break +fi + done + + #calculate md5 and use it as the archive
[OE-core] [PATCH 09/10] gconf-dbus: packaging fixup
Behave more like plain gconf: include a dtd and .la files into -dev package. Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- meta/recipes-gnome/gnome/gconf-dbus_705.bb |4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/meta/recipes-gnome/gnome/gconf-dbus_705.bb b/meta/recipes-gnome/gnome/gconf-dbus_705.bb index fdfc45f..c0c2e28 100644 --- a/meta/recipes-gnome/gnome/gconf-dbus_705.bb +++ b/meta/recipes-gnome/gnome/gconf-dbus_705.bb @@ -10,7 +10,7 @@ RPROVIDES_${PN}-dev = gconf-dev #SRCREV = 705 #PV = 2.16.0+svnr${SRCPV} -PR = r0 +PR = r1 # This SVN repo is no longer available use a tarball mirror site until # we move to proper gconf recipe. @@ -33,6 +33,8 @@ do_configure_prepend() { FILES_${PN} = ${libdir}/GConf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus* ${libdir}/*.so.* ${bindir}/* ${libexecdir}/* FILES_${PN}-dbg += ${libdir}/GConf-dbus/2/.debug +FILES_${PN}-dev += ${datadir}/sgml/gconf/gconf-1.0.dtd \ + ${libdir}/GConf-dbus/2/*.la BBCLASSEXTEND = native -- 1.7.2.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 07/10] gcc: fix possible problems with nscd compilation during eglibc-nativesdk build
Long time ago a066e7ca90a28d5681c5fa895a29e999ed7c88b was committed to address possible problems with compilation of nscd during eglibc-nativesdk build. Problems were related to the way gcc searches for headers to check if it should enable it's own stack smash protection bits or it can relay on eglibc for it. However after 934d38530c9a67562e53d4034aee5531f0f26750 things got broken, as for gcc-crosssdk-intermediate packages: 1) EXTRA_OECONF is ignored 2) headers are installed in a different location than expected by that patch. This results in eglibc-nativesdk build broken on some systems (e.g. mine Debian x86_64 squeeze). Fix that by providing with-headers options to crosssdk-intermediate gcc configuration. Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- meta/recipes-devtools/gcc/gcc-4.5.1.inc|2 +- meta/recipes-devtools/gcc/gcc-4.6.inc |2 +- .../gcc/gcc-crosssdk-intermediate.inc |2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/gcc/gcc-4.5.1.inc b/meta/recipes-devtools/gcc/gcc-4.5.1.inc index 90824bd..6a9a7a6 100644 --- a/meta/recipes-devtools/gcc/gcc-4.5.1.inc +++ b/meta/recipes-devtools/gcc/gcc-4.5.1.inc @@ -1,6 +1,6 @@ require gcc-common.inc -PR = r10 +PR = r11 DEPENDS =+ mpfr gmp libmpc elfutils NATIVEDEPS = mpfr-native gmp-native gettext-native libmpc-native elfutils-native diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc b/meta/recipes-devtools/gcc/gcc-4.6.inc index ee42fa7..5d83e90 100644 --- a/meta/recipes-devtools/gcc/gcc-4.6.inc +++ b/meta/recipes-devtools/gcc/gcc-4.6.inc @@ -1,6 +1,6 @@ require gcc-common.inc -PR = r11 +PR = r12 # Third digit in PV should be incremented after a minor release # happens from this branch on gcc e.g. currently its 4.6.0 diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk-intermediate.inc b/meta/recipes-devtools/gcc/gcc-crosssdk-intermediate.inc index ed5d5e8..8f20d20 100644 --- a/meta/recipes-devtools/gcc/gcc-crosssdk-intermediate.inc +++ b/meta/recipes-devtools/gcc/gcc-crosssdk-intermediate.inc @@ -7,3 +7,5 @@ SYSTEMLIBS1 = ${SDKPATHNATIVE}${libdir_nativesdk}/ DEPENDS = virtual/${TARGET_PREFIX}binutils-crosssdk gettext-native DEPENDS += virtual/${TARGET_PREFIX}libc-initial-nativesdk PROVIDES = virtual/${TARGET_PREFIX}gcc-intermediate-crosssdk + +EXTRA_OECONF += --with-headers=${STAGING_DIR_TCBOOTSTRAP}${SYSTEMHEADERS} -- 1.7.2.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 08/10] gcc: include libgcov.a into libgcc-dev package
From: lumag dbarysh...@gmail.com First, this lib is usefull for coverage analysis-enabled building. Second, this fixes the warning about unpackaged files in libgcc recipe. Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com Signed-off-by: Koen Kooi k...@dominion.thruhere.net Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- meta/recipes-devtools/gcc/gcc-4.5.1.inc |2 +- meta/recipes-devtools/gcc/gcc-4.6.inc |2 +- meta/recipes-devtools/gcc/libgcc_4.5.1.bb |1 + meta/recipes-devtools/gcc/libgcc_4.6.bb |1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/gcc/gcc-4.5.1.inc b/meta/recipes-devtools/gcc/gcc-4.5.1.inc index 6a9a7a6..839529e 100644 --- a/meta/recipes-devtools/gcc/gcc-4.5.1.inc +++ b/meta/recipes-devtools/gcc/gcc-4.5.1.inc @@ -1,6 +1,6 @@ require gcc-common.inc -PR = r11 +PR = r12 DEPENDS =+ mpfr gmp libmpc elfutils NATIVEDEPS = mpfr-native gmp-native gettext-native libmpc-native elfutils-native diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc b/meta/recipes-devtools/gcc/gcc-4.6.inc index 5d83e90..b7b6a43 100644 --- a/meta/recipes-devtools/gcc/gcc-4.6.inc +++ b/meta/recipes-devtools/gcc/gcc-4.6.inc @@ -1,6 +1,6 @@ require gcc-common.inc -PR = r12 +PR = r13 # Third digit in PV should be incremented after a minor release # happens from this branch on gcc e.g. currently its 4.6.0 diff --git a/meta/recipes-devtools/gcc/libgcc_4.5.1.bb b/meta/recipes-devtools/gcc/libgcc_4.5.1.bb index 09e3c1e..500dda9 100644 --- a/meta/recipes-devtools/gcc/libgcc_4.5.1.bb +++ b/meta/recipes-devtools/gcc/libgcc_4.5.1.bb @@ -12,6 +12,7 @@ FILES_${PN} = ${base_libdir}/libgcc*.so.* FILES_${PN}-dev = \ ${base_libdir}/libgcc*.so \ ${libdir}/${TARGET_SYS}/${BINV}/crt* \ + ${libdir}/${TARGET_SYS}/${BINV}/libgcov.a \ ${libdir}/${TARGET_SYS}/${BINV}/libgcc* do_configure[noexec] = 1 diff --git a/meta/recipes-devtools/gcc/libgcc_4.6.bb b/meta/recipes-devtools/gcc/libgcc_4.6.bb index 63a46ec..6ba0339 100644 --- a/meta/recipes-devtools/gcc/libgcc_4.6.bb +++ b/meta/recipes-devtools/gcc/libgcc_4.6.bb @@ -12,6 +12,7 @@ FILES_${PN} = ${base_libdir}/libgcc*.so.* FILES_${PN}-dev = \ ${base_libdir}/libgcc*.so \ ${libdir}/${TARGET_SYS}/${BINV}/crt* \ + ${libdir}/${TARGET_SYS}/${BINV}/libgcov.a \ ${libdir}/${TARGET_SYS}/${BINV}/libgcc* do_configure[noexec] = 1 -- 1.7.2.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 10/10] libffi: really populate -dev package
As per gcc PR 11147, libffi installs headers into a target dependent place (/usr/lib/). Include a rule to include those files into libffi-dev package. Reference: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=11147 Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- meta/recipes-gnome/libffi/libffi_3.0.9.bb |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/meta/recipes-gnome/libffi/libffi_3.0.9.bb b/meta/recipes-gnome/libffi/libffi_3.0.9.bb index b6c7c13..0ea2284 100644 --- a/meta/recipes-gnome/libffi/libffi_3.0.9.bb +++ b/meta/recipes-gnome/libffi/libffi_3.0.9.bb @@ -7,10 +7,13 @@ library really only provides the lowest, machine dependent layer of a fully feat A layer must exist above `libffi' that handles type conversions for values passed between the two languages. SRC_URI = ftp://sourceware.org/pub/libffi/${BPN}-${PV}.tar.gz; +PR = r1 + SRC_URI[md5sum] = 1f300a7a7f975d4046f51c3022fa5ff1 SRC_URI[sha256sum] = 589d25152318bc780cd8919b14670793f4971d9838dab46ed38c32b3ee92c452 LICENSE = MIT LIC_FILES_CHKSUM = file://LICENSE;md5=fa09cb778aaba64dc9eac37ab7e4e5d8 inherit autotools +FILES_${PN}-dev += ${libdir}/libffi-${PV} BBCLASSEXTEND = native -- 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] [PATCH 17/17] package.bbclass: make unshipped files a fatal error
On 9/22/11, Richard Purdie richard.pur...@linuxfoundation.org wrote: On Wed, 2011-09-21 at 22:40 +0400, Dmitry Eremin-Solenikov wrote: I belive that files were installed but not shipped in any package message should become a fatal error. While it's true that sometimes some files are generated by do_install task, which aren't necessary for our target systems. However in generic I think this is a very important and usually overlooked QA sign. E.g. recently I've found/fixed some bugs in eglibc packaging only due to making this a fatal error. Sometimes new versions of a software add new files, but then they are sometimes ignored, as this messages can be easily missed. You can come with more examples if you'd like to. Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- meta/classes/package.bbclass |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index a9c510d..f4a535e 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -948,6 +948,7 @@ python populate_packages () { bb.warn(For recipe %s, the following files were installed but not shipped in any package: % pn) for f in unshipped: bb.warn( + f) +bb.fatal(Unshipped files found) bb.build.exec_func(package_name_hook, d) One of thee post-release things I want to sort out is the QA warnings and I add this warning under that category. We introduced the ideas of warnings to error and warn on into the QA class already and I'd like to be able to control this warning in that way using the same variables. Nice idea! On the rights of a feature request: It would be nice to allow user to: 1) specify the severity of the QA problems (warn, error, fatal) on a global + per-qa-check level 2) specify an override for some of the checks, so that the packager can specify that e.g. QA check for .so links in a non-dev packages should be ignored for cgroups-pam package for /lib/security/pam*.so lib. (I get the idea from Debian lintian overrides. Hope I was able to write what I mean). Also, rather than being bb.fatal, this should be bb.error. An Error message will allow the build to complete but will set the bitbake exit code to show when errors have occurred. This means errors still light the autobuilder up red when they occur so we're usually pretty good about noticing and removing error messages. Hmmm. If it's a bb.error, is it logged somewhere except in the task log file? Because even if I see a red state in my oestats installation (BTW: what is the current way to track build statuses?), I don't think I'll be able to dig through multi-page oestats task output for some big image looking for erroneous-but-not-failed items. -- With best wishes Dmitry ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 01/17] icecc-create-env: rename to -native
On 9/22/11, Richard Purdie richard.pur...@linuxfoundation.org wrote: On Wed, 2011-09-21 at 22:39 +0400, Dmitry Eremin-Solenikov wrote: icecc-create-env(-native) is a native package. But if it doesn't have the -native suffix, some dependency tracking stuff in oe-core (in nativesdk.bbclass) get's crazy about it, trying to generate dependencies to icecc-create-env-native packages. To fix that simply add -native suffix to this package. Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- Thanks for some great cleanups. I've merged most of this to master, except where there has been feedback/discussion. Thanks! It seems icecc patch file got damaged somewhere in the loop. I think I'll just drop the patch and the not-so-upstream tarball and submit the script to be included in the oe-core tree. Does that sound good? -- With best wishes Dmitry ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/5] kernel.bbclass: blacklist 'perf-dbg' as well for the modules metapackage
On 09/18/2011 02:23 AM, Otavio Salvador wrote: I have sent this in July and it was nacked. See at https://github.com/OSSystems/oe-core/commit/5c53cbf951a11ed92fb2ad0837991db256c11489 Answering the original question by Saul: A possible better question is why perf-dbg is getting generated and what's in it? perf and perf-dbg are generated to contain perf tool if it's not directly enabled (AFAIK), but you can compile it by running make in tools/perf. It has some additional depends (like binutils-dev, elfutils-dev, news-dev, etc., so it's not enabled by default. Probably we should enable it though. On Sat, Sep 17, 2011 at 19:18, Dmitry Eremin-Solenikov dbarysh...@gmail.com wrote: Signed-off-by: Koen Kooik...@dominion.thruhere.net Signed-off-by: Dmitry Eremin-Solenikovdbarysh...@gmail.com --- meta/classes/kernel.bbclass |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index bc1baa0..c577011 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -451,7 +451,7 @@ python populate_packages_prepend () { metapkg = kernel-modules bb.data.setVar('ALLOW_EMPTY_' + metapkg, 1, d) bb.data.setVar('FILES_' + metapkg, , d) - blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base', 'kernel-vmlinux', 'perf', 'kernel-misc' ] + blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base', 'kernel-vmlinux', 'perf', 'perf-dbg', 'kernel-misc' ] for l in module_deps.values(): for i in l: pkg = module_pattern % legitimize_package_name(re.match(module_regex, os.path.basename(i)).group(1)) -- 1.7.2.5 ___ 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 1/5] kernel.bbclass: blacklist 'perf-dbg' as well for the modules metapackage
On 09/22/2011 04:35 PM, Koen Kooi wrote: Op 22 sep. 2011, om 14:25 heeft Dmitry Eremin-Solenikov het volgende geschreven: On 09/18/2011 02:23 AM, Otavio Salvador wrote: I have sent this in July and it was nacked. See at https://github.com/OSSystems/oe-core/commit/5c53cbf951a11ed92fb2ad0837991db256c11489 Answering the original question by Saul: A possible better question is why perf-dbg is getting generated and what's in it? perf and perf-dbg are generated to contain perf tool if it's not directly enabled (AFAIK), but you can compile it by running make in tools/perf. It has some additional depends (like binutils-dev, elfutils-dev, news-dev, etc., so it's not enabled by default. Probably we should enable it though. the oe core kernel.bbclass builds perf by default according to kernel.bbclass: perf must be enabled in individual kernel recipes -- With best wishes Dmitry ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/5] kernel.bbclass: move uImage handling to separate task
On 09/18/2011 02:25 AM, Otavio Salvador wrote: This was nack'ed but I don't remember why; Richard? This was nack'ed because that version of the patch didn't check for existence of uImage built by kernel tree (not present in oe-dev/meta-oe, added in oe-core as somebody had problems with regenerated uImage). My version of the patch has such check, so it can go in probably. On Sat, Sep 17, 2011 at 19:18, Dmitry Eremin-Solenikov dbarysh...@gmail.com wrote: As per org.oe.dev and meta-oe's kernel.bbclass move uImage creation to separate task from do_deploy. The only major feature of oe-core's version (not to recreate uImage if it exists) is retained in this patch. Signed-off-by: Dmitry Eremin-Solenikovdbarysh...@gmail.com --- meta/classes/kernel.bbclass | 40 1 files changed, 24 insertions(+), 16 deletions(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index b44e3b5..6ff4018 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -486,6 +486,30 @@ do_sizecheck() { addtask sizecheck before do_install after do_compile +do_uboot_mkimage() { +if test x${KERNEL_IMAGETYPE} = xuImage -a \ +! -e arch/${ARCH}/boot/uImage ; then +ENTRYPOINT=${UBOOT_ENTRYPOINT} +if test -n ${UBOOT_ENTRYSYMBOL}; then +ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \ + awk '$3==${UBOOT_ENTRYSYMBOL} {print $1}'` +fi +if test -e arch/${ARCH}/boot/compressed/vmlinux ; then +${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin +uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C none -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n ${DISTRO_NAME}/${PV}/${MACHINE} -d linux.bin arch/${ARCH}/boot/uImage +rm -f linux.bin +else +${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin +rm -f linux.bin.gz +gzip -9 linux.bin +uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C gzip -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n ${DISTRO_NAME}/${PV}/${MACHINE} -d linux.bin.gz arch/${ARCH}/boot/uImage +rm -f linux.bin.gz +fi +fi +} + +addtask uboot_mkimage before do_install after do_compile + KERNEL_IMAGE_BASE_NAME ?= ${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME} # Don't include the DATETIME variable in the sstate package signatures KERNEL_IMAGE_BASE_NAME[vardepsexclude] = DATETIME @@ -497,22 +521,6 @@ kernel_do_deploy() { tar -cvzf ${DEPLOYDIR}/modules-${KERNEL_VERSION}-${PR}-${MACHINE}.tgz -C ${D} lib fi - if test x${KERNEL_IMAGETYPE} = xuImage ; then - if test -e arch/${ARCH}/boot/uImage ; then - cp arch/${ARCH}/boot/uImage ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin - elif test -e arch/${ARCH}/boot/compressed/vmlinux ; then - ${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin - uboot-mkimage -A ${ARCH} -O linux -T kernel -C none -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n ${DISTRO_NAME}/${PV}/${MACHINE} -d linux.bin ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin - rm -f linux.bin - else - ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin - rm -f linux.bin.gz - gzip -9 linux.bin - uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n ${DISTRO_NAME}/${PV}/${MACHINE} -d linux.bin.gz ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin - rm -f linux.bin.gz - fi - fi - cd ${DEPLOYDIR} rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin -- 1.7.2.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 04/17] avahi: include dbus interfaces definitions into daemon package
Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- meta/recipes-connectivity/avahi/avahi.inc |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc index a847394..c3c9c71 100644 --- a/meta/recipes-connectivity/avahi/avahi.inc +++ b/meta/recipes-connectivity/avahi/avahi.inc @@ -14,7 +14,7 @@ SECTION = network # python scripts are under GPLv2+ LICENSE = GPLv2+ LGPLv2.1+ -INC_PR = r6 +INC_PR = r7 DEPENDS = expat libcap libdaemon dbus glib-2.0 @@ -67,6 +67,7 @@ FILES_avahi-daemon = ${sbindir}/avahi-daemon \ ${datadir}/avahi/introspection/*.introspect \ ${datadir}/avahi/avahi-service.dtd \ ${datadir}/avahi/service-types \ + ${datadir}/dbus-1/interfaces \ ${datadir}/dbus-1/system-services FILES_libavahi-client = ${libdir}/libavahi-client.so.* FILES_libavahi-ui = ${libdir}/libavahi-ui.so.* -- 1.7.2.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 02/17] icecc.bbclass: fix handling of nativesdk and cross-canadian packages
icecc.bbclass assumed that nativesdk and cross-canadian packages should use local icecc version. Instead those packages should use target-like scheme for toolchain tarball generation. Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- meta/classes/icecc.bbclass |4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass index 710d798..f8e9d88 100644 --- a/meta/classes/icecc.bbclass +++ b/meta/classes/icecc.bbclass @@ -113,9 +113,7 @@ def icc_is_kernel(bb, d): def icc_is_native(bb, d): return \ bb.data.inherits_class(cross, d) or \ -bb.data.inherits_class(cross-canadian, d) or \ -bb.data.inherits_class(native, d) or \ -bb.data.inherits_class(nativesdk, d); +bb.data.inherits_class(native, d); def icc_version(bb, d): if use_icc(bb, d) == no: -- 1.7.2.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 01/17] icecc-create-env: rename to -native
icecc-create-env(-native) is a native package. But if it doesn't have the -native suffix, some dependency tracking stuff in oe-core (in nativesdk.bbclass) get's crazy about it, trying to generate dependencies to icecc-create-env-native packages. To fix that simply add -native suffix to this package. Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- meta/classes/icecc.bbclass |2 +- .../icecc-create-env-native/icecc-lto-update.patch | 103 .../icecc-create-env-native_0.1.bb | 29 ++ .../icecc-create-env/icecc-lto-update.patch| 103 .../icecc-create-env/icecc-create-env_0.1.bb | 29 -- 5 files changed, 133 insertions(+), 133 deletions(-) create mode 100644 meta/recipes-devtools/icecc-create-env/icecc-create-env-native/icecc-lto-update.patch create mode 100644 meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb delete mode 100644 meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-lto-update.patch delete mode 100644 meta/recipes-devtools/icecc-create-env/icecc-create-env_0.1.bb diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass index e20666b..710d798 100644 --- a/meta/classes/icecc.bbclass +++ b/meta/classes/icecc.bbclass @@ -33,7 +33,7 @@ def icecc_dep_prepend(d): # we need that built is the responsibility of the patch function / class, not # the application. if not bb.data.getVar('INHIBIT_DEFAULT_DEPS', d): -return icecc-create-env +return icecc-create-env-native return DEPENDS_prepend += ${@icecc_dep_prepend(d)} diff --git a/meta/recipes-devtools/icecc-create-env/icecc-create-env-native/icecc-lto-update.patch b/meta/recipes-devtools/icecc-create-env/icecc-create-env-native/icecc-lto-update.patch new file mode 100644 index 000..a7af2e3 --- /dev/null +++ b/meta/recipes-devtools/icecc-create-env/icecc-create-env-native/icecc-lto-update.patch @@ -0,0 +1,103 @@ +--- a/icecc-create-env 2006-12-14 09:50:46.0 +0300 b/icecc-create-env 2011-08-31 17:52:45.0 +0400 +@@ -27,9 +27,6 @@ + # readlink is not portable enough. + path=`ls -H $path` + toadd=$name=$path +- if test $name = $path; then +-toadd=$path +- fi + is_contained $toadd return + if test -z $silent; then + echo adding file $toadd +@@ -117,6 +114,14 @@ + add_file $specfile + fi + ++ltofile=`$added_gcc -print-prog-name=lto1` ++pluginfile=${ltofile%lto1}liblto_plugin.so ++if test -r $pluginfile ++then ++ add_file $pluginfile ${pluginfile#*usr} ++ add_file $pluginfile /usr${pluginfile#*usr} ++fi ++ + tempdir=`mktemp -d /tmp/iceccenvXX` + new_target_files= + for i in $target_files; do +@@ -140,49 +147,44 @@ + done + + #sort the files +- target_files=`for i in $new_target_files; do echo $i; done | sort` ++target_files=`for i in $new_target_files; do echo $i; done | sort` + + #test if an archive name was supplied + #if not use the md5 of all files as the archive name + if test -z $archive_name; then +-md5sum=NONE +-for file in /usr/bin/md5sum /bin/md5 /usr/bin/md5; do +- if test -x $file; then +- md5sum=$file +-break +- fi +-done ++ md5sum=NONE ++ for file in /usr/bin/md5sum /bin/md5 /usr/bin/md5; do ++if test -x $file; then ++ md5sum=$file ++ break ++fi ++ done + +-#calculate md5 and use it as the archive name +-archive_name=`for i in $target_files; do $md5sum $tempdir/$i; done | sed -e 's/ .*$//' | $md5sum | sed -e 's/ .*$//'` || { +- if test -z $silent; then +- echo Couldn't compute MD5 sum. ++ #calculate md5 and use it as the archive name ++ archive_name=`for i in $target_files; do test -f $tempdir/$i $md5sum $tempdir/$i; done | sed -e 's/ .*$//' | $md5sum | sed -e 's/ .*$//'`.tar.gz || { ++if test -z $silent; then ++ echo Couldn't compute MD5 sum. ++fi ++exit 2 ++ } ++ mydir=`pwd` ++else ++ mydir=`dirname $archive_name` ++ ++ #check if we have a full path or only a filename ++ if test $mydir = . ; then ++mydir=`pwd` ++ else ++mydir= + fi +- exit 2 +-} +- + fi + + if test -z $silent; then +-echo creating $archive_name.tar.gz ++echo creating $archive_name + fi + +-if test -z $archive_name; then +- mydir=`pwd` +-else +-# mydir=dirname ${archive_name} +- mydir=${archive_name%/*} +- +-#check if we have a full path or only a filename +- if test -z $mydir; then +- mydir=`pwd` +- else +- mydir= +- fi +- +-fi + cd $tempdir +-tar -czhf $mydir/$archive_name.tar.gz $target_files || { ++tar -czhf $mydir/$archive_name $target_files || { + if test -z $silent; then + echo Couldn't create archive + fi diff --git a/meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb b/meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb new file mode 100644 index 000..9a440ba --- /dev/null +++ b/meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb @@ -0,0 +1,29
[OE-core] [PATCH 03/17] insane.bbclass: don't warn on .so files in -nativesdk packages
There is no point in warning against .so symlinks in -nativesdk packages. They have to contain such links, so shut up the warning. Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- meta/classes/insane.bbclass |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index a660a06..addb9ac 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -179,8 +179,8 @@ def package_qa_check_dev(path, name, d, elf, messages): Check for .so library symlinks in non-dev packages -if not name.endswith(-dev) and not name.endswith(-dbg) and path.endswith(.so) and os.path.islink(path): -messages.append(non -dev/-dbg package contains symlink .so: %s path '%s' % \ +if not name.endswith(-dev) and not name.endswith(-dbg) and not name.endswith(-nativesdk) and path.endswith(.so) and os.path.islink(path): +messages.append(non -dev/-dbg/-nativesdk package contains symlink .so: %s path '%s' % \ (name, package_qa_clean_path(path,d))) QAPATHTEST[debug-files] = package_qa_check_dbg -- 1.7.2.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 05/17] gst-plugins-base: add support for non-X11-enabled distros
Separate dependencies on X11 and them to DEPENDS only if DISTRO_FEATURES contain x11 Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- .../gstreamer/gst-plugins-base_0.10.32.bb |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.32.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.32.bb index 82d9afc..9a658fa 100644 --- a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.32.bb +++ b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.32.bb @@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605 \ file://gst/ffmpegcolorspace/utils.c;beginline=1;endline=20;md5=9c83a200b8e597b26ca29df20fc6ecd0 -DEPENDS += virtual/libx11 alsa-lib freetype liboil libogg libvorbis libxv libtheora avahi util-linux tremor +X11DEPENDS = virtual/libx11 libxv +DEPENDS += alsa-lib freetype liboil libogg libvorbis libtheora avahi util-linux tremor ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)} SRC_URI += file://gst-plugins-base-tremor.patch -- 1.7.2.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 06/17] libgpg-error: drop common-lisp files
OE doesn't have common-lisp neither in oe-core, nor in org.oe.dev. Stop this package from installing clisp-related files. Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- .../libgpg-error/libgpg-error_1.10.bb |7 ++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.10.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.10.bb index 6dea084..0c10b47 100644 --- a/meta/recipes-support/libgpg-error/libgpg-error_1.10.bb +++ b/meta/recipes-support/libgpg-error/libgpg-error_1.10.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ SECTION = libs -PR = r0 +PR = r1 SRC_URI = ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.bz2 \ file://pkgconfig.patch @@ -23,3 +23,8 @@ FILES_${PN} = ${libdir}/lib*.so.* FILES_${PN}-dev += ${bindir}/* inherit autotools binconfig pkgconfig gettext + +do_install_append() { + # we don't have common lisp in OE + rm -rf ${D}${datadir}/common-lisp/ +} -- 1.7.2.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 11/17] eglibc: fix packaging of some of nativesdk packages
eglibc.inc contains packaging rules that depend on PKGSUFFIX expansion. However that variable wasn't expanded properly in some case. E.g. PACKAGES = ... nscd${PKGSUFFIX} ... FILES_nscd${PKGSUFFIX} = ${sbindir}/nscd* would be expanded to PACKAGES = ... nscd-nativesdk ... FILES_nscd = ${sbindir}/nscd* Thus leading to empty -nativesdk packages and missing files. To overcome that use python code blob to properly define PKGSUFFIX variable. Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- meta/recipes-core/eglibc/eglibc-locale.inc | 13 + meta/recipes-core/eglibc/eglibc-package.inc |9 +++-- meta/recipes-core/eglibc/eglibc_2.12.bb |2 +- meta/recipes-core/eglibc/eglibc_2.13.bb |2 +- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc b/meta/recipes-core/eglibc/eglibc-locale.inc index 9424ff5..cfc7d84 100644 --- a/meta/recipes-core/eglibc/eglibc-locale.inc +++ b/meta/recipes-core/eglibc/eglibc-locale.inc @@ -26,10 +26,15 @@ BINARY_LOCALE_ARCHES ?= arm.* i[3-6]86 x86_64 powerpc mips # set 0 for qemu emulation of native localedef for locale generation LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = 1 -PR = r16 - -PKGSUFFIX = -PKGSUFFIX_virtclass-nativesdk = -nativesdk +PR = r17 + +python __anonymous () { +import bb +if bb.data.inherits_class(nativesdk, d): +bb.data.setVar(PKGSUFFIX, -nativesdk, d) +else: +bb.data.setVar(PKGSUFFIX, , d) +} PROVIDES = virtual/libc-locale${PKGSUFFIX} diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc index 519a49c..dc6fce0 100644 --- a/meta/recipes-core/eglibc/eglibc-package.inc +++ b/meta/recipes-core/eglibc/eglibc-package.inc @@ -17,8 +17,13 @@ python __anonymous () { # Set this to zero if you don't want ldconfig in the output package USE_LDCONFIG ?= 1 -PKGSUFFIX = -PKGSUFFIX_virtclass-nativesdk = -nativesdk +python __anonymous () { +import bb +if bb.data.inherits_class(nativesdk, d): +bb.data.setVar(PKGSUFFIX, -nativesdk, d) +else: +bb.data.setVar(PKGSUFFIX, , d) +} PACKAGES = ${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} ldd${PKGSUFFIX} ${PN}-utils eglibc-extra-nss${PKGSUFFIX} eglibc-thread-db${PKGSUFFIX} ${PN}-pic ${PN}-dev ${PN}-doc libcidn${PKGSUFFIX} libmemusage${PKGSUFFIX} libsegfault${PKGSUFFIX} ${PN}-pcprofile libsotruss${PKGSUFFIX} diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bb b/meta/recipes-core/eglibc/eglibc_2.12.bb index a9d208b..7a1a569 100644 --- a/meta/recipes-core/eglibc/eglibc_2.12.bb +++ b/meta/recipes-core/eglibc/eglibc_2.12.bb @@ -1,7 +1,7 @@ require eglibc.inc DEPENDS += gperf-native -PR = r24 +PR = r25 SRCREV = 14158 diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb index b549496..e172785 100644 --- a/meta/recipes-core/eglibc/eglibc_2.13.bb +++ b/meta/recipes-core/eglibc/eglibc_2.13.bb @@ -3,7 +3,7 @@ require eglibc.inc SRCREV = 14157 DEPENDS += gperf-native -PR = r15 +PR = r16 PR_append = +svnr${SRCPV} EGLIBC_BRANCH=eglibc-2_13 -- 1.7.2.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 09/17] dbus-glib: disable bash-completion
Bash completion stuff isn't packaged and used. Stop building it by passing --disable-bash-completion to configure Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- meta/recipes-core/dbus/dbus-glib.inc |3 ++- meta/recipes-core/dbus/dbus-glib_0.92.bb |2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/dbus/dbus-glib.inc b/meta/recipes-core/dbus/dbus-glib.inc index 704dc04..959fa64 100644 --- a/meta/recipes-core/dbus/dbus-glib.inc +++ b/meta/recipes-core/dbus/dbus-glib.inc @@ -16,7 +16,8 @@ SRC_URI = http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz inherit autotools pkgconfig gettext EXTRA_OECONF = --with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml \ - --with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool + --with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool \ +--disable-bash-completion EXTRA_OECONF_virtclass-native = --with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml FILES_${PN} = ${libdir}/lib*.so.* diff --git a/meta/recipes-core/dbus/dbus-glib_0.92.bb b/meta/recipes-core/dbus/dbus-glib_0.92.bb index 72bea89..c7266d4 100644 --- a/meta/recipes-core/dbus/dbus-glib_0.92.bb +++ b/meta/recipes-core/dbus/dbus-glib_0.92.bb @@ -1,6 +1,6 @@ require dbus-glib.inc -PR = r0 +PR = r1 SRC_URI[md5sum] = b595b36890c4f9f8f5d5dec131c495f8 SRC_URI[sha256sum] = 5a7fd4cf937cdcb7f2eed61341b70ee0f2607450a50db381618598adf60dd40e -- 1.7.2.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 10/17] gettext: shut up unshipped files warning
It seems nobody uses preloadable_libintl.so in OE world. It's not included in any package. To stop oe-core from emiting a unshipped files warning, remove that file in the end of do_install. Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- meta/recipes-core/gettext/gettext_0.18.1.1.bb |7 ++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/meta/recipes-core/gettext/gettext_0.18.1.1.bb b/meta/recipes-core/gettext/gettext_0.18.1.1.bb index 2c0b2f8..fabd126 100644 --- a/meta/recipes-core/gettext/gettext_0.18.1.1.bb +++ b/meta/recipes-core/gettext/gettext_0.18.1.1.bb @@ -5,7 +5,7 @@ SECTION = libs LICENSE = GPLv3 LIC_FILES_CHKSUM = file://COPYING;md5=d32239bcb673463ab874e80d47fae504 -PR = r3 +PR = r4 DEPENDS = libxml2-native gettext-native virtual/libiconv ncurses expat DEPENDS_virtclass-native = libxml2-native PROVIDES = virtual/libintl virtual/gettext @@ -90,4 +90,9 @@ FILES_gettext-runtime-doc = ${mandir}/man1/gettext.* \ ${docdir}/libasprintf/autosprintf.html \ ${infodir}/autosprintf.info \ + +do_install_append() { +rm -f ${D}${libdir}/preloadable_libintl.so +} + BBCLASSEXTEND = native nativesdk -- 1.7.2.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 12/17] glib-2.0: include glib-gettextize stuff
glib-utils already includes glib-gettextize program. Include some files necessary for glib-gettextize to work. Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb |2 +- meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb |2 +- meta/recipes-core/glib-2.0/glib.inc |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb index 26fc8fb..fed72a1 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb @@ -1,6 +1,6 @@ require glib.inc -PR = r6 +PR = r7 SRC_URI = ${GNOME_MIRROR}/glib/2.27/glib-${PV}.tar.bz2 \ file://configure-libtool.patch \ diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb index dce6802..24c5992 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb @@ -1,6 +1,6 @@ require glib.inc -PR = r3 +PR = r4 PE = 1 SRC_URI = ${GNOME_MIRROR}/glib/2.28/glib-${PV}.tar.bz2 \ diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index fdbfa54..e1b8ea9 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc @@ -19,7 +19,7 @@ DEPENDS_virtclass-nativesdk = libtool-nativesdk PACKAGES =+ ${PN}-utils LEAD_SONAME = libglib-2.0.* -FILES_${PN}-utils = ${bindir}/* +FILES_${PN}-utils = ${bindir}/* ${datadir}/glib-2.0/gettext inherit autotools pkgconfig gettext -- 1.7.2.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 14/17] e2fsprogs: include devtools scripts
Some scripts are necessary to develop programs with libcom_err and libss. Include those into e2fsprogs-dev package. Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- .../e2fsprogs/e2fsprogs_1.41.14.bb |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb index ea0782d..1fca7b9 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb @@ -1,6 +1,6 @@ require e2fsprogs.inc -PR = r1 +PR = r2 SRC_URI += file://quotefix.patch \ file://acinclude.m4 @@ -51,5 +51,6 @@ FILES_libcomerr = ${libdir}/libcom_err.so.* FILES_libss = ${libdir}/libss.so.* FILES_libe2p = ${libdir}/libe2p.so.* FILES_libext2fs = ${libdir}/e2initrd_helper ${libdir}/libext2fs.so.* +FILES_${PN}-dev += ${datadir}/*/*.awk ${datadir}/*/*.sed BBCLASSEXTEND = native -- 1.7.2.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 13/17] libxml2: reinclude a -staticdev package
libxml2 provides a libxml2.a library, which wasn't included in any of the packages. Usually static libs are included into a -staticdev package, but this package wasn't generated for libxml2, due to libxml2.inc redeclaring PACKAGES variable (to include libxml2-utils). Replace PACKAGES setting with expansion to include all default packages (and so -staticdev package with libxml2.a). Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- meta/recipes-core/libxml/libxml2.inc |2 +- meta/recipes-core/libxml/libxml2_2.7.8.bb |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/libxml/libxml2.inc b/meta/recipes-core/libxml/libxml2.inc index cf789b2..6f79333 100644 --- a/meta/recipes-core/libxml/libxml2.inc +++ b/meta/recipes-core/libxml/libxml2.inc @@ -37,7 +37,7 @@ python populate_packages_prepend () { bb.data.setVar('PKG_libxml2', '${MLPREFIX}libxml2', d) } -PACKAGES = ${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale +PACKAGES += ${PN}-utils FILES_${PN}-dev += ${bindir}/*-config ${libdir}/xml2Conf.sh FILES_${PN}-utils += ${bindir}/* diff --git a/meta/recipes-core/libxml/libxml2_2.7.8.bb b/meta/recipes-core/libxml/libxml2_2.7.8.bb index 3909839..74860af 100644 --- a/meta/recipes-core/libxml/libxml2_2.7.8.bb +++ b/meta/recipes-core/libxml/libxml2_2.7.8.bb @@ -1,6 +1,6 @@ require libxml2.inc -PR = r1 +PR = r2 SRC_URI[md5sum] = 8127a65e8c3b08856093099b52599c86 SRC_URI[sha256sum] = cda23bc9ebd26474ca8f3d67e7d1c4a1f1e7106364b690d822e009fdc3c417ec -- 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] [PATCH 17/17] package.bbclass: make unshipped files
On 9/21/11, Daniel Lazzari dlazz...@leapfrog.com wrote: I belive that files were installed but not shipped in any package message should become a fatal error. While it's true that sometimes some files are generated by do_install task, which aren't necessary for our target systems. However in generic I think this is a very important and usually overlooked QA sign. E.g. recently I've found/fixed some bugs in eglibc packaging only due to making this a fatal error. Sometimes new versions of a software add new files, but then they are sometimes ignored, as this messages can be easily missed. You can come with more examples if you'd like to. Could we have a variable that overrides this functionality on a per recipe basis? I have a few internal projects whose normal build process spits out files I'd rather not have to package in our oe recipes (like map files). Of couse I can add it, but it might be simpler to use some other options: 1) do_install_append() with rm as Koen suggested 2) create a package with all map files that are created by your software. BTW, just to make sure that we understand each other: your software _installs_ map files and you don't want to package them, doesn't it? Dan Lazzari Jr. Firmware Engineer dlazz...@leapfrog.com -- With best wishes Dmitry ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 09/17] dbus-glib: disable bash-completion
On 9/21/11, Koen Kooi k...@dominion.thruhere.net wrote: Op 21 sep. 2011, om 20:39 heeft Dmitry Eremin-Solenikov het volgende geschreven: Bash completion stuff isn't packaged and used. Stop building it by passing --disable-bash-completion to configure A better idea would be to package it Then we need bash-completion. Would you like it in meta-oe/recipes-extended? meta-oe/recipes-support? meta-oe/recipes-whatever? -- With best wishes Dmitry ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 17/17] package.bbclass: make unshipped files
On 9/21/11, Daniel Lazzari dlazz...@leapfrog.com wrote: On 9/21/11, Daniel Lazzari dlazz...@leapfrog.com wrote: I belive that files were installed but not shipped in any package message should become a fatal error. While it's true that sometimes some files are generated by do_install task, which aren't necessary for our target systems. However in generic I think this is a very important and usually overlooked QA sign. E.g. recently I've found/fixed some bugs in eglibc packaging only due to making this a fatal error. Sometimes new versions of a software add new files, but then they are sometimes ignored, as this messages can be easily missed. You can come with more examples if you'd like to. Could we have a variable that overrides this functionality on a per recipe basis? I have a few internal projects whose normal build process spits out files I'd rather not have to package in our oe recipes (like map files). Of couse I can add it, but it might be simpler to use some other options: 1) do_install_append() with rm as Koen suggested 2) create a package with all map files that are created by your software. BTW, just to make sure that we understand each other: your software _installs_ map files and you don't want to package them, doesn't it? -- With best wishes Dmitry Yeah, I freely admit that some of the project builds over here have some problems with what gets installed versus just built. The do_install_append suggestion seems like a workable solution. And just for the record, I like the idea of making this a fatal error. Thanks! Dan Lazzari Jr. Firmware Engineer dlazz...@leapfrog.com -- With best wishes Dmitry ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [RFC] policy proposal: INC_PR
Hello, colleagues, While debugging some stuff in oe-core company I've noticed that lot's of packages either don't use INC_PR, or misuse it (e.g. .inc has INC_PR, but then .bb just defines PR = rX). From my previous experience with oe-dev, I found INC_PR very usefull and error-prone feature. What about making usage of INC_PR a policy decision, demanding that all new packages should use INC_PR for their recipes, if .inc files are used. And then define a grace period during which all remaining packages should be converted to INC_PR (3 months? Next release? I really don't know). I'm sorry if this issue was already discussed somewhere and I'm duplicating the efforts or proposing already discarded idea. -- With best wishes Dmitry ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/5] kernel.bbclass: remove unshipped files in do_install
Drop two unsed files (modules.order and modules.builtin) in do_install to stop the unshipped files warning. Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- meta/classes/kernel.bbclass |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 59d3b89..6b2e603 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -108,6 +108,8 @@ kernel_do_install() { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then oe_runmake DEPMOD=echo INSTALL_MOD_PATH=${D} modules_install + rm -f ${D}/lib/modules/${KERNEL_VERSION}/modules.order + rm -f ${D}/lib/modules/${KERNEL_VERSION}/modules.builtin else bbnote no modules to install fi -- 1.7.2.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/5] kernel.bbclass: blacklist 'perf-dbg' as well for the modules metapackage
Signed-off-by: Koen Kooi k...@dominion.thruhere.net Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- meta/classes/kernel.bbclass |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index bc1baa0..c577011 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -451,7 +451,7 @@ python populate_packages_prepend () { metapkg = kernel-modules bb.data.setVar('ALLOW_EMPTY_' + metapkg, 1, d) bb.data.setVar('FILES_' + metapkg, , d) - blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base', 'kernel-vmlinux', 'perf', 'kernel-misc' ] + blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base', 'kernel-vmlinux', 'perf', 'perf-dbg', 'kernel-misc' ] for l in module_deps.values(): for i in l: pkg = module_pattern % legitimize_package_name(re.match(module_regex, os.path.basename(i)).group(1)) -- 1.7.2.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/5] kernel.bbclass: respect MACHINE_KERNEL_PR
MACHINE_KERNEL_PR was introduced long ago in org.oe.dev. It's present in meta-oe kernel.bbclass. Several machines depend on this functionality. Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- meta/classes/kernel.bbclass |5 + 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index c577011..b44e3b5 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -20,6 +20,11 @@ python __anonymous () { image = bb.data.getVar('INITRAMFS_IMAGE', d, True) if image: bb.data.setVar('INITRAMFS_TASK', '${INITRAMFS_IMAGE}:do_rootfs', d) + +machine_kernel_pr = bb.data.getVar('MACHINE_KERNEL_PR', d, True) + +if machine_kernel_pr: +bb.data.setVar('PR', machine_kernel_pr, d) } inherit kernel-arch deploy -- 1.7.2.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/5] kernel.bbclass: move uImage handling to separate task
As per org.oe.dev and meta-oe's kernel.bbclass move uImage creation to separate task from do_deploy. The only major feature of oe-core's version (not to recreate uImage if it exists) is retained in this patch. Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- meta/classes/kernel.bbclass | 40 1 files changed, 24 insertions(+), 16 deletions(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index b44e3b5..6ff4018 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -486,6 +486,30 @@ do_sizecheck() { addtask sizecheck before do_install after do_compile +do_uboot_mkimage() { +if test x${KERNEL_IMAGETYPE} = xuImage -a \ +! -e arch/${ARCH}/boot/uImage ; then +ENTRYPOINT=${UBOOT_ENTRYPOINT} +if test -n ${UBOOT_ENTRYSYMBOL}; then +ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \ + awk '$3==${UBOOT_ENTRYSYMBOL} {print $1}'` +fi +if test -e arch/${ARCH}/boot/compressed/vmlinux ; then +${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin +uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C none -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n ${DISTRO_NAME}/${PV}/${MACHINE} -d linux.bin arch/${ARCH}/boot/uImage +rm -f linux.bin +else +${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin +rm -f linux.bin.gz +gzip -9 linux.bin +uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C gzip -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n ${DISTRO_NAME}/${PV}/${MACHINE} -d linux.bin.gz arch/${ARCH}/boot/uImage +rm -f linux.bin.gz +fi +fi +} + +addtask uboot_mkimage before do_install after do_compile + KERNEL_IMAGE_BASE_NAME ?= ${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME} # Don't include the DATETIME variable in the sstate package signatures KERNEL_IMAGE_BASE_NAME[vardepsexclude] = DATETIME @@ -497,22 +521,6 @@ kernel_do_deploy() { tar -cvzf ${DEPLOYDIR}/modules-${KERNEL_VERSION}-${PR}-${MACHINE}.tgz -C ${D} lib fi - if test x${KERNEL_IMAGETYPE} = xuImage ; then - if test -e arch/${ARCH}/boot/uImage ; then - cp arch/${ARCH}/boot/uImage ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin - elif test -e arch/${ARCH}/boot/compressed/vmlinux ; then - ${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin - uboot-mkimage -A ${ARCH} -O linux -T kernel -C none -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n ${DISTRO_NAME}/${PV}/${MACHINE} -d linux.bin ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin - rm -f linux.bin - else - ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin - rm -f linux.bin.gz - gzip -9 linux.bin - uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n ${DISTRO_NAME}/${PV}/${MACHINE} -d linux.bin.gz ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin - rm -f linux.bin.gz - fi - fi - cd ${DEPLOYDIR} rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin -- 1.7.2.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/5] kernel.bbclass: handle .cis firmware
.cis firmware files are used by kernel to patch incorrect CIS fir PCMCIA cards. Create respective packages. Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- meta/classes/kernel.bbclass |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 6ff4018..59d3b89 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -450,6 +450,7 @@ python populate_packages_prepend () { postrm = bb.data.getVar('pkg_postrm_modules', d, 1) do_split_packages(d, root='/lib/firmware', file_regex='^(.*)\.bin$', output_pattern='kernel-firmware-%s', description='Firmware for %s', recursive=True, extra_depends='') do_split_packages(d, root='/lib/firmware', file_regex='^(.*)\.fw$', output_pattern='kernel-firmware-%s', description='Firmware for %s', recursive=True, extra_depends='') + do_split_packages(d, root='/lib/firmware', file_regex='^(.*)\.cis$', output_pattern='kernel-firmware-%s', description='Firmware for %s', recursive=True, extra_depends='') do_split_packages(d, root='/lib/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='update-modules kernel-%s' % bb.data.getVar(KERNEL_VERSION, d, 1)) import re -- 1.7.2.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] icecc-create-env: a tool to create icecc toolchain tarballs
IceCC needs tarballs with toolchains to work correctly. This is a version largely based on one from org.openembedded.dev, plus a patch to support recent compilers, LTO, etc. Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- .../icecc-create-env/icecc-lto-update.patch| 103 .../icecc-create-env/icecc-create-env_0.1.bb | 29 ++ 2 files changed, 132 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-lto-update.patch create mode 100644 meta/recipes-devtools/icecc-create-env/icecc-create-env_0.1.bb diff --git a/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-lto-update.patch b/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-lto-update.patch new file mode 100644 index 000..b396261 --- /dev/null +++ b/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-lto-update.patch @@ -0,0 +1,103 @@ +--- a/icecc-create-env 2006-12-14 09:50:46.0 +0300 b/icecc-create-env 2011-08-31 17:52:45.0 +0400 +@@ -27,9 +27,6 @@ + # readlink is not portable enough. + path=`ls -H $path` + toadd=$name=$path +- if test $name = $path; then +-toadd=$path +- fi + is_contained $toadd return + if test -z $silent; then + echo adding file $toadd +@@ -117,6 +114,14 @@ + add_file $specfile + fi + ++ltofile=`$added_gcc -print-prog-name=lto1` ++pluginfile=${ltofile%lto1}liblto_plugin.so ++if test -r $pluginfile ++then ++ add_file $pluginfile ${pluginfile#*usr} ++ add_file $pluginfile /usr${pluginfile#*usr} ++fi ++ + tempdir=`mktemp -d /tmp/iceccenvXX` + new_target_files= + for i in $target_files; do +@@ -140,49 +147,44 @@ + done + + #sort the files +- target_files=`for i in $new_target_files; do echo $i; done | sort` ++target_files=`for i in $new_target_files; do echo $i; done | sort` + + #test if an archive name was supplied + #if not use the md5 of all files as the archive name + if test -z $archive_name; then +-md5sum=NONE +-for file in /usr/bin/md5sum /bin/md5 /usr/bin/md5; do +- if test -x $file; then +- md5sum=$file +-break +- fi +-done ++ md5sum=NONE ++ for file in /usr/bin/md5sum /bin/md5 /usr/bin/md5; do ++if test -x $file; then ++ md5sum=$file ++ break ++fi ++ done + +-#calculate md5 and use it as the archive name +-archive_name=`for i in $target_files; do $md5sum $tempdir/$i; done | sed -e 's/ .*$//' | $md5sum | sed -e 's/ .*$//'` || { +- if test -z $silent; then +- echo Couldn't compute MD5 sum. ++ #calculate md5 and use it as the archive name ++ archive_name=`for i in $target_files; do test -f $tempdir/$i $md5sum $tempdir/$i; done | sed -e 's/ .*$//' | $md5sum | sed -e 's/ .*$//'`.tar.gz || { ++if test -z $silent; then ++ echo Couldn't compute MD5 sum. ++fi ++exit 2 ++ } ++ mydir=`pwd` ++else ++ mydir=`dirname $archive_name` ++ ++ #check if we have a full path or only a filename ++ if test $mydir = . ; then ++mydir=`pwd` ++ else ++mydir= + fi +- exit 2 +-} +- + fi + + if test -z $silent; then +-echo creating $archive_name.tar.gz ++echo creating $archive_name + fi + +-if test -z $archive_name; then +- mydir=`pwd` +-else +-# mydir=dirname ${archive_name} +- mydir=${archive_name%/*} +- +-#check if we have a full path or only a filename +- if test -z $mydir; then +- mydir=`pwd` +- else +- mydir= +- fi +- +-fi + cd $tempdir +-tar -czhf $mydir/$archive_name.tar.gz $target_files || { ++tar -czhf $mydir/$archive_name $target_files || { + if test -z $silent; then + echo Couldn't create archive + fi diff --git a/meta/recipes-devtools/icecc-create-env/icecc-create-env_0.1.bb b/meta/recipes-devtools/icecc-create-env/icecc-create-env_0.1.bb new file mode 100644 index 000..9a440ba --- /dev/null +++ b/meta/recipes-devtools/icecc-create-env/icecc-create-env_0.1.bb @@ -0,0 +1,29 @@ +DESCRIPTION = This is a modified version of the icecc-create-env script in order to\ +make it work with OE. +SECTION = base +PRIORITY = optional +# source file has just a GPL word, but upstream is GPLv2+. +# most probably just GPL would be a mistake +LICENSE = GPLv2+ +LIC_FILES_CHKSUM = file://icecc-create-env;beginline=2;endline=5;md5=ae1df3d6a058bfda40b66094c5f6065f + +PR = r1 + +DEPENDS = +INHIBIT_DEFAULT_DEPS = 1 + +inherit native + +PATCHTOOL = patch +SRC_URI = http://www.digital-opsis.com/openembedded/icecc-create-env-${PV}.tar.gz \ + file://icecc-lto-update.patch + +S = ${WORKDIR} + +do_install() { +install -d ${D}/${bindir} +install -m 0755 ${WORKDIR}/icecc-create-env ${D}/${bindir} +} + +SRC_URI[md5sum] = 641ec45fe377529c7fd914f77b11b44f +SRC_URI[sha256sum] = 9ff8360375432a7a5c476cc6d55b3fdea9d6f3edc080d295a60421d8f47b1834 -- 1.7.2.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] bugzilla.bbclass: add a class to report build problems to bugzilla
Add a class to report build errors to bugzilla. Idea largely based on sepukku.bbclass, however it's rewritten nearly fully to use XML-RPC interface of bugzilla. Tested with bugzilla 4.0, other version might require some sort of adaptation. Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- meta/classes/bugzilla.bbclass | 186 + 1 files changed, 186 insertions(+), 0 deletions(-) create mode 100644 meta/classes/bugzilla.bbclass diff --git a/meta/classes/bugzilla.bbclass b/meta/classes/bugzilla.bbclass new file mode 100644 index 000..801bd66 --- /dev/null +++ b/meta/classes/bugzilla.bbclass @@ -0,0 +1,186 @@ +# +# Small event handler to automatically open URLs and file +# bug reports at a bugzilla of your choiche +# it uses XML-RPC interface, so you must have it enabled +# +# Before using you must define BUGZILLA_USER, BUGZILLA_PASS credentials, +# BUGZILLA_XMLRPC - uri of xmlrpc.cgi, +# BUGZILLA_PRODUCT, BUGZILLA_COMPONENT - a place in BTS for build bugs +# BUGZILLA_VERSION - version against which to report new bugs +# + +def bugzilla_find_bug_report(debug_file, server, args, bugname): +args['summary'] = bugname +bugs = server.Bug.search(args) +if len(bugs['bugs']) == 0: +print debug_file, Bugs not found +return (False,None) +else: # silently pick the first result +print debug_file, Result of bug search is +print debug_file, bugs +status = bugs['bugs'][0]['status'] +id = bugs['bugs'][0]['id'] +return (not status in [CLOSED, RESOLVED, VERIFIED],id) + +def bugzilla_file_bug(debug_file, server, args, name, text, version): +args['summary'] = name +args['comment'] = text +args['version'] = version +args['op_sys'] = 'Linux' +args['platform'] = 'Other' +args['severity'] = 'normal' +args['priority'] = 'Normal' +try: +return server.Bug.create(args)['id'] +except Exception, e: +print debug_file, repr(e) +return None + +def bugzilla_reopen_bug(debug_file, server, args, bug_number): +args['ids'] = [bug_number] +args['status'] = CONFIRMED +try: +server.Bug.update(args) +return True +except Exception, e: +print debug_file, repr(e) +return False + +def bugzilla_create_attachment(debug_file, server, args, bug_number, text, file_name, log, logdescription): +args['ids'] = [bug_number] +args['file_name'] = file_name +args['summary'] = logdescription +args['content_type'] = text/plain +args['data'] = log +args['comment'] = text +try: +server.Bug.add_attachment(args) +return True +except Exception, e: +print debug_file, repr(e) +return False + +def bugzilla_add_comment(debug_file, server, args, bug_number, text): +args['id'] = bug_number +args['comment'] = text +try: +server.Bug.add_comment(args) +return True +except Exception, e: +print debug_file, repr(e) +return False + +addhandler bugzilla_eventhandler +python bugzilla_eventhandler() { +import bb, os, glob +import xmlrpclib, httplib + +class ProxiedTransport(xmlrpclib.Transport): +def __init__(self, proxy, use_datetime = 0): +xmlrpclib.Transport.__init__(self, use_datetime) +self.proxy = proxy +self.user = None +self.password = None + +def set_user(self, user): +self.user = user + +def set_password(self, password): +self.password = password + +def make_connection(self, host): +self.realhost = host +return httplib.HTTP(self.proxy) + +def send_request(self, connection, handler, request_body): +connection.putrequest(POST, 'http://%s%s' % (self.realhost, handler)) +if self.user != None: +if self.password != None: +auth = %s:%s % (self.user, self.password) +else: +auth = self.user +connection.putheader(Proxy-authorization, Basic + base64.encodestring(auth)) + +event = e +data = e.data +name = bb.event.getName(event) +if name == MsgNote: + # avoid recursion + return + +if name == TaskFailed: +xmlrpc = bb.data.getVar(BUGZILLA_XMLRPC, data, True) +user= bb.data.getVar(BUGZILLA_USER, data, True) +passw = bb.data.getVar(BUGZILLA_PASS, data, True) +product = bb.data.getVar(BUGZILLA_PRODUCT, data, True) +compon = bb.data.getVar(BUGZILLA_COMPONENT, data, True) +version = bb.data.getVar(BUGZILLA_VERSION, data, True) + +proxy = bb.data.getVar('http_proxy', data, True ) +if (proxy): +import urllib2 +s, u, p, hostport = urllib2._parse_proxy(proxy) +transport = ProxiedTransport(hostport) +else: +transport = None
[OE-core] [PATCH 2/3] icu-3.6: fix building with big make -j
icu-3.6 buildsystem contains small problem which causes some parallel builds to fail. Fix that. Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- .../icu/files/fix-parallel-build.patch | 19 +++ meta/recipes-support/icu/icu-3.6.inc |1 + 2 files changed, 20 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-support/icu/files/fix-parallel-build.patch diff --git a/meta/recipes-support/icu/files/fix-parallel-build.patch b/meta/recipes-support/icu/files/fix-parallel-build.patch new file mode 100644 index 000..5b01a4c --- /dev/null +++ b/meta/recipes-support/icu/files/fix-parallel-build.patch @@ -0,0 +1,19 @@ +Upstream-Status: pending + +Fix parallel builds + +Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com + +Index: source/data/Makefile.in +=== +--- source.orig/data/Makefile.in 2011-09-02 02:03:37.0 +0400 source/data/Makefile.in2011-09-02 02:06:26.0 +0400 +@@ -351,8 +351,8 @@ + endif + + +-build-dir: $(BUILD_DIRS) +-$(BUILD_DIRS): ++$(MAINBUILDDIR) $(BUILD_DIRS): build-dir ++build-dir: + -$(MKINSTALLDIRS) $(BUILD_DIRS) diff --git a/meta/recipes-support/icu/icu-3.6.inc b/meta/recipes-support/icu/icu-3.6.inc index 1c611bd..18efd16 100644 --- a/meta/recipes-support/icu/icu-3.6.inc +++ b/meta/recipes-support/icu/icu-3.6.inc @@ -3,6 +3,7 @@ HOMEPAGE = http://www-01.ibm.com/software/globalization/icu/index.jsp; BASE_SRC_URI = ftp://ftp.software.ibm.com/software/globalization/icu/3.6/icu4c-3_6-src.tgz \ file://gccfix.patch;apply=yes \ + file://fix-parallel-build.patch \ file://use-g++-for-linking.patch;apply=yes SRC_URI = ${BASE_SRC_URI} \ file://noldlibpath.patch;apply=yes -- 1.7.2.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] zaurusd: enable support for collie
Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- .../0001-zaurusd-add-support-for-collie.patch | 50 meta/recipes-bsp/zaurusd/zaurusd_git.bb|3 +- 2 files changed, 52 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-bsp/zaurusd/zaurusd/0001-zaurusd-add-support-for-collie.patch diff --git a/meta/recipes-bsp/zaurusd/zaurusd/0001-zaurusd-add-support-for-collie.patch b/meta/recipes-bsp/zaurusd/zaurusd/0001-zaurusd-add-support-for-collie.patch new file mode 100644 index 000..36ded13 --- /dev/null +++ b/meta/recipes-bsp/zaurusd/zaurusd/0001-zaurusd-add-support-for-collie.patch @@ -0,0 +1,50 @@ +From 85b94bed1feab70bc529a59fb80c26da825b9abe Mon Sep 17 00:00:00 2001 +From: Dmitry Eremin-Solenikov dbarysh...@gmail.com +Date: Fri, 5 Aug 2011 16:00:10 +0400 +Subject: [PATCH] zaurusd: add support for collie +Upstream-Status: Pending + +Note: alsa mixer support is disabled, as collie doesn't support sound (yet). + +Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com +--- + config/mach-config/mach-collie-functions |4 + config/mach-config/mach-collie-vars.in |3 +++ + configure.ac |1 + + 3 files changed, 8 insertions(+), 0 deletions(-) + create mode 100644 config/mach-config/mach-collie-functions + create mode 100644 config/mach-config/mach-collie-vars.in + +diff --git a/config/mach-config/mach-collie-functions b/config/mach-config/mach-collie-functions +new file mode 100644 +index 000..4d77c53 +--- /dev/null b/config/mach-config/mach-collie-functions +@@ -0,0 +1,4 @@ ++HAVE_INPUT_SWITCHES=0 ++HAVE_TSKEYS=0 ++HAVE_ALSA_MIXER=0 ++ +diff --git a/config/mach-config/mach-collie-vars.in b/config/mach-config/mach-collie-vars.in +new file mode 100644 +index 000..ec1bfb8 +--- /dev/null b/config/mach-config/mach-collie-vars.in +@@ -0,0 +1,3 @@ ++MACHINE=collie ++ ++ALSA_MIXER_INIT=@appconfdir@/alsa/5500-default.state +diff --git a/configure.ac b/configure.ac +index 78ea2ae..5160fab 100644 +--- a/configure.ac b/configure.ac +@@ -65,6 +65,7 @@ AC_CONFIG_FILES([ + config/config + config/mach-config/mach-akita-vars + config/mach-config/mach-borzoi-vars ++ config/mach-config/mach-collie-vars + config/mach-config/mach-corgi-vars + config/mach-config/mach-husky-vars + config/mach-config/mach-poodle-vars +-- +1.7.2.5 diff --git a/meta/recipes-bsp/zaurusd/zaurusd_git.bb b/meta/recipes-bsp/zaurusd/zaurusd_git.bb index 3b8cc43..ebc3c66 100644 --- a/meta/recipes-bsp/zaurusd/zaurusd_git.bb +++ b/meta/recipes-bsp/zaurusd/zaurusd_git.bb @@ -7,9 +7,10 @@ RDEPENDS_${PN} = xrandr SRCREV = 82b30c7865f007fff81372c3cdc71b2ff6843ccc PV = 0.1+git${SRCPV} -PR = r0 +PR = r1 SRC_URI = git://git.yoctoproject.org/${BPN};protocol=git \ + file://0001-zaurusd-add-support-for-collie.patch \ file://fix_makefile.patch S = ${WORKDIR}/git -- 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] [PATCH 1/3] zaurusd: enable support for collie
On 9/3/11, Koen Kooi k...@dominion.thruhere.net wrote: shouldn't this move to meta-zaurus now that oe-core is qemu only? Maybe. IIUC, currently the plan is to push meta-zaurus into meta-hh as published by Paul Eggleton. On the other hand we didn't start this move (yet). So please ignore this patch for now. BTW: Probably this patch and fix-makefile.patch should just be applied into main git? -- With best wishes Dmitry ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] image_types.bbclass: use per-image dirs for extX.gz images generation
Currently image_types.bbclass uses deploy/images/${MACHINE}tpm.gz dir for temporary files when generating extX.gz images. This can lead to races and strange errors during image generation. To overcome this use deploy/images/${MACHINE}tpm.gz-${PN} dir for temporary files. Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- meta/classes/image_types.bbclass | 32 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index 2bdda41..1abd533 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass @@ -40,11 +40,11 @@ IMAGE_CMD_cramfs = mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.r IMAGE_CMD_ext2 = genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2 IMAGE_CMD_ext2.gz () { - rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz - genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 - gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 - mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz - rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz + rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN} mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN} + genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext2 + gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext2 + mv ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz + rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN} } IMAGE_CMD_ext3 () { @@ -52,12 +52,12 @@ IMAGE_CMD_ext3 () { tune2fs -j ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3 } IMAGE_CMD_ext3.gz () { - rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz - genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3 - tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3 - gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3 - mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.gz - rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz + rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN} mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN} + genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext3 + tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext3 + gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext3 + mv ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext3.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.gz + rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN} } oe_mkext4fs () { @@ -77,11 +77,11 @@ IMAGE_CMD_ext4 () { oe_mkext4fs ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4 } IMAGE_CMD_ext4.gz () { - rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz - oe_mkext4fs ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4 - gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4 - mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.gz - rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz + rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN} mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN} + oe_mkext4fs ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext4 + gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext4 + mv ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext4.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.gz + rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN} } IMAGE_CMD_btrfs () { -- 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] [PATCH] opkg-utils: ignore packages disapperaring filelist generation
On 8/25/11, Dmitry Eremin-Solenikov dbarysh...@gmail.com wrote: Package files disappearing during index generation don't cause a fatal error. Make package file disappearing during filelist generation also a non-fatal error. Please ignore this, I'll send a V2 soon. Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- .../opkg-utils/no-ioerror-during-filelist.patch| 31 meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb |3 +- 2 files changed, 33 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-devtools/opkg-utils/no-ioerror-during-filelist.patch diff --git a/meta/recipes-devtools/opkg-utils/no-ioerror-during-filelist.patch b/meta/recipes-devtools/opkg-utils/no-ioerror-during-filelist.patch new file mode 100644 index 000..dc85cb6 --- /dev/null +++ b/meta/recipes-devtools/opkg-utils/no-ioerror-during-filelist.patch @@ -0,0 +1,31 @@ +From: Dmitry Eremin-Solenikov dbarysh...@gmail.com +Subject: Ignore IOError errors while populating filelist +Upstream-Status: Pending/Not-Applicable + +While populating Packages.filelist there is a possibility that the package file +will disappear while reading. So ignore errors during filelist generation. + + +Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com + +Index: opkg-utils/opkg-make-index +=== +--- opkg-utils.orig/opkg-make-index 2011-08-25 16:45:41.0 +0400 opkg-utils/opkg-make-index 2011-08-25 17:38:57.0 +0400 +@@ -197,7 +197,15 @@ + names = packages.packages.keys() + names.sort() + for name in names: +- for fn in packages[name].get_file_list(): ++ try: ++ fnlist = packages[name].get_file_list() ++ except OSError, e: ++ sys.stderr.write(e) ++ continue ++ except IOError, e: ++ sys.stderr.write(e) ++ continue ++ for fn in fnlist: + (h,t) = os.path.split(fn) + if not t: continue + if not files.has_key(t): files[t] = name+':'+fn diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb index fd2b5e6..7659465 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb @@ -8,12 +8,13 @@ RDEPENDS_${PN} = python RDEPENDS_${PN}_virtclass-native = SRCREV = 4747 PV = 0.1.8+svnr${SRCPV} -PR = r4 +PR = r5 SRC_URI = svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http \ file://index-ignore-filenotfound.patch \ file://mtime-int.patch \ file://add-license-field.patch \ + file://no-ioerror-during-filelist.patch \ S = ${WORKDIR}/opkg-utils -- 1.7.2.5 -- With best wishes Dmitry ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] opkg-utils: ignore packages disapperaring filelist generation
Package files disappearing during index generation don't cause a fatal error. Make package file disappearing during filelist generation also a non-fatal error. Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- .../opkg-utils/no-ioerror-during-filelist.patch| 31 meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb |3 +- 2 files changed, 33 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-devtools/opkg-utils/no-ioerror-during-filelist.patch diff --git a/meta/recipes-devtools/opkg-utils/no-ioerror-during-filelist.patch b/meta/recipes-devtools/opkg-utils/no-ioerror-during-filelist.patch new file mode 100644 index 000..dc85cb6 --- /dev/null +++ b/meta/recipes-devtools/opkg-utils/no-ioerror-during-filelist.patch @@ -0,0 +1,31 @@ +From: Dmitry Eremin-Solenikov dbarysh...@gmail.com +Subject: Ignore IOError errors while populating filelist +Upstream-Status: Pending/Not-Applicable + +While populating Packages.filelist there is a possibility that the package file +will disappear while reading. So ignore errors during filelist generation. + + +Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com + +Index: opkg-utils/opkg-make-index +=== +--- opkg-utils.orig/opkg-make-index2011-08-25 16:45:41.0 +0400 opkg-utils/opkg-make-index 2011-08-25 17:38:57.0 +0400 +@@ -197,7 +197,15 @@ + names = packages.packages.keys() + names.sort() + for name in names: +- for fn in packages[name].get_file_list(): ++ try: ++ fnlist = packages[name].get_file_list() ++ except OSError, e: ++ sys.stderr.write(e) ++ continue ++ except IOError, e: ++ sys.stderr.write(e) ++ continue ++ for fn in fnlist: + (h,t) = os.path.split(fn) + if not t: continue + if not files.has_key(t): files[t] = name+':'+fn diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb index fd2b5e6..7659465 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb @@ -8,12 +8,13 @@ RDEPENDS_${PN} = python RDEPENDS_${PN}_virtclass-native = SRCREV = 4747 PV = 0.1.8+svnr${SRCPV} -PR = r4 +PR = r5 SRC_URI = svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http \ file://index-ignore-filenotfound.patch \ file://mtime-int.patch \ file://add-license-field.patch \ + file://no-ioerror-during-filelist.patch \ S = ${WORKDIR}/opkg-utils -- 1.7.2.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] udisks: add checksums for udisks-1.0.2
Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- meta-oe/recipes-support/udisks/udisks_1.0.2.bb |4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/meta-oe/recipes-support/udisks/udisks_1.0.2.bb b/meta-oe/recipes-support/udisks/udisks_1.0.2.bb index aafeca7..5fe8e36 100644 --- a/meta-oe/recipes-support/udisks/udisks_1.0.2.bb +++ b/meta-oe/recipes-support/udisks/udisks_1.0.2.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = file://COPYING;md5=73d83aebe7e4b62346afde80e0e94273 DEPENDS = libatasmart sg3-utils polkit udev dbus-glib glib-2.0 # optional dependencies: device-mapper parted -SRC_URI = http://hal.freedesktop.org/releases/${BPN}-${PV}.tar.gz \ +SRC_URI = http://hal.freedesktop.org/releases/${BPN}-${PV}.tar.gz;name=${BPN} \ file://optional-depends.patch inherit autotools @@ -19,4 +19,6 @@ FILES_${PN} += ${libdir}/polkit-1/extensions/*.so \ FILES_${PN}-dbg += ${base_libdir}/udev/.debug +SRC_URI[udisks.md5sum] = f630eefa51b95d6485eb3246bc1bea9a +SRC_URI[udisks.sha256sum] = 7dc1a150a6a31b2727144603fa5a8f9852696fc5bdc4a11917b9b0f1b8e3dcf1 -- 1.7.2.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] meta-efl/screenshot: add LIC_FILES_CHKSUM
Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- meta-efl/recipes-efl/e17/screenshot_svn.bb |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/meta-efl/recipes-efl/e17/screenshot_svn.bb b/meta-efl/recipes-efl/e17/screenshot_svn.bb index 0cd0d8b..a3678e6 100644 --- a/meta-efl/recipes-efl/e17/screenshot_svn.bb +++ b/meta-efl/recipes-efl/e17/screenshot_svn.bb @@ -1,6 +1,7 @@ LICENSE = MIT PV = 0.3.0+svnr${SRCREV} PR = ${INC_PR}.0 +LIC_FILES_CHKSUM = file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35 require e-module.inc -- 1.7.2.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] meta-efl/screenshot: fix building with current gettext/auto*
Current auto*/gettext stopped substituting @MKINSTALLDIRS@ variable which is necessary in screenshot/po/Makefile. Fix that by calling AM_MKINSTALLDIRS manually. Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- .../screenshot/screenshot-fix-mkinstalldirs.patch | 23 meta-efl/recipes-efl/e17/screenshot_svn.bb |1 + 2 files changed, 24 insertions(+), 0 deletions(-) create mode 100644 meta-efl/recipes-efl/e17/screenshot/screenshot-fix-mkinstalldirs.patch diff --git a/meta-efl/recipes-efl/e17/screenshot/screenshot-fix-mkinstalldirs.patch b/meta-efl/recipes-efl/e17/screenshot/screenshot-fix-mkinstalldirs.patch new file mode 100644 index 000..14f1141 --- /dev/null +++ b/meta-efl/recipes-efl/e17/screenshot/screenshot-fix-mkinstalldirs.patch @@ -0,0 +1,23 @@ +From: Dmitry Eremin-Solenikov dbarysh...@gmail.com +Subject: fix screenshot po/ building +Upstream-Status: Pending + +Somehow configure doesn't substitute @MKINSTALLDIRS@ by default anymore, +however this substitution is required for po/Makefile + +Fix that by calling AM_MKINSTALLDIRS from configure.ac + +Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com + +Index: E-MODULES-EXTRA/screenshot/configure.ac +=== +--- E-MODULES-EXTRA.orig/screenshot/configure.ac 2011-08-17 15:49:22.0 +0400 E-MODULES-EXTRA/screenshot/configure.ac2011-08-17 15:49:34.0 +0400 +@@ -24,6 +24,7 @@ + define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl + AC_PROG_LIBTOOL + ++AM_MKINSTALLDIRS + m4_ifdef([AM_GNU_GETTEXT_VERSION], [ + AM_GNU_GETTEXT_VERSION([0.14]) + ]) diff --git a/meta-efl/recipes-efl/e17/screenshot_svn.bb b/meta-efl/recipes-efl/e17/screenshot_svn.bb index a3678e6..465ffcf 100644 --- a/meta-efl/recipes-efl/e17/screenshot_svn.bb +++ b/meta-efl/recipes-efl/e17/screenshot_svn.bb @@ -2,6 +2,7 @@ LICENSE = MIT PV = 0.3.0+svnr${SRCREV} PR = ${INC_PR}.0 LIC_FILES_CHKSUM = file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35 +SRC_URI += file://screenshot-fix-mkinstalldirs.patch require e-module.inc -- 1.7.2.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] binutils-2.20.1: import several patches from Debian
Import several patches from Debian to improve --no-add-needed handling vs. weak symbols and branching to weak symbols on arm. Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- .../binutils/.binutils_2.20.1.bb.swp | Bin 0 - 4096 bytes .../152_arm_branches_to_weak_symbols.patch | 240 .../binutils-2.20.1/200_elflink_%B_fixes.patch | 65 ++ .../201_elflink_improve_noaddneeded_errors.patch | 70 ++ .../202_elflink_noaddneeded_vs_weak.patch | 87 +++ .../recipes-devtools/binutils/binutils_2.20.1.bb |6 +- 6 files changed, 467 insertions(+), 1 deletions(-) create mode 100644 meta-oe/recipes-devtools/binutils/.binutils_2.20.1.bb.swp create mode 100644 meta-oe/recipes-devtools/binutils/binutils-2.20.1/152_arm_branches_to_weak_symbols.patch create mode 100644 meta-oe/recipes-devtools/binutils/binutils-2.20.1/200_elflink_%B_fixes.patch create mode 100644 meta-oe/recipes-devtools/binutils/binutils-2.20.1/201_elflink_improve_noaddneeded_errors.patch create mode 100644 meta-oe/recipes-devtools/binutils/binutils-2.20.1/202_elflink_noaddneeded_vs_weak.patch diff --git a/meta-oe/recipes-devtools/binutils/.binutils_2.20.1.bb.swp b/meta-oe/recipes-devtools/binutils/.binutils_2.20.1.bb.swp new file mode 100644 index ..6067470179a28799e82f41a85e864e87bd170f00 GIT binary patch literal 4096 zcmeIuu?oU45C-6T0YP+^T5)XB#=$3WP*EpcrD={5uuVu(!NrI3sT^^!L1L_yXiQ7 zj=N8$m+c{1GXZUl0haOZID;3w_W+d+kGz}rROz%*=z3BB+kHh+HjAdv57C7w!w36 z8dsp_6^1-97Hg~|wj0%Ng4|)DE4^Js5NITW?B`mebPCQ_C$DSOYL00|6KU50X hrQP$3cpgnB=YcxV+ay2BtQZrKmsH{0wgd@fe!(PGF|`x literal 0 HcmV?d1 diff --git a/meta-oe/recipes-devtools/binutils/binutils-2.20.1/152_arm_branches_to_weak_symbols.patch b/meta-oe/recipes-devtools/binutils/binutils-2.20.1/152_arm_branches_to_weak_symbols.patch new file mode 100644 index 000..48523f8 --- /dev/null +++ b/meta-oe/recipes-devtools/binutils/binutils-2.20.1/152_arm_branches_to_weak_symbols.patch @@ -0,0 +1,240 @@ +#!/bin/sh -e +## 152_arm_branches_to_weak_symbols.dpatch +## +## DP: Description: http://sourceware.org/ml/binutils/2010-04/msg00446.html +## DP: Description: taken from the trunk + +if [ $# -ne 1 ]; then +echo 2 `basename $0`: script expects -patch|-unpatch as argument +exit 1 +fi + +[ -f debian/patches/00patch-opts ] . debian/patches/00patch-opts +patch_opts=${patch_opts:--f --no-backup-if-mismatch} + +case $1 in + -patch) patch $patch_opts -p0 $0;; + -unpatch) patch $patch_opts -p0 -R $0;; +*) +echo 2 `basename $0`: script expects -patch|-unpatch as argument +exit 1;; +esac + +exit 0 + +gas/ + +2010-05-04 Nick Clifton ni...@redhat.com + + * write.c (fixup_segment): Revert previous delta. + * config/tc-arm.h (TC_FORCE_RELOCATION_LOCAL): Also force the + generation of relocations for fixups against weak symbols. + +2010-04-29 Nathan Sidwell nat...@codesourcery.com + + * write.c (fixup_segment): Do not assume we know the section a + defined weak symbol is in. + * config/tc-arm.c (relax_adr, relax_branch, md_apply_fix): Treat + weak symbols as not known to be in the same section, even if they + are defined. + +gas/testsuite/ + +2010-04-29 Nathan Sidwell nat...@codesourcery.com + + * gas/arm/weakdef-1.s: New. + * gas/arm/weakdef-1.d: New. + * gas/arm/weakdef-2.s: New. + * gas/arm/weakdef-2.d: New. + * gas/arm/weakdef-2.l: New. + +@DPATCH@ +diff -urN gas.orig/config/tc-arm.c gas/config/tc-arm.c +--- a/gas/config/tc-arm.c 2010-02-22 08:06:52.0 + b/gas/config/tc-arm.c 2010-05-06 12:52:25.391085365 + +@@ -18207,7 +18207,8 @@ + + /* Assume worst case for symbols not known to be in the same section. */ + if (!S_IS_DEFINED (fragp-fr_symbol) +- || sec != S_GET_SEGMENT (fragp-fr_symbol)) ++ || sec != S_GET_SEGMENT (fragp-fr_symbol) ++ || S_IS_WEAK (fragp-fr_symbol)) + return 4; + + val = relaxed_symbol_addr (fragp, stretch); +@@ -18250,7 +18251,8 @@ + + /* Assume worst case for symbols not known to be in the same section. */ + if (!S_IS_DEFINED (fragp-fr_symbol) +- || sec != S_GET_SEGMENT (fragp-fr_symbol)) ++ || sec != S_GET_SEGMENT (fragp-fr_symbol) ++ || S_IS_WEAK (fragp-fr_symbol)) + return 4; + + #ifdef OBJ_ELF +@@ -19463,22 +19465,23 @@ +not have a reloc for it, so tc_gen_reloc will reject it. */ + fixP-fx_done = 1; + +- if (fixP-fx_addsy +- ! S_IS_DEFINED (fixP-fx_addsy)) ++ if (fixP-fx_addsy) + { +-as_bad_where (fixP-fx_file, fixP-fx_line, +- _(undefined symbol %s used as an immediate value), +- S_GET_NAME (fixP-fx_addsy)); +-break; +- } ++const char *msg = 0; + +- if (fixP-fx_addsy +- S_GET_SEGMENT (fixP-fx_addsy
[OE-core] [PATCH V2] binutils-2.20.1: import several patches from Debian
Import several patches from Debian to improve --no-add-needed handling vs. weak symbols and branching to weak symbols on arm. Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- .../152_arm_branches_to_weak_symbols.patch | 240 .../binutils-2.20.1/200_elflink_%B_fixes.patch | 65 ++ .../201_elflink_improve_noaddneeded_errors.patch | 70 ++ .../202_elflink_noaddneeded_vs_weak.patch | 87 +++ .../recipes-devtools/binutils/binutils_2.20.1.bb |6 +- 5 files changed, 467 insertions(+), 1 deletions(-) create mode 100644 meta-oe/recipes-devtools/binutils/binutils-2.20.1/152_arm_branches_to_weak_symbols.patch create mode 100644 meta-oe/recipes-devtools/binutils/binutils-2.20.1/200_elflink_%B_fixes.patch create mode 100644 meta-oe/recipes-devtools/binutils/binutils-2.20.1/201_elflink_improve_noaddneeded_errors.patch create mode 100644 meta-oe/recipes-devtools/binutils/binutils-2.20.1/202_elflink_noaddneeded_vs_weak.patch diff --git a/meta-oe/recipes-devtools/binutils/binutils-2.20.1/152_arm_branches_to_weak_symbols.patch b/meta-oe/recipes-devtools/binutils/binutils-2.20.1/152_arm_branches_to_weak_symbols.patch new file mode 100644 index 000..48523f8 --- /dev/null +++ b/meta-oe/recipes-devtools/binutils/binutils-2.20.1/152_arm_branches_to_weak_symbols.patch @@ -0,0 +1,240 @@ +#!/bin/sh -e +## 152_arm_branches_to_weak_symbols.dpatch +## +## DP: Description: http://sourceware.org/ml/binutils/2010-04/msg00446.html +## DP: Description: taken from the trunk + +if [ $# -ne 1 ]; then +echo 2 `basename $0`: script expects -patch|-unpatch as argument +exit 1 +fi + +[ -f debian/patches/00patch-opts ] . debian/patches/00patch-opts +patch_opts=${patch_opts:--f --no-backup-if-mismatch} + +case $1 in + -patch) patch $patch_opts -p0 $0;; + -unpatch) patch $patch_opts -p0 -R $0;; +*) +echo 2 `basename $0`: script expects -patch|-unpatch as argument +exit 1;; +esac + +exit 0 + +gas/ + +2010-05-04 Nick Clifton ni...@redhat.com + + * write.c (fixup_segment): Revert previous delta. + * config/tc-arm.h (TC_FORCE_RELOCATION_LOCAL): Also force the + generation of relocations for fixups against weak symbols. + +2010-04-29 Nathan Sidwell nat...@codesourcery.com + + * write.c (fixup_segment): Do not assume we know the section a + defined weak symbol is in. + * config/tc-arm.c (relax_adr, relax_branch, md_apply_fix): Treat + weak symbols as not known to be in the same section, even if they + are defined. + +gas/testsuite/ + +2010-04-29 Nathan Sidwell nat...@codesourcery.com + + * gas/arm/weakdef-1.s: New. + * gas/arm/weakdef-1.d: New. + * gas/arm/weakdef-2.s: New. + * gas/arm/weakdef-2.d: New. + * gas/arm/weakdef-2.l: New. + +@DPATCH@ +diff -urN gas.orig/config/tc-arm.c gas/config/tc-arm.c +--- a/gas/config/tc-arm.c 2010-02-22 08:06:52.0 + b/gas/config/tc-arm.c 2010-05-06 12:52:25.391085365 + +@@ -18207,7 +18207,8 @@ + + /* Assume worst case for symbols not known to be in the same section. */ + if (!S_IS_DEFINED (fragp-fr_symbol) +- || sec != S_GET_SEGMENT (fragp-fr_symbol)) ++ || sec != S_GET_SEGMENT (fragp-fr_symbol) ++ || S_IS_WEAK (fragp-fr_symbol)) + return 4; + + val = relaxed_symbol_addr (fragp, stretch); +@@ -18250,7 +18251,8 @@ + + /* Assume worst case for symbols not known to be in the same section. */ + if (!S_IS_DEFINED (fragp-fr_symbol) +- || sec != S_GET_SEGMENT (fragp-fr_symbol)) ++ || sec != S_GET_SEGMENT (fragp-fr_symbol) ++ || S_IS_WEAK (fragp-fr_symbol)) + return 4; + + #ifdef OBJ_ELF +@@ -19463,22 +19465,23 @@ +not have a reloc for it, so tc_gen_reloc will reject it. */ + fixP-fx_done = 1; + +- if (fixP-fx_addsy +- ! S_IS_DEFINED (fixP-fx_addsy)) ++ if (fixP-fx_addsy) + { +-as_bad_where (fixP-fx_file, fixP-fx_line, +- _(undefined symbol %s used as an immediate value), +- S_GET_NAME (fixP-fx_addsy)); +-break; +- } ++const char *msg = 0; + +- if (fixP-fx_addsy +- S_GET_SEGMENT (fixP-fx_addsy) != seg) +- { +-as_bad_where (fixP-fx_file, fixP-fx_line, +- _(symbol %s is in a different section), +- S_GET_NAME (fixP-fx_addsy)); +-break; ++if (! S_IS_DEFINED (fixP-fx_addsy)) ++ msg = _(undefined symbol %s used as an immediate value); ++else if (S_GET_SEGMENT (fixP-fx_addsy) != seg) ++ msg = _(symbol %s is in a different section); ++else if (S_IS_WEAK (fixP-fx_addsy)) ++ msg = _(symbol %s is weak and may be overridden later); ++ ++if (msg) ++ { ++as_bad_where (fixP-fx_file, fixP-fx_line, ++ msg, S_GET_NAME (fixP
Re: [OE-core] [PATCH V2] binutils-2.20.1: import several patches from Debian
On 8/16/11, Koen Kooi k...@dominion.thruhere.net wrote: Op 16 aug. 2011, om 10:07 heeft Dmitry Eremin-Solenikov het volgende geschreven: Import several patches from Debian to improve --no-add-needed handling vs. weak symbols and branching to weak symbols on arm. Out of curiousity, which platforms did you test this on? I'm building sato and systemd-gnome-image for tosa and w/o these patches building fails (e.g. during build of musicbrainz). Haven't done full rebuild, but probably I can do it if you require it. Runtime tested in qemu. Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- .../152_arm_branches_to_weak_symbols.patch | 240 .../binutils-2.20.1/200_elflink_%B_fixes.patch | 65 ++ .../201_elflink_improve_noaddneeded_errors.patch | 70 ++ .../202_elflink_noaddneeded_vs_weak.patch | 87 +++ .../recipes-devtools/binutils/binutils_2.20.1.bb |6 +- 5 files changed, 467 insertions(+), 1 deletions(-) create mode 100644 meta-oe/recipes-devtools/binutils/binutils-2.20.1/152_arm_branches_to_weak_symbols.patch create mode 100644 meta-oe/recipes-devtools/binutils/binutils-2.20.1/200_elflink_%B_fixes.patch create mode 100644 meta-oe/recipes-devtools/binutils/binutils-2.20.1/201_elflink_improve_noaddneeded_errors.patch create mode 100644 meta-oe/recipes-devtools/binutils/binutils-2.20.1/202_elflink_noaddneeded_vs_weak.patch diff --git a/meta-oe/recipes-devtools/binutils/binutils-2.20.1/152_arm_branches_to_weak_symbols.patch b/meta-oe/recipes-devtools/binutils/binutils-2.20.1/152_arm_branches_to_weak_symbols.patch new file mode 100644 index 000..48523f8 --- /dev/null +++ b/meta-oe/recipes-devtools/binutils/binutils-2.20.1/152_arm_branches_to_weak_symbols.patch @@ -0,0 +1,240 @@ +#!/bin/sh -e +## 152_arm_branches_to_weak_symbols.dpatch +## +## DP: Description: http://sourceware.org/ml/binutils/2010-04/msg00446.html +## DP: Description: taken from the trunk + +if [ $# -ne 1 ]; then +echo 2 `basename $0`: script expects -patch|-unpatch as argument +exit 1 +fi + +[ -f debian/patches/00patch-opts ] . debian/patches/00patch-opts +patch_opts=${patch_opts:--f --no-backup-if-mismatch} + +case $1 in + -patch) patch $patch_opts -p0 $0;; + -unpatch) patch $patch_opts -p0 -R $0;; +*) +echo 2 `basename $0`: script expects -patch|-unpatch as argument +exit 1;; +esac + +exit 0 + +gas/ + +2010-05-04 Nick Clifton ni...@redhat.com + +* write.c (fixup_segment): Revert previous delta. +* config/tc-arm.h (TC_FORCE_RELOCATION_LOCAL): Also force the +generation of relocations for fixups against weak symbols. + +2010-04-29 Nathan Sidwell nat...@codesourcery.com + +* write.c (fixup_segment): Do not assume we know the section a +defined weak symbol is in. +* config/tc-arm.c (relax_adr, relax_branch, md_apply_fix): Treat +weak symbols as not known to be in the same section, even if they +are defined. + +gas/testsuite/ + +2010-04-29 Nathan Sidwell nat...@codesourcery.com + +* gas/arm/weakdef-1.s: New. +* gas/arm/weakdef-1.d: New. +* gas/arm/weakdef-2.s: New. +* gas/arm/weakdef-2.d: New. +* gas/arm/weakdef-2.l: New. + +@DPATCH@ +diff -urN gas.orig/config/tc-arm.c gas/config/tc-arm.c +--- a/gas/config/tc-arm.c 2010-02-22 08:06:52.0 + b/gas/config/tc-arm.c 2010-05-06 12:52:25.391085365 + +@@ -18207,7 +18207,8 @@ + + /* Assume worst case for symbols not known to be in the same section. */ + if (!S_IS_DEFINED (fragp-fr_symbol) +- || sec != S_GET_SEGMENT (fragp-fr_symbol)) ++ || sec != S_GET_SEGMENT (fragp-fr_symbol) ++ || S_IS_WEAK (fragp-fr_symbol)) + return 4; + + val = relaxed_symbol_addr (fragp, stretch); +@@ -18250,7 +18251,8 @@ + + /* Assume worst case for symbols not known to be in the same section. */ + if (!S_IS_DEFINED (fragp-fr_symbol) +- || sec != S_GET_SEGMENT (fragp-fr_symbol)) ++ || sec != S_GET_SEGMENT (fragp-fr_symbol) ++ || S_IS_WEAK (fragp-fr_symbol)) + return 4; + + #ifdef OBJ_ELF +@@ -19463,22 +19465,23 @@ + not have a reloc for it, so tc_gen_reloc will reject it. */ + fixP-fx_done = 1; + +- if (fixP-fx_addsy +- ! S_IS_DEFINED (fixP-fx_addsy)) ++ if (fixP-fx_addsy) +{ +- as_bad_where (fixP-fx_file, fixP-fx_line, +- _(undefined symbol %s used as an immediate value), +- S_GET_NAME (fixP-fx_addsy)); +- break; +- } ++ const char *msg = 0; + +- if (fixP-fx_addsy +- S_GET_SEGMENT (fixP-fx_addsy) != seg) +- { +- as_bad_where (fixP-fx_file, fixP-fx_line, +- _(symbol %s is in a different section), +- S_GET_NAME (fixP-fx_addsy)); +- break; ++ if (! S_IS_DEFINED (fixP-fx_addsy)) ++ msg
[OE-core] [PATCH] emprint: add LIC_FILES_CHKSUM
Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- meta-efl/recipes-efl/e17/emprint_svn.bb |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/meta-efl/recipes-efl/e17/emprint_svn.bb b/meta-efl/recipes-efl/e17/emprint_svn.bb index 31c744d..d5c4769 100644 --- a/meta-efl/recipes-efl/e17/emprint_svn.bb +++ b/meta-efl/recipes-efl/e17/emprint_svn.bb @@ -2,6 +2,7 @@ DESCRIPTION = Emprint is a utility for taking screenshots of the entire screen, LICENSE = MIT BSD DEPENDS = imlib2 virtual/libx11 ecore evas edje eina PV = 0.0.1+svnr${SRCPV} +LIC_FILES_CHKSUM = file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35 SRCREV = ${EFL_SRCREV} inherit e -- 1.7.2.5 ___ 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
[OE-core] [PATCH V2] eglibc: fix build for armv4 machines
eglibc builds for arm-eabi unconditionally enables the libc-do-syscall.S file, which contains thumb assembly. It's unused in arm-eabi-nothumb case, so just ifdef the actual code. V2: use the patch from oe.dev. The patch is submitted to sourceware bugzilla by Khem Raj back in October of 2010, but the status is still UNCONFIRMED and the patch isn't commited. Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com Cc: Khem Raj raj.k...@gmail.com --- .../eglibc-2.12/armv4-eabi-compile-fix.patch | 25 .../eglibc-2.13/armv4-eabi-compile-fix.patch | 25 meta/recipes-core/eglibc/eglibc_2.12.bb|3 +- meta/recipes-core/eglibc/eglibc_2.13.bb|3 +- 4 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-core/eglibc/eglibc-2.12/armv4-eabi-compile-fix.patch create mode 100644 meta/recipes-core/eglibc/eglibc-2.13/armv4-eabi-compile-fix.patch diff --git a/meta/recipes-core/eglibc/eglibc-2.12/armv4-eabi-compile-fix.patch b/meta/recipes-core/eglibc/eglibc-2.12/armv4-eabi-compile-fix.patch new file mode 100644 index 000..c2407ee --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-2.12/armv4-eabi-compile-fix.patch @@ -0,0 +1,25 @@ +Source: http://sourceware.org/bugzilla/show_bug.cgi?id=12097 +Upstream-Status: Submitted + +The patch should be merged into glibc-ports + +-Khem +Index: libc/ports/sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S +=== +--- libc.orig/ports/sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S libc/ports/sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S +@@ -16,6 +16,8 @@ +Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. */ + ++#if defined(__thumb__) ++ + #include sysdep.h + + /* Out-of-line syscall stub. We expect the system call number in ip +@@ -41,3 +43,5 @@ ENTRY (__libc_do_syscall) + pop {r7, pc} + .fnend + END (__libc_do_syscall) ++ ++#endif /* __thumb__ */ diff --git a/meta/recipes-core/eglibc/eglibc-2.13/armv4-eabi-compile-fix.patch b/meta/recipes-core/eglibc/eglibc-2.13/armv4-eabi-compile-fix.patch new file mode 100644 index 000..c2407ee --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-2.13/armv4-eabi-compile-fix.patch @@ -0,0 +1,25 @@ +Source: http://sourceware.org/bugzilla/show_bug.cgi?id=12097 +Upstream-Status: Submitted + +The patch should be merged into glibc-ports + +-Khem +Index: libc/ports/sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S +=== +--- libc.orig/ports/sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S libc/ports/sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S +@@ -16,6 +16,8 @@ +Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. */ + ++#if defined(__thumb__) ++ + #include sysdep.h + + /* Out-of-line syscall stub. We expect the system call number in ip +@@ -41,3 +43,5 @@ ENTRY (__libc_do_syscall) + pop {r7, pc} + .fnend + END (__libc_do_syscall) ++ ++#endif /* __thumb__ */ diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bb b/meta/recipes-core/eglibc/eglibc_2.12.bb index 1ada892..ce16bd6 100644 --- a/meta/recipes-core/eglibc/eglibc_2.12.bb +++ b/meta/recipes-core/eglibc/eglibc_2.12.bb @@ -1,7 +1,7 @@ require eglibc.inc DEPENDS += gperf-native -PR = r20 +PR = r21 SRCREV = 14158 @@ -11,6 +11,7 @@ SRC_URI = svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http file://IO-acquire-lock-fix.patch \ file://shorten-build-commands.patch \ file://mips-rld-map-check.patch \ + file://armv4-eabi-compile-fix.patch \ file://etc/ld.so.conf \ file://generate-supported.mk \ diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb index 41fe7c7..ddca50f 100644 --- a/meta/recipes-core/eglibc/eglibc_2.13.bb +++ b/meta/recipes-core/eglibc/eglibc_2.13.bb @@ -3,7 +3,7 @@ require eglibc.inc SRCREV = 14157 DEPENDS += gperf-native -PR = r9 +PR = r10 PR_append = +svnr${SRCPV} EGLIBC_BRANCH=eglibc-2_13 @@ -13,6 +13,7 @@ SRC_URI = svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http file://shorten-build-commands.patch \ file://mips-rld-map-check.patch \ file://stack-protector-test.patch \ + file://armv4-eabi-compile-fix.patch \ file://etc/ld.so.conf \ file://generate-supported.mk \ file://glibc_bug_fix_12454.patch \ -- 1.7.2.3 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] eglibc: fix build for armv4 machines
eglibc builds for arm-eabi unconditionally enables the libc-do-syscall.S file, which contains thumb assembly. It's unused in arm-eabi-nothumb case, so just ifdef the actual code. Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- .../eglibc-fixup-arm-eabi-nothumb.patch| 17 + .../eglibc-fixup-arm-eabi-nothumb.patch| 17 + meta/recipes-core/eglibc/eglibc_2.12.bb|3 ++- meta/recipes-core/eglibc/eglibc_2.13.bb|3 ++- 4 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-core/eglibc/eglibc-2.12/eglibc-fixup-arm-eabi-nothumb.patch create mode 100644 meta/recipes-core/eglibc/eglibc-2.13/eglibc-fixup-arm-eabi-nothumb.patch diff --git a/meta/recipes-core/eglibc/eglibc-2.12/eglibc-fixup-arm-eabi-nothumb.patch b/meta/recipes-core/eglibc/eglibc-2.12/eglibc-fixup-arm-eabi-nothumb.patch new file mode 100644 index 000..e189b23 --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-2.12/eglibc-fixup-arm-eabi-nothumb.patch @@ -0,0 +1,17 @@ +Index: libc/ports/sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S +=== +--- libc.orig/ports/sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S 2011-07-31 12:07:13.0 +0400 libc/ports/sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S 2011-07-31 12:08:30.0 +0400 +@@ -25,6 +25,7 @@ +ARM unwind tables for register to register moves, the actual opcodes +are not defined. */ + ++#ifdef __thumb__ + .thumb + .syntax unified + .hidden __libc_do_syscall +@@ -41,3 +42,4 @@ + pop {r7, pc} + .fnend + END (__libc_do_syscall) ++#endif diff --git a/meta/recipes-core/eglibc/eglibc-2.13/eglibc-fixup-arm-eabi-nothumb.patch b/meta/recipes-core/eglibc/eglibc-2.13/eglibc-fixup-arm-eabi-nothumb.patch new file mode 100644 index 000..e189b23 --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-2.13/eglibc-fixup-arm-eabi-nothumb.patch @@ -0,0 +1,17 @@ +Index: libc/ports/sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S +=== +--- libc.orig/ports/sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S 2011-07-31 12:07:13.0 +0400 libc/ports/sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S 2011-07-31 12:08:30.0 +0400 +@@ -25,6 +25,7 @@ +ARM unwind tables for register to register moves, the actual opcodes +are not defined. */ + ++#ifdef __thumb__ + .thumb + .syntax unified + .hidden __libc_do_syscall +@@ -41,3 +42,4 @@ + pop {r7, pc} + .fnend + END (__libc_do_syscall) ++#endif diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bb b/meta/recipes-core/eglibc/eglibc_2.12.bb index 1ada892..eb7d220 100644 --- a/meta/recipes-core/eglibc/eglibc_2.12.bb +++ b/meta/recipes-core/eglibc/eglibc_2.12.bb @@ -1,7 +1,7 @@ require eglibc.inc DEPENDS += gperf-native -PR = r20 +PR = r21 SRCREV = 14158 @@ -11,6 +11,7 @@ SRC_URI = svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http file://IO-acquire-lock-fix.patch \ file://shorten-build-commands.patch \ file://mips-rld-map-check.patch \ + file://eglibc-fixup-arm-eabi-nothumb.patch \ file://etc/ld.so.conf \ file://generate-supported.mk \ diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb index 41fe7c7..e54692b 100644 --- a/meta/recipes-core/eglibc/eglibc_2.13.bb +++ b/meta/recipes-core/eglibc/eglibc_2.13.bb @@ -3,7 +3,7 @@ require eglibc.inc SRCREV = 14157 DEPENDS += gperf-native -PR = r9 +PR = r10 PR_append = +svnr${SRCPV} EGLIBC_BRANCH=eglibc-2_13 @@ -13,6 +13,7 @@ SRC_URI = svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http file://shorten-build-commands.patch \ file://mips-rld-map-check.patch \ file://stack-protector-test.patch \ + file://eglibc-fixup-arm-eabi-nothumb.patch \ file://etc/ld.so.conf \ file://generate-supported.mk \ file://glibc_bug_fix_12454.patch \ -- 1.7.2.3 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] tune-xscale: fix xscale/xscale-be confusion
Currently tune-xscale.inc has options wrt. setting of xscale/xscale-be tunes. Fix that. Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- meta/conf/machine/include/tune-xscale.inc |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/conf/machine/include/tune-xscale.inc b/meta/conf/machine/include/tune-xscale.inc index 9fe9685..54f3727 100644 --- a/meta/conf/machine/include/tune-xscale.inc +++ b/meta/conf/machine/include/tune-xscale.inc @@ -10,7 +10,7 @@ TUNE_FEATURES_tune-xscale = ${TUNE_FEATURES_tune-armv5te} xscale PACKAGE_EXTRA_ARCHS_tune-xscale = ${PACKAGE_EXTRA_ARCHS_tune-armv5te} AVAILTUNES += xscale-be -TUNE_FEATURES_tune-xscale = ${TUNE_FEATURES_tune-armv5teb} xscale +TUNE_FEATURES_tune-xscale-be = ${TUNE_FEATURES_tune-armv5teb} xscale-be PACKAGE_EXTRA_ARCHS_tune-xscale-be = ${PACKAGE_EXTRA_ARCHS_tune-armv5teb} # webkit-gtk has alignment issues with double instructions on armv5 so -- 1.7.2.3 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] tune-xscale: fix xscale/xscale-be confusion
Currently tune-xscale.inc has options wrt. setting of xscale/xscale-be tunes. Fix that. Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com --- meta/conf/machine/include/tune-xscale.inc |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/conf/machine/include/tune-xscale.inc b/meta/conf/machine/include/tune-xscale.inc index 9fe9685..54f3727 100644 --- a/meta/conf/machine/include/tune-xscale.inc +++ b/meta/conf/machine/include/tune-xscale.inc @@ -10,7 +10,7 @@ TUNE_FEATURES_tune-xscale = ${TUNE_FEATURES_tune-armv5te} xscale PACKAGE_EXTRA_ARCHS_tune-xscale = ${PACKAGE_EXTRA_ARCHS_tune-armv5te} AVAILTUNES += xscale-be -TUNE_FEATURES_tune-xscale = ${TUNE_FEATURES_tune-armv5teb} xscale +TUNE_FEATURES_tune-xscale-be = ${TUNE_FEATURES_tune-armv5teb} xscale-be PACKAGE_EXTRA_ARCHS_tune-xscale-be = ${PACKAGE_EXTRA_ARCHS_tune-armv5teb} # webkit-gtk has alignment issues with double instructions on armv5 so -- 1.7.2.3 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core