* [PATCH] insane.bbclass: print full path on invalid LICENSE_FILES_CHKSUM
From: Darren Hart @ 2011-10-18 19:00 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Currently only the basename is printed when os.path.isfile() returns a failure
for the license file. If the file is present, but in the wrong directory, this
can be non-obvious to debug. Use the full path instead.
Make a minor grammatical correction in the error message while we're at it.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
meta/classes/insane.bbclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index b861e85..017f7be 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -330,7 +330,7 @@ def package_qa_check_license(workdir, d):
(type, host, path, user, pswd, parm) = bb.decodeurl(url)
srclicfile = os.path.join(srcdir, path)
if not os.path.isfile(srclicfile):
- raise bb.build.FuncFailed( pn + ": LIC_FILES_CHKSUM points to invalid file: " + path)
+ raise bb.build.FuncFailed( pn + ": LIC_FILES_CHKSUM points to an invalid file: " + srclicfile)
if 'md5' not in parm:
bb.error(pn + ": md5 checksum is not specified for ", url)
--
1.7.1
--
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel
^ permalink raw reply related
* Re: [v2 -CONSOLIDATED PULL 06/14] pulseaudio: make bluetooth support conditional upon DISTRO_FEATURES
From: Martin Jansa @ 2011-10-18 18:49 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <bd5259c1b77e280bf7c076b50eedd0c3dc3424dc.1318796061.git.sgw@linux.intel.com>
On Sun, Oct 16, 2011 at 10:17 PM, Saul Wold <sgw@linux.intel.com> wrote:
> From: Paul Eggleton <paul.eggleton@linux.intel.com>
>
> If "bluetooth" is in DISTRO_FEATURES then enable bluetooth and depend on
> bluez4, otherwise disable it.
>
> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> ---
> meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 5 +++--
> .../pulseaudio/pulseaudio_0.9.22.bb | 2 +-
> .../pulseaudio/pulseaudio_0.9.23.bb | 2 +-
> 3 files changed, 5 insertions(+), 4 deletions(-)
It's not caused by this patch.. but if you're looking into pulseaudio,
can you also fix this:
Building man pages is using host perl and fails if there isn't
XML/Parser.pm on host:
| perl ./xmltoman default.pa.5.xml > default.pa.5 || rm -f default.pa.5
| Can't locate XML/Parser.pm in @INC (@INC contains: /etc/perl
/usr/lib64/perl5/site_perl/5.12.4/x86_64-linux
/usr/lib64/perl5/site_perl/5.12.4
/usr/lib64/perl5/vendor_perl/5.12.4/x86_64-linux
/usr/lib64/perl5/vendor_perl/5.12.4 /usr/lib
64/perl5/site_perl /usr/lib64/perl5/vendor_perl
/usr/lib64/perl5/5.12.4/x86_64-linux /usr/lib64/perl5/5.12.4
/usr/local/lib/site_perl .) at ./xmltoman line 21.
| BEGIN failed--compilation aborted at ./xmltoman line 21.
| test -z "/usr/share/man/man1" || /bin/mkdir -p
"/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/pulseaudio-0.9.23-r5/image/usr/share/man/man1"
| /usr/bin/install -c -m 644 ./pulseaudio.1 ./esdcompat.1
./pax11publish.1 ./paplay.1 ./pacat.1 ./pacmd.1 ./pactl.1
./pasuspender.1 ./padsp.1 ./pabrowse.1
'/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/pulseaudio-0.9.23-r5/image/usr/share/man/man1'
| /usr/bin/install: cannot stat `./pulseaudio.1': No such file or directory
| /usr/bin/install: cannot stat `./esdcompat.1': No such file or directory
| /usr/bin/install: cannot stat `./pax11publish.1': No such file or directory
| /usr/bin/install: cannot stat `./paplay.1': No such file or directory
| /usr/bin/install: cannot stat `./pacat.1': No such file or directory
| /usr/bin/install: cannot stat `./pacmd.1': No such file or directory
| /usr/bin/install: cannot stat `./pactl.1': No such file or directory
| /usr/bin/install: cannot stat `./pasuspender.1': No such file or directory
| /usr/bin/install: cannot stat `./padsp.1': No such file or directory
| /usr/bin/install: cannot stat `./pabrowse.1': No such file or directory
| make[3]: *** [install-man1] Error 1
| make[3]: Leaving directory
`/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/pulseaudio-0.9.23-r5/pulseaudio-0.9.23/man'
inherit perlnative works for me as work around as it puts perl
perl-native in PATH before host perl and XML/Parser.pm is installed in
native sysroot, but maybe you'll find cleaner solution (maybe patching
Makefile to use env perl will be enough).
Regards,
^ permalink raw reply
* Race condition or something when fetching local files?
From: Martin Jansa @ 2011-10-18 18:35 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 10459 bytes --]
I have noticed that even local patches are stored in downloads dir,
but today I've noticed that wrong file was used later in do_patch.
I have latest oe-core/meta-oe + latest bitbake.
Pulseaudio was building here for first time
downloads/buildfix.patch is from previous build of xf86-video-intel-2.16.0
$ head downloads/buildfix.patch
Newer mesa doesn't provide dri support, just dri2. The intel driver
...
pulseaudio has right one:
$ head /OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/buildfix.patch
Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com>
Upstream-Status: Pending
Index: pulseaudio-0.9.11/src/pulsecore/atomic.h
...
but while building pulseaudio it's using wrong downloads/buildfix.patch
$ bitbake -e -b /OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb | grep ^FILESPATH | sed "s/:/\n/"
FILESPATH="/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23-r5/linux-gnueabi
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23-r5/arm
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23-r5/build-linux
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23-r5/pn-pulseaudio
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23-r5/nokia900
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23-r5/
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23-r5/shr
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23-r5/forcevariable
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23-r5/libc-glibc
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23-r5/
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/linux-gnueabi
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/arm
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/build-linux
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/pn-pulseaudio
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/nokia900
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/shr
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/forcevariable
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/libc-glibc
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio/linux-gnueabi
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio/arm
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio/build-linux
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio/pn-pulseaudio
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio/nokia900
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio/
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio/shr
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio/forcevariable
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio/libc-glibc
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio/
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/linux-gnueabi
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/arm
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/build-linux
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/pn-pulseaudio
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/nokia900
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/shr
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/forcevariable
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/libc-glibc
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.23/
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio/linux-gnueabi
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio/arm
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio/build-linux
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio/pn-pulseaudio
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio/nokia900
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio/
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio/shr
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio/forcevariable
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio/libc-glibc
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio/
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/files/linux-gnueabi
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/files/arm
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/files/build-linux
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/files/pn-pulseaudio
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/files/nokia900
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/files/
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/files/shr
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/files/forcevariable
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/files/libc-glibc
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/files/
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/linux-gnueabi
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/arm
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/build-linux
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pn-pulseaudio
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/nokia900
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/shr
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/forcevariable
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/libc-glibc
/OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/"
-c cleansstate doesn't help
rm -rf downloads/buildfix.patch* and probably also -c cleanall _does_ help and do_patch finished now OK.
log from first build:
NOTE: Running task 6777 of 7835 (ID: 6734, /OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb, do_fetch)
NOTE: package pulseaudio-0.9.23-r5: task do_fetch: Started
NOTE: package pulseaudio-0.9.23-r5: task do_fetch: Succeeded
NOTE: Running task 6778 of 7835 (ID: 6730, /OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb, do_unpack)
NOTE: package pulseaudio-0.9.23-r5: task do_unpack: Started
NOTE: package pulseaudio-0.9.23-r5: task do_unpack: Succeeded
NOTE: Running task 6779 of 7835 (ID: 6731, /OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb, do_patch)
NOTE: package pulseaudio-0.9.23-r5: task do_patch: Started
ERROR: Error executing a python function in /OE/shr-core/openembedded-core/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb:
CmdError: Command Error: exit status: 1 Output:
Applying patch buildfix.patch
can't find file to patch at input line 13
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Newer mesa doesn't provide dri support, just dri2. The intel driver
|hasn't quite caught up and whilst the configure checks work, the
|global includes have not and need manually tweaking.
|
|RP 2011/10/12
|
|Upstream Status: Superceeded
|
|Index: xf86-video-intel-2.16.0/src/intel.h
|===================================================================
|--- xf86-video-intel-2.16.0.orig/src/intel.h 2011-10-12 20:36:18.587187994 +0100
|+++ xf86-video-intel-2.16.0/src/intel.h 2011-10-12 20:36:30.717188011 +0100
--------------------------
No file to patch. Skipping patch.
1 out of 1 hunk ignored
Patch buildfix.patch does not apply (enforce with -f)
ERROR: The stack trace of python calls that resulted in this exception/failure was:
ERROR: File "patch_do_patch", line 136, in <module>
ERROR:
ERROR: File "patch_do_patch", line 133, in patch_do_patch
ERROR:
ERROR: File "/OE/shr-core/openembedded-core/meta/lib/oe/patch.py", line 338, in Resolve
ERROR: raise sys.exc_value
ERROR:
ERROR: The code that was being executed was:
ERROR: 0132: raise bb.build.FuncFailed(str(sys.exc_value))
ERROR: 0133: resolver.Resolve()
ERROR: 0134:
ERROR: 0135:
ERROR: *** 0136:patch_do_patch(d)
ERROR: 0137:
ERROR: (file: 'patch_do_patch', lineno: 136, function: <module>)
ERROR: 0129: patchset.Import({"file":local, "remote":url, "strippath": striplevel}, True)
ERROR: 0130: except Exception:
ERROR: 0131: import sys
ERROR: 0132: raise bb.build.FuncFailed(str(sys.exc_value))
ERROR: *** 0133: resolver.Resolve()
ERROR: 0134:
ERROR: 0135:
ERROR: 0136:patch_do_patch(d)
ERROR: 0137:
ERROR: (file: 'patch_do_patch', lineno: 133, function: patch_do_patch)
ERROR: Function 'patch_do_patch' failed
ERROR: Logfile of failure stored in: /OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/pulseaudio-0.9.23-r5/temp/log.do_patch.28119
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply
* Re: [PATCH] fontconfig: fix fix-pkgconfig.patch
From: Richard Purdie @ 2011-10-18 17:14 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <1318889360-23524-1-git-send-email-Martin.Jansa@gmail.com>
On Tue, 2011-10-18 at 00:09 +0200, Martin Jansa wrote:
> * 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(-)
Merged to master, thanks.
Richard
^ permalink raw reply
* Re: [PATCH 3/3] gcc-4.6: Backport PR46934 fix
From: Koen Kooi @ 2011-10-18 16:54 UTC (permalink / raw)
To: Saul Wold; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <4E9DAD99.9080508@intel.com>
Op 18 okt. 2011, om 18:47 heeft Saul Wold het volgende geschreven:
> On 10/18/2011 07:18 AM, Koen Kooi wrote:
>>
>> Op 18 okt. 2011, om 03:39 heeft Khem Raj het volgende geschreven:
>>
>>> We have been hitting this issue on ARM/thumb and
>>> have a workaround in place to compile samba
>>> http://git.openembedded.org/openembedded/commit/recipes/samba/samba_3.2.15.bb?id=4ba7aa07c0dcd28f94515ff9927e2a04403fcf15
>>> This backport should fix the gcc bug
>>
>> Can I have a rough ETA when this is going into master? There are meta-oe patches depending on this. No rush, this is just to order my patch queue more intelligently :)
>>
> Koen,
>
> We are working on it, I am doing builds with these changes to day and will submit a consolidated pull for tonight and if all goes well RP will pull tomorrow.
Thanks! I'll check again after tomorrow :)
^ permalink raw reply
* Re: [PATCH 3/3] gcc-4.6: Backport PR46934 fix
From: Saul Wold @ 2011-10-18 16:47 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Koen Kooi
In-Reply-To: <7B75FA82-846A-4B85-872E-0B611C41C11D@dominion.thruhere.net>
On 10/18/2011 07:18 AM, Koen Kooi wrote:
>
> Op 18 okt. 2011, om 03:39 heeft Khem Raj het volgende geschreven:
>
>> We have been hitting this issue on ARM/thumb and
>> have a workaround in place to compile samba
>> http://git.openembedded.org/openembedded/commit/recipes/samba/samba_3.2.15.bb?id=4ba7aa07c0dcd28f94515ff9927e2a04403fcf15
>> This backport should fix the gcc bug
>
> Can I have a rough ETA when this is going into master? There are meta-oe patches depending on this. No rush, this is just to order my patch queue more intelligently :)
>
Koen,
We are working on it, I am doing builds with these changes to day and
will submit a consolidated pull for tonight and if all goes well RP will
pull tomorrow.
Sau!
> regards,
>
> Koen
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
^ permalink raw reply
* Re: [PATCH] fontconfig: fix fix-pkgconfig.patch
From: Koen Kooi @ 2011-10-18 14:18 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <1318889360-23524-1-git-send-email-Martin.Jansa@gmail.com>
Op 18 okt. 2011, om 00:09 heeft Martin Jansa het volgende geschreven:
> * missing $ is causing problems ie when building webkit-efl
> * see http://lists.linuxtogo.org/pipermail/openembedded-core/2011-June/003798.html
> for details
Can I have a rough ETA when this is going into master? There are meta-oe patches depending on this. No rush, this is just to order my patch queue more intelligently :)
regards,
Koen
^ permalink raw reply
* Re: [PATCH 3/3] gcc-4.6: Backport PR46934 fix
From: Koen Kooi @ 2011-10-18 14:18 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <32b67c2bc8ebfcbf0db650e93a2152399ca89ee7.1318901607.git.raj.khem@gmail.com>
Op 18 okt. 2011, om 03:39 heeft Khem Raj het volgende geschreven:
> We have been hitting this issue on ARM/thumb and
> have a workaround in place to compile samba
> http://git.openembedded.org/openembedded/commit/recipes/samba/samba_3.2.15.bb?id=4ba7aa07c0dcd28f94515ff9927e2a04403fcf15
> This backport should fix the gcc bug
Can I have a rough ETA when this is going into master? There are meta-oe patches depending on this. No rush, this is just to order my patch queue more intelligently :)
regards,
Koen
^ 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-18 11:54 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <1318860385.22985.118.camel@phil-desktop>
[-- Attachment #1: Type: text/plain, Size: 2178 bytes --]
On Mon, Oct 17, 2011 at 03:06:24PM +0100, Phil Blundell wrote:
> 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.
OK, I didn't any research to find what type of files are usually stored
in ${libdir}/${BPN} but find /usr/lib64 on my gentoo box suggests that
you're right (almost every directory under /usr/lib64 has something more
than .so and .la files:
# find /usr/lib64/ -mindepth 1 -maxdepth 1 -type d | wc -l
186
# for i in `find /usr/lib64/ -mindepth 1 -maxdepth 1 -type d`; do ls -1 $i/* 2>/dev/null | grep -v ".so" | wc -l | grep -v '^0$'; done | wc -l
136
# for i in `find /usr/lib64/ -mindepth 1 -maxdepth 1 -type d`; do ls -1 $i/* 2>/dev/null | grep -v ".so" | grep -v ".la" | wc -l | grep -v '^0$'; done | wc -l
128
I've fixed it in syslog-ng by redifining FILES_${PN} in
http://git.openembedded.org/meta-openembedded/commit/?id=1ab4e30380da2444cfc66fe5283beb83168964a7
and we can ignore this conf/bitbake.conf patch.
Thanks
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply
* Re: [RFC] Preventing race when compiling external kernel modules
From: Anders Darander @ 2011-10-18 8:19 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1318592560.942.3.camel@ted>
* Richard Purdie <richard.purdie@linuxfoundation.org> [111014 13:43]:
> On Fri, 2011-10-14 at 12:47 +0200, Anders Darander wrote:
> > * Anders Darander <anders@chargestorm.se> [111014 09:55]:
> > > In our local tree, I've circumvented this race by applying a patch like
> > > [3]. (Well, we could likely have put the lock in do_make_scripts()
> > > instead of module_do_compile(), as we have done currently). Obviously,
> > > I'm not proposing to apply this patch, as it depends on lockfile from
> > > the procmail-package (host-package).
> > Just to confirm, it seems (after a very few tests) that it indeed is
> > enough to guard the do_make_scripts() with the lock.
> > However, the question on how to make the real solution remains...
> I've not tested this but it might give you enough info to test
> something:
> (Basic idea is to promote that function to a task, then apply a lock to
> it).
Just to give you some status feedback.
Your code gave me enough to get my previously failed attempt at
promoting the function to a task. Which obviously showed a few new
problems, which I think I've solved. I'll just want to test it a few
more times, but expect a patch today or tomorrow.
Cheers,
Anders
--
Anders Darander
ChargeStorm AB / eStorm AB
^ permalink raw reply
* Re: [PATCH 3/3] gcc-4.6: Backport PR46934 fix
From: Martin Jansa @ 2011-10-18 7:54 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <32b67c2bc8ebfcbf0db650e93a2152399ca89ee7.1318901607.git.raj.khem@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 651 bytes --]
On Mon, Oct 17, 2011 at 06:39:27PM -0700, Khem Raj wrote:
> We have been hitting this issue on ARM/thumb and
> have a workaround in place to compile samba
> http://git.openembedded.org/openembedded/commit/recipes/samba/samba_3.2.15.bb?id=4ba7aa07c0dcd28f94515ff9927e2a04403fcf15
> This backport should fix the gcc bug
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
I can confirm that samba build with this works again (without forcing
ARM mode), I'm going to run more build tests with it but for now:
Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
(holds also for 2/3)
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply
* Re: [PATCH 1/2] qmmp: update to 0.5.2
From: Xiaofeng Yan @ 2011-10-18 5:44 UTC (permalink / raw)
To: Saul Wold; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <4E9D103B.10506@intel.com>
On 2011年10月18日 13:35, Saul Wold wrote:
> On 10/17/2011 10:21 PM, Xiaofeng Yan wrote:
>> From: Xiaofeng Yan<xiaofeng.yan@windriver.com>
>>
>> The new version of qmmp can run on core-image-sato by test.
>> $qmmp *.mp3
>>
>> Signed-off-by: Xiaofeng Yan<xiaofeng.yan@windriver.com>
>> ---
>> meta/recipes-qt/qt-apps/qmmp_0.5.2.bb | 49
>> +++++++++++++++++++++++++++++++++
>> 1 files changed, 49 insertions(+), 0 deletions(-)
>> create mode 100644 meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
>>
>> diff --git a/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
>> b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
>> new file mode 100644
>> index 0000000..f31409b
>> --- /dev/null
>> +++ b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
>> @@ -0,0 +1,49 @@
>> +dESCRIPTION = "Qmmp (Qt-based Multimedia Player) is an audio-player,
>> written with help of Qt library"
>> +HOMEPAGE = "http://qmmp.ylsoftware.com"
>> +LICENSE = "GPLv2"
>> +LIC_FILES_CHKSUM =
>> "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
>> +SECTION = "multimedia"
>> +
>> +PR = "r3"
>> +
>> +PROVIDES = "qmmp"
>> +DEPENDS = "qt4-x11-free taglib libmad libvorbis libogg alsa-lib"
>> +RDEPENDS_${PN} += "taglib alsa-lib libmad curl"
>> +
>> +SRC_URI = "http://qmmp.ylsoftware.com/files/${BPN}-${PV}.tar.bz2"
>> +
>> +SRC_URI[md5sum] = "20852f3cce3471bfc5affa9b2e947dc6"
>> +SRC_URI[sha256sum] =
>> "6391dec020d2a381d7f4b7890fae6c49eadf88b3c9aef571fe3c5e96140822ec"
>> +
>> +
>> +PARALLEL_MAKE = ""
>> +
>> +inherit qmake2 cmake
>> +
>> +export EXTRA_OECMAKE = "-DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \
>> + -DQT_LRELEASE_EXECUTABLE=${OE_QMAKE_LRELEASE} \
>> + -DQT_MOC_EXECUTABLE=${OE_QMAKE_MOC} \
>> + -DQT_UIC_EXECUTABLE=${OE_QMAKE_UIC} \
>> + -DQT_RCC_EXECUTABLE=${OE_QMAKE_RCC} \
>> + -DQT_LIBRARY_DIR=${OE_QMAKE_LIBDIR_QT} \
>> + -DQT_HEADERS_DIR=${OE_QMAKE_INCDIR_QT} \
>> + -DQT_QTCORE_INCLUDE_DIR=${OE_QMAKE_INCDIR_QT}/QtCore \
>> + "
>> +
>> +FILES_${PN} =+ "\
>> + ${libdir}/qmmp/*/*.so \
>> + ${datadir}/icons/* \
>> + ${datadir}/qmmp/images/* \
>> + ${datadir}/applications/qmmp.desktop \
>> + "
>> +
> Xiaofeng,
>
> I was looking into this also, I think it would be better to split all
> the various plugins into separate packages using do_split_packages(), in
> the packages.bbclass.
>
> I started with this code:
>> PACKAGES_DYNAMIC = "qmmp-plugin-*"
>>
>> python populate_packages_prepend () {
>> qmmp_libdir = bb.data.expand('${libdir}/qmmp', d)
>>
>> do_split_packages(d, qmmp_libdir, '^(.*)/(.*)\.so$',
>> 'qmmp-plugin-%s-%s', 'Qmmp %s Plugin for %s', extra_depends='')
>> }
>
> But have not completed it yet, if you have time to investigate further
> and complete this correctly, there might be a problem with using
> multiple Regular expressions in the do_split_packages code, but I have
> not fully debugged this yet.
>
> Please let me know if you can complete this task.
>
Thanks for your reply and I will investigate it according to your
suggestion.
Thanks
Yan
> Thanks
> Sau!
>
>
>> +FILES_${PN}-dbg += "\
>> + ${libdir}/qmmp/*/.debug/* \
>> + "
>> +
>> +PACKAGES += "${PN}-plugin-input-mad ${PN}-plugin-input-vorbis"
>> +
>> +FILES_${PN}-plugin-input-mad = "${libdir}/qmmp/Input/libmad.so"
>> +RDEPENDS_${PN}-plugin-input-mad = "libmad"
>> +FILES_${PN}-plugin-input-vorbis = "${libdir}/qmmp/Input/libvorbis.so"
>> +RDEPENDS_${PN}-plugin-input-vorbis = "libvorbis libogg"
>
>
^ permalink raw reply
* Re: [PATCH 1/2] qmmp: update to 0.5.2
From: Saul Wold @ 2011-10-18 5:35 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <ff63f110f1f657a011c24f5c8cfb8e7328fae49a.1318904555.git.xiaofeng.yan@windriver.com>
On 10/17/2011 10:21 PM, Xiaofeng Yan wrote:
> From: Xiaofeng Yan<xiaofeng.yan@windriver.com>
>
> The new version of qmmp can run on core-image-sato by test.
> $qmmp *.mp3
>
> Signed-off-by: Xiaofeng Yan<xiaofeng.yan@windriver.com>
> ---
> meta/recipes-qt/qt-apps/qmmp_0.5.2.bb | 49 +++++++++++++++++++++++++++++++++
> 1 files changed, 49 insertions(+), 0 deletions(-)
> create mode 100644 meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
>
> diff --git a/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
> new file mode 100644
> index 0000000..f31409b
> --- /dev/null
> +++ b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
> @@ -0,0 +1,49 @@
> +dESCRIPTION = "Qmmp (Qt-based Multimedia Player) is an audio-player, written with help of Qt library"
> +HOMEPAGE = "http://qmmp.ylsoftware.com"
> +LICENSE = "GPLv2"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
> +SECTION = "multimedia"
> +
> +PR = "r3"
> +
> +PROVIDES = "qmmp"
> +DEPENDS = "qt4-x11-free taglib libmad libvorbis libogg alsa-lib"
> +RDEPENDS_${PN} += "taglib alsa-lib libmad curl"
> +
> +SRC_URI = "http://qmmp.ylsoftware.com/files/${BPN}-${PV}.tar.bz2"
> +
> +SRC_URI[md5sum] = "20852f3cce3471bfc5affa9b2e947dc6"
> +SRC_URI[sha256sum] = "6391dec020d2a381d7f4b7890fae6c49eadf88b3c9aef571fe3c5e96140822ec"
> +
> +
> +PARALLEL_MAKE = ""
> +
> +inherit qmake2 cmake
> +
> +export EXTRA_OECMAKE = "-DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \
> + -DQT_LRELEASE_EXECUTABLE=${OE_QMAKE_LRELEASE} \
> + -DQT_MOC_EXECUTABLE=${OE_QMAKE_MOC} \
> + -DQT_UIC_EXECUTABLE=${OE_QMAKE_UIC} \
> + -DQT_RCC_EXECUTABLE=${OE_QMAKE_RCC} \
> + -DQT_LIBRARY_DIR=${OE_QMAKE_LIBDIR_QT} \
> + -DQT_HEADERS_DIR=${OE_QMAKE_INCDIR_QT} \
> + -DQT_QTCORE_INCLUDE_DIR=${OE_QMAKE_INCDIR_QT}/QtCore \
> + "
> +
> +FILES_${PN} =+ "\
> + ${libdir}/qmmp/*/*.so \
> + ${datadir}/icons/* \
> + ${datadir}/qmmp/images/* \
> + ${datadir}/applications/qmmp.desktop \
> + "
> +
Xiaofeng,
I was looking into this also, I think it would be better to split all
the various plugins into separate packages using do_split_packages(), in
the packages.bbclass.
I started with this code:
> PACKAGES_DYNAMIC = "qmmp-plugin-*"
>
> python populate_packages_prepend () {
> qmmp_libdir = bb.data.expand('${libdir}/qmmp', d)
>
> do_split_packages(d, qmmp_libdir, '^(.*)/(.*)\.so$', 'qmmp-plugin-%s-%s', 'Qmmp %s Plugin for %s', extra_depends='')
> }
But have not completed it yet, if you have time to investigate further
and complete this correctly, there might be a problem with using
multiple Regular expressions in the do_split_packages code, but I have
not fully debugged this yet.
Please let me know if you can complete this task.
Thanks
Sau!
> +FILES_${PN}-dbg += "\
> + ${libdir}/qmmp/*/.debug/* \
> + "
> +
> +PACKAGES += "${PN}-plugin-input-mad ${PN}-plugin-input-vorbis"
> +
> +FILES_${PN}-plugin-input-mad = "${libdir}/qmmp/Input/libmad.so"
> +RDEPENDS_${PN}-plugin-input-mad = "libmad"
> +FILES_${PN}-plugin-input-vorbis = "${libdir}/qmmp/Input/libvorbis.so"
> +RDEPENDS_${PN}-plugin-input-vorbis = "libvorbis libogg"
^ permalink raw reply
* [PATCH 2/2] libx11-diet: update to 1.4.4
From: Xiaofeng Yan @ 2011-10-18 5:22 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1318904555.git.xiaofeng.yan@windriver.com>
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
core-image-sato based on libx11-diet can run on qemu by test.
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
.../xorg-lib/libx11-diet-1.4.4/X18NCMSstubs.diff | 540 ++++++++++++++++++++
.../libx11-diet-1.4.4/fix-disable-xlocale.diff | 16 +
.../libx11-diet-1.4.4/fix-utf8-wrong-define.patch | 17 +
.../xorg-lib/libx11-diet-1.4.4/include_fix.patch | 25 +
.../xorg-lib/libx11-diet-1.4.4/nodolt.patch | 14 +
.../libx11-diet-1.4.4/x11_disable_makekeys.patch | 31 ++
.../recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb | 27 +
7 files changed, 670 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/X18NCMSstubs.diff
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-disable-xlocale.diff
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-utf8-wrong-define.patch
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/include_fix.patch
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/nodolt.patch
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/x11_disable_makekeys.patch
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/X18NCMSstubs.diff b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/X18NCMSstubs.diff
new file mode 100644
index 0000000..91ab180
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/X18NCMSstubs.diff
@@ -0,0 +1,540 @@
+Upstream-Status: Pending
+
+Index: libX11-1.3/src/imConv.c
+===================================================================
+--- libX11-1.3.orig/src/imConv.c
++++ libX11-1.3/src/imConv.c
+@@ -83,6 +83,7 @@ static const struct SubstRec SubstTable[
+ * from UCS char to specified charset char.
+ * This converter is needed for _XimGetCharCode subroutine.
+ */
++#ifdef XLOCALE
+ XPointer
+ _XimGetLocaleCode (
+ _Xconst char* encoding_name)
+@@ -96,6 +97,7 @@ _XimGetLocaleCode (
+ }
+ return cvt;
+ }
++#endif
+
+ /*
+ * Returns the locale dependent representation of a keysym.
+@@ -106,6 +108,7 @@ _XimGetLocaleCode (
+ * terminating NUL byte. Return 0 if the keysym is not representable in the
+ * locale
+ */
++#ifdef XLOCALE
+ /*ARGSUSED*/
+ int
+ _XimGetCharCode (
+@@ -135,6 +138,7 @@ _XimGetCharCode (
+ buf[count]= '\0';
+ return count;
+ }
++#endif
+
+ #ifdef XKB
+ static int lookup_string(
+Index: libX11-1.3/src/X18NCMSstubs.c
+===================================================================
+--- /dev/null
++++ libX11-1.3/src/X18NCMSstubs.c
+@@ -0,0 +1,428 @@
++/*
++ * X18NCMSstubs.c
++ * - Provides stubs and dummy funcs needed when Xcms and XLocale stuff removed
++ *
++ * Copyright © 2003 Matthew Allum
++ *
++ * Permission to use, copy, modify, distribute, and sell this software and its
++ * documentation for any purpose is hereby granted without fee, provided that
++ * the above copyright notice appear in all copies and that both that
++ * copyright notice and this permission notice appear in supporting
++ * documentation, and that the name of Matthew Allum not be used in
++ * advertising or publicity pertaining to distribution of the software without
++ * specific, written prior permission. Keith Packard and Compaq makes no
++ * representations about the suitability of this software for any purpose. It
++ * is provided "as is" without express or implied warranty.
++ *
++ * MATTHEW ALLUM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
++ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
++ * IN NO EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++ * PERFORMANCE OF THIS SOFTWARE.
++ */
++
++#include <stdlib.h>
++#include "Xlibint.h"
++#include "Xlcint.h"
++#include <X11/Xlocale.h>
++#include <X11/Xos.h>
++#ifdef WIN32
++#undef close
++#endif
++#include <X11/Xutil.h>
++#include "XlcPubI.h"
++
++#include "Xcmsint.h" /* for XcmsCCC type */
++#include "XlcPubI.h" /* for XLCd type */
++#include "config.h"
++
++#if ! XLOCALE
++
++Bool
++XSupportsLocale()
++{
++ return False;
++}
++
++char *
++XSetLocaleModifiers(
++ const char *modifiers)
++{
++ return NULL;
++}
++
++XLCd
++_XOpenLC(
++ char *name)
++{
++ return NULL;
++}
++
++XLCd
++_XlcCurrentLC()
++{
++ return NULL;
++}
++
++void
++_XlcVaToArgList(
++ va_list var,
++ int count,
++ XlcArgList *args_ret)
++{
++ return;
++}
++
++void
++_XlcCountVaList(
++ va_list var,
++ int *count_ret)
++{
++ return;
++}
++
++void
++_XCloseLC(
++ XLCd lcd)
++{
++ return;
++}
++
++int
++_XlcConvert(
++ XlcConv conv,
++ XPointer *from,
++ int *from_left,
++ XPointer *to,
++ int *to_left,
++ XPointer *args,
++ int num_args)
++{
++ return 0;
++}
++
++/* XIM Stubs */
++
++XPointer
++_XimGetLocaleCode ( _Xconst char* encoding_name )
++{
++ return NULL;
++}
++
++int
++_XimGetCharCode (
++ XPointer ucs_conv,
++ KeySym keysym,
++ unsigned char* buf,
++ int nbytes)
++{
++ return 0;
++}
++
++/* Xrm Stubs */
++
++XrmMethods
++_XrmInitParseInfo(
++ XPointer *state)
++{
++ return (XrmMethods) NULL;
++}
++
++/* Xwc Stubs */
++
++int
++XwcTextExtents(
++ XFontSet font_set,
++ _Xconst wchar_t *text,
++ int text_len,
++ XRectangle *overall_ink_extents,
++ XRectangle *overall_logical_extents)
++{
++ return 0;
++}
++
++void
++XwcDrawString(Display *display,
++ Drawable d,
++ XFontSet font_set,
++ GC gc,
++ int x, int y,
++ _Xconst wchar_t *string,
++ int num_wchars)
++{
++ ;
++}
++
++void
++XwcDrawText(
++ Display *dpy,
++ Drawable d,
++ GC gc,
++ int x,
++ int y,
++ XwcTextItem *text_items,
++ int nitems)
++{
++ ;
++}
++
++void
++XwcDrawImageString(
++ Display *dpy,
++ Drawable d,
++ XFontSet font_set,
++ GC gc,
++ int x,
++ int y,
++ _Xconst wchar_t *text,
++ int text_len)
++{
++ ;
++}
++
++int
++XwcTextEscapement(
++ XFontSet font_set,
++ _Xconst wchar_t *text,
++ int text_len)
++{
++ return 0;
++}
++
++Status
++XwcTextPerCharExtents(
++ XFontSet font_set,
++ _Xconst wchar_t *text,
++ int text_len,
++ XRectangle *ink_extents_buffer,
++ XRectangle *logical_extents_buffer,
++ int buffer_size,
++ int *num_chars,
++ XRectangle *max_ink_extents,
++ XRectangle *max_logical_extents)
++{
++ ;
++}
++
++int
++XwcTextPropertyToTextList(
++ Display *dpy,
++ const XTextProperty *text_prop,
++ wchar_t ***list_ret,
++ int *count_ret)
++{
++ return 0;
++}
++
++int
++XwcTextListToTextProperty(
++ Display *dpy,
++ wchar_t **list,
++ int count,
++ XICCEncodingStyle style,
++ XTextProperty *text_prop)
++{
++ return 0;
++}
++
++void
++XwcFreeStringList(wchar_t **list)
++{
++ return;
++}
++
++
++void XmbSetWMProperties ( /* Actually from mbWMProps.c */
++ Display *dpy,
++ Window w,
++ _Xconst char *windowName,
++ _Xconst char *iconName,
++ char **argv,
++ int argc,
++ XSizeHints *sizeHints,
++ XWMHints *wmHints,
++ XClassHint *classHints)
++{
++ return;
++}
++
++int
++XmbTextPropertyToTextList(
++ Display *dpy,
++ const XTextProperty *text_prop,
++ char ***list_ret,
++ int *count_ret)
++{
++ return XLocaleNotSupported;
++}
++
++int
++XmbTextListToTextProperty(
++ Display *dpy,
++ char **list,
++ int count,
++ XICCEncodingStyle style,
++ XTextProperty *text_prop)
++{
++ return XLocaleNotSupported;
++}
++
++int
++XmbTextExtents(
++ XFontSet font_set,
++ _Xconst char *text,
++ int text_len,
++ XRectangle *overall_ink_extents,
++ XRectangle *overall_logical_extents)
++{
++ return 0;
++}
++
++void
++XmbDrawText(
++ Display *dpy,
++ Drawable d,
++ GC gc,
++ int x,
++ int y,
++ XmbTextItem *text_items,
++ int nitems)
++{
++ ;
++}
++
++void
++XmbDrawString(
++ Display *dpy,
++ Drawable d,
++ XFontSet font_set,
++ GC gc,
++ int x,
++ int y,
++ _Xconst char *text,
++ int text_len)
++{
++ ;
++}
++
++void
++XmbDrawImageString(
++ Display *dpy,
++ Drawable d,
++ XFontSet font_set,
++ GC gc,
++ int x,
++ int y,
++ _Xconst char *text,
++ int text_len)
++{
++ ;
++}
++
++int
++XmbTextEscapement(
++ XFontSet font_set,
++ _Xconst char *text,
++ int text_len)
++{
++ return 0;
++}
++
++Status
++XmbTextPerCharExtents(
++ XFontSet font_set,
++ _Xconst char *text,
++ int text_len,
++ XRectangle *ink_extents_buffer,
++ XRectangle *logical_extents_buffer,
++ int buffer_size,
++ int *num_chars,
++ XRectangle *max_ink_extents,
++ XRectangle *max_logical_extents)
++{
++ return 0;
++}
++
++unsigned int
++KeySymToUcs4(KeySym keysym)
++{
++ return 0;
++}
++
++#endif
++
++#if ! XCMS
++
++XcmsCCC
++XcmsCCCOfColormap(dpy, cmap)
++ Display *dpy;
++ Colormap cmap;
++{
++ return NULL;
++}
++
++Status
++_XcmsResolveColorString (
++ XcmsCCC ccc,
++ const char **color_string,
++ XcmsColor *pColor_exact_return,
++ XcmsColorFormat result_format)
++{
++ return(XcmsFailure);
++}
++
++void
++_XcmsUnresolveColor(
++ XcmsCCC ccc,
++ XcmsColor *pColor)
++{
++ return;
++}
++
++void
++_XUnresolveColor(
++ XcmsCCC ccc,
++ XColor *pXColor)
++{
++ return;
++}
++
++XcmsCmapRec *
++_XcmsAddCmapRec(dpy, cmap, windowID, visual)
++ Display *dpy;
++ Colormap cmap;
++ Window windowID;
++ Visual *visual;
++{
++ return NULL;
++}
++
++void
++_XcmsRGB_to_XColor(
++ XcmsColor *pColors,
++ XColor *pXColors,
++ unsigned int nColors)
++{
++ return;
++}
++
++XcmsCmapRec *
++_XcmsCopyCmapRecAndFree(
++ Display *dpy,
++ Colormap src_cmap,
++ Colormap copy_cmap)
++{
++ return NULL;
++}
++
++void
++_XcmsDeleteCmapRec(
++ Display *dpy,
++ Colormap cmap)
++{
++ return;
++}
++
++#endif
+Index: libX11-1.3/src/Makefile.am
+===================================================================
+--- libX11-1.3.orig/src/Makefile.am
++++ libX11-1.3/src/Makefile.am
+@@ -335,6 +335,8 @@ if THRSTUBS
+ libX11_la_SOURCES+=UIThrStubs.c
+ endif
+
++libX11_la_SOURCES+=X18NCMSstubs.c
++
+ x11datadir = @X11_DATADIR@
+ x11data_DATA = XKeysymDB XErrorDB
+
+@@ -342,7 +344,8 @@ EXTRA_DIST = \
+ $(x11data_DATA) \
+ os2Stubs.c \
+ udcInf.c \
+- UIThrStubs.c
++ UIThrStubs.c \
++ X18NCMSstubs.c
+
+ if XCB
+ libX11_la_SOURCES += \
+Index: libX11-1.3/src/locking.c
+===================================================================
+--- libX11-1.3.orig/src/locking.c
++++ libX11-1.3/src/locking.c
+@@ -66,7 +66,9 @@ in this Software without prior written a
+ #define NUM_FREE_CVLS 4
+
+ /* in lcWrap.c */
++#ifdef XLOCALE
+ extern LockInfoPtr _Xi18n_lock;
++#endif
+
+ #ifdef WIN32
+ static DWORD _X_TlsIndex = (DWORD)-1;
+@@ -594,9 +596,11 @@ Status XInitThreads(void)
+ _Xglobal_lock = &global_lock;
+ xmutex_init(_Xglobal_lock->lock);
+ xmutex_set_name(_Xglobal_lock->lock, "Xlib global");
++#ifdef XLOCALE
+ _Xi18n_lock = &i18n_lock;
+ xmutex_init(_Xi18n_lock->lock);
+ xmutex_set_name(_Xi18n_lock->lock, "Xlib i18n");
++#endif
+ _XLockMutex_fn = _XLockMutex;
+ _XUnlockMutex_fn = _XUnlockMutex;
+ _XCreateMutex_fn = _XCreateMutex;
+Index: libX11-1.3/configure.ac
+===================================================================
+--- libX11-1.3.orig/configure.ac
++++ libX11-1.3/configure.ac
+@@ -289,7 +289,14 @@ else
+ fi
+ AC_SUBST(KEYSYMDEF)
+
+-AM_CONDITIONAL(UDC, test xfalse = xtrue)
++AC_ARG_ENABLE(udc,
++ AC_HELP_STRING([--disable-udc],
++ [Disable Xlib support for UDC *EXPERIMENTAL*]),
++ [UDC=$enableval],[UDC=yes])
++AM_CONDITIONAL(UDC, [test x$UDC = xyes ])
++if test x"$UDC" = "xyes"; then
++ AC_DEFINE(UDC,1,[Include support for UDC])
++fi
+
+ AC_ARG_ENABLE(xcms,
+ AC_HELP_STRING([--disable-xcms],
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-disable-xlocale.diff b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-disable-xlocale.diff
new file mode 100644
index 0000000..7dcdd6a
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-disable-xlocale.diff
@@ -0,0 +1,16 @@
+Upstream-Status: Pending
+
+--- libX11-X11R7.0-1.0.0/src/Font.c.orig 2006-03-12 18:35:42.000000000 +0100
++++ libX11-X11R7.0-1.0.0/src/Font.c 2006-03-12 18:40:27.000000000 +0100
+@@ -701,7 +701,11 @@
+ }
+ if (l - 2 - (p - charset) < 0)
+ return 0;
++#ifdef XLOCALE
+ if (_XlcNCompareISOLatin1(name + l - 2 - (p - charset), charset, p - charset))
++#else
++ if (strncasecmp(name + l - 2 - (p - charset), charset, p - charset))
++#endif
+ return 0;
+ if (strlen(p + 1) + l - 1 >= sizeof(buf) - 1)
+ return 0;
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-utf8-wrong-define.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-utf8-wrong-define.patch
new file mode 100644
index 0000000..26d3349
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-utf8-wrong-define.patch
@@ -0,0 +1,17 @@
+Upstream-Status: Pending
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- libX11-X11R7.0-1.0.0/include/X11/Xlib.h~fix-utf8-wrong-define
++++ libX11-X11R7.0-1.0.0/include/X11/Xlib.h
+@@ -103,7 +103,7 @@
+
+ /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in
+ November 2000. Its presence is indicated through the following macro. */
+-#define X_HAVE_UTF8_STRING 1
++#undef X_HAVE_UTF8_STRING
+
+ typedef char *XPointer;
+
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/include_fix.patch
new file mode 100644
index 0000000..b3bcbab
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/include_fix.patch
@@ -0,0 +1,25 @@
+Upstream-Status: Inappropriate [configuration]
+
+---
+ configure.ac | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- libX11-1.1.5.orig/configure.ac
++++ libX11-1.1.5/configure.ac
+@@ -218,13 +218,13 @@ AC_SUBST(XDMCP_LIBS)
+ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
+
+ #
+ # Find keysymdef.h
+ #
+-AC_MSG_CHECKING([keysymdef.h])
+-dir=`pkg-config --variable=includedir xproto`
+-KEYSYMDEF="$dir/X11/keysymdef.h"
++AC_ARG_WITH(keysymdef,
++ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
++ KEYSYMDEF=$withval, KEYSYMDEF="")
+ if test -f "$KEYSYMDEF"; then
+ AC_MSG_RESULT([$KEYSYMDEF])
+ else
+ AC_MSG_ERROR([Cannot find keysymdef.h])
+ fi
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/nodolt.patch
new file mode 100644
index 0000000..cc05fdc
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/nodolt.patch
@@ -0,0 +1,14 @@
+Upstream-Status: Inappropriate [configuration]
+
+Index: libX11-1.2.1/configure.ac
+===================================================================
+--- libX11-1.2.1.orig/configure.ac 2009-07-02 14:07:54.000000000 +0100
++++ libX11-1.2.1/configure.ac 2009-07-02 14:08:01.000000000 +0100
+@@ -20,7 +20,6 @@
+
+ # Checks for programs.
+ AC_PROG_LIBTOOL
+-DOLT
+ AC_PROG_CC
+ XORG_CWARNFLAGS
+
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/x11_disable_makekeys.patch
new file mode 100644
index 0000000..70ee695
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/x11_disable_makekeys.patch
@@ -0,0 +1,31 @@
+---
+ src/util/Makefile.am | 21 -----------------
+ 1 file changed, 21 deletions(-)
+
+--- a/src/util/Makefile.am
++++ b/src/util/Makefile.am
+@@ -1,24 +1,3 @@
+
+-noinst_PROGRAMS=makekeys
+-
+-makekeys_CFLAGS = \
+- $(X11_CFLAGS) \
+- $(CWARNFLAGS)
+-
+-CC = @CC_FOR_BUILD@
+-CPPFLAGS = @CPPFLAGS_FOR_BUILD@
+-CFLAGS = @CFLAGS_FOR_BUILD@
+-LDFLAGS = @LDFLAGS_FOR_BUILD@
+-
+ EXTRA_DIST = mkks.sh
+
+-if LINT
+-# Check source code with tools like lint & sparse
+-
+-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
+-
+-lint:
+- $(LINT) $(ALL_LINT_FLAGS) makekeys.c
+-
+-endif LINT
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb
new file mode 100644
index 0000000..df2a47f
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb
@@ -0,0 +1,27 @@
+require libx11.inc
+
+DESCRIPTION += " Support for XCB, UDC, XCMS and XLOCALE is disabled in \
+this version."
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
+
+PR = "r5"
+
+SRC_URI += "file://x11_disable_makekeys.patch \
+ file://X18NCMSstubs.diff \
+ file://fix-disable-xlocale.diff \
+ file://fix-utf8-wrong-define.patch \
+ "
+
+
+SRC_URI[md5sum] = "ed7c382cbf8c13425b6a66bcac0ca5d9"
+SRC_URI[sha256sum] = "7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d"
+
+DEPENDS += "bigreqsproto xproto xextproto xtrans libxau libx11 xcmiscproto \
+ libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
+
+EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale"
+CFLAGS += "-D_GNU_SOURCE"
+
--
1.7.0.4
^ permalink raw reply related
* [PATCH 1/2] qmmp: update to 0.5.2
From: Xiaofeng Yan @ 2011-10-18 5:21 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1318904555.git.xiaofeng.yan@windriver.com>
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
The new version of qmmp can run on core-image-sato by test.
$qmmp *.mp3
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
meta/recipes-qt/qt-apps/qmmp_0.5.2.bb | 49 +++++++++++++++++++++++++++++++++
1 files changed, 49 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
diff --git a/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
new file mode 100644
index 0000000..f31409b
--- /dev/null
+++ b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
@@ -0,0 +1,49 @@
+dESCRIPTION = "Qmmp (Qt-based Multimedia Player) is an audio-player, written with help of Qt library"
+HOMEPAGE = "http://qmmp.ylsoftware.com"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
+SECTION = "multimedia"
+
+PR = "r3"
+
+PROVIDES = "qmmp"
+DEPENDS = "qt4-x11-free taglib libmad libvorbis libogg alsa-lib"
+RDEPENDS_${PN} += "taglib alsa-lib libmad curl"
+
+SRC_URI = "http://qmmp.ylsoftware.com/files/${BPN}-${PV}.tar.bz2"
+
+SRC_URI[md5sum] = "20852f3cce3471bfc5affa9b2e947dc6"
+SRC_URI[sha256sum] = "6391dec020d2a381d7f4b7890fae6c49eadf88b3c9aef571fe3c5e96140822ec"
+
+
+PARALLEL_MAKE = ""
+
+inherit qmake2 cmake
+
+export EXTRA_OECMAKE = "-DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \
+ -DQT_LRELEASE_EXECUTABLE=${OE_QMAKE_LRELEASE} \
+ -DQT_MOC_EXECUTABLE=${OE_QMAKE_MOC} \
+ -DQT_UIC_EXECUTABLE=${OE_QMAKE_UIC} \
+ -DQT_RCC_EXECUTABLE=${OE_QMAKE_RCC} \
+ -DQT_LIBRARY_DIR=${OE_QMAKE_LIBDIR_QT} \
+ -DQT_HEADERS_DIR=${OE_QMAKE_INCDIR_QT} \
+ -DQT_QTCORE_INCLUDE_DIR=${OE_QMAKE_INCDIR_QT}/QtCore \
+ "
+
+FILES_${PN} =+ "\
+ ${libdir}/qmmp/*/*.so \
+ ${datadir}/icons/* \
+ ${datadir}/qmmp/images/* \
+ ${datadir}/applications/qmmp.desktop \
+ "
+
+FILES_${PN}-dbg += "\
+ ${libdir}/qmmp/*/.debug/* \
+ "
+
+PACKAGES += "${PN}-plugin-input-mad ${PN}-plugin-input-vorbis"
+
+FILES_${PN}-plugin-input-mad = "${libdir}/qmmp/Input/libmad.so"
+RDEPENDS_${PN}-plugin-input-mad = "libmad"
+FILES_${PN}-plugin-input-vorbis = "${libdir}/qmmp/Input/libvorbis.so"
+RDEPENDS_${PN}-plugin-input-vorbis = "libvorbis libogg"
--
1.7.0.4
^ permalink raw reply related
* [PATCH 0/2] update packages
From: Xiaofeng Yan @ 2011-10-18 5:21 UTC (permalink / raw)
To: openembedded-core
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Update packages "qmmp" and "libx11-diet".
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: xiaofeng/update
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/update
Thanks,
Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
Xiaofeng Yan (2):
qmmp: update to 0.5.2
libx11-diet: update to 1.4.4
.../xorg-lib/libx11-diet-1.4.4/X18NCMSstubs.diff | 540 ++++++++++++++++++++
.../libx11-diet-1.4.4/fix-disable-xlocale.diff | 16 +
.../libx11-diet-1.4.4/fix-utf8-wrong-define.patch | 17 +
.../xorg-lib/libx11-diet-1.4.4/include_fix.patch | 25 +
.../xorg-lib/libx11-diet-1.4.4/nodolt.patch | 14 +
.../libx11-diet-1.4.4/x11_disable_makekeys.patch | 31 ++
.../recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb | 27 +
meta/recipes-qt/qt-apps/qmmp_0.5.2.bb | 49 ++
8 files changed, 719 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/X18NCMSstubs.diff
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-disable-xlocale.diff
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-utf8-wrong-define.patch
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/include_fix.patch
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/nodolt.patch
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/x11_disable_makekeys.patch
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb
create mode 100644 meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
^ permalink raw reply
* [PATCH 3/3] gcc-4.6: Backport PR46934 fix
From: Khem Raj @ 2011-10-18 1:39 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1318901607.git.raj.khem@gmail.com>
We have been hitting this issue on ARM/thumb and
have a workaround in place to compile samba
http://git.openembedded.org/openembedded/commit/recipes/samba/samba_3.2.15.bb?id=4ba7aa07c0dcd28f94515ff9927e2a04403fcf15
This backport should fix the gcc bug
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-devtools/gcc/gcc-4.6.inc | 3 +-
meta/recipes-devtools/gcc/gcc-4.6/pr46934.patch | 392 +++++++++++++++++++++++
2 files changed, 394 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6/pr46934.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc b/meta/recipes-devtools/gcc/gcc-4.6.inc
index 0fb6287..fbc90ea 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 = "r14"
+PR = "r15"
# Third digit in PV should be incremented after a minor release
# happens from this branch on gcc e.g. currently its 4.6.0
@@ -69,6 +69,7 @@ SRC_URI = "svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH};proto=http \
file://powerpc-e5500.patch \
file://fix-for-ice-50099.patch \
file://gcc-with-linker-hash-style.patch \
+ file://pr46934.patch \
"
SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch "
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/pr46934.patch b/meta/recipes-devtools/gcc/gcc-4.6/pr46934.patch
new file mode 100644
index 0000000..afd3eef
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-4.6/pr46934.patch
@@ -0,0 +1,392 @@
+2011-09-19 chengbin <bin.cheng@arm.com>
+
+ Backport r174035 from mainline
+ 2011-05-22 Tom de Vries <tom@codesourcery.com>
+
+ PR middle-end/48689
+ * fold-const.c (fold_checksum_tree): Guard TREE_CHAIN use with
+ CODE_CONTAINS_STRUCT (TS_COMMON).
+
+ Backport r172297 from mainline
+ 2011-04-11 Chung-Lin Tang <cltang@codesourcery.com>
+ Richard Earnshaw <rearnsha@arm.com>
+
+ PR target/48250
+ * config/arm/arm.c (arm_legitimize_reload_address): Update cases
+ to use sign-magnitude offsets. Reject unsupported unaligned
+ cases. Add detailed description in comments.
+ * config/arm/arm.md (reload_outdf): Disable for ARM mode; change
+ condition from TARGET_32BIT to TARGET_ARM.
+
+ Backport r171978 from mainline
+ 2011-04-05 Tom de Vries <tom@codesourcery.com>
+
+ PR target/43920
+ * config/arm/arm.h (BRANCH_COST): Set to 1 for Thumb-2 when optimizing
+ for size.
+
+ Backport r171632 from mainline
+ 2011-03-28 Richard Sandiford <richard.sandiford@linaro.org>
+
+ * builtins.c (expand_builtin_memset_args): Use gen_int_mode
+ instead of GEN_INT.
+
+ Backport r171379 from mainline
+ 2011-03-23 Chung-Lin Tang <cltang@codesourcery.com>
+
+ PR target/46934
+ * config/arm/arm.md (casesi): Use the gen_int_mode() function
+ to subtract lower bound instead of GEN_INT().
+
+ Backport r171251 from mainline
+ 2011-03-21 Daniel Jacobowitz <dan@codesourcery.com>
+
+ * config/arm/unwind-arm.c (__gnu_unwind_pr_common): Correct test
+ for barrier handlers.
+
+ Backport r171096 from mainline
+ 2011-03-17 Chung-Lin Tang <cltang@codesourcery.com>
+
+ PR target/43872
+ * config/arm/arm.c (arm_get_frame_offsets): Adjust early
+ return condition with !cfun->calls_alloca.
+
+Index: gcc-4_6-branch/gcc/builtins.c
+===================================================================
+--- gcc-4_6-branch.orig/gcc/builtins.c 2011-10-17 17:45:32.050502963 -0700
++++ gcc-4_6-branch/gcc/builtins.c 2011-10-17 17:46:11.154696878 -0700
+@@ -3972,6 +3972,7 @@
+ {
+ tree fndecl, fn;
+ enum built_in_function fcode;
++ enum machine_mode val_mode;
+ char c;
+ unsigned int dest_align;
+ rtx dest_mem, dest_addr, len_rtx;
+@@ -4006,14 +4007,14 @@
+
+ len_rtx = expand_normal (len);
+ dest_mem = get_memory_rtx (dest, len);
++ val_mode = TYPE_MODE (unsigned_char_type_node);
+
+ if (TREE_CODE (val) != INTEGER_CST)
+ {
+ rtx val_rtx;
+
+ val_rtx = expand_normal (val);
+- val_rtx = convert_to_mode (TYPE_MODE (unsigned_char_type_node),
+- val_rtx, 0);
++ val_rtx = convert_to_mode (val_mode, val_rtx, 0);
+
+ /* Assume that we can memset by pieces if we can store
+ * the coefficients by pieces (in the required modes).
+@@ -4024,8 +4025,7 @@
+ builtin_memset_read_str, &c, dest_align,
+ true))
+ {
+- val_rtx = force_reg (TYPE_MODE (unsigned_char_type_node),
+- val_rtx);
++ val_rtx = force_reg (val_mode, val_rtx);
+ store_by_pieces (dest_mem, tree_low_cst (len, 1),
+ builtin_memset_gen_str, val_rtx, dest_align,
+ true, 0);
+@@ -4051,7 +4051,8 @@
+ true))
+ store_by_pieces (dest_mem, tree_low_cst (len, 1),
+ builtin_memset_read_str, &c, dest_align, true, 0);
+- else if (!set_storage_via_setmem (dest_mem, len_rtx, GEN_INT (c),
++ else if (!set_storage_via_setmem (dest_mem, len_rtx,
++ gen_int_mode (c, val_mode),
+ dest_align, expected_align,
+ expected_size))
+ goto do_libcall;
+Index: gcc-4_6-branch/gcc/config/arm/arm.c
+===================================================================
+--- gcc-4_6-branch.orig/gcc/config/arm/arm.c 2011-10-17 17:45:41.914551883 -0700
++++ gcc-4_6-branch/gcc/config/arm/arm.c 2011-10-17 17:48:35.447412371 -0700
+@@ -6406,23 +6406,126 @@
+ HOST_WIDE_INT val = INTVAL (XEXP (*p, 1));
+ HOST_WIDE_INT low, high;
+
+- if (mode == DImode || (mode == DFmode && TARGET_SOFT_FLOAT))
+- low = ((val & 0xf) ^ 0x8) - 0x8;
+- else if (TARGET_MAVERICK && TARGET_HARD_FLOAT)
+- /* Need to be careful, -256 is not a valid offset. */
+- low = val >= 0 ? (val & 0xff) : -((-val) & 0xff);
+- else if (mode == SImode
+- || (mode == SFmode && TARGET_SOFT_FLOAT)
+- || ((mode == HImode || mode == QImode) && ! arm_arch4))
+- /* Need to be careful, -4096 is not a valid offset. */
+- low = val >= 0 ? (val & 0xfff) : -((-val) & 0xfff);
+- else if ((mode == HImode || mode == QImode) && arm_arch4)
+- /* Need to be careful, -256 is not a valid offset. */
+- low = val >= 0 ? (val & 0xff) : -((-val) & 0xff);
+- else if (GET_MODE_CLASS (mode) == MODE_FLOAT
+- && TARGET_HARD_FLOAT && TARGET_FPA)
+- /* Need to be careful, -1024 is not a valid offset. */
+- low = val >= 0 ? (val & 0x3ff) : -((-val) & 0x3ff);
++ /* Detect coprocessor load/stores. */
++ bool coproc_p = ((TARGET_HARD_FLOAT
++ && (TARGET_VFP || TARGET_FPA || TARGET_MAVERICK)
++ && (mode == SFmode || mode == DFmode
++ || (mode == DImode && TARGET_MAVERICK)))
++ || (TARGET_REALLY_IWMMXT
++ && VALID_IWMMXT_REG_MODE (mode))
++ || (TARGET_NEON
++ && (VALID_NEON_DREG_MODE (mode)
++ || VALID_NEON_QREG_MODE (mode))));
++
++ /* For some conditions, bail out when lower two bits are unaligned. */
++ if ((val & 0x3) != 0
++ /* Coprocessor load/store indexes are 8-bits + '00' appended. */
++ && (coproc_p
++ /* For DI, and DF under soft-float: */
++ || ((mode == DImode || mode == DFmode)
++ /* Without ldrd, we use stm/ldm, which does not
++ fair well with unaligned bits. */
++ && (! TARGET_LDRD
++ /* Thumb-2 ldrd/strd is [-1020,+1020] in steps of 4. */
++ || TARGET_THUMB2))))
++ return false;
++
++ /* When breaking down a [reg+index] reload address into [(reg+high)+low],
++ of which the (reg+high) gets turned into a reload add insn,
++ we try to decompose the index into high/low values that can often
++ also lead to better reload CSE.
++ For example:
++ ldr r0, [r2, #4100] // Offset too large
++ ldr r1, [r2, #4104] // Offset too large
++
++ is best reloaded as:
++ add t1, r2, #4096
++ ldr r0, [t1, #4]
++ add t2, r2, #4096
++ ldr r1, [t2, #8]
++
++ which post-reload CSE can simplify in most cases to eliminate the
++ second add instruction:
++ add t1, r2, #4096
++ ldr r0, [t1, #4]
++ ldr r1, [t1, #8]
++
++ The idea here is that we want to split out the bits of the constant
++ as a mask, rather than as subtracting the maximum offset that the
++ respective type of load/store used can handle.
++
++ When encountering negative offsets, we can still utilize it even if
++ the overall offset is positive; sometimes this may lead to an immediate
++ that can be constructed with fewer instructions.
++ For example:
++ ldr r0, [r2, #0x3FFFFC]
++
++ This is best reloaded as:
++ add t1, r2, #0x400000
++ ldr r0, [t1, #-4]
++
++ The trick for spotting this for a load insn with N bits of offset
++ (i.e. bits N-1:0) is to look at bit N; if it is set, then chose a
++ negative offset that is going to make bit N and all the bits below
++ it become zero in the remainder part.
++
++ The SIGN_MAG_LOW_ADDR_BITS macro below implements this, with respect
++ to sign-magnitude addressing (i.e. separate +- bit, or 1's complement),
++ used in most cases of ARM load/store instructions. */
++
++#define SIGN_MAG_LOW_ADDR_BITS(VAL, N) \
++ (((VAL) & ((1 << (N)) - 1)) \
++ ? (((VAL) & ((1 << ((N) + 1)) - 1)) ^ (1 << (N))) - (1 << (N)) \
++ : 0)
++
++ if (coproc_p)
++ low = SIGN_MAG_LOW_ADDR_BITS (val, 10);
++ else if (GET_MODE_SIZE (mode) == 8)
++ {
++ if (TARGET_LDRD)
++ low = (TARGET_THUMB2
++ ? SIGN_MAG_LOW_ADDR_BITS (val, 10)
++ : SIGN_MAG_LOW_ADDR_BITS (val, 8));
++ else
++ /* For pre-ARMv5TE (without ldrd), we use ldm/stm(db/da/ib)
++ to access doublewords. The supported load/store offsets are
++ -8, -4, and 4, which we try to produce here. */
++ low = ((val & 0xf) ^ 0x8) - 0x8;
++ }
++ else if (GET_MODE_SIZE (mode) < 8)
++ {
++ /* NEON element load/stores do not have an offset. */
++ if (TARGET_NEON_FP16 && mode == HFmode)
++ return false;
++
++ if (TARGET_THUMB2)
++ {
++ /* Thumb-2 has an asymmetrical index range of (-256,4096).
++ Try the wider 12-bit range first, and re-try if the result
++ is out of range. */
++ low = SIGN_MAG_LOW_ADDR_BITS (val, 12);
++ if (low < -255)
++ low = SIGN_MAG_LOW_ADDR_BITS (val, 8);
++ }
++ else
++ {
++ if (mode == HImode || mode == HFmode)
++ {
++ if (arm_arch4)
++ low = SIGN_MAG_LOW_ADDR_BITS (val, 8);
++ else
++ {
++ /* The storehi/movhi_bytes fallbacks can use only
++ [-4094,+4094] of the full ldrb/strb index range. */
++ low = SIGN_MAG_LOW_ADDR_BITS (val, 12);
++ if (low == 4095 || low == -4095)
++ return false;
++ }
++ }
++ else
++ low = SIGN_MAG_LOW_ADDR_BITS (val, 12);
++ }
++ }
+ else
+ return false;
+
+@@ -15415,7 +15518,10 @@
+ offsets->soft_frame = offsets->saved_regs + CALLER_INTERWORKING_SLOT_SIZE;
+ /* A leaf function does not need any stack alignment if it has nothing
+ on the stack. */
+- if (leaf && frame_size == 0)
++ if (leaf && frame_size == 0
++ /* However if it calls alloca(), we have a dynamically allocated
++ block of BIGGEST_ALIGNMENT on stack, so still do stack alignment. */
++ && ! cfun->calls_alloca)
+ {
+ offsets->outgoing_args = offsets->soft_frame;
+ offsets->locals_base = offsets->soft_frame;
+Index: gcc-4_6-branch/gcc/config/arm/arm.h
+===================================================================
+--- gcc-4_6-branch.orig/gcc/config/arm/arm.h 2011-10-17 17:45:41.910551858 -0700
++++ gcc-4_6-branch/gcc/config/arm/arm.h 2011-10-17 17:48:35.447412371 -0700
+@@ -2041,7 +2041,8 @@
+ /* Try to generate sequences that don't involve branches, we can then use
+ conditional instructions */
+ #define BRANCH_COST(speed_p, predictable_p) \
+- (TARGET_32BIT ? 4 : (optimize > 0 ? 2 : 0))
++ (TARGET_32BIT ? (TARGET_THUMB2 && !speed_p ? 1 : 4) \
++ : (optimize > 0 ? 2 : 0))
+ \f
+ /* Position Independent Code. */
+ /* We decide which register to use based on the compilation options and
+Index: gcc-4_6-branch/gcc/config/arm/arm.md
+===================================================================
+--- gcc-4_6-branch.orig/gcc/config/arm/arm.md 2011-10-17 17:46:11.002696119 -0700
++++ gcc-4_6-branch/gcc/config/arm/arm.md 2011-10-17 17:46:11.202697111 -0700
+@@ -6187,7 +6187,7 @@
+ [(match_operand:DF 0 "arm_reload_memory_operand" "=o")
+ (match_operand:DF 1 "s_register_operand" "r")
+ (match_operand:SI 2 "s_register_operand" "=&r")]
+- "TARGET_32BIT"
++ "TARGET_THUMB2"
+ "
+ {
+ enum rtx_code code = GET_CODE (XEXP (operands[0], 0));
+@@ -8359,7 +8359,8 @@
+ rtx reg = gen_reg_rtx (SImode);
+
+ emit_insn (gen_addsi3 (reg, operands[0],
+- GEN_INT (-INTVAL (operands[1]))));
++ gen_int_mode (-INTVAL (operands[1]),
++ SImode)));
+ operands[0] = reg;
+ }
+
+Index: gcc-4_6-branch/gcc/config/arm/unwind-arm.c
+===================================================================
+--- gcc-4_6-branch.orig/gcc/config/arm/unwind-arm.c 2011-10-17 17:45:41.390549278 -0700
++++ gcc-4_6-branch/gcc/config/arm/unwind-arm.c 2011-10-17 17:46:11.000000000 -0700
+@@ -1196,8 +1196,6 @@
+ ucbp->barrier_cache.bitpattern[4] = (_uw) &data[1];
+
+ if (data[0] & uint32_highbit)
+- phase2_call_unexpected_after_unwind = 1;
+- else
+ {
+ data += rtti_count + 1;
+ /* Setup for entry to the handler. */
+@@ -1207,6 +1205,8 @@
+ _Unwind_SetGR (context, 0, (_uw) ucbp);
+ return _URC_INSTALL_CONTEXT;
+ }
++ else
++ phase2_call_unexpected_after_unwind = 1;
+ }
+ if (data[0] & uint32_highbit)
+ data++;
+Index: gcc-4_6-branch/gcc/fold-const.c
+===================================================================
+--- gcc-4_6-branch.orig/gcc/fold-const.c 2011-10-17 17:45:32.050502963 -0700
++++ gcc-4_6-branch/gcc/fold-const.c 2011-10-17 17:46:11.178696990 -0700
+@@ -13788,7 +13788,8 @@
+ if (TREE_CODE_CLASS (code) != tcc_type
+ && TREE_CODE_CLASS (code) != tcc_declaration
+ && code != TREE_LIST
+- && code != SSA_NAME)
++ && code != SSA_NAME
++ && CODE_CONTAINS_STRUCT (code, TS_COMMON))
+ fold_checksum_tree (TREE_CHAIN (expr), ctx, ht);
+ switch (TREE_CODE_CLASS (code))
+ {
+Index: gcc-4_6-branch/gcc/testsuite/gcc.target/arm/pr40887.c
+===================================================================
+--- gcc-4_6-branch.orig/gcc/testsuite/gcc.target/arm/pr40887.c 2011-06-24 08:13:47.000000000 -0700
++++ gcc-4_6-branch/gcc/testsuite/gcc.target/arm/pr40887.c 2011-10-17 17:46:11.182697014 -0700
+@@ -1,5 +1,6 @@
+ /* { dg-options "-O2 -march=armv5te" } */
+ /* { dg-final { scan-assembler "blx" } } */
++/* { dg-prune-output "switch .* conflicts with" } */
+
+ int (*indirect_func)();
+
+Index: gcc-4_6-branch/gcc/testsuite/gcc.target/arm/pr42575.c
+===================================================================
+--- gcc-4_6-branch.orig/gcc/testsuite/gcc.target/arm/pr42575.c 2011-06-24 08:13:47.000000000 -0700
++++ gcc-4_6-branch/gcc/testsuite/gcc.target/arm/pr42575.c 2011-10-17 17:46:11.182697014 -0700
+@@ -1,4 +1,4 @@
+-/* { dg-options "-O2 -march=armv7-a" } */
++/* { dg-options "-O2" } */
+ /* Make sure RA does good job allocating registers and avoids
+ unnecessary moves. */
+ /* { dg-final { scan-assembler-not "mov" } } */
+Index: gcc-4_6-branch/gcc/testsuite/gcc.target/arm/pr43698.c
+===================================================================
+--- gcc-4_6-branch.orig/gcc/testsuite/gcc.target/arm/pr43698.c 2011-06-24 08:13:47.000000000 -0700
++++ gcc-4_6-branch/gcc/testsuite/gcc.target/arm/pr43698.c 2011-10-17 17:46:11.182697014 -0700
+@@ -1,5 +1,5 @@
+ /* { dg-do run } */
+-/* { dg-options "-Os -march=armv7-a" } */
++/* { dg-options "-Os" } */
+ #include <stdint.h>
+ #include <stdlib.h>
+
+Index: gcc-4_6-branch/gcc/testsuite/gcc.target/arm/pr44788.c
+===================================================================
+--- gcc-4_6-branch.orig/gcc/testsuite/gcc.target/arm/pr44788.c 2011-06-24 08:13:47.000000000 -0700
++++ gcc-4_6-branch/gcc/testsuite/gcc.target/arm/pr44788.c 2011-10-17 17:46:11.182697014 -0700
+@@ -1,6 +1,6 @@
+ /* { dg-do compile } */
+ /* { dg-require-effective-target arm_thumb2_ok } */
+-/* { dg-options "-Os -fno-strict-aliasing -fPIC -mthumb -march=armv7-a -mfpu=vfp3 -mfloat-abi=softfp" } */
++/* { dg-options "-Os -fno-strict-aliasing -fPIC -mthumb -mfpu=vfp3 -mfloat-abi=softfp" } */
+
+ void joint_decode(float* mlt_buffer1, int t) {
+ int i;
+Index: gcc-4_6-branch/gcc/testsuite/gcc.target/arm/sync-1.c
+===================================================================
+--- gcc-4_6-branch.orig/gcc/testsuite/gcc.target/arm/sync-1.c 2011-06-24 08:13:47.000000000 -0700
++++ gcc-4_6-branch/gcc/testsuite/gcc.target/arm/sync-1.c 2011-10-17 17:46:11.182697014 -0700
+@@ -1,5 +1,6 @@
+-/* { dg-do run } */
+-/* { dg-options "-O2 -march=armv7-a" } */
++
++/* { dg-do run { target sync_int_long } } */
++/* { dg-options "-O2" } */
+
+ volatile int mem;
+
--
1.7.5.4
^ permalink raw reply related
* [PATCH 2/3] gcc-4.6: Upgrade SRCREV to latest FSF 4.6 branch
From: Khem Raj @ 2011-10-18 1:39 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1318901607.git.raj.khem@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-devtools/gcc/gcc-4.6.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc b/meta/recipes-devtools/gcc/gcc-4.6.inc
index 8ca3174..0fb6287 100644
--- a/meta/recipes-devtools/gcc/gcc-4.6.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.6.inc
@@ -18,7 +18,7 @@ PV = "4.6.1+svnr${SRCPV}"
BINV = "4.6.2"
-SRCREV = 178924
+SRCREV = 180099
BRANCH = "gcc-4_6-branch"
FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/gcc-4.6' ], d)}"
--
1.7.5.4
^ permalink raw reply related
* [PATCH 1/3] bluez4: Add glib-2.0 to DEPENDS
From: Khem Raj @ 2011-10-18 1:39 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1318901607.git.raj.khem@gmail.com>
Fixes
| attrib/utils.c:25:18: fatal error: glib.h: No such file or directory
| compilation terminated.
| make[1]: *** [attrib/utils.o] Error 1
| make[1]: *** Waiting for unfinished jobs....
| attrib/interactive.c:27:18: fatal error: glib.h: No such file or
directory
| compilation terminated.
| make[1]: *** [attrib/interactive.o] Error 1
| make: *** [all] Error 2
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-connectivity/bluez/bluez4.inc | 2 +-
meta/recipes-connectivity/bluez/bluez4_4.96.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-connectivity/bluez/bluez4.inc b/meta/recipes-connectivity/bluez/bluez4.inc
index fc515f6..9158687 100644
--- a/meta/recipes-connectivity/bluez/bluez4.inc
+++ b/meta/recipes-connectivity/bluez/bluez4.inc
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \
file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e \
file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191"
-DEPENDS = "udev alsa-lib libusb dbus-glib"
+DEPENDS = "udev alsa-lib libusb dbus-glib glib-2.0"
RDEPENDS_${PN}-dev = "bluez-hcidump"
ASNEEDED = ""
diff --git a/meta/recipes-connectivity/bluez/bluez4_4.96.bb b/meta/recipes-connectivity/bluez/bluez4_4.96.bb
index 52268cf..88ec7a4 100644
--- a/meta/recipes-connectivity/bluez/bluez4_4.96.bb
+++ b/meta/recipes-connectivity/bluez/bluez4_4.96.bb
@@ -1,6 +1,6 @@
require bluez4.inc
-PR = "r3"
+PR = "r4"
SRC_URI += "file://bluetooth.conf"
--
1.7.5.4
^ permalink raw reply related
* [PATCH 0/3] gcc update and bug fix
From: Khem Raj @ 2011-10-18 1:38 UTC (permalink / raw)
To: openembedded-core
This patchset does two things for gcc
1. Updates to latest from FSF gcc-4_6-branch
2. Backport the fix for PR46934
The changes that come from FSF gcc are listed here
http://sakrah.homelinux.org/files/gcc-4.6-ChangeLog-r180099_r180099.txt
3. Bluez4 needed glib.h therefore depend on glib-2.0
The following changes since commit 8bc098475f58b60bfb24ec0fd338e49ac2387c50:
gcc-4.6: Backport PR46934 fix (2011-10-17 18:00:29 -0700)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib kraj/gcc-update
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=kraj/gcc-update
Khem Raj (3):
bluez4: Add glib-2.0 to DEPENDS
gcc-4.6: Upgrade SRCREV to latest FSF 4.6 branch
gcc-4.6: Backport PR46934 fix
meta/recipes-connectivity/bluez/bluez4.inc | 2 +-
meta/recipes-connectivity/bluez/bluez4_4.96.bb | 2 +-
meta/recipes-devtools/gcc/gcc-4.6.inc | 5 +-
meta/recipes-devtools/gcc/gcc-4.6/pr46934.patch | 392 +++++++++++++++++++++++
4 files changed, 397 insertions(+), 4 deletions(-)
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6/pr46934.patch
--
1.7.5.4
^ permalink raw reply
* [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
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