* [PATCH] fontconfig: fix fix-pkgconfig.patch
From: Martin Jansa @ 2011-10-17 22:09 UTC (permalink / raw)
To: openembedded-core
* missing $ is causing problems ie when building webkit-efl
* see http://lists.linuxtogo.org/pipermail/openembedded-core/2011-June/003798.html
for details
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../fontconfig-2.8.0/fix-pkgconfig.patch | 2 +-
.../fontconfig/fontconfig_2.8.0.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch b/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch
index c8a3bf5..30415fc 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch
+++ b/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch
@@ -11,5 +11,5 @@ Upstream-Status: Inappropriate [configuration]
Version: @VERSION@
Libs: -L${libdir} -lfontconfig
-Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ @FREETYPE_LIBS@ @ICONV_LIBS@
-+Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ -L{libdir} -lfreetype @ICONV_LIBS@
++Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ -L${libdir} -lfreetype @ICONV_LIBS@
Cflags: -I${includedir}
diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb
index 5381065..55c04cc 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb
+++ b/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb
@@ -20,7 +20,7 @@ SECTION = "libs"
DEPENDS = "expat freetype zlib"
-PR = "r3"
+PR = "r4"
SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
file://fix-pkgconfig.patch \
--
1.7.7
^ permalink raw reply related
* [ANNOUNCEMENT] New Patchwork available for testing
From: Khem Raj @ 2011-10-17 19:06 UTC (permalink / raw)
To: openembeded-devel,
Patches and discussions about the oe-core layer
Hi
Here is a new instance of patchwork accessible at
http://patchwork.openembedded.org
This instance uses same database therefore it should not be any different than
existing patches.openembedded.org
However with the new patchwork you will see additionally "Mail settings"
link on the right hand upper corner this could be used to subscribe to patchwork
activity. This is a new feature so try it out and report any issues.
The patch capturing is done by the new patchwork.
reiterating what Koen already announced, git post-recieve hook is
installed for meta-openembedded repository to interact with patchwork
on push so it will change the state of patch to "Accepted" once
it has been pushed. This should avoid lot of manual work for the maintainers
Please test this and report any problems you see with patches being marked
incorrectly or something else. Eventually if this turns out to be
useful we could
consider it for oe-core and bitbake as well.
Registering new user should work now. There has been issues with old server
sending out emails.
Eventually patches.openembedded.org will just be an alias to
patchwork.openembedded.org
Happy patching
-Khem
^ permalink raw reply
* Re: intermittent (50% of the time) parse failures
From: Koen Kooi @ 2011-10-17 17:11 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <5BC7E975-3E96-4DFC-8E03-FE60EC5C47FC@dominion.thruhere.net>
Op 17 okt. 2011, om 19:07 heeft Koen Kooi het volgende geschreven:
> Hi,
>
> I'm working on xfce and half the time I get:
>
> koen@dominion:/OE/tentacle/sources/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph$ bitbake xfce4-cpugraph-plugin
> Loading cache: 100% |#############################################################################################################################################################################################################################################| ETA: 00:00:00
> Loaded 1794 entries from dependency cache.
> Parsing recipes: 100% |###########################################################################################################################################################################################################################################| Time: 00:00:00
> Parsing of 1397 .bb files complete (1396 cached, 1 parsed). 1794 targets, 58 skipped, 0 masked, 0 errors.
> ERROR: Command execution failed: Traceback (most recent call last):
> File "/OE/tentacle/sources/bitbake/lib/bb/command.py", line 99, in runAsyncCommand
> self.cooker.updateCache()
> File "/OE/tentacle/sources/bitbake/lib/bb/cooker.py", line 1135, in updateCache
> if not self.parser.parse_next():
> File "/OE/tentacle/sources/bitbake/lib/bb/cooker.py", line 1466, in parse_next
> self.shutdown()
> File "/OE/tentacle/sources/bitbake/lib/bb/cooker.py", line 1455, in shutdown
> bb.codeparser.parser_cache_savemerge(self.cooker.configuration.data)
> File "/OE/tentacle/sources/bitbake/lib/bb/codeparser.py", line 121, in parser_cache_savemerge
> data, version = p.load()
> ValueError: could not convert string to int
>
> The next run is fine, the one after that broken, etc
>
> I suspect it's this bit of code:
>
> SRC_URI = "http://archive.xfce.org/src/panel-plugins/${BPN}/${@'${PV}'[0:3]}/${BPN}-${PV}.tar.bz2"
>
> But I wonder why it works half the time, not always.
Update: it only fails when parsing the recipe, not when it's already in the cache. It seems the failed attempt does manage to update the cache properly.
^ permalink raw reply
* intermittent (50% of the time) parse failures
From: Koen Kooi @ 2011-10-17 17:07 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Hi,
I'm working on xfce and half the time I get:
koen@dominion:/OE/tentacle/sources/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph$ bitbake xfce4-cpugraph-plugin
Loading cache: 100% |#############################################################################################################################################################################################################################################| ETA: 00:00:00
Loaded 1794 entries from dependency cache.
Parsing recipes: 100% |###########################################################################################################################################################################################################################################| Time: 00:00:00
Parsing of 1397 .bb files complete (1396 cached, 1 parsed). 1794 targets, 58 skipped, 0 masked, 0 errors.
ERROR: Command execution failed: Traceback (most recent call last):
File "/OE/tentacle/sources/bitbake/lib/bb/command.py", line 99, in runAsyncCommand
self.cooker.updateCache()
File "/OE/tentacle/sources/bitbake/lib/bb/cooker.py", line 1135, in updateCache
if not self.parser.parse_next():
File "/OE/tentacle/sources/bitbake/lib/bb/cooker.py", line 1466, in parse_next
self.shutdown()
File "/OE/tentacle/sources/bitbake/lib/bb/cooker.py", line 1455, in shutdown
bb.codeparser.parser_cache_savemerge(self.cooker.configuration.data)
File "/OE/tentacle/sources/bitbake/lib/bb/codeparser.py", line 121, in parser_cache_savemerge
data, version = p.load()
ValueError: could not convert string to int
The next run is fine, the one after that broken, etc
I suspect it's this bit of code:
SRC_URI = "http://archive.xfce.org/src/panel-plugins/${BPN}/${@'${PV}'[0:3]}/${BPN}-${PV}.tar.bz2"
But I wonder why it works half the time, not always.
regards,
Koen
^ permalink raw reply
* Re: [PATCH] bind 9.8.1: fix build after recent update
From: Koen Kooi @ 2011-10-17 17:02 UTC (permalink / raw)
To: Saul Wold; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <4E9C5C9C.8060107@intel.com>
Op 17 okt. 2011, om 18:49 heeft Saul Wold het volgende geschreven:
> On 10/17/2011 08:59 AM, Koen Kooi wrote:
>>
>> Op 17 okt. 2011, om 17:25 heeft Koen Kooi het volgende geschreven:
>>
>>> | checking linking as -lgssapi -lkrb5 -ldes -lcrypt -lasn1 -lroken -lcom_err... no
>>> | checking linking as -lgssapi -lkrb5 -lcrypto -lcrypt -lasn1 -lroken -lcom_err... no
>>> | checking linking as -lgss -lkrb5... no
>>> | configure: error: could not determine proper GSSAPI linkage
>>> | + bbfatal 'oe_runconf failed'
>>> | + echo 'ERROR: oe_runconf failed'
>>>
>>> Signed-off-by: Koen Kooi<koen@dominion.thruhere.net>
>>> ---
>>> meta/recipes-connectivity/bind/bind_9.8.1.bb | 5 +++--
>>> 1 files changed, 3 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/meta/recipes-connectivity/bind/bind_9.8.1.bb b/meta/recipes-connectivity/bind/bind_9.8.1.bb
>>> index 330acdb..af473e9 100644
>>> --- a/meta/recipes-connectivity/bind/bind_9.8.1.bb
>>> +++ b/meta/recipes-connectivity/bind/bind_9.8.1.bb
>>> @@ -6,10 +6,10 @@ LICENSE = "ISC& BSD"
>>> LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=0fbe2a3ab3c68ac3fea3cad13093877c"
>>>
>>> DEPENDS = "openssl"
>>> -PR = "r0"
>>> +PR = "r1"
>>>
>>> SRC_URI = "ftp://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \
>>> - file://conf.patch \
>>> + file://conf.patch \
>>> file://cross-build-fix.patch \
>>> "
>>>
>>> @@ -19,6 +19,7 @@ SRC_URI[sha256sum] = "02285dc429cb2a6687a1b2446e9ee22c1df27f2577225b05be5092395e
>>> # --enable-exportlib is necessary for building dhcp
>>> EXTRA_OECONF = " --enable-ipv6=no --with-randomdev=/dev/random --disable-threads \
>>> --disable-devpoll --disable-epoll --with-gost=no \
>>
>> Not related to my patch: if someone can explain we we disable epoll I would appreciate it, since we generally want it enabled and I think we're using recent enough kernels (2.6.26+) where epoll finally got hooked up for arm
>>
> Koen,
>
> Thanks for pointing this out, a little code spelunking showed that Holger added this back in '08, you might be right about epoll at this point. Have you tested that we can pass the configure stage and build a working bind?
The thing will epoll is that you can have 2 failure modes:
1) old linux-libc-headers -> build fail
2) recent linux-libc-headers, old kernel -> undefined behaviour
Does anyone have a testcase for epoll in bind?
> On your gssapi, just curious under what OS conditions you found this, I wonder why it passed on multiple systems that I built it on.
Debian testing, ubuntu 10.04 and fedora 15 building any machine with angstrom made it fail.
regards,
Koen
^ permalink raw reply
* Re: [PATCH] bind 9.8.1: fix build after recent update
From: Saul Wold @ 2011-10-17 16:49 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Koen Kooi
In-Reply-To: <9945D4F2-8DB8-420E-BF9C-B20D335221C7@dominion.thruhere.net>
On 10/17/2011 08:59 AM, Koen Kooi wrote:
>
> Op 17 okt. 2011, om 17:25 heeft Koen Kooi het volgende geschreven:
>
>> | checking linking as -lgssapi -lkrb5 -ldes -lcrypt -lasn1 -lroken -lcom_err... no
>> | checking linking as -lgssapi -lkrb5 -lcrypto -lcrypt -lasn1 -lroken -lcom_err... no
>> | checking linking as -lgss -lkrb5... no
>> | configure: error: could not determine proper GSSAPI linkage
>> | + bbfatal 'oe_runconf failed'
>> | + echo 'ERROR: oe_runconf failed'
>>
>> Signed-off-by: Koen Kooi<koen@dominion.thruhere.net>
>> ---
>> meta/recipes-connectivity/bind/bind_9.8.1.bb | 5 +++--
>> 1 files changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta/recipes-connectivity/bind/bind_9.8.1.bb b/meta/recipes-connectivity/bind/bind_9.8.1.bb
>> index 330acdb..af473e9 100644
>> --- a/meta/recipes-connectivity/bind/bind_9.8.1.bb
>> +++ b/meta/recipes-connectivity/bind/bind_9.8.1.bb
>> @@ -6,10 +6,10 @@ LICENSE = "ISC& BSD"
>> LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=0fbe2a3ab3c68ac3fea3cad13093877c"
>>
>> DEPENDS = "openssl"
>> -PR = "r0"
>> +PR = "r1"
>>
>> SRC_URI = "ftp://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \
>> - file://conf.patch \
>> + file://conf.patch \
>> file://cross-build-fix.patch \
>> "
>>
>> @@ -19,6 +19,7 @@ SRC_URI[sha256sum] = "02285dc429cb2a6687a1b2446e9ee22c1df27f2577225b05be5092395e
>> # --enable-exportlib is necessary for building dhcp
>> EXTRA_OECONF = " --enable-ipv6=no --with-randomdev=/dev/random --disable-threads \
>> --disable-devpoll --disable-epoll --with-gost=no \
>
> Not related to my patch: if someone can explain we we disable epoll I would appreciate it, since we generally want it enabled and I think we're using recent enough kernels (2.6.26+) where epoll finally got hooked up for arm
>
Koen,
Thanks for pointing this out, a little code spelunking showed that
Holger added this back in '08, you might be right about epoll at this
point. Have you tested that we can pass the configure stage and build a
working bind?
On your gssapi, just curious under what OS conditions you found this, I
wonder why it passed on multiple systems that I built it on.
Thanks
Sau!
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
^ permalink raw reply
* Re: [PATCH] bind 9.8.1: fix build after recent update
From: Koen Kooi @ 2011-10-17 15:59 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1318865134-4380-1-git-send-email-koen@dominion.thruhere.net>
Op 17 okt. 2011, om 17:25 heeft Koen Kooi het volgende geschreven:
> | checking linking as -lgssapi -lkrb5 -ldes -lcrypt -lasn1 -lroken -lcom_err... no
> | checking linking as -lgssapi -lkrb5 -lcrypto -lcrypt -lasn1 -lroken -lcom_err... no
> | checking linking as -lgss -lkrb5... no
> | configure: error: could not determine proper GSSAPI linkage
> | + bbfatal 'oe_runconf failed'
> | + echo 'ERROR: oe_runconf failed'
>
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
> meta/recipes-connectivity/bind/bind_9.8.1.bb | 5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-connectivity/bind/bind_9.8.1.bb b/meta/recipes-connectivity/bind/bind_9.8.1.bb
> index 330acdb..af473e9 100644
> --- a/meta/recipes-connectivity/bind/bind_9.8.1.bb
> +++ b/meta/recipes-connectivity/bind/bind_9.8.1.bb
> @@ -6,10 +6,10 @@ LICENSE = "ISC & BSD"
> LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=0fbe2a3ab3c68ac3fea3cad13093877c"
>
> DEPENDS = "openssl"
> -PR = "r0"
> +PR = "r1"
>
> SRC_URI = "ftp://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \
> - file://conf.patch \
> + file://conf.patch \
> file://cross-build-fix.patch \
> "
>
> @@ -19,6 +19,7 @@ SRC_URI[sha256sum] = "02285dc429cb2a6687a1b2446e9ee22c1df27f2577225b05be5092395e
> # --enable-exportlib is necessary for building dhcp
> EXTRA_OECONF = " --enable-ipv6=no --with-randomdev=/dev/random --disable-threads \
> --disable-devpoll --disable-epoll --with-gost=no \
Not related to my patch: if someone can explain we we disable epoll I would appreciate it, since we generally want it enabled and I think we're using recent enough kernels (2.6.26+) where epoll finally got hooked up for arm
^ permalink raw reply
* Re: [PATCH 0/2] A couple of bluetooth improvements
From: Saul Wold @ 2011-10-17 15:53 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Paul Eggleton
In-Reply-To: <cover.1318601142.git.paul.eggleton@linux.intel.com>
On 10/14/2011 07:07 AM, Paul Eggleton wrote:
> The following changes since commit 362512b83775ad7020e5870a594f0e7ca9ef83ba:
>
> bitbake.conf Exclude MACHINE from MACHINEOVERRIDE variable dependencies (2011-10-14 13:51:14 +0100)
>
> are available in the git repository at:
> git://git.openembedded.org/openembedded-core-contrib paule/bluetooth
> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/bluetooth
>
> Paul Eggleton (2):
> pulseaudio: make bluetooth support conditional upon DISTRO_FEATURES
> bluez4: disable hidd, pand& dund
>
> meta/recipes-connectivity/bluez/bluez4.inc | 6 +++---
> meta/recipes-connectivity/bluez/bluez4_4.96.bb | 2 +-
> meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 5 +++--
> .../pulseaudio/pulseaudio_0.9.22.bb | 2 +-
> .../pulseaudio/pulseaudio_0.9.23.bb | 2 +-
> 5 files changed, 9 insertions(+), 8 deletions(-)
>
Merged into OE-Core
Thanks
Sau!
^ permalink raw reply
* Re: [v2 1/1] cmake : Disable building ccmake.
From: Saul Wold @ 2011-10-17 15:53 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <1318606540-14130-1-git-send-email-philip@balister.org>
On 10/14/2011 08:35 AM, Philip Balister wrote:
> ccmake fails to build due to an as-needed type error with -ltinfo. Disable
> it for now since the build fails and cmake is what we need for target
> sdk.
>
> Signed-off-by: Philip Balister<philip@balister.org>
> ---
> meta/recipes-devtools/cmake/cmake_2.8.5.bb | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/meta/recipes-devtools/cmake/cmake_2.8.5.bb b/meta/recipes-devtools/cmake/cmake_2.8.5.bb
> index 4fa9562..8e04072 100644
> --- a/meta/recipes-devtools/cmake/cmake_2.8.5.bb
> +++ b/meta/recipes-devtools/cmake/cmake_2.8.5.bb
> @@ -4,7 +4,7 @@ inherit cmake
>
> DEPENDS += "curl expat zlib libarchive ncurses"
>
> -PR = "${INC_PR}.2"
> +PR = "${INC_PR}.3"
>
> SRC_URI += "file://dont-run-cross-binaries.patch"
>
> @@ -30,6 +30,7 @@ EXTRA_OECMAKE=" \
> -DCMAKE_DOC_DIR=${docdir_stripped}/cmake-${CMAKE_MAJOR_VERSION} \
> -DCMAKE_USE_SYSTEM_LIBRARIES=1 \
> -DKWSYS_CHAR_IS_SIGNED=1 \
> + -DBUILD_CursesDialog=0 \
> ${@base_contains('DISTRO_FEATURES', 'largefile', '-DKWSYS_LFS_WORKS=1', '-DKWSYS_LFS_DISABLE=1', d)} \
> "
>
Merged into OE-Core
Thanks
Sau!
^ permalink raw reply
* Re: [PATCH] qt4: Added support for QtMobility 1.2
From: Saul Wold @ 2011-10-17 15:52 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <1317909379-25683-1-git-send-email-dima_ch@emcraft.com>
On 10/06/2011 06:56 AM, Dmitry Cherukhin wrote:
> The QtMobility is a Qt add-on which allows to include standard mobile
> functionality to Qt applications. For details, see
> http://qt.nokia.com/products/qt-addons/mobility/
> The patch is intended to add support for the QtMobility 1.2 package to OE.
>
> Added two recipes:
> 1) qt-mobility-x11 builds the QtMobility 1.2 package
> on the basis of Qt/X11 using the qt4-x11-free package;
> 2) qt-mobility-embedded builds the QtMobility 1.2 package
> on the basis of Qt/Embedded using the qt4-embedded package.
>
> Signed-off-by: Dmitry Cherukhin<dima_ch@emcraft.com>
> ---
> meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb | 11 ++++
> meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb | 10 +++
> meta/recipes-qt/qt4/qt-mobility_1.2.0.inc | 62 +++++++++++++++++++++
> 3 files changed, 83 insertions(+), 0 deletions(-)
> create mode 100644 meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb
> create mode 100644 meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb
> create mode 100644 meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
>
> diff --git a/meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb b/meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb
> new file mode 100644
> index 0000000..0c30e5f
> --- /dev/null
> +++ b/meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb
> @@ -0,0 +1,11 @@
> +DESCRIPTION = "Qt Mobility 1.2.0 - version for Qt/Embedded"
> +DEPENDS = "qt4-embedded"
> +SECTION = "libs"
> +qtm_embedded := "embedded"
> +qtm_dir = "qtopia"
> +qtm_glflags := "-=opengl"
> +qtm_extra_config := "gstreamer-photography_enabled = no"
> +
> +inherit qt4e
> +require qt-mobility_${PV}.inc
> +
> diff --git a/meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb b/meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb
> new file mode 100644
> index 0000000..cd7d5b5
> --- /dev/null
> +++ b/meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb
> @@ -0,0 +1,10 @@
> +DESCRIPTION = "Qt Mobility 1.2.0 - version for Qt/X11"
> +DEPENDS = "qt4-x11-free"
> +SECTION = "x11/libs"
> +qtm_embedded := ""
> +qtm_dir = "qt4"
> +qtm_glflags := "${@base_contains('DISTRO_FEATURES', 'opengl', '+=opengl', '-=opengl', d)} "
> +qtm_extra_config := ""
> +
> +inherit qt4x11
> +require qt-mobility_${PV}.inc
> diff --git a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
> new file mode 100644
> index 0000000..f665e64
> --- /dev/null
> +++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
> @@ -0,0 +1,62 @@
> +HOMEPAGE = "http://qt.nokia.com"
> +DEPENDS += "pulseaudio bluez4"
> +
> +LICENSE = "LGPLv2.1"
> +LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
> + file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
> +
> +SRC_URI = "http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.tar.gz "
> +
> +SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8"
> +SRC_URI[sha256sum]="ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44"
> +
> +S = "${WORKDIR}/qt-mobility-opensource-src-${PV}"
> +
> +qtm_bin := "/usr/bin/${qtm_dir}"
> +qtm_lib := "/usr/lib"
> +qtm_include := "/usr/include/${qtm_dir}"
> +qtm_examples := "/usr/bin/${qtm_dir}/examples/QtMobility"
> +qtm_demos := "/usr/bin/${qtm_dir}/demos/QtMobility"
> +qtm_plugins := "/usr/lib/${qtm_dir}/plugins/QtMobility"
> +qtm_data := "/usr/share/${qtm_dir}"
> +qtm_imports := "/usr/lib/${qtm_dir}/imports"
> +
> +do_configure_prepend() {
> + cp qtmobility.pro qtmobility.pro.old
> + sed -e 's@...QT_INSTALL_DATA.@${qtm_data}@'<qtmobility.pro.old>qtmobility.pro
> + for NAME in plugins/declarative/*/*.pro
> + do
> + cp $NAME $NAME.old
> + sed -e 's@...QT_INSTALL_IMPORTS.@${qtm_imports}@'<$NAME.old>$NAME
> + done
> + cp staticconfig.pri staticconfig.pri.old
> + echo "include(${STAGING_DATADIR}/${qtm_dir}/mkspecs/qconfig.pri)">staticconfig.pri
> + cat staticconfig.pri.old>>staticconfig.pri
> + ./configure -qmake-exec qmake2 -prefix /usr -examples -demos
> + echo QT_MOBILITY_BIN = ${qtm_bin}>>./config.pri
> + echo QT_MOBILITY_LIB = ${qtm_lib}>>./config.pri
> + echo QT_MOBILITY_INCLUDE = ${qtm_include}>>./config.pri
> + echo QT_MOBILITY_PLUGINS = ${qtm_plugins}>>./config.pri
> + echo QT_MOBILITY_EXAMPLES = ${qtm_examples}>>./config.pri
> + echo QT_MOBILITY_DEMOS = ${qtm_demos}>>./config.pri
> + echo QT_CONFIG ${qtm_glflags}>>./config.pri
> + echo bluez_enabled = yes>>./config.pri
> + echo ${qtm_extra_config}>>./config.pri
> + echo CONFIG += ${qtm_embedded}>>./config.pri
> +}
> +
> +do_install() {
> + for NAME in */*.prf
> + do
> + cp $NAME $NAME.old
> + sed -e 's@/usr@${STAGING_BINDIR}/..@'<$NAME.old>$NAME
> + done
> + oe_runmake install INSTALL_ROOT=${D}
> +}
> +
> +PACKAGES = "${PN}-dbg ${PN} ${PN}-dev"
> +
> +FILES_${PN}-dbg = "${qtm_bin}/.debug ${qtm_examples}/.debug ${qtm_demos}/.debug ${qtm_lib}/.debug ${qtm_plugins}/*/.debug \
> + ${qtm_imports}/*/.debug ${qtm_imports}/*/*/.debug /usr/src/debug"
> +FILES_${PN} = "${qtm_bin} ${qtm_examples} ${qtm_demos} ${qtm_lib}/*.so.1* ${qtm_plugins} ${qtm_imports}"
> +FILES_${PN}-dev = "/usr"
Merged into OE-Core
Thanks
Sau!
^ permalink raw reply
* [PATCH] bind 9.8.1: fix build after recent update
From: Koen Kooi @ 2011-10-17 15:25 UTC (permalink / raw)
To: openembedded-core; +Cc: Koen Kooi
| checking linking as -lgssapi -lkrb5 -ldes -lcrypt -lasn1 -lroken -lcom_err... no
| checking linking as -lgssapi -lkrb5 -lcrypto -lcrypt -lasn1 -lroken -lcom_err... no
| checking linking as -lgss -lkrb5... no
| configure: error: could not determine proper GSSAPI linkage
| + bbfatal 'oe_runconf failed'
| + echo 'ERROR: oe_runconf failed'
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
meta/recipes-connectivity/bind/bind_9.8.1.bb | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-connectivity/bind/bind_9.8.1.bb b/meta/recipes-connectivity/bind/bind_9.8.1.bb
index 330acdb..af473e9 100644
--- a/meta/recipes-connectivity/bind/bind_9.8.1.bb
+++ b/meta/recipes-connectivity/bind/bind_9.8.1.bb
@@ -6,10 +6,10 @@ LICENSE = "ISC & BSD"
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=0fbe2a3ab3c68ac3fea3cad13093877c"
DEPENDS = "openssl"
-PR = "r0"
+PR = "r1"
SRC_URI = "ftp://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \
- file://conf.patch \
+ file://conf.patch \
file://cross-build-fix.patch \
"
@@ -19,6 +19,7 @@ SRC_URI[sha256sum] = "02285dc429cb2a6687a1b2446e9ee22c1df27f2577225b05be5092395e
# --enable-exportlib is necessary for building dhcp
EXTRA_OECONF = " --enable-ipv6=no --with-randomdev=/dev/random --disable-threads \
--disable-devpoll --disable-epoll --with-gost=no \
+ --with-gssapi=no \
--sysconfdir=${sysconfdir}/bind \
--with-openssl=${STAGING_LIBDIR}/.. --with-libxml2=${STAGING_LIBDIR}/.. \
--enable-exportlib --with-export-includedir=${includedir} --with-export-libdir=${libdir} \
--
1.6.6.1
^ permalink raw reply related
* Re: [RFC] bitbake.conf: include only ${libdir}/${BPN}/*${SOLIBS} not whole ${libdir}/${BPN}/* in FILES_${PN}-dev
From: Phil Blundell @ 2011-10-17 14:06 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <20111017135938.GH12684@jama.jama.net>
On Mon, 2011-10-17 at 15:59 +0200, Martin Jansa wrote:
> On Mon, Oct 17, 2011 at 02:48:29PM +0100, Phil Blundell wrote:
> > If there are .la or .so files in ${libdir}/${PN} that are causing a
> > problem then it does seem reasonable to add them to FILES_${PN}-dev.
> > But I don't think that restricting the scope of FILES_${PN} is
> > desirable, or ought to be necessary.
>
> How to do this with this order of PACKAGES, without redefining PACKAGES
> itself?
>
> PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-staticdev ${PN}-locale"
Ah, hm. I had thought for some reason that ${PN}-dev was before ${PN}
but evidently that's not correct. So you're right, there is probably no
good way to do it without fiddling FILES_${PN}.
That being the case, I am inclined to say that this ought just to be
fixed locally in the recipes that have the problem: it isn't very
obvious to me that setting a restrictive glob on FILES_${PN} (and then
having to edit all the recipes that install non-library things in there)
is going to be a net win compared to just fixing the recipes that are
currently shipping .la files in there by mistake.
Or, maybe another solution would be to invent some sort of mechanism
like...
EXCLUDEFILES_${PN} = "*.la"
and get package.bbclass to skip anything matching that glob.
p.
^ permalink raw reply
* Re: [RFC] bitbake.conf: include only ${libdir}/${BPN}/*${SOLIBS} not whole ${libdir}/${BPN}/* in FILES_${PN}-dev
From: Martin Jansa @ 2011-10-17 13:59 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <1318859310.22985.114.camel@phil-desktop>
[-- Attachment #1: Type: text/plain, Size: 2977 bytes --]
On Mon, Oct 17, 2011 at 02:48:29PM +0100, Phil Blundell wrote:
> On Mon, 2011-10-17 at 14:52 +0200, Martin Jansa wrote:
> > * ie syslog-ng has a lot of .so and .la files in ${libdir}/${BPN}/ and
> > fails with this QA check:
> > | ERROR: QA Issue: non -dev/-dbg/-nativesdk package contains symlink .so: syslog-ng path
> > '/work/i586-oe-linux/syslog-ng-3.2.2-r6.1/packages-split/syslog-ng/usr/lib/syslog-ng/libafsocket.so'
> > * I haven't tried to rebuild from scratch to check if this changes is
> > creating more QA issues about unpackaged files then what is trying to
> > fix (ie in syslog-ng), that's why it's RFC
> >
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
>
> The subject line of this patch doesn't seem to match what it's actually
> doing.
Ah, sorry you're right it should be without '-dev' suffix in subject
> If there are .la or .so files in ${libdir}/${PN} that are causing a
> problem then it does seem reasonable to add them to FILES_${PN}-dev.
> But I don't think that restricting the scope of FILES_${PN} is
> desirable, or ought to be necessary.
How to do this with this order of PACKAGES, without redefining PACKAGES
itself?
PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-staticdev ${PN}-locale"
Regards,
> p.
>
> > ---
> > meta/conf/bitbake.conf | 4 ++--
> > 1 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> > index e2c1b6f..772c09e 100644
> > --- a/meta/conf/bitbake.conf
> > +++ b/meta/conf/bitbake.conf
> > @@ -262,7 +262,7 @@ FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS}
> > ${sysconfdir} ${sharedstatedir} ${localstatedir} \
> > ${base_bindir}/* ${base_sbindir}/* \
> > ${base_libdir}/*${SOLIBS} \
> > - ${datadir}/${BPN} ${libdir}/${BPN}/* \
> > + ${datadir}/${BPN} ${libdir}/${BPN}/*${SOLIBS} \
> > ${datadir}/pixmaps ${datadir}/applications \
> > ${datadir}/idl ${datadir}/omf ${datadir}/sounds \
> > ${libdir}/bonobo/servers"
> > @@ -271,7 +271,7 @@ FILES_${PN}-doc = "${docdir} ${mandir} ${infodir} ${datadir}/gtk-doc \
> > ${datadir}/gnome/help"
> > SECTION_${PN}-doc = "doc"
> >
> > -FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
> > +FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/${BPN}/*${SOLIBSDEV} ${libdir}/*.la \
> > ${libdir}/*.o ${libdir}/pkgconfig ${datadir}/pkgconfig \
> > ${datadir}/aclocal ${base_libdir}/*.o"
> > SECTION_${PN}-dev = "devel"
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply
* Re: [RFC] bitbake.conf: include only ${libdir}/${BPN}/*${SOLIBS} not whole ${libdir}/${BPN}/* in FILES_${PN}-dev
From: Phil Blundell @ 2011-10-17 13:48 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <1318855942-8677-1-git-send-email-Martin.Jansa@gmail.com>
On Mon, 2011-10-17 at 14:52 +0200, Martin Jansa wrote:
> * ie syslog-ng has a lot of .so and .la files in ${libdir}/${BPN}/ and
> fails with this QA check:
> | ERROR: QA Issue: non -dev/-dbg/-nativesdk package contains symlink .so: syslog-ng path
> '/work/i586-oe-linux/syslog-ng-3.2.2-r6.1/packages-split/syslog-ng/usr/lib/syslog-ng/libafsocket.so'
> * I haven't tried to rebuild from scratch to check if this changes is
> creating more QA issues about unpackaged files then what is trying to
> fix (ie in syslog-ng), that's why it's RFC
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
The subject line of this patch doesn't seem to match what it's actually
doing.
If there are .la or .so files in ${libdir}/${PN} that are causing a
problem then it does seem reasonable to add them to FILES_${PN}-dev.
But I don't think that restricting the scope of FILES_${PN} is
desirable, or ought to be necessary.
p.
> ---
> meta/conf/bitbake.conf | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index e2c1b6f..772c09e 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -262,7 +262,7 @@ FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS}
> ${sysconfdir} ${sharedstatedir} ${localstatedir} \
> ${base_bindir}/* ${base_sbindir}/* \
> ${base_libdir}/*${SOLIBS} \
> - ${datadir}/${BPN} ${libdir}/${BPN}/* \
> + ${datadir}/${BPN} ${libdir}/${BPN}/*${SOLIBS} \
> ${datadir}/pixmaps ${datadir}/applications \
> ${datadir}/idl ${datadir}/omf ${datadir}/sounds \
> ${libdir}/bonobo/servers"
> @@ -271,7 +271,7 @@ FILES_${PN}-doc = "${docdir} ${mandir} ${infodir} ${datadir}/gtk-doc \
> ${datadir}/gnome/help"
> SECTION_${PN}-doc = "doc"
>
> -FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
> +FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/${BPN}/*${SOLIBSDEV} ${libdir}/*.la \
> ${libdir}/*.o ${libdir}/pkgconfig ${datadir}/pkgconfig \
> ${datadir}/aclocal ${base_libdir}/*.o"
> SECTION_${PN}-dev = "devel"
^ permalink raw reply
* [PATCH 2/2] gst-plugins-good: add pulseaudio to DEPENDS
From: Paul Eggleton @ 2011-10-17 13:27 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1318852098.git.paul.eggleton@linux.intel.com>
This explicitly enables the pulseaudio plugin rather than it being built
if pulseaudio happens to have been built first.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
.../gstreamer/gst-plugins-good_0.10.28.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.28.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.28.bb
index cca63e9..6c837a7 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.28.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.28.bb
@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe"
DEPENDS += "gst-plugins-base gconf cairo jpeg libpng gtk+ zlib libid3tag flac \
- speex libsoup-2.4"
-PR = "r1"
+ speex libsoup-2.4 pulseaudio"
+PR = "r2"
inherit gettext
--
1.7.4.1
^ permalink raw reply related
* [PATCH 1/2] gst-plugins-base: update to 0.10.35
From: Paul Eggleton @ 2011-10-17 13:27 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1318852098.git.paul.eggleton@linux.intel.com>
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
.../gst-plugins-base-tremor.patch | 0
...base_0.10.32.bb => gst-plugins-base_0.10.35.bb} | 6 +++---
2 files changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-multimedia/gstreamer/{gst-plugins-base-0.10.32 => gst-plugins-base-0.10.35}/gst-plugins-base-tremor.patch (100%)
rename meta/recipes-multimedia/gstreamer/{gst-plugins-base_0.10.32.bb => gst-plugins-base_0.10.35.bb} (84%)
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-base-0.10.32/gst-plugins-base-tremor.patch b/meta/recipes-multimedia/gstreamer/gst-plugins-base-0.10.35/gst-plugins-base-tremor.patch
similarity index 100%
rename from meta/recipes-multimedia/gstreamer/gst-plugins-base-0.10.32/gst-plugins-base-tremor.patch
rename to meta/recipes-multimedia/gstreamer/gst-plugins-base-0.10.35/gst-plugins-base-tremor.patch
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.32.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.35.bb
similarity index 84%
rename from meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.32.bb
rename to meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.35.bb
index 82d9afc..e49a00c 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.32.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.35.bb
@@ -10,10 +10,10 @@ DEPENDS += "virtual/libx11 alsa-lib freetype liboil libogg libvorbis libxv libth
SRC_URI += " file://gst-plugins-base-tremor.patch"
-SRC_URI[md5sum] = "2920af2b3162f3d9fbaa7fabc8ed4d38"
-SRC_URI[sha256sum] = "e9aabfac83f6480896da0686e9c911989f896fbad634821b7771ed84a446172b"
+SRC_URI[md5sum] = "1d300983525f4f09030eb3ba47cb04b0"
+SRC_URI[sha256sum] = "cd24f01bb5258a1f400bc4f2c212bb7cee9ee23c9ffb80d537a24ef366d17103"
-PR = "r1"
+PR = "r0"
inherit gettext
--
1.7.4.1
^ permalink raw reply related
* [PATCH 0/2] gstreamer plugins update/fix
From: Paul Eggleton @ 2011-10-17 13:27 UTC (permalink / raw)
To: openembedded-core
I noticed we don't have the latest stable version of gst-plugins-base,
I'm assuming there wasn't a specific reason for this (FWIW the old version
installs a header which causes some applications to fail to build, due to
the use of G_CONST_RETURN which has been deprecated).
In addition, gst-plugins-good builds a pulseaudio plugin if it is found,
and this is useful so make this dependency explicit.
The following changes since commit 629bea96ae07d9f3129a5da488682851a4e09d52:
xserver-xorg: remove glx-use-tls again (2011-10-17 12:26:52 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib paule/gst
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/gst
Paul Eggleton (2):
gst-plugins-base: update to 0.10.35
gst-plugins-good: add pulseaudio to DEPENDS
.../gst-plugins-base-tremor.patch | 0
...base_0.10.32.bb => gst-plugins-base_0.10.35.bb} | 6 +++---
.../gstreamer/gst-plugins-good_0.10.28.bb | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
rename meta/recipes-multimedia/gstreamer/{gst-plugins-base-0.10.32 => gst-plugins-base-0.10.35}/gst-plugins-base-tremor.patch (100%)
rename meta/recipes-multimedia/gstreamer/{gst-plugins-base_0.10.32.bb => gst-plugins-base_0.10.35.bb} (84%)
--
1.7.4.1
^ permalink raw reply
* [PATCH 0/1] Make src_distribute to work
From: Otavio Salvador @ 2011-10-17 13:04 UTC (permalink / raw)
To: openembedded-core
The following changes since commit f2dada2079b5f98e13d4888609368ba111967a60:
lsb: Change link of ${baselib} to lib64 for 64bits system (2011-10-17 13:42:03 +0100)
are available in the git repository at:
git://github.com/OSSystems/oe-core master
https://github.com/OSSystems/oe-core/tree/HEAD
Otavio Salvador (1):
src_distribute.bbclass, src_distribute_local.bbclass: mostly
rewritten
meta/classes/src_distribute.bbclass | 54 ++++++++++++++++++++---------
meta/classes/src_distribute_local.bbclass | 28 ++++++++-------
2 files changed, 52 insertions(+), 30 deletions(-)
--
1.7.2.5
^ permalink raw reply
* [PATCH 1/1] src_distribute.bbclass, src_distribute_local.bbclass: mostly rewritten
From: Otavio Salvador @ 2011-10-17 13:04 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1318856652.git.otavio@ossystems.com.br>
The code used to reference unavailable variables and mistakenly define
the tasks so fully demonstrating this have not been in use for a
while.
During the code rewrite, it was extended to copy also the patches into
the source distribution directory but using the PF as prefix to avoid
name colision among other recipes.
As 'distsrcall' task was not properly defined and noone noticed it,
until now, it got renamed to 'distribute_sources_all' as it is a
better and more meanful name for the task.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta/classes/src_distribute.bbclass | 54 ++++++++++++++++++++---------
meta/classes/src_distribute_local.bbclass | 28 ++++++++-------
2 files changed, 52 insertions(+), 30 deletions(-)
diff --git a/meta/classes/src_distribute.bbclass b/meta/classes/src_distribute.bbclass
index 17d6c09..fbfbdf0 100644
--- a/meta/classes/src_distribute.bbclass
+++ b/meta/classes/src_distribute.bbclass
@@ -2,28 +2,48 @@ SRC_DISTRIBUTECOMMAND[func] = "1"
python do_distribute_sources () {
l = bb.data.createCopy(d)
bb.data.update_data(l)
- licenses = (bb.data.getVar('LICENSE', d, 1) or "unknown").split()
sources_dir = bb.data.getVar('SRC_DISTRIBUTEDIR', d, 1)
- import re
- for license in licenses:
- for entry in license.split("|"):
- for s in (bb.data.getVar('A', d, 1) or "").split():
- s = re.sub(';.*$', '', s)
- cmd = bb.data.getVar('SRC_DISTRIBUTECOMMAND', d, 1)
- if not cmd:
- raise bb.build.FuncFailed("Unable to distribute sources, SRC_DISTRIBUTECOMMAND not defined")
- bb.data.setVar('SRC', s, d)
- bb.data.setVar('SRC_DISTRIBUTEDIR', "%s/%s" % (sources_dir, entry), d)
- bb.build.exec_func('SRC_DISTRIBUTECOMMAND', d)
+ src_uri = bb.data.getVar('SRC_URI', d, 1).split()
+ fetcher = bb.fetch2.Fetch(src_uri, d)
+ ud = fetcher.ud
+
+ licenses = bb.data.getVar('LICENSE', d, 1).replace('&', '|')
+ licenses = licenses.replace('(', '').replace(')', '')
+ clean_licenses = ""
+ for x in licenses.split():
+ if x.strip() == '' or x == 'CLOSED':
+ continue
+
+ if x != "|":
+ clean_licenses += x
+
+ for license in clean_licenses.split('|'):
+ for url in ud.values():
+ cmd = bb.data.getVar('SRC_DISTRIBUTECOMMAND', d, 1)
+ if not cmd:
+ raise bb.build.FuncFailed("Unable to distribute sources, SRC_DISTRIBUTECOMMAND not defined")
+ url.setup_localpath(d)
+ bb.data.setVar('SRC', url.localpath, d)
+ if url.type == 'file':
+ if url.basename == '*':
+ import os.path
+ dest_dir = os.path.basename(os.path.dirname(os.path.abspath(url.localpath)))
+ bb.data.setVar('DEST', "%s_%s/" % (bb.data.getVar('PF', d, 1), dest_dir), d)
+ else:
+ bb.data.setVar('DEST', "%s_%s" % (bb.data.getVar('PF', d, 1), url.basename), d)
+ else:
+ bb.data.setVar('DEST', '', d)
+
+ bb.data.setVar('SRC_DISTRIBUTEDIR', "%s/%s" % (sources_dir, license), d)
+ bb.build.exec_func('SRC_DISTRIBUTECOMMAND', d)
}
addtask distribute_sources before do_build after do_fetch
-addtask distsrcall after do_distribute_sources
-do_distall[recrdeptask] = "do_distribute_sources"
-base_do_distsrcall() {
+addtask distribute_sources_all after do_distribute_sources
+do_distribute_sources_all[recrdeptask] = "do_distribute_sources"
+do_distribute_sources_all[nostamp] = "1"
+do_distribute_sources_all () {
:
}
-
-EXPORT_FUNCTIONS do_distsrcall
diff --git a/meta/classes/src_distribute_local.bbclass b/meta/classes/src_distribute_local.bbclass
index 5f0cef5..17b67e3 100644
--- a/meta/classes/src_distribute_local.bbclass
+++ b/meta/classes/src_distribute_local.bbclass
@@ -1,31 +1,33 @@
inherit src_distribute
# SRC_DIST_LOCAL possible values:
-# copy copies the files from ${A} to the distributedir
-# symlink symlinks the files from ${A} to the distributedir
+# copy copies the files to the distributedir
+# symlink symlinks the files to the distributedir
# move+symlink moves the files into distributedir, and symlinks them back
SRC_DIST_LOCAL ?= "move+symlink"
SRC_DISTRIBUTEDIR ?= "${DEPLOY_DIR}/sources"
SRC_DISTRIBUTECOMMAND () {
s="${SRC}"
- if [ ! -L "$s" ] && (echo "$s"|grep "^${DL_DIR}"); then
- :
- else
- exit 0;
- fi
+ d="${DEST}"
+
mkdir -p ${SRC_DISTRIBUTEDIR}
+
+ if echo $d | grep -q '/$'; then
+ mkdir -p ${SRC_DISTRIBUTEDIR}/$d
+ fi
+
case "${SRC_DIST_LOCAL}" in
copy)
- test -e $s.md5 && cp -f $s.md5 ${SRC_DISTRIBUTEDIR}/
- cp -f $s ${SRC_DISTRIBUTEDIR}/
+ test -e $s.md5 && cp -f $s.md5 ${SRC_DISTRIBUTEDIR}/$d.md5
+ cp -f $s ${SRC_DISTRIBUTEDIR}/$d
;;
symlink)
- test -e $s.md5 && ln -sf $s.md5 ${SRC_DISTRIBUTEDIR}/
- ln -sf $s ${SRC_DISTRIBUTEDIR}/
+ test -e $s.md5 && ln -sf $s.md5 ${SRC_DISTRIBUTEDIR}/$d.md5
+ ln -sf $s ${SRC_DISTRIBUTEDIR}/$d
;;
move+symlink)
- mv $s ${SRC_DISTRIBUTEDIR}/
- ln -sf ${SRC_DISTRIBUTEDIR}/`basename $s` $s
+ mv $s ${SRC_DISTRIBUTEDIR}/$d
+ ln -sf ${SRC_DISTRIBUTEDIR}/$d $s
;;
esac
}
--
1.7.2.5
^ permalink raw reply related
* Re: [RFC] bitbake.conf: include only ${libdir}/${BPN}/*${SOLIBS} not whole ${libdir}/${BPN}/* in FILES_${PN}-dev
From: Otavio Salvador @ 2011-10-17 12:55 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <1318855942-8677-1-git-send-email-Martin.Jansa@gmail.com>
On Mon, Oct 17, 2011 at 10:52, Martin Jansa <martin.jansa@gmail.com> wrote:
> * ie syslog-ng has a lot of .so and .la files in ${libdir}/${BPN}/ and
> fails with this QA check:
> | ERROR: QA Issue: non -dev/-dbg/-nativesdk package contains symlink .so: syslog-ng path
> '/work/i586-oe-linux/syslog-ng-3.2.2-r6.1/packages-split/syslog-ng/usr/lib/syslog-ng/libafsocket.so'
> * I haven't tried to rebuild from scratch to check if this changes is
> creating more QA issues about unpackaged files then what is trying to
> fix (ie in syslog-ng), that's why it's RFC
...
Even it raising new warinings it seems the way to go.
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply
* [RFC] bitbake.conf: include only ${libdir}/${BPN}/*${SOLIBS} not whole ${libdir}/${BPN}/* in FILES_${PN}-dev
From: Martin Jansa @ 2011-10-17 12:52 UTC (permalink / raw)
To: openembedded-core
* ie syslog-ng has a lot of .so and .la files in ${libdir}/${BPN}/ and
fails with this QA check:
| ERROR: QA Issue: non -dev/-dbg/-nativesdk package contains symlink .so: syslog-ng path
'/work/i586-oe-linux/syslog-ng-3.2.2-r6.1/packages-split/syslog-ng/usr/lib/syslog-ng/libafsocket.so'
* I haven't tried to rebuild from scratch to check if this changes is
creating more QA issues about unpackaged files then what is trying to
fix (ie in syslog-ng), that's why it's RFC
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/conf/bitbake.conf | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index e2c1b6f..772c09e 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -262,7 +262,7 @@ FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS}
${sysconfdir} ${sharedstatedir} ${localstatedir} \
${base_bindir}/* ${base_sbindir}/* \
${base_libdir}/*${SOLIBS} \
- ${datadir}/${BPN} ${libdir}/${BPN}/* \
+ ${datadir}/${BPN} ${libdir}/${BPN}/*${SOLIBS} \
${datadir}/pixmaps ${datadir}/applications \
${datadir}/idl ${datadir}/omf ${datadir}/sounds \
${libdir}/bonobo/servers"
@@ -271,7 +271,7 @@ FILES_${PN}-doc = "${docdir} ${mandir} ${infodir} ${datadir}/gtk-doc \
${datadir}/gnome/help"
SECTION_${PN}-doc = "doc"
-FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
+FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/${BPN}/*${SOLIBSDEV} ${libdir}/*.la \
${libdir}/*.o ${libdir}/pkgconfig ${datadir}/pkgconfig \
${datadir}/aclocal ${base_libdir}/*.o"
SECTION_${PN}-dev = "devel"
--
1.7.7
^ permalink raw reply related
* Re: [PATCH 1/1] lsb: Change link of ${baselib} to lib64 for 64bits system
From: Richard Purdie @ 2011-10-17 12:43 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <9b6df8992d50fe277f28786dec2a13c75d09ad95.1318843077.git.xiaofeng.yan@windriver.com>
On Mon, 2011-10-17 at 17:24 +0800, Xiaofeng Yan wrote:
> From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
>
> Correct two faults:
>
> 1 Binaries of lsb test suite need ld-linux.so* in /lib64.
> for example:
> Target$ ./lsbcmdchk
> -sh: ./lsbcmdchk: No such file or directory
> Target$ strings lsbcmdchk | grep "ld-"
> /lib64/ld-lsb-x86-64.so.3
>
> "lsbcmdchk" from lsb test suite is a binary program.
> A new modification to lsb_1.4.bb caused that binaries from lsb test suite can't run
> because binaries of lsb test suite need ld-linux.so* in /lib64.
> But the link is changed due to adding multilib. I changed this link again.
>
> 2 correct mandir
> Waring will appear when running task task do_populate_sysroot
>
> NOTE: package lsb-1.4-r2: task do_populate_sysroot: Succeeded
> WARNING: For recipe lsb, the following files were installed but not shipped in any package:
> WARNING: /{datadir}/man/man1/lsb_release.1.gz
>
> I changed mandir=${D}/man to mandir=${D}/${datadir}/man
>
> Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
> ---
> meta/recipes-extended/lsb/lsb_1.4.bb | 12 ++++++++----
> 1 files changed, 8 insertions(+), 4 deletions(-)
Merged to master, thanks.
Richard
^ permalink raw reply
* Re: missing mesa-dri dependency?
From: Richard Purdie @ 2011-10-17 12:37 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <201110151452.31950.schnitzeltony@gmx.de>
On Sat, 2011-10-15 at 14:52 +0200, Andreas Müller wrote:
> On Thursday, October 13, 2011 10:24:19 AM Koen Kooi wrote:
> > Hi,
> >
> > I remember fixing this in meta-oe, but now exactly how. IIRC both mesa-xlib and mesa-dri needed to get built.
> >
> > configure: error: Package requirements (glproto >= 1.4.14 dri >= 7.8.0) were not met:
> > |
> > | No package 'dri' found
> > |
> > | Consider adjusting the PKG_CONFIG_PATH environment variable if you
> > | installed software in a non-standard prefix.
> > |
> > | Alternatively, you may set the environment variables DRI_CFLAGS
> > | and DRI_LIBS to avoid the need to call pkg-config.
> > | See the pkg-config man page for more details.
> > | + bbfatal 'oe_runconf failed'
> > | + echo 'ERROR: oe_runconf failed'
> > | ERROR: oe_runconf failed
> > | + exit 1
> > | ERROR: Function 'do_configure' failed (see /OE/tentacle/build/tmp-angstrom_2010_x-eglibc/work/armv7a-angstrom-linux-gnueabi/xserver-xorg-1_1.11.1-r0/temp/log.do_configure.3602 for further information)
> > NOTE: package xserver-xorg-1_1.11.1-r0: task do_configure: Failed
> > ERROR: Task 1842 (/OE/tentacle/sources/openembedded-core/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb, do_configure) failed with exit code '1'
> >
> > regards,
> >
> > Koen
> ping - or how do you workaround this for machines not supporting mesa-dri?
All machines should support mesa-dri with just the swrast backend
enabled (which is the default). Xgl now requires dri. If you don't want
xgl you can use the xserver-xorg-lite recipe.
Cheers,
Richard
^ permalink raw reply
* Re: [v2 -CONSOLIDATED PULL 00/14] Updates and World Build Fixes
From: Richard Purdie @ 2011-10-17 12:33 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <cover.1318796061.git.sgw@linux.intel.com>
On Sun, 2011-10-16 at 13:17 -0700, Saul Wold wrote:
> Richard,
>
> This is version contains additional comments and fixes based on Khem's
> notes, I also fixes the Upstream-Status to have correct capitolization.
>
> Sau!
>
> The following changes since commit d1b12b92439805ec9ca5d031d34d264acd0cab3b:
>
> mesa-dri: Enable swrast only by default and intel drivers only on IA platform (2011-10-15 00:41:12 +0100)
>
> are available in the git repository at:
> git://git.openembedded.org/openembedded-core-contrib sgw/stage
> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage
>
> Dmitry Cherukhin (1):
> qt4: Added support for QtMobility 1.2
>
> Dmitry Eremin-Solenikov (1):
> default-provider: also define a default provider for gconf-native
>
> Paul Eggleton (2):
> pulseaudio: make bluetooth support conditional upon DISTRO_FEATURES
> bluez4: disable hidd, pand & dund
>
> Philip Balister (1):
> cmake : Disable building ccmake.
>
> Saul Wold (9):
> bind: update to 9.8.1
> resolvconf: Update to 1.61
> glib-2.0: Add nativesdk depends for libffi
> qmmp: Fix QA Packaging Errors
> libomxil: Fix QA Package Errors
> Distro Tracking: Fix dates
> sysprof: remove duplicated patch
> mktemp: Add patch to fix parallel make install
> screen: Add patch to fix parallel make install
Merged to master apart from the qmmp change, thanks.
Richard
^ permalink raw reply
* Re: [v2 -CONSOLIDATED PULL 09/14] qmmp: Fix QA Packaging Errors
From: Richard Purdie @ 2011-10-17 12:33 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <d8bdf3a41a8a090bccb7ffdbe937d9a586876a59.1318796061.git.sgw@linux.intel.com>
On Sun, 2011-10-16 at 13:17 -0700, Saul Wold wrote:
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
> meta/recipes-qt/qt-apps/qmmp_0.5.1.bb | 36 +++++++++++++++++++++++++++-----
> 1 files changed, 30 insertions(+), 6 deletions(-)
>
> diff --git a/meta/recipes-qt/qt-apps/qmmp_0.5.1.bb b/meta/recipes-qt/qt-apps/qmmp_0.5.1.bb
> index 948c32a..3f710f5 100644
> --- a/meta/recipes-qt/qt-apps/qmmp_0.5.1.bb
> +++ b/meta/recipes-qt/qt-apps/qmmp_0.5.1.bb
> @@ -4,7 +4,7 @@ LICENSE = "GPLv2"
> LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
> SECTION = "multimedia"
>
> -PR = "r0"
> +PR = "r1"
>
> DEPENDS = "qt4-x11-free taglib libmad libvorbis libogg alsa-lib"
> RDEPENDS_${PN} += "taglib alsa-lib curl"
> @@ -29,16 +29,40 @@ export EXTRA_OECMAKE = "-DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \
> -DQT_QTCORE_INCLUDE_DIR=${OE_QMAKE_INCDIR_QT}/QtCore \
> "
>
> -FILES_${PN} = "${bindir}/qmmp ${libdir}/*.so* \
> - ${libdir}/qmmp/PlaylistFormats/*.so \
> - ${libdir}/qmmp/Output/libalsa.so \
> - ${libdir}/qmmp/Transports/libhttp.so \
> - ${libdir}/qmmp/Visual/libanalyzer.so \
> +FILES_${PN} = "${bindir}/qmmp ${libdir}/*${SOLIBS} \
> + ${libdir}/qmmp/PlaylistFormats/*${SOLIBS} \
> + ${libdir}/qmmp/Output/libalsa${SOLIBS} \
> + ${libdir}/qmmp/Transports/libhttp${SOLIBS} \
> + ${libdir}/qmmp/Visual/libanalyzer${SOLIBS} \
> ${datadir}/icons/* \
> ${datadir}/qmmp/images/* \
> ${datadir}/applications/qmmp.desktop \
> "
>
> +FILES_${PN}-dev += "${libdir}/qmmp/PlaylistFormats/*${SOLIBSDEV} \
> + ${libdir}/qmmp/Output/libalsa${SOLIBSDEV} \
> + ${libdir}/qmmp/Transports/libhttp${SOLIBSDEV} \
> + ${libdir}/qmmp/Visual/libanalyzer${SOLIBSDEV} \
> + "
> +
> +FILES_${PN}-dbg += "${libdir}/qmmp/PlaylistFormats/.debug \
> + ${libdir}/qmmp/Output/.debug/libalsa* \
> + ${libdir}/qmmp/Transports/.debug/libhttp* \
> + ${libdir}/qmmp/Visual/.debug/libanalyzer* \
> + "
> +
> +FILES_${PN}-others-dbg = "${libdir}/qmmp/PlaylistFormats/.debug \
> + ${libdir}/qmmp/General/.debug \
> + ${libdir}/qmmp/Input/.debug \
> + ${libdir}/qmmp/Output/.debug \
> + ${libdir}/qmmp/Effect/.debug \
> + ${libdir}/qmmp/Engines/.debug \
> + ${libdir}/qmmp/FileDialogs/.debug \
> + ${libdir}/qmmp/Transports/.debug \
> + ${libdir}/qmmp/Visual/.debug \
> + ${libdir}/qmmp/CommandLineOptions/.debug \
> + "
What is FILES_${PN}-others-dbg? Shouldn't these be in the -dbg package?
Is this package listed in PACKAGES?
Cheers,
Richard
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox