[OE-core] [PATCH] eglibc-2.14: add patch to fix libdl crash
From: Klaus Kurzmann m...@fluxnetz.de
* Without this patch programs using alsa-lib crash (alsamixer for example).
* This patch is taken verbatim from ArchLinux.
Signed-off-by: Klaus Kurzmann m...@fluxnetz.de
---
.../eglibc-2.14/glibc-2.14-libdl-crash.patch | 132
meta/recipes-core/eglibc/eglibc_2.14.bb|3 +-
2 files changed, 134 insertions(+), 1 deletions(-)
create mode 100644
meta/recipes-core/eglibc/eglibc-2.14/glibc-2.14-libdl-crash.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.14/glibc-2.14-libdl-crash.patch
b/meta/recipes-core/eglibc/eglibc-2.14/glibc-2.14-libdl-crash.patch
new file mode 100644
index 000..ee29f8c
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-2.14/glibc-2.14-libdl-crash.patch
@@ -0,0 +1,132 @@
+diff --git a/elf/dl-close.c b/elf/dl-close.c
+index 73b2a2f..9bd91e3 100644
+--- a/elf/dl-close.c
b/elf/dl-close.c
+@@ -1,5 +1,5 @@
+ /* Close a shared object opened by `_dl_open'.
+- Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc.
++ Copyright (C) 1996-2007, 2009, 2010 Free Software Foundation, Inc.
+This file is part of the GNU C Library.
+
+The GNU C Library is free software; you can redistribute it and/or
+@@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map)
+ if (map-l_direct_opencount 0 || map-l_type != lt_loaded
+ || dl_close_state != not_pending)
+ {
+- if (map-l_direct_opencount == 0)
+- {
+-if (map-l_type == lt_loaded)
+- dl_close_state = rerun;
+-else if (map-l_type == lt_library)
+- {
+-struct link_map **oldp = map-l_initfini;
+-map-l_initfini = map-l_orig_initfini;
+-_dl_scope_free (oldp);
+- }
+- }
++ if (map-l_direct_opencount == 0 map-l_type == lt_loaded)
++ dl_close_state = rerun;
+
+ /* There are still references to this object. Do nothing more. */
+ if (__builtin_expect (GLRO(dl_debug_mask) DL_DEBUG_FILES, 0))
+diff --git a/elf/dl-deps.c b/elf/dl-deps.c
+index 9e30594..3890d00 100644
+--- a/elf/dl-deps.c
b/elf/dl-deps.c
+@@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map,
+ nneeded * sizeof needed[0]);
+ atomic_write_barrier ();
+ l-l_initfini = l_initfini;
++l-l_free_initfini = 1;
+ }
+
+ /* If we have no auxiliary objects just go on to the next map. */
+@@ -681,6 +682,7 @@ Filters not supported with LD_TRACE_PRELINKING));
+ l_initfini[nlist] = NULL;
+ atomic_write_barrier ();
+ map-l_initfini = l_initfini;
++ map-l_free_initfini = 1;
+ if (l_reldeps != NULL)
+ {
+ atomic_write_barrier ();
+@@ -689,5 +691,5 @@ Filters not supported with LD_TRACE_PRELINKING));
+ _dl_scope_free (old_l_reldeps);
+ }
+ if (old_l_initfini != NULL)
+- map-l_orig_initfini = old_l_initfini;
++_dl_scope_free (old_l_initfini);
+ }
+diff --git a/elf/dl-libc.c b/elf/dl-libc.c
+index 7be9483..a13fce3 100644
+--- a/elf/dl-libc.c
b/elf/dl-libc.c
+@@ -265,13 +265,13 @@ libc_freeres_fn (free_mem)
+
+ for (Lmid_t ns = 0; ns GL(dl_nns); ++ns)
+ {
+- /* Remove all additional names added to the objects. */
+ for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l-l_next)
+ {
+ struct libname_list *lnp = l-l_libname-next;
+
+ l-l_libname-next = NULL;
+
++/* Remove all additional names added to the objects. */
+ while (lnp != NULL)
+ {
+ struct libname_list *old = lnp;
+@@ -279,6 +279,10 @@ libc_freeres_fn (free_mem)
+ if (! old-dont_free)
+ free (old);
+ }
++
++/* Free the initfini dependency list. */
++if (l-l_free_initfini)
++ free (l-l_initfini);
+ }
+
+ if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0
+diff --git a/elf/rtld.c b/elf/rtld.c
+index 4a9109e..617e30e 100644
+--- a/elf/rtld.c
b/elf/rtld.c
+@@ -2251,6 +2251,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit
interface: %s; ignored.\n,
+ lnp-dont_free = 1;
+ lnp = lnp-next;
+ }
++l-l_free_initfini = 0;
+
+ if (l != GL(dl_rtld_map))
+ _dl_relocate_object (l, l-l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0,
+diff --git a/include/link.h b/include/link.h
+index e877104..051b99a 100644
+--- a/include/link.h
b/include/link.h
+@@ -1,6 +1,6 @@
+ /* Data structure for communication from the run-time dynamic linker for
+loaded ELF shared objects.
+- Copyright (C) 1995-2006, 2007, 2009, 2010, 2011 Free Software Foundation,
Inc.
++ Copyright (C) 1995-2006, 2007, 2009, 2010 Free Software Foundation, Inc.
+This file is part of the GNU C Library.
+
+The GNU C Library is free software; you can redistribute it and/or
+@@ -192,6 +192,9 @@ struct link_map
+during LD_TRACE_PRELINKING=1
+
Re: [OE-core] [oe-core][PATCH 00/13] Xorg related changes
On Fri, Sep 30, 2011 at 12:28:39PM +0100, Richard Purdie wrote: On Fri, 2011-09-30 at 09:26 +0200, Martin Jansa wrote: Hi, this patchset brings meta-oe and oe-core xorg stuff together and most of xorg recipes will be removed from meta-oe (sending another pull request now). This step is needed to be able to separate common x11 to meta-x11 or whatever later. The following changes since commit 96241de59fdf548ae0f80cc9e4668f9ba11924ef: Fix flac build on e500mc cores (2011-09-29 19:31:38 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib jansa/x11 http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/x11 Martin Jansa (13): xorg-driver: rename .inc files and merge some changes from meta-oe libxft, libxrender, renderproto: add native BBCLASSEXTEND xorg-app-common: merge some changes from meta-oe xf86-video-omapfb: bump SRCREV and add patch from meta-oe rgb: import from meta-oe layer libdrm: improve packaging I'll take these ones. I've queued them on a master-next branch for now as I want to give other people some time to comment on them. If there isn't negative feedback I'll take them in ~24 hours. I've given feedback on why I think these need further work: xserver-xf86: upgrade to 1.11.0 and move shared definitions to .inc files xserver-xf86-dri-lite: remove COMPATIBLE_HOST libx11: upgrade to 1.4.4 default-providers: define PREFERRED_PROVIDER_virtual/libx11-native xserver-nodm-init: merge some changes from meta-oe glx-use-tls: add from meta-oe layer mesa: upgrade to 7.11 I've updated jansa/x11 branch according to your comments, now 17 patches instead of 7 :). Before I send updated pull-request, what do you think about renaming xserver-xf86 to xserver-xorg which is closer to upstream naming and that's how it's named in OE-classic and meta-oe? It would make meta-oe transition easier and better to do it now then convert meta-oe to xserver-xf86 and then rename it back later. Regards, -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [oe-core][PATCH 00/13] Xorg related changes
On Mon, 2011-10-03 at 12:38 +0200, Martin Jansa wrote: On Fri, Sep 30, 2011 at 12:28:39PM +0100, Richard Purdie wrote: On Fri, 2011-09-30 at 09:26 +0200, Martin Jansa wrote: Hi, this patchset brings meta-oe and oe-core xorg stuff together and most of xorg recipes will be removed from meta-oe (sending another pull request now). This step is needed to be able to separate common x11 to meta-x11 or whatever later. The following changes since commit 96241de59fdf548ae0f80cc9e4668f9ba11924ef: Fix flac build on e500mc cores (2011-09-29 19:31:38 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib jansa/x11 http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/x11 Martin Jansa (13): xorg-driver: rename .inc files and merge some changes from meta-oe libxft, libxrender, renderproto: add native BBCLASSEXTEND xorg-app-common: merge some changes from meta-oe xf86-video-omapfb: bump SRCREV and add patch from meta-oe rgb: import from meta-oe layer libdrm: improve packaging I'll take these ones. I've queued them on a master-next branch for now as I want to give other people some time to comment on them. If there isn't negative feedback I'll take them in ~24 hours. I've given feedback on why I think these need further work: xserver-xf86: upgrade to 1.11.0 and move shared definitions to .inc files xserver-xf86-dri-lite: remove COMPATIBLE_HOST libx11: upgrade to 1.4.4 default-providers: define PREFERRED_PROVIDER_virtual/libx11-native xserver-nodm-init: merge some changes from meta-oe glx-use-tls: add from meta-oe layer mesa: upgrade to 7.11 I've updated jansa/x11 branch according to your comments, now 17 patches instead of 7 :). Before I send updated pull-request, what do you think about renaming xserver-xf86 to xserver-xorg which is closer to upstream naming and that's how it's named in OE-classic and meta-oe? It would make meta-oe transition easier and better to do it now then convert meta-oe to xserver-xf86 and then rename it back later. I'm ok with renaming it. I think the historical reasons for the differences don't matter now. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [RFC] .la files cleanup
Proposal: extend some bbclass with a task to remove unused .la files
Rationale: There are lots of recipes, which install tons of .la files
(thanks libtool),
but then do not ship them (correctly as most of them are unused in
real systems).
My proposal would be to include a special task or a
do_install_append() part that
will remove specified .la files. (like ${libdir}/xorg/modules/*/.la,
${libdir}/matchbox-panel/*.la, etc.). I see this usually done in
do_install or in special do_install_append
parts, but I think it would be better to handle this globally.
--
With best wishes
Dmitry
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] oe-core/meta-oe PN clash
Hello, I've stumbled upon two different packages with same PN (screenshot): One is a sato-related screenshoter from oe-core, second is a e17 screenshot module from meta-efl. I'd propose to rename a sato screenshot package, since e17 one depends on PN being equal to internal module name in several places. -- With best wishes Dmitry ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC] .la files cleanup
On Mon, 2011-10-03 at 14:58 +0400, Dmitry Eremin-Solenikov wrote:
Proposal: extend some bbclass with a task to remove unused .la files
Rationale: There are lots of recipes, which install tons of .la files
(thanks libtool),
but then do not ship them (correctly as most of them are unused in
real systems).
My proposal would be to include a special task or a
do_install_append() part that
will remove specified .la files. (like ${libdir}/xorg/modules/*/.la,
${libdir}/matchbox-panel/*.la, etc.). I see this usually done in
do_install or in special do_install_append
parts, but I think it would be better to handle this globally.
I think the simple append to the recipes concerned is just as simple as
any addition to core classes to try and do this generically...
Cheers,
Richard
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCHv2 00/30] Xorg related changes
Hi,
this patchset brings meta-oe and oe-core xorg stuff together and most of
xorg recipes will be removed from meta-oe (sending another pull request now).
This step is needed to be able to separate common x11 to meta-x11 or whatever
later.
The following changes since commit c54c1280fc0d06a53e23339c3913ec88eead13d9:
base.bbclass: Drop unneeded dependency (2011-09-30 11:34:44 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib jansa/x11
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/x11
Martin Jansa (29):
libxft, libxrender, renderproto: add native BBCLASSEXTEND
xorg-app-common: merge some changes from meta-oe
xorg-driver: rename .inc files and merge some changes from meta-oe
xf86-video-omapfb: bump SRCREV and add patch from meta-oe
libdrm: improve packaging
rgb: import from meta-oe layer
xserver-xf86-dri-lite: remove old git recipe
xserver-xf86: improve packaging and move shared definitions to .inc
files
xserver-xf86: add new version 1.11.1
xserver-xf86: remove old 1.10.1 version
xserver-xf86-dri-lite: remove COMPATIBLE_HOST
xserver-xf86: drop unused files
xserver-xf86: move patches to xserver-xf86-dri-lite-1.11.1 and use
same directory from xserver-xf86-lite recipe
xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite
xserver-kdrive: drop unused files (same files are in
xserver-kdrive-1.7.99.2 directory
xorg-driver-common: bump INC_PR to rebuild drivers agains new
xserver-xorg ABI
libx11: package xcb, merge few changes from meta-oe
libx11: add new version 1.4.4
libx11: remove older 1.3.4
libx11: drop old 1.2.2 git version
libx11-trim: move files for libx11-trim from libx11-1.3.4 to
libx11-trim-1.3.4
libx11-diet: move old patches used only by libx11-diet-1.3 to
separate directory
libx11-diet: add SRC_URI checksums
xserver-nodm-init: merge some changes from meta-oe
glx-use-tls: add from meta-oe layer
mesa: add mesa-dri.inc and mesa-xlib.inc with shared options, move
uclibc.patch
mesa-dri-glsl-native: drop recipe which wasn't usefull since 7.8.2
was removed
mesa: add new version 7.11
mesa: drop older 7.10.2 and 7.7+git recipes
Richard Purdie (1):
xserver/mesa: Bump PR after libdrm packaging changes
meta/classes/glx-use-tls.bbclass |7 +
meta/conf/distro/include/default-providers.inc |4 +-
.../conf/distro/include/distro_tracking_fields.inc | 20 +-
meta/conf/machine/qemux86-64.conf |6 +-
meta/conf/machine/qemux86.conf |6 +-
meta/conf/multilib.conf|2 +-
meta/recipes-graphics/drm/libdrm.inc |7 +-
meta/recipes-graphics/drm/libdrm_2.4.26.bb |2 +-
meta/recipes-graphics/drm/libdrm_git.bb|2 +-
meta/recipes-graphics/mesa/mesa-7.11.inc | 15 +
meta/recipes-graphics/mesa/mesa-common.inc | 36 ++-
.../mesa/mesa-dri-glsl-native_7.11.bb | 28 +
.../mesa/mesa-dri-glsl-native_7.8.2.bb | 27 -
meta/recipes-graphics/mesa/mesa-dri.inc| 22 +
meta/recipes-graphics/mesa/mesa-dri/cross2.patch | 46 --
meta/recipes-graphics/mesa/mesa-dri/crossfix.patch | 18 -
meta/recipes-graphics/mesa/mesa-dri/i586/matypes.h | 162 --
meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb | 40 --
meta/recipes-graphics/mesa/mesa-dri_7.11.bb|4 +
meta/recipes-graphics/mesa/mesa-dri_git.bb | 57 --
meta/recipes-graphics/mesa/mesa-xlib.inc |1 +
meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb | 22 -
meta/recipes-graphics/mesa/mesa-xlib_7.11.bb |4 +
.../mesa/{mesa-dri = mesa}/uclibc.patch |0
.../x11-common/xserver-nodm-init/xserver-nodm | 30 +-
meta/recipes-graphics/xorg-app/rgb_1.0.4.bb| 10 +
meta/recipes-graphics/xorg-app/xorg-app-common.inc | 10 +-
.../xorg-driver/xf86-input-evdev_2.6.0.bb |4 +-
.../xorg-driver/xf86-input-keyboard_1.6.0.bb |4 +-
.../xorg-driver/xf86-input-keyboard_git.bb |3 +-
.../xorg-driver/xf86-input-mouse_1.7.0.bb |4 +-
.../xorg-driver/xf86-input-mouse_git.bb|4 +-
.../xorg-driver/xf86-input-synaptics_1.4.0.bb |4 +-
.../xorg-driver/xf86-input-synaptics_git.bb|3 +-
.../xorg-driver/xf86-input-vmmouse_12.7.0.bb |4 +-
.../xorg-driver/xf86-video-intel_2.15.0.bb |4 +-
.../xorg-driver/xf86-video-intel_git.bb|4 +-
.../0004-Attempt-to-fix-VRFB.patch | 325 +++
.../xorg-driver/xf86-video-omapfb_git.bb | 20 +-
.../xorg-driver/xf86-video-vesa_2.3.0.bb |4 +-
.../xorg-driver/xf86-video-vmware_11.0.3.bb|4 +-
...86-driver-common.inc = xorg-driver-common.inc} | 14 +-
...xf86-input-common.inc = xorg-driver-input.inc} |3 +-
[OE-core] [oe-core][PATCHv2 01/30] libxft, libxrender, renderproto: add native BBCLASSEXTEND
From: Martin Jansa martin.ja...@gmail.com
Signed-off-by: Martin Jansa martin.ja...@gmail.com
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb |2 ++
meta/recipes-graphics/xorg-lib/libxrender_0.9.6.bb |2 +-
.../xorg-proto/renderproto_0.11.1.bb |2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb
b/meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb
index ac7dfb1..0fb10e6 100644
--- a/meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb
@@ -23,6 +23,8 @@ PE = 1
XORG_PN = libXft
+BBCLASSEXTEND = native nativesdk
+
python () {
if bb.data.getVar('DEBIAN_NAMES', d, 1):
bb.data.setVar('PKG_${PN}', '${MLPREFIX}libxft2', d)
diff --git a/meta/recipes-graphics/xorg-lib/libxrender_0.9.6.bb
b/meta/recipes-graphics/xorg-lib/libxrender_0.9.6.bb
index a5c5ead..893ea14 100644
--- a/meta/recipes-graphics/xorg-lib/libxrender_0.9.6.bb
+++ b/meta/recipes-graphics/xorg-lib/libxrender_0.9.6.bb
@@ -18,7 +18,7 @@ PE = 1
XORG_PN = libXrender
-BBCLASSEXTEND = nativesdk
+BBCLASSEXTEND = native nativesdk
SRC_URI[md5sum] = 3b3b7d076c2384b6c600c0b5f4ba971f
SRC_URI[sha256sum] =
7f58b1e263109e0a873eef8423aa14733a5499befbe645053aa622ed1f3ea668
diff --git a/meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb
b/meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb
index a352b1e..5eb06cb 100644
--- a/meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb
+++ b/meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb
@@ -14,7 +14,7 @@ CONFLICTS = renderext
PR = r0
PE = 1
-BBCLASSEXTEND = nativesdk
+BBCLASSEXTEND = native nativesdk
SRC_URI[md5sum] = a914ccc1de66ddeb4b611c6b0686e274
SRC_URI[sha256sum] =
06735a5b92b20759204e4751ecd6064a2ad8a6246bb65b3078b862a00def2537
--
1.7.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCHv2 03/30] xorg-driver: rename .inc files and merge some changes from meta-oe
From: Martin Jansa martin.ja...@gmail.com
* use INC_PR
* use BPN directly instead of XORG_PN
Signed-off-by: Martin Jansa martin.ja...@gmail.com
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
.../xorg-driver/xf86-input-evdev_2.6.0.bb |4 ++--
.../xorg-driver/xf86-input-keyboard_1.6.0.bb |4 ++--
.../xorg-driver/xf86-input-keyboard_git.bb |3 ++-
.../xorg-driver/xf86-input-mouse_1.7.0.bb |4 +++-
.../xorg-driver/xf86-input-mouse_git.bb|4 ++--
.../xorg-driver/xf86-input-synaptics_1.4.0.bb |4 +++-
.../xorg-driver/xf86-input-synaptics_git.bb|3 ++-
.../xorg-driver/xf86-input-vmmouse_12.7.0.bb |4 ++--
.../xorg-driver/xf86-video-intel_2.15.0.bb |4 ++--
.../xorg-driver/xf86-video-intel_git.bb|4 ++--
.../xorg-driver/xf86-video-omapfb_git.bb |4 ++--
.../xorg-driver/xf86-video-vesa_2.3.0.bb |4 +++-
.../xorg-driver/xf86-video-vmware_11.0.3.bb|4 ++--
...86-driver-common.inc = xorg-driver-common.inc} | 14 +++---
...xf86-input-common.inc = xorg-driver-input.inc} |3 +--
...xf86-video-common.inc = xorg-driver-video.inc} |2 +-
16 files changed, 38 insertions(+), 31 deletions(-)
rename meta/recipes-graphics/xorg-driver/{xf86-driver-common.inc =
xorg-driver-common.inc} (66%)
rename meta/recipes-graphics/xorg-driver/{xf86-input-common.inc =
xorg-driver-input.inc} (81%)
rename meta/recipes-graphics/xorg-driver/{xf86-video-common.inc =
xorg-driver-video.inc} (65%)
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.6.0.bb
b/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.6.0.bb
index a37be17..db6a3b3 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.6.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.6.0.bb
@@ -1,4 +1,4 @@
-require xf86-input-common.inc
+require xorg-driver-input.inc
SUMMARY = X.Org X server -- event devices (evdev) input driver
@@ -14,7 +14,7 @@ xorg.conf for each input device that will use this driver.
LIC_FILES_CHKSUM = file://COPYING;md5=fefe33b1cf0cacba0e72e3b0fa0f0e16
-PR = r0
+PR = ${INC_PR}.0
SRC_URI[md5sum] = f33fe9413bde68936d8909206a13e8a1
SRC_URI[sha256sum] =
b0e7f3991a8183a4743196c3e16d7184d439b80bf43653aa2f45b0756a6753ac
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.6.0.bb
b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.6.0.bb
index 9b1441d..e374fbd 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.6.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.6.0.bb
@@ -1,4 +1,4 @@
-require xf86-input-common.inc
+require xorg-driver-input.inc
SUMMARY = X.Org X server -- keyboard input driver
@@ -9,7 +9,7 @@ core keyboard.
LIC_FILES_CHKSUM = file://COPYING;md5=ea2099d24ac9e316a6d4b9f20b3d4e10
-PR = r0
+PR = ${INC_PR}.0
SRC_URI[md5sum] = e2abe9f13e526a73cb68a7d257546eba
SRC_URI[sha256sum] =
c46c790fec905d696573b7a374b10ab8b4389112a8f69993fe011006c99e858e
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb
b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb
index fe8cee9..5bc0558 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb
@@ -1,4 +1,4 @@
-require xf86-input-common.inc
+require xorg-driver-input.inc
SUMMARY = X.Org X server -- keyboard input driver
@@ -9,6 +9,7 @@ core keyboard.
SRCREV = 3e28d68b50d291938734e9684b8296ca864f3892
PV = 1.3.2+git${SRCPV}
+PR = ${INC_PR}.0
SRC_URI =
git://anongit.freedesktop.org/git/xorg/driver/xf86-input-keyboard;protocol=git
S = ${WORKDIR}/git
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.7.0.bb
b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.7.0.bb
index fbc2c66..b4918ef 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.7.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.7.0.bb
@@ -1,4 +1,4 @@
-require xf86-input-common.inc
+require xorg-driver-input.inc
SUMMARY = X.Org X server -- mouse input driver
@@ -10,5 +10,7 @@ driver.
LIC_FILES_CHKSUM = file://COPYING;md5=237eb1d1a602d29ef2af62d8fba60f19
+PR = ${INC_PR}.0
+
SRC_URI[md5sum] = 7f31472689c15b6de62eff04d0fb57d7
SRC_URI[sha256sum] =
4e989542b5e9e0c5f9087288b18e70de1064dd27c83a4bc6dce58f3ea9d74994
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb
b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb
index b4dd1ed..392892e 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb
@@ -1,4 +1,4 @@
-require xf86-input-common.inc
+require xorg-driver-input.inc
SUMMARY = X.Org X server -- mouse input driver
@@ -10,7 +10,7 @@ driver.
SRCREV = ea5cfe804e112f320f14ad896c7802d53551d3e6
PV =
[OE-core] [oe-core][PATCHv2 04/30] xf86-video-omapfb: bump SRCREV and add patch from meta-oe
From: Martin Jansa martin.ja...@gmail.com
Signed-off-by: Martin Jansa martin.ja...@gmail.com
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
.../0004-Attempt-to-fix-VRFB.patch | 325
.../xorg-driver/xf86-video-omapfb_git.bb | 20 +-
2 files changed, 335 insertions(+), 10 deletions(-)
create mode 100644
meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-Attempt-to-fix-VRFB.patch
diff --git
a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-Attempt-to-fix-VRFB.patch
b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-Attempt-to-fix-VRFB.patch
new file mode 100644
index 000..6b59b9f
--- /dev/null
+++
b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-Attempt-to-fix-VRFB.patch
@@ -0,0 +1,325 @@
+From 9f034f7a83751e4d1bbff6dd742d54bd96d38230 Mon Sep 17 00:00:00 2001
+From: Eino-Ville Talvala talv...@stanford.edu
+Date: Tue, 23 Aug 2011 18:37:01 +0200
+Subject: [PATCH] Attempt to fix VRFB
+
+Upstream-Status: Pending
+
+http://dominion.thruhere.net/git/cgit.cgi/xf86-video-omapfb/commit/?h=koen/fixupsid=6833fc9f795265e4943d248103fbaf3463b515d6
+
+Signed-off-by: Sebastian Krzyszkowiak d...@dosowisko.net
+
+---
+ src/image-format-conversions.c |4 +-
+ src/image-format-conversions.h |2 +-
+ src/omapfb-driver.c| 28 +--
+ src/omapfb-xv-blizzard.c |1 +
+ src/omapfb-xv-generic.c| 72 +++
+ src/omapfb-xv.c|3 ++
+ 6 files changed, 88 insertions(+), 22 deletions(-)
+
+diff --git a/src/image-format-conversions.c b/src/image-format-conversions.c
+index dcefa9b..d43427d 100644
+--- a/src/image-format-conversions.c
b/src/image-format-conversions.c
+@@ -38,13 +38,13 @@
+ #include image-format-conversions.h
+
+ /* Basic line-based copy for packed formats */
+-void packed_line_copy(int w, int h, int stride, uint8_t *src, uint8_t *dest)
++void packed_line_copy(int w, int h, int src_stride, int dst_stride, uint8_t
*src, uint8_t *dest)
+ {
+ int i;
+ int len = w * 2;
+ for (i = 0; i h; i++)
+ {
+- memcpy(dest + i * len, src + i * stride, len);
++ memcpy(dest + i * dst_stride, src + i * src_stride, len);
+ }
+ }
+
+diff --git a/src/image-format-conversions.h b/src/image-format-conversions.h
+index 584896a..ba7caf2 100644
+--- a/src/image-format-conversions.h
b/src/image-format-conversions.h
+@@ -27,7 +27,7 @@
+ #include stdint.h
+
+ /* Basic line-based copy for packed formats */
+-void packed_line_copy(int w, int h, int stride, uint8_t *src, uint8_t *dest);
++void packed_line_copy(int w, int h, int src_stride, int dst_stride, uint8_t
*src, uint8_t *dest);
+
+ /* Basic C implementation of YV12/I420 to UYVY conversion */
+ void uv12_to_uyvy(int w, int h, int y_pitch, int uv_pitch, uint8_t *y_p,
uint8_t *u_p, uint8_t *v_p, uint8_t *dest);
+diff --git a/src/omapfb-driver.c b/src/omapfb-driver.c
+index 48aa09c..07989f5 100644
+--- a/src/omapfb-driver.c
b/src/omapfb-driver.c
+@@ -66,6 +66,7 @@
+ #define OMAPFB_VERSION 1000
+ #define OMAPFB_DRIVER_NAME OMAPFB
+ #define OMAPFB_NAME omapfb
++#define ENFORCE_MODES
+
+ static Bool OMAPFBProbe(DriverPtr drv, int flags);
+ static Bool OMAPFBPreInit(ScrnInfoPtr pScrn, int flags);
+@@ -105,11 +106,13 @@ static SymTabRec OMAPFBChipsets[] = {
+ typedef enum {
+ OPTION_ACCELMETHOD,
+ OPTION_FB,
++ OPTION_ROTATE,
+ } FBDevOpts;
+
+ static const OptionInfoRec OMAPFBOptions[] = {
+ { OPTION_ACCELMETHOD, AccelMethod, OPTV_STRING,{0},FALSE },
+ { OPTION_FB,fb, OPTV_STRING,{0},FALSE },
++ { OPTION_ROTATE,rotation, OPTV_STRING,{0},FALSE },
+ { -1, NULL, OPTV_NONE, {0},FALSE }
+ };
+
+@@ -286,6 +289,7 @@ OMAPFBPreInit(ScrnInfoPtr pScrn, int flags)
+ {
+ OMAPFBPtr ofb;
+ EntityInfoPtr pEnt;
++ char *rotate;
+ rgb zeros = { 0, 0, 0 };
+ struct stat st;
+
+@@ -379,6 +383,8 @@ OMAPFBPreInit(ScrnInfoPtr pScrn, int flags)
+ pScrn-progClock = TRUE;
+ pScrn-chipset = omapfb;
+
++ xf86DrvMsg(pScrn-scrnIndex, X_INFO, Rotate test version 0.02\n);
++
+ /* Start with configured virtual size */
+ pScrn-virtualX = pScrn-display-virtualX;
+ pScrn-virtualY = pScrn-display-virtualY;
+@@ -496,12 +502,21 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int
argc, char **argv)
+ ofb-CloseScreen = pScreen-CloseScreen;
+ pScreen-CloseScreen = OMAPFBCloseScreen;
+
++ /* Enforce the default mode (this is silly I guess) */
++#ifdef ENFORCE_MODES
++ //xf86DrvMsg(pScrn-scrnIndex, X_INFO, Enforcing modes\n);
++ //set_mode(ofb, ofb-default_mode);
++ //pScrn-displayWidth = ofb-fixed_info.line_length /
++ //
[OE-core] [oe-core][PATCHv2 05/30] libdrm: improve packaging
From: Martin Jansa martin.ja...@gmail.com
Signed-off-by: Martin Jansa martin.ja...@gmail.com
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta/recipes-graphics/drm/libdrm.inc |7 ---
meta/recipes-graphics/drm/libdrm_2.4.26.bb |2 +-
meta/recipes-graphics/drm/libdrm_git.bb|2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-graphics/drm/libdrm.inc
b/meta/recipes-graphics/drm/libdrm.inc
index 1ad9dc3..20d7f1f 100644
--- a/meta/recipes-graphics/drm/libdrm.inc
+++ b/meta/recipes-graphics/drm/libdrm.inc
@@ -15,7 +15,8 @@ DEPENDS += libpciaccess
inherit autotools pkgconfig
-PACKAGES =+ libdrm-tests
-FILES_libdrm-tests = ${bindir}/dr* ${bindir}/mode*
+PACKAGES =+ ${PN}-tests ${PN}-drivers ${PN}-kms
+FILES_${PN}-tests = ${bindir}/dr* ${bindir}/mode*
+FILES_${PN}-drivers = ${libdir}/libdrm_*.so.*
+FILES_${PN}-kms = ${libdir}/libkms*.so.*
-LEAD_SONAME = libdrm.so
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.26.bb
b/meta/recipes-graphics/drm/libdrm_2.4.26.bb
index e5aa6a4..f7a7307 100644
--- a/meta/recipes-graphics/drm/libdrm_2.4.26.bb
+++ b/meta/recipes-graphics/drm/libdrm_2.4.26.bb
@@ -7,4 +7,4 @@ SRC_URI += file://installtests.patch
SRC_URI[md5sum] = 062569426773f69b11a47a7712bba770
SRC_URI[sha256sum] =
b25b06ab5a077736044cbd9a3a05a9a23b873a0887ab1aaf93aa2b3218b2d3dc
-PR = r0
+PR = r1
diff --git a/meta/recipes-graphics/drm/libdrm_git.bb
b/meta/recipes-graphics/drm/libdrm_git.bb
index 7d4e1b3..85bd4fb 100644
--- a/meta/recipes-graphics/drm/libdrm_git.bb
+++ b/meta/recipes-graphics/drm/libdrm_git.bb
@@ -6,4 +6,4 @@ S = ${WORKDIR}/git
SRCREV = 3f3c5be6f908272199ccf53f108b1124bfe0a00e
PV = 2.4.15+git${SRCPV}
-PR = r0
+PR = r1
--
1.7.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCHv2 06/30] xserver/mesa: Bump PR after libdrm packaging changes
From: Richard Purdie richard.pur...@linuxfoundation.org
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb |2 +-
meta/recipes-graphics/mesa/mesa-dri_git.bb |2 +-
.../xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb |2 +-
.../xorg-xserver/xserver-xf86-dri-lite_git.bb |2 +-
.../xorg-xserver/xserver-xf86-lite_1.10.1.bb |2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb
b/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb
index aac7a1c..68f89a2 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb
@@ -8,7 +8,7 @@ LIB_DEPS = libdrm virtual/libx11 libxext libxxf86vm libxdamage
libxfixes expat
DEPENDS = ${PROTO_DEPS} ${LIB_DEPS} makedepend-native python-native
-PR = r1
+PR = r2
SRC_URI = ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
file://crossfix.patch \
diff --git a/meta/recipes-graphics/mesa/mesa-dri_git.bb
b/meta/recipes-graphics/mesa/mesa-dri_git.bb
index c4132d7..9e32d0a 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_git.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_git.bb
@@ -13,7 +13,7 @@ DEPENDS = ${PROTO_DEPS} ${LIB_DEPS}
SRCREV = 1bf94d419805538ac23a4d0b04d31ac5e4487aca
PV = 7.7+git${SRCPV}
-PR = r1
+PR = r2
# most of our targets do not have DRI so will use mesa-xlib
DEFAULT_PREFERENCE = -1
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
index ea57140..035e39c 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
@@ -7,7 +7,7 @@ PROTO_DEPS += xf86driproto dri2proto
DEPENDS += font-util
PE = 1
-PR = r0
+PR = r1
SRC_URI += file://crosscompile.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
index adefcdb..066ff13 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM =
file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00
SRCREV = 6689e8add183835274a70ee013e5d3bc8023681f
PE = 1
-PR = r0
+PR = r1
PV = 1.10+git${SRCPV}
PROTO_DEPS += xf86driproto dri2proto
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
index f9b3a64..5575c0f 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
@@ -2,7 +2,7 @@ require xserver-xf86-lite.inc
LIC_FILES_CHKSUM = file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00
-PR = r0
+PR = r1
DEPENDS += font-util
--
1.7.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCHv2 07/30] rgb: import from meta-oe layer
From: Martin Jansa martin.ja...@gmail.com
Signed-off-by: Martin Jansa martin.ja...@gmail.com
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta/recipes-graphics/xorg-app/rgb_1.0.4.bb | 10 ++
1 files changed, 10 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-graphics/xorg-app/rgb_1.0.4.bb
diff --git a/meta/recipes-graphics/xorg-app/rgb_1.0.4.bb
b/meta/recipes-graphics/xorg-app/rgb_1.0.4.bb
new file mode 100644
index 000..59dca2a
--- /dev/null
+++ b/meta/recipes-graphics/xorg-app/rgb_1.0.4.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+DEPENDS += xproto util-macros
+LIC_FILES_CHKSUM = file://COPYING;md5=ef598adbe241bd0b0b9113831f6e249a
+PE = 1
+PR = ${INC_PR}.0
+
+SRC_URI[md5sum] = 35c6cccbf25a872bdd62bfcb1a73d951
+SRC_URI[sha256sum] =
80887da011ad086fff88bfd16c6d9d5ac7da45ef1bc9d0c192a6f370423370f1
+
+FILES_${PN} += ${datadir}/X11
--
1.7.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCHv2 08/30] xserver-xf86-dri-lite: remove old git recipe
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
.../xorg-xserver/xserver-xf86-dri-lite_git.bb | 25
1 files changed, 0 insertions(+), 25 deletions(-)
delete mode 100644
meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
deleted file mode 100644
index 066ff13..000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-require xserver-xf86-dri-lite.inc
-
-LIC_FILES_CHKSUM = file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00
-
-SRCREV = 6689e8add183835274a70ee013e5d3bc8023681f
-PE = 1
-PR = r1
-PV = 1.10+git${SRCPV}
-
-PROTO_DEPS += xf86driproto dri2proto
-
-DEPENDS += font-util
-
-RDEPENDS_${PN} += xkeyboard-config
-
-SRC_URI =
git://anongit.freedesktop.org/git/xorg/xserver;protocol=git;branch=master \
- file://crosscompile.patch; \
- file://fix_macros1.patch;
-
-# Misc build failure for master HEAD
-SRC_URI += file://fix_open_max_preprocessor_error.patch;
-
-EXTRA_OECONF += --enable-dri --enable-dri2 --enable-dga
-
-S = ${WORKDIR}/git
--
1.7.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCHv2 09/30] xserver-xf86: improve packaging and move shared definitions to .inc files
* introduce DISTRO_XORG_CONFIG_MANAGER for distribution to select
hal/udev/files
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
.../xorg-xserver/xserver-xf86-common.inc | 114 +---
.../xorg-xserver/xserver-xf86-dri-lite.inc | 35 ++-
.../xorg-xserver/xserver-xf86-lite.inc | 32 +-
3 files changed, 110 insertions(+), 71 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
b/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
index 000aea3..81abfc9 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
@@ -2,8 +2,7 @@ DESCRIPTION = The X.Org X server
HOMEPAGE = http://www.x.org;
SECTION = x11/base
LICENSE = MIT-X
-
-LIC_FILES_CHKSUM = file://COPYING;md5=3dd2bbe3563837f80ed8926b06c1c353
+LIC_FILES_CHKSUM = file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00
# xf86-*-* packages depend on an X server built with the xfree86 DDX
# so we have a virtual to represent that:
@@ -12,26 +11,115 @@ PROVIDES = virtual/xserver-xf86
# Other packages tend to just care that there is *an* X server:
PROVIDES += virtual/xserver
+# Config manager for xserver, options are: hal, udev, empty (for configuration
in xorg.conf)
+DISTRO_XORG_CONFIG_MANAGER ?= udev
+
+# default none, enabled by DISTRO_XORG_CONFIG_MANAGER setting
+CONFIG_MANAGER_OPTION +=
${@['--disable-config-hal','--enable-config-hal',''][bb.data.getVar('DISTRO_XORG_CONFIG_MANAGER',d)
in ['hal']]}
+CONFIG_MANAGER_OPTION +=
${@['--disable-config-udev','--enable-config-udev',''][bb.data.getVar('DISTRO_XORG_CONFIG_MANAGER',d)
in ['udev']]}
+
XORG_PN = xorg-server
SRC_URI = ${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2
+SRC_URI += file://macro_tweak.patch
S = ${WORKDIR}/${XORG_PN}-${PV}
inherit autotools pkgconfig
-PACKAGES =+ ${PN}-utils
+PROTO_DEPS = randrproto renderproto fixesproto damageproto xextproto xproto
xf86dgaproto xf86miscproto xf86rushproto xf86vidmodeproto xf86bigfontproto
compositeproto recordproto resourceproto videoproto scrnsaverproto evieext
trapproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto
glproto
-RDEPENDS_${PN} += xserver-xf86-config xkeyboard-config
+LIB_DEPS = pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile
libpciaccess openssl
-FILES_${PN}-utils = ${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport
${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf
${bindir}/getconfig ${bindir}/getconfig.pl
-FILES_${PN} = ${libdir}/X11/Options ${libdir}/X11/Cards
${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/xserver/SecurityPolicy
${libdir}/xorg/modules/*.so ${libdir}/xorg/modules/*/*.so
${libdir}/xorg/modules/*/*/*.so /etc/X11
-FILES_${PN}-doc += ${libdir}/X11/doc
${datadir}/X11/xkb/compiled/README.compiled
+DEPENDS = ${PROTO_DEPS} ${LIB_DEPS} font-util
-FILES_${PN}-dbg += ${libdir}/xorg/modules/.debug \
-${libdir}/xorg/modules/*/.debug \
- ${libdir}/xorg/modules/*/*/.debug \
-
+EXTRA_OECONF += --with-fop=no \
+ --disable-static \
+ --disable-acfb \
+ --disable-ccfb \
+ --disable-mcfb \
+ --disable-dga \
+ --disable-xinerama \
+ --disable-xf86misc \
+ --disable-xorgcfg \
+ --disable-record \
+ --disable-dmx \
+ --disable-xnest \
+ --disable-xvfb \
+ --enable-composite \
+ --sysconfdir=/etc/X11 \
+ --localstatedir=/var \
+ --with-fontdir=${datadir}/fonts/X11 \
+ --with-xkb-output=/var/lib/xkb \
+ ${CONFIG_MANAGER_OPTION} \
+ ac_cv_file__usr_share_sgml_X11_defs_ent=no \
+
-SRC_URI += file://macro_tweak.patch
+# Split out some modules and extensions from the main package
+# These aren't needed for basic operations and only take up space:
+# 32.0k libdri.so
+# 336.0k libglx.so
+# 1360k libint10.so
+# 180.0k libwfb.so
+# 320.0k libxaa.so
+# 124.0k libxf1bpp.so
+# 84.0k libxf4bpp.so
+# librecord.so
+# libextmod.so
+# libdbe.so
+
+PACKAGES =+ ${PN}-security-policy \
+ ${PN}-sdl \
+ ${PN}-fbdev \
+ ${PN}-xprint \
+ ${PN}-xvfb \
+ ${PN}-utils \
+ ${PN}-xephyr \
+ ${PN}-multimedia-modules \
+ ${PN}-extension-dri \
+ ${PN}-extension-dri2 \
+ ${PN}-extension-glx \
+ ${PN}-extension-record \
+ ${PN}-extension-extmod \
+ ${PN}-extension-dbe \
+ ${PN}-module-libint10 \
+ ${PN}-module-libafb \
+ ${PN}-module-libwfb \
+ ${PN}-module-libmfb \
+
[OE-core] [oe-core][PATCHv2 10/30] xserver-xf86: add new version 1.11.1
* move shared definitions to .inc file
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
.../xorg-xserver/xserver-xf86-1.11.1.inc |7 +++
.../xorg-xserver/xserver-xf86-dri-lite_1.11.1.bb |4
.../xorg-xserver/xserver-xf86-lite_1.11.1.bb |2 ++
3 files changed, 13 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-1.11.1.inc
create mode 100644
meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.11.1.bb
create mode 100644
meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.11.1.bb
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-1.11.1.inc
b/meta/recipes-graphics/xorg-xserver/xserver-xf86-1.11.1.inc
new file mode 100644
index 000..690de3f
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-1.11.1.inc
@@ -0,0 +1,7 @@
+SRC_URI += file://crosscompile.patch
+
+# Misc build failure for master HEAD
+SRC_URI += file://fix_open_max_preprocessor_error.patch
+
+SRC_URI[md5sum] = 4cdf54dc569b6a5548257c93a45dcd3d
+SRC_URI[sha256sum] =
c069c177d9a80bca2ee1d49aa1af6d9f996c83e4ff12393cab2ca3f8817276f6
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.11.1.bb
b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.11.1.bb
new file mode 100644
index 000..54ff37a
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.11.1.bb
@@ -0,0 +1,4 @@
+require xserver-xf86-dri-lite.inc
+require xserver-xf86-${PV}.inc
+
+PE = 1
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.11.1.bb
b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.11.1.bb
new file mode 100644
index 000..0c1b0fd
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.11.1.bb
@@ -0,0 +1,2 @@
+require xserver-xf86-lite.inc
+require xserver-xf86-${PV}.inc
--
1.7.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCHv2 11/30] xserver-xf86: remove old 1.10.1 version
Signed-off-by: Martin Jansa martin.ja...@gmail.com --- .../xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb | 20 .../xorg-xserver/xserver-xf86-lite_1.10.1.bb | 12 2 files changed, 0 insertions(+), 32 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb deleted file mode 100644 index 035e39c..000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb +++ /dev/null @@ -1,20 +0,0 @@ -require xserver-xf86-dri-lite.inc - -LIC_FILES_CHKSUM = file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00 - -PROTO_DEPS += xf86driproto dri2proto - -DEPENDS += font-util - -PE = 1 -PR = r1 - -SRC_URI += file://crosscompile.patch - -# Misc build failure for master HEAD -SRC_URI += file://fix_open_max_preprocessor_error.patch - -SRC_URI[md5sum] = 75f117c74f2ecaf9dd167f6a66ac98de -SRC_URI[sha256sum] = 143c7c3d7d4428352e1153dffa34fd64af391f72d30b2a03e911e54e36f00b5d - -EXTRA_OECONF += --enable-dri --enable-dri2 diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb deleted file mode 100644 index 5575c0f..000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -require xserver-xf86-lite.inc - -LIC_FILES_CHKSUM = file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00 - -PR = r1 - -DEPENDS += font-util - -SRC_URI += file://crosscompile.patch - -# Misc build failure for master HEAD -SRC_URI += file://fix_open_max_preprocessor_error.patch; -- 1.7.7 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCHv2 12/30] xserver-xf86-dri-lite: remove COMPATIBLE_HOST
* ie om-gta02 has mesa-dri module too Signed-off-by: Martin Jansa martin.ja...@gmail.com --- .../xorg-xserver/xserver-xf86-dri-lite.inc |3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc index 740c59d..0d956b5 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc @@ -11,6 +11,3 @@ EXTRA_OECONF += \ --with-pic \ --with-int10=x86emu \ - -# Due to mesa-dri -COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' -- 1.7.7 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCHv2 14/30] xserver-xf86: move patches to xserver-xf86-dri-lite-1.11.1 and use same directory from xserver-xf86-lite recipe
* FILESEXTRAPATHS needs to be in xserver-xf86-lite_1.11.1
because in .inc we don't have ${PV} expanded yet
* crosscompile.patch macro_tweak.patch were identical
* fix_open_max_preprocessor_error.patch has only different header
# $ diff xserver-xorg/fix_open_max_preprocessor_error.patch
xserver-xorg-dri/fix_open_max_preprocessor_error.patch
1c1
Upstream-Status: Pending
---
Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
.../crosscompile.patch |0
.../fix_open_max_preprocessor_error.patch |0
.../macro_tweak.patch |7 +
.../fix_open_max_preprocessor_error.patch | 15 --
.../xserver-xf86-dri-lite/macro_tweak.patch| 30
.../xserver-xf86-lite/crosscompile.patch | 22 --
.../xorg-xserver/xserver-xf86-lite_1.11.1.bb |2 +
7 files changed, 3 insertions(+), 73 deletions(-)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite =
xserver-xf86-dri-lite-1.11.1}/crosscompile.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite =
xserver-xf86-dri-lite-1.11.1}/fix_open_max_preprocessor_error.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite =
xserver-xf86-dri-lite-1.11.1}/macro_tweak.patch (74%)
delete mode 100644
meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_preprocessor_error.patch
delete mode 100644
meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch
delete mode 100644
meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch
diff --git
a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch
b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite-1.11.1/crosscompile.patch
similarity index 100%
rename from
meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch
rename to
meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite-1.11.1/crosscompile.patch
diff --git
a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/fix_open_max_preprocessor_error.patch
b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite-1.11.1/fix_open_max_preprocessor_error.patch
similarity index 100%
rename from
meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/fix_open_max_preprocessor_error.patch
rename to
meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite-1.11.1/fix_open_max_preprocessor_error.patch
diff --git
a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch
b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite-1.11.1/macro_tweak.patch
similarity index 74%
rename from
meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch
rename to
meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite-1.11.1/macro_tweak.patch
index 2b75427..ec0eea6 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch
+++
b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite-1.11.1/macro_tweak.patch
@@ -1,10 +1,5 @@
This is the revised version of files/macro_tweak.patch for
-xorg-server 1.8.99.904.
-
-the files/macro_tweak.patch can not removed now since it is used by
-xserver-kdrive-1.7.99.2 and xserver-xf86-lite_1.7.99.2. Once they
-are all upgraded to 1.8.99.904, the the files/macro_tweak.patch
-can be safely replace by this patch.
+xorg-server 1.8.99.904 and newer.
Upstream-Status: Pending
diff --git
a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_preprocessor_error.patch
b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_preprocessor_error.patch
deleted file mode 100644
index 9c33072..000
---
a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_preprocessor_error.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-Index: git/os/osdep.h
-===
git.orig/os/osdep.h2008-10-07 18:38:21.0 +0100
-+++ git/os/osdep.h 2008-10-07 18:39:36.0 +0100
-@@ -92,7 +92,7 @@
- * like sysconf(_SC_OPEN_MAX) is not supported.
- */
-
--#if OPEN_MAX = 256
-+#if 0
- #define MAXSOCKS (OPEN_MAX - 1)
- #else
- #define MAXSOCKS 256
diff --git
a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch
b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch
deleted file mode 100644
index 2b75427..000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-This is the revised version of files/macro_tweak.patch for
-xorg-server 1.8.99.904.
-
-the files/macro_tweak.patch can not removed now since it is used by
-xserver-kdrive-1.7.99.2 and xserver-xf86-lite_1.7.99.2. Once they
-are all upgraded to 1.8.99.904, the the files/macro_tweak.patch
-can be safely replace by this patch.
-
[OE-core] [oe-core][PATCHv2 16/30] xserver-kdrive: drop unused files (same files are in xserver-kdrive-1.7.99.2 directory
Signed-off-by: Martin Jansa martin.ja...@gmail.com --- .../xorg-xserver/xserver-kdrive/disable-apm.patch | 24 -- .../xserver-kdrive/disable-xf86-dga-xorgcfg.patch | 43 -- .../xorg-xserver/xserver-kdrive/extra-kmodes.patch | 87 .../xserver-kdrive/fbdev_xrandr_ioctl.patch| 63 -- .../xserver-kdrive/no-serial-probing.patch | 17 5 files changed, 0 insertions(+), 234 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-apm.patch delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive/extra-kmodes.patch delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive/fbdev_xrandr_ioctl.patch delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive/no-serial-probing.patch diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-apm.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-apm.patch deleted file mode 100644 index c22b1c0..000 --- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-apm.patch +++ /dev/null @@ -1,24 +0,0 @@ -Upstream-Status: Inappropriate [disable feature] - -Signed-off-by: Yu Ke ke...@intel.com - xserver/hw/kdrive/linux/linux.c.orig 2005-04-23 15:56:13.988849232 + -+++ xserver/hw/kdrive/linux/linux.c2005-04-23 15:57:05.001094192 + -@@ -342,7 +342,7 @@ - /* - * Open the APM driver - */ --LinuxApmFd = open (/dev/apm_bios, 2); -+/*LinuxApmFd = open (/dev/apm_bios, 2); - if (LinuxApmFd 0 errno == ENOENT) - LinuxApmFd = open (/dev/misc/apm_bios, 2); - if (LinuxApmFd = 0) -@@ -352,7 +352,7 @@ - RegisterBlockAndWakeupHandlers (LinuxApmBlock, LinuxApmWakeup, 0); - AddEnabledDevice (LinuxApmFd); - } -- -+*/ - /* - * now get the VT - */ diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch deleted file mode 100644 index 631c111..000 --- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch +++ /dev/null @@ -1,43 +0,0 @@ -Upstream-Status: Inappropriate [disable feature] - -Signed-off-by: Yu Ke ke...@intel.com - -Index: xorg-server-1.3.0.0/configure.ac -=== xorg-server-1.3.0.0.orig/configure.ac 2007-04-20 03:23:40.0 +0200 -+++ xorg-server-1.3.0.0/configure.ac 2007-05-09 16:51:34.0 +0200 -@@ -520,7 +520,11 @@ - XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' - - dnl Core modules for most extensions, et al. -+if test $KDRIVE = yes; then -+REQUIRED_MODULES=[randrproto = 1.2] renderproto [fixesproto = 4.0] [damageproto = 1.1] xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto = 1.1] bigreqsproto resourceproto fontsproto inputproto [kbproto = 1.0.3] -+else - REQUIRED_MODULES=[randrproto = 1.2] renderproto [fixesproto = 4.0] [damageproto = 1.1] xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto = 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto [kbproto = 1.0.3] -+fi - REQUIRED_LIBS=xfont xau fontenc - - AM_CONDITIONAL(XV, [test x$XV = xyes]) -@@ -1603,7 +1607,9 @@ - AC_SUBST(XKB_COMPILED_DIR) - - dnl and the rest of these are generic, so they're in config.h -+if test ! x$KDRIVE = xyes; then - AC_DEFINE(XFreeXDGA, 1, [Build XDGA support]) -+fi - AC_DEFINE(XResExtension, 1, [Build XRes extension]) - - AC_TRY_COMPILE([ -@@ -1616,10 +1622,12 @@ - - AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix]) - -+if test ! x$KDRIVE = xyes ; then - dnl xorgconfig CLI configuration utility - PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11]) - AC_SUBST(XORGCONFIG_DEP_CFLAGS) - AC_SUBST(XORGCONFIG_DEP_LIBS) -+fi - - dnl xorgcfg GUI configuration utility - AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg], diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/extra-kmodes.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/extra-kmodes.patch deleted file mode 100644 index 896c033..000 --- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/extra-kmodes.patch +++ /dev/null @@ -1,87 +0,0 @@ -Add some extra video modes and change the default to VGA. - -Upstream-Status: Pending - -Signed-off-by: Yu Ke ke...@intel.com - - hw/kdrive/src/kmode.c | 41 +++-- - 1 file changed, 39 insertions(+), 2 deletions(-) - -Index: xorg-server-1.3.0.0/hw/kdrive/src/kmode.c -=== xorg-server-1.3.0.0.orig/hw/kdrive/src/kmode.c 2008-01-11 14:20:47.0 + -+++ xorg-server-1.3.0.0/hw/kdrive/src/kmode.c 2008-01-11 14:21:18.0 +
[OE-core] [oe-core][PATCHv2 13/30] xserver-xf86: drop unused files
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
.../xorg-xserver/files/macro_tweak.patch | 20 --
.../cache-xkbcomp-output-for-fast-start-up.patch | 360
.../xserver-xf86-dri-lite/fix_macros1.patch| 24 --
3 files changed, 0 insertions(+), 404 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-xserver/files/macro_tweak.patch
delete mode 100644
meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/cache-xkbcomp-output-for-fast-start-up.patch
delete mode 100644
meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_macros1.patch
diff --git a/meta/recipes-graphics/xorg-xserver/files/macro_tweak.patch
b/meta/recipes-graphics/xorg-xserver/files/macro_tweak.patch
deleted file mode 100644
index c4af228..000
--- a/meta/recipes-graphics/xorg-xserver/files/macro_tweak.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Upstream-Status: Pending
-
-Index: xorg-server-1.5.0/xorg-server.m4
-===
xorg-server-1.5.0.orig/xorg-server.m4 2007-05-29 20:36:51.0
+0100
-+++ xorg-server-1.5.0/xorg-server.m4 2008-11-04 23:56:55.0 +
-@@ -28,9 +28,12 @@
- # Checks for the $1 define in xorg-server.h (from the sdk). If it
- # is defined, then add $1 to $REQUIRED_MODULES.
-
-+m4_pattern_allow(PKG_CONFIG_SYSROOT_DIR)
-+
- AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
-+ PKG_PROG_PKG_CONFIG
- SAVE_CFLAGS=$CFLAGS
-- CFLAGS=$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`
-+ CFLAGS=$CFLAGS -I$PKG_CONFIG_SYSROOT_DIR`pkg-config --variable=sdkdir
xorg-server`
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include xorg-server.h
- #if !defined $1
diff --git
a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/cache-xkbcomp-output-for-fast-start-up.patch
b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/cache-xkbcomp-output-for-fast-start-up.patch
deleted file mode 100644
index 6b1b40f..000
---
a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/cache-xkbcomp-output-for-fast-start-up.patch
+++ /dev/null
@@ -1,360 +0,0 @@
-From 0f70ba9d3412b17ac4e08e33e1be3c226c06ea54 Mon Sep 17 00:00:00 2001
-From: Yan Li yan.i...@intel.com
-Date: Tue, 12 May 2009 17:49:07 +0800
-Subject: [PATCH] XKB: cache xkbcomp output for fast start-up v5 for 1.6.1
-Organization: Intel
-
-xkbcomp outputs will be cached in files with hashed keymap as
-names. This saves boot time for around 1s on commodity netbooks.
-
-Upstream-Status: Pending
-
-Signed-off-by: Yan Li yan.i...@intel.com
- configure.ac|6 +-
- xkb/README.compiled |8 +-
- xkb/ddxLoad.c | 192 +-
- 3 files changed, 164 insertions(+), 42 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4c4c797..7a5020a 100644
a/configure.ac
-+++ b/configure.ac
-@@ -476,9 +476,9 @@ AC_ARG_WITH(default-font-path,
AS_HELP_STRING([--with-default-font-path=PATH], [
- AC_ARG_WITH(xkb-path, AS_HELP_STRING([--with-xkb-path=PATH], [Path to
XKB base dir (default: ${datadir}/X11/xkb)]),
- [ XKBPATH=$withval ],
- [ XKBPATH=${datadir}/X11/xkb ])
--AC_ARG_WITH(xkb-output, AS_HELP_STRING([--with-xkb-output=PATH], [Path
to XKB output dir (default: ${datadir}/X11/xkb/compiled)]),
-+AC_ARG_WITH(xkb-output, AS_HELP_STRING([--with-xkb-output=PATH], [Path
to XKB output dir (default: ${localstatedir}/cache/xkb)]),
- [ XKBOUTPUT=$withval ],
-- [ XKBOUTPUT=compiled ])
-+ [ XKBOUTPUT=${localstatedir}/cache/xkb ])
- AC_ARG_WITH(serverconfig-path, AS_HELP_STRING([--with-serverconfig-path=PATH],
- [Directory where ancillary server config
files are installed (default: ${libdir}/xorg)]),
- [ SERVERCONFIG=$withval ],
-@@ -1757,7 +1757,7 @@ AC_DEFINE_DIR(XKB_BIN_DIRECTORY, bindir, [Path to XKB
bin dir])
- XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1`
-
- if [[ x$XKBOUTPUT_FIRSTCHAR != x/ ]] ; then
-- XKBOUTPUT=$XKB_BASE_DIRECTORY/$XKBOUTPUT
-+ AC_MSG_ERROR([xkb-output must be an absolute path.])
- fi
-
- # XKM_OUTPUT_DIR (used in code) must end in / or file names get hosed
-diff --git a/xkb/README.compiled b/xkb/README.compiled
-index 71caa2f..a4a2ae0 100644
a/xkb/README.compiled
-+++ b/xkb/README.compiled
-@@ -4,10 +4,10 @@ current keymap and/or any scratch keymaps used by clients.
The X server
- or some other tool might destroy or replace the files in this directory,
- so it is not a safe place to store compiled keymaps for long periods of
- time. The default keymap for any server is usually stored in:
-- Xnum-default.xkm
--where num is the display number of the server in question, which makes
--it possible for several servers *on the same host* to share the same
--directory.
-+ server-SHA1.xkm
-+
[OE-core] [oe-core][PATCHv2 18/30] libx11: package xcb, merge few changes from meta-oe
* move --with-keysymdef/--with-keysymdefdir setting to recipes (newer
versions are using keysymdefdir instead keysymdef
* fix MIN_REHASH in makekeys by sed call
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb |2 +-
meta/recipes-graphics/xorg-lib/libx11-diet_git.bb |2 +-
.../recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb |2 +-
meta/recipes-graphics/xorg-lib/libx11-trim_git.bb |2 +-
meta/recipes-graphics/xorg-lib/libx11.inc | 25 ---
meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb |2 +-
meta/recipes-graphics/xorg-lib/libx11_git.bb |2 +
7 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
b/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
index 487e796..018a141 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
@@ -19,5 +19,5 @@ DEPENDS += bigreqsproto xproto xextproto xtrans libxau
xcmiscproto \
FILESDIR = ${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11
-EXTRA_OECONF += --without-xcb --disable-udc --disable-xcms --disable-xlocale
+EXTRA_OECONF += --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h
--without-xcb --disable-udc --disable-xcms --disable-xlocale
CFLAGS += -D_GNU_SOURCE
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_git.bb
b/meta/recipes-graphics/xorg-lib/libx11-diet_git.bb
index dea7faf..4cda779 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_git.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_git.bb
@@ -13,5 +13,5 @@ DEPENDS += bigreqsproto xproto xextproto xtrans libxau
xcmiscproto \
SRCREV = d23aad31338e7d869d878d5aa1b6b91d20287005
-EXTRA_OECONF += --without-xcb --disable-udc --disable-xcms --disable-xlocale
+EXTRA_OECONF += --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h
--without-xcb --disable-udc --disable-xcms --disable-xlocale
CFLAGS += -D_GNU_SOURCE
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
b/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
index 1469bc1..18cd10a 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
@@ -14,4 +14,4 @@ SRC_URI += file://../libx11-${PV}/x11_disable_makekeys.patch
\
file://../libx11-${PV}/nodolt.patch \
file://../libx11-${PV}/makekeys_crosscompile.patch
-EXTRA_OECONF += --disable-xcms --with-xcb
+EXTRA_OECONF += --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h
--disable-xcms --with-xcb
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_git.bb
b/meta/recipes-graphics/xorg-lib/libx11-trim_git.bb
index 730efe1..d1bf67b 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-trim_git.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim_git.bb
@@ -8,6 +8,6 @@ SRCREV = d23aad31338e7d869d878d5aa1b6b91d20287005
DEPENDS += libxcb xproto xextproto xtrans libxau kbproto inputproto
xf86bigfontproto xproto-native
-EXTRA_OECONF += --disable-xcms --with-xcb
+EXTRA_OECONF += --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h
--disable-xcms --with-xcb
CFLAGS += -D_GNU_SOURCE
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc
b/meta/recipes-graphics/xorg-lib/libx11.inc
index 455753f..748a48c 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -11,32 +11,39 @@ inherit siteinfo
PROVIDES = virtual/libx11
XORG_PN = libX11
-LEAD_SONAME = libX11.so
+LICENSE = MIT MIT-style BSD
+LIC_FILES_CHKSUM = file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7
-EXTRA_OECONF += --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h
--disable-specs
+EXTRA_OECONF += --with-groff=no --with-ps2pdf=no --with-fop=no
--disable-specs
+
+PACKAGES =+ ${PN}-xcb
FILES_${PN} += ${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB
${libdir}/X11/Xcms.txt
+FILES_${PN}-xcb += ${libdir}/libX11-xcb.so.*
FILES_${PN}-locale += ${datadir}/X11/locale ${libdir}/X11/locale
-do_compile() {
+do_compile_prepend() {
cd ${S}/src/util
mv makekeys.c.orig makekeys.c || true
touch makekeys-makekeys.o
(
unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
+ # MIN_REHASH 10 is only in 1.0.1
+ sed -i -e 's:MIN_REHASH 10:MIN_REHASH 16:g' makekeys.c
+ sed -i -e 's:MIN_REHASH 15:MIN_REHASH 16:g' makekeys.c
+ touch makekeys-makekeys.o;
if [ ${SITEINFO_BITS} == 64 ]; then
-${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE}
makekeys.c -o makekeys
-else
-${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE}
-DUSE32 makekeys.c -o makekeys
-fi
+ ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE}
makekeys.c -o makekeys
+ else
+ ${BUILD_CC} ${BUILD_CFLAGS}
[OE-core] [oe-core][PATCHv2 15/30] xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite
* xserver-xorg is closer to upstream naming and
that's how it's named in OE-classic and meta-oe? It would make meta-oe
transition easier and better to do it now then convert meta-oe to
xserver-xf86 and then rename it back later.
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta/conf/distro/include/default-providers.inc |4 ++--
.../conf/distro/include/distro_tracking_fields.inc | 20 ++--
meta/conf/machine/qemux86-64.conf |6 +++---
meta/conf/machine/qemux86.conf |6 +++---
meta/conf/multilib.conf|2 +-
.../xorg-xserver/xserver-xf86-dri-lite_1.11.1.bb |4
.../xorg-xserver/xserver-xf86-lite_1.11.1.bb |4
...ver-xf86-1.11.1.inc = xserver-xorg-1.11.1.inc} |0
.../crosscompile.patch |0
.../fix_open_max_preprocessor_error.patch |0
.../macro_tweak.patch |0
...ver-xf86-common.inc = xserver-xorg-common.inc} |1 +
...xserver-xf86-lite.inc = xserver-xorg-lite.inc} |2 +-
.../xorg-xserver/xserver-xorg-lite_1.11.1.bb |4
...{xserver-xf86-dri-lite.inc = xserver-xorg.inc} |2 +-
.../xorg-xserver/xserver-xorg_1.11.1.bb|4
16 files changed, 30 insertions(+), 29 deletions(-)
delete mode 100644
meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.11.1.bb
delete mode 100644
meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.11.1.bb
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-1.11.1.inc =
xserver-xorg-1.11.1.inc} (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite-1.11.1 =
xserver-xorg-1.11.1}/crosscompile.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite-1.11.1 =
xserver-xorg-1.11.1}/fix_open_max_preprocessor_error.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite-1.11.1 =
xserver-xorg-1.11.1}/macro_tweak.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-common.inc =
xserver-xorg-common.inc} (99%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite.inc =
xserver-xorg-lite.inc} (73%)
create mode 100644
meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.11.1.bb
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite.inc =
xserver-xorg.inc} (87%)
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
diff --git a/meta/conf/distro/include/default-providers.inc
b/meta/conf/distro/include/default-providers.inc
index d51ac64..a5cdb5b 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -3,8 +3,8 @@
#
PREFERRED_PROVIDER_virtual/db ?= db
PREFERRED_PROVIDER_virtual/db-native ?= db-native
-PREFERRED_PROVIDER_virtual/xserver ?= xserver-xf86
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= xserver-xf86-dri-lite
+PREFERRED_PROVIDER_virtual/xserver ?= xserver-xorg
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= xserver-xorg
PREFERRED_PROVIDER_virtual/libgl ?= mesa-xlib
PREFERRED_PROVIDER_virtual/update-alternatives ?= update-alternatives-cworth
PREFERRED_PROVIDER_virtual/update-alternatives-native ?= opkg-native
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc
b/meta/conf/distro/include/distro_tracking_fields.inc
index 47fa7bf..eaaafaa 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -3680,14 +3680,14 @@ RECIPE_INTEL_SECTION_pn-mesa-xlib=graphic core
RECIPE_LAST_UPDATE_pn-mesa-xlib = Nov 27, 2010
RECIPE_MAINTAINER_pn-mesa-xlib=Yu Ke ke...@intel.com
-RECIPE_STATUS_pn-xserver-xf86-dri-lite=green # no update needed
-RECIPE_LATEST_VERSION_pn-xserver-xf86-dri-lite=1.8.99.904
-RECIPE_NO_OF_PATCHES_pn-xserver-xf86-dri-lite=2
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-xserver-xf86-dri-lite=2 monthes
-RECIPE_LATEST_RELEASE_DATE_pn-xserver-xf86-dri-lite=2010/07/01
-RECIPE_INTEL_SECTION_pn-xserver-xf86-dri-lite=graphic core
-RECIPE_LAST_UPDATE_pn-xserver-xf86-dri-lite = Jan 18, 2011
-RECIPE_MAINTAINER_pn-xserver-xf86-dri-lite=Yu Ke ke...@intel.com
+RECIPE_STATUS_pn-xserver-xorg=green # no update needed
+RECIPE_LATEST_VERSION_pn-xserver-xorg=1.8.99.904
+RECIPE_NO_OF_PATCHES_pn-xserver-xorg=2
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-xserver-xorg=2 monthes
+RECIPE_LATEST_RELEASE_DATE_pn-xserver-xorg=2010/07/01
+RECIPE_INTEL_SECTION_pn-xserver-xorg=graphic core
+RECIPE_LAST_UPDATE_pn-xserver-xorg = Jan 18, 2011
+RECIPE_MAINTAINER_pn-xserver-xorg=Yu Ke ke...@intel.com
RECIPE_STATUS_pn-xf86-input-synaptics = red
DISTRO_PN_ALIAS_pn-xf86-input-synaptics = Meego=xorg-x11-drv-synaptics
Fedora=xorg-x11-drv-synaptics Ubuntu=xserver-xorg-input-synaptics
Mandriva=x11-driver-input-synaptics Debian=xfree86-driver-synaptics
@@ -5895,8 +5895,8 @@ DISTRO_PN_ALIAS_pn-pseudo = Windriver
DISTRO_PN_ALIAS_pn-btrfs-tools = Debian=btrfs-tools
[OE-core] [oe-core][PATCHv2 17/30] xorg-driver-common: bump INC_PR to rebuild drivers agains new xserver-xorg ABI
Signed-off-by: Martin Jansa martin.ja...@gmail.com --- .../xorg-driver/xorg-driver-common.inc |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc index 801d8d3..edcbbbc 100644 --- a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc +++ b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc @@ -5,7 +5,7 @@ SECTION = x11/drivers LICENSE = MIT-X PE = 1 -INC_PR = r15 +INC_PR = r17 DEPENDS = virtual/xserver-xf86 xproto randrproto util-macros -- 1.7.7 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCHv2 22/30] libx11-trim: move files for libx11-trim from libx11-1.3.4 to libx11-trim-1.3.4
* because there isn't libx11-1.3.4 recipe anymore
* remove older versions from libx11-trim directory
* notice that DESCRIPTION says xcb is disabled and EXTRA_OECONF has
--with-xcb
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
.../{libx11 = libx11-diet-1.3}/X18NCMSstubs.diff |0
.../fix-disable-xlocale.diff |0
.../fix-utf8-wrong-define.patch|0
.../include_fix.patch |0
.../makekeys_crosscompile.patch|0
.../nodolt.patch |0
.../x11_disable_makekeys.patch |0
.../xorg-lib/libx11-trim/include_fix.patch | 25
.../xorg-lib/libx11-trim/nodolt.patch | 14 -
.../libx11-trim/x11_disable_makekeys.patch | 31
.../recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb |8 ++--
11 files changed, 4 insertions(+), 74 deletions(-)
rename meta/recipes-graphics/xorg-lib/{libx11 =
libx11-diet-1.3}/X18NCMSstubs.diff (100%)
rename meta/recipes-graphics/xorg-lib/{libx11 =
libx11-diet-1.3}/fix-disable-xlocale.diff (100%)
rename meta/recipes-graphics/xorg-lib/{libx11 =
libx11-diet-1.3}/fix-utf8-wrong-define.patch (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-1.3.4 =
libx11-trim-1.3.4}/include_fix.patch (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-1.3.4 =
libx11-trim-1.3.4}/makekeys_crosscompile.patch (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-1.3.4 =
libx11-trim-1.3.4}/nodolt.patch (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-1.3.4 =
libx11-trim-1.3.4}/x11_disable_makekeys.patch (100%)
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim/include_fix.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim/nodolt.patch
delete mode 100644
meta/recipes-graphics/xorg-lib/libx11-trim/x11_disable_makekeys.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/X18NCMSstubs.diff
similarity index 100%
rename from meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
rename to meta/recipes-graphics/xorg-lib/libx11-diet-1.3/X18NCMSstubs.diff
diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff
b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-disable-xlocale.diff
similarity index 100%
rename from meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff
rename to
meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-disable-xlocale.diff
diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch
b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-utf8-wrong-define.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch
rename to
meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-utf8-wrong-define.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/include_fix.patch
b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/include_fix.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-lib/libx11-1.3.4/include_fix.patch
rename to meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/include_fix.patch
diff --git
a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/makekeys_crosscompile.patch
b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/makekeys_crosscompile.patch
similarity index 100%
rename from
meta/recipes-graphics/xorg-lib/libx11-1.3.4/makekeys_crosscompile.patch
rename to
meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/makekeys_crosscompile.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/nodolt.patch
b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/nodolt.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-lib/libx11-1.3.4/nodolt.patch
rename to meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/nodolt.patch
diff --git
a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch
b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/x11_disable_makekeys.patch
similarity index 100%
rename from
meta/recipes-graphics/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch
rename to
meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/x11_disable_makekeys.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim/include_fix.patch
b/meta/recipes-graphics/xorg-lib/libx11-trim/include_fix.patch
deleted file mode 100644
index b3bcbab..000
--- a/meta/recipes-graphics/xorg-lib/libx11-trim/include_fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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`
[OE-core] [oe-core][PATCHv2 20/30] libx11: remove older 1.3.4
* libx11-1.3.4 directory is kept for libx11-trim_1.3.4.bb
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb | 35
1 files changed, 0 insertions(+), 35 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb
b/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb
deleted file mode 100644
index ffec7d1..000
--- a/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-require libx11.inc
-inherit gettext
-
-LICENSE = MIT MIT-style BSD
-LIC_FILES_CHKSUM = file://COPYING;md5=bf75bfe4d05068311b5e6862d4b5f2c5
-
-PE = 1
-PR = r4
-
-SRC_URI += file://x11_disable_makekeys.patch \
-file://nodolt.patch \
-file://include_fix.patch \
- file://makekeys_crosscompile.patch
-
-SRC_URI[md5sum] = f65c9c7ecbfb64c19dbd7927160d63fd
-SRC_URI[sha256sum] =
88d7238ce5f7cd123450567de7a3b56a43556e4ccc45df38b8324147c889a844
-
-DEPENDS += bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
-libxdmcp xf86bigfontproto kbproto inputproto xproto-native libxcb
-
-DEPENDS_virtclass-native += bigreqsproto-native xextproto-native \
-xtrans-native libxau-native xcmiscproto-native \
-libxdmcp-native xf86bigfontproto-native kbproto-native \
-inputproto-native xproto-native
-
-DEPENDS_virtclass-nativesdk += bigreqsproto xproto xextproto \
-xtrans libxau xcmiscproto libxdmcp xf86bigfontproto kbproto \
-inputproto xproto-native
-
-XCB = --with-xcb
-XCB_virtclass-native = --without-xcb
-XCB_virtclass-nativesdk = --without-xcb
-EXTRA_OECONF += --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h ${XCB}
-
-BBCLASSEXTEND = native nativesdk
--
1.7.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCHv2 28/30] mesa-dri-glsl-native: drop recipe which wasn't usefull since 7.8.2 was removed
* it will be added again with 7.11 but with different content
(builtin_compiler, instead of glsl)
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
.../mesa/mesa-dri-glsl-native_7.8.2.bb | 27
1 files changed, 0 insertions(+), 27 deletions(-)
delete mode 100644 meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.8.2.bb
diff --git a/meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.8.2.bb
b/meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.8.2.bb
deleted file mode 100644
index d6f2c33..000
--- a/meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.8.2.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = gl shader language specific build from mesa-dri
-HOMEPAGE = http://mesa3d.org;
-BUGTRACKER = https://bugs.freedesktop.org;
-SECTION = x11
-LICENSE = MIT
-LIC_FILES_CHKSUM =
file://apps/compile.c;endline=26;md5=27c2833286ce9566b162bcbe21d5b267
-PR = r0
-
-DEPENDS = makedepend-native
-
-SRC_URI = ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2;
-SRC_URI[md5sum] = 6be2d343a0089bfd395ce02aaf8adb57
-SRC_URI[sha256sum] =
505bf418dceba05837f4ea1b1972b9620c35f8cb94bc4d1e6d573c15f562576d
-
-S = ${WORKDIR}/Mesa-7.8.2/src/glsl/
-
-inherit native
-
-# use default config for native build
-do_configure_prepend() {
- ln -s ${S}/../../configs/default ${S}/../../configs/current
-}
-
-do_install() {
- install -d ${D}/${bindir}
- install -m 755 ${S}/apps/compile ${D}/${bindir}/glsl-compile
-}
--
1.7.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCHv2 25/30] xserver-nodm-init: merge some changes from meta-oe
* /etc/X11/Xusername handling should be moved to x11-common so the same
username and logic is used from initscript and when user starts it
from terminal
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
.../x11-common/xserver-nodm-init/xserver-nodm | 30 ++--
1 files changed, 9 insertions(+), 21 deletions(-)
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
index c707a4b..9cd7904 100755
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
+++ b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
@@ -8,10 +8,7 @@
# Default-Stop: 0 1 6
### END INIT INFO
-killproc() {# kill the named process(es)
-pid=`/bin/pidof $1`
-[ $pid != ] kill $pid
-}
+. /etc/init.d/functions
read CMDLINE /proc/cmdline
for x in $CMDLINE; do
@@ -25,25 +22,16 @@ done
case $1 in
start)
+# We don't want this script to block the rest of the boot process
+if [ $2 != background ]; then
+ $0 $1 background
+else
. /etc/profile
- username=root
+
echo Starting Xserver
- if [ -f /etc/X11/Xusername ]; then
- username=`cat /etc/X11/Xusername`
- # setting for rootless X
- chmod o+w /var/log
- chmod g+r /dev/tty[0-3]
- chmod o+rw /dev/input/*
- # hidraw device is probably needed
- if [ -e /dev/hidraw0 ]; then
- chmod o+rw /dev/hidraw*
- fi
- fi
- # Using su rather than sudo as latest 1.8.1 cause failure [YOCTO #1211]
- su -l -c '/etc/X11/Xserver' $username
- # Wait for the desktop to say its finished loading
- # before loading the rest of the system
- # dbus-wait org.matchbox_project.desktop Loaded
+ . /etc/X11/xserver-common
+ xinit /etc/X11/Xsession -- `which $XSERVER` $ARGS
/var/log/Xsession.log 21
+fi
;;
stop)
--
1.7.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCHv2 23/30] libx11-diet: move old patches used only by libx11-diet-1.3 to separate directory
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
.../{libx11 = libx11-diet-1.3}/include_fix.patch |0
.../{libx11 = libx11-diet-1.3}/nodolt.patch |0
.../x11_disable_makekeys.patch |0
meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb |1 -
4 files changed, 0 insertions(+), 1 deletions(-)
rename meta/recipes-graphics/xorg-lib/{libx11 =
libx11-diet-1.3}/include_fix.patch (100%)
rename meta/recipes-graphics/xorg-lib/{libx11 = libx11-diet-1.3}/nodolt.patch
(100%)
rename meta/recipes-graphics/xorg-lib/{libx11 =
libx11-diet-1.3}/x11_disable_makekeys.patch (100%)
diff --git a/meta/recipes-graphics/xorg-lib/libx11/include_fix.patch
b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/include_fix.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-lib/libx11/include_fix.patch
rename to meta/recipes-graphics/xorg-lib/libx11-diet-1.3/include_fix.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11/nodolt.patch
b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/nodolt.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-lib/libx11/nodolt.patch
rename to meta/recipes-graphics/xorg-lib/libx11-diet-1.3/nodolt.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch
b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/x11_disable_makekeys.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch
rename to
meta/recipes-graphics/xorg-lib/libx11-diet-1.3/x11_disable_makekeys.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
b/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
index 018a141..44e8765 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
@@ -17,7 +17,6 @@ SRC_URI += file://x11_disable_makekeys.patch \
DEPENDS += bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
libxdmcp xf86bigfontproto kbproto inputproto xproto-native
-FILESDIR = ${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11
EXTRA_OECONF += --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h
--without-xcb --disable-udc --disable-xcms --disable-xlocale
CFLAGS += -D_GNU_SOURCE
--
1.7.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCHv2 29/30] mesa: add new version 7.11
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta/recipes-graphics/mesa/mesa-7.11.inc | 15 ++
.../mesa/mesa-dri-glsl-native_7.11.bb | 28
meta/recipes-graphics/mesa/mesa-dri_7.11.bb|4 +++
meta/recipes-graphics/mesa/mesa-xlib_7.11.bb |4 +++
4 files changed, 51 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-graphics/mesa/mesa-7.11.inc
create mode 100644 meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.11.bb
create mode 100644 meta/recipes-graphics/mesa/mesa-dri_7.11.bb
create mode 100644 meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
diff --git a/meta/recipes-graphics/mesa/mesa-7.11.inc
b/meta/recipes-graphics/mesa/mesa-7.11.inc
new file mode 100644
index 000..98b888f
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-7.11.inc
@@ -0,0 +1,15 @@
+SRC_URI = ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
+ file://uclibc.patch \
+
+
+DEPENDS += mesa-dri-glsl-native
+
+SRC_URI[md5sum] = ff03aca82d0560009a076a87c888cf13
+SRC_URI[sha256sum] =
f8bf37a00882840a3e3d327576bc26a79ae7f4e18fe1f7d5f17a5b1c80dd7acf
+
+do_configure_prepend() {
+ #check for python not python2, because python-native does not stage python2
binary/link
+ sed -i 's/AC_CHECK_PROGS(\[PYTHON2\], \[python2
python\])/AC_CHECK_PROGS(\[PYTHON2\], \[python python\])/g' ${S}/configure.ac
+ # We need builtin_compiler built for buildhost arch instead of target (is
provided by mesa-dri-glsl-native)
+ sed -i
s#\./builtin_compiler#${STAGING_BINDIR_NATIVE}/glsl/builtin_compiler#g
${S}/src/glsl/Makefile
+}
diff --git a/meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.11.bb
b/meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.11.bb
new file mode 100644
index 000..f1987fd
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.11.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = gl shader language specific build from mesa-dri
+HOMEPAGE = http://mesa3d.org;
+BUGTRACKER = https://bugs.freedesktop.org;
+SECTION = x11
+LICENSE = GPLv3+
+LIC_FILES_CHKSUM =
file://glsl_parser.cpp;beginline=3;endline=33;md5=d078f1cddc2fc355719c090482254bd9
+
+DEPENDS = makedepend-native
+
+SRC_URI = ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2;
+
+SRC_URI[md5sum] = ff03aca82d0560009a076a87c888cf13
+SRC_URI[sha256sum] =
f8bf37a00882840a3e3d327576bc26a79ae7f4e18fe1f7d5f17a5b1c80dd7acf
+
+S = ${WORKDIR}/Mesa-${PV}/src/glsl/
+
+inherit native
+
+# use default config for native build
+do_configure_prepend() {
+ ln -s ${S}/../../configs/default ${S}/../../configs/current
+}
+
+do_install() {
+ install -d ${D}/${bindir}/glsl
+ install -m 755 ${S}/builtin_compiler
${D}/${bindir}/glsl/builtin_compiler
+ install -m 755 ${S}/glsl_compiler ${D}/${bindir}/glsl/glsl_compiler
+}
diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
b/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
new file mode 100644
index 000..26b56e4
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
@@ -0,0 +1,4 @@
+require mesa-common.inc
+require mesa-${PV}.inc
+require mesa-dri.inc
+PR = ${INC_PR}.0
diff --git a/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
b/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
new file mode 100644
index 000..93bb8cd
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
@@ -0,0 +1,4 @@
+require mesa-common.inc
+require mesa-${PV}.inc
+require mesa-xlib.inc
+PR = ${INC_PR}.0
--
1.7.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCHv2 30/30] mesa: drop older 7.10.2 and 7.7+git recipes
Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta/recipes-graphics/mesa/mesa-dri/cross2.patch | 46 -- meta/recipes-graphics/mesa/mesa-dri/crossfix.patch | 18 --- meta/recipes-graphics/mesa/mesa-dri/i586/matypes.h | 162 meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb | 40 - meta/recipes-graphics/mesa/mesa-dri_git.bb | 57 --- meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb | 22 --- 6 files changed, 0 insertions(+), 345 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/mesa-dri/cross2.patch delete mode 100644 meta/recipes-graphics/mesa/mesa-dri/crossfix.patch delete mode 100644 meta/recipes-graphics/mesa/mesa-dri/i586/matypes.h delete mode 100644 meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb delete mode 100644 meta/recipes-graphics/mesa/mesa-dri_git.bb delete mode 100644 meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb diff --git a/meta/recipes-graphics/mesa/mesa-dri/cross2.patch b/meta/recipes-graphics/mesa/mesa-dri/cross2.patch deleted file mode 100644 index 264c153..000 --- a/meta/recipes-graphics/mesa/mesa-dri/cross2.patch +++ /dev/null @@ -1,46 +0,0 @@ -Upstream-Status: Pending - -Index: git/configure.ac -=== git.orig/configure.ac 2009-09-01 16:38:26.0 +0100 -+++ git/configure.ac 2009-09-01 16:38:47.0 +0100 -@@ -269,15 +269,6 @@ - GLAPI_ASM_SOURCES= - AC_MSG_CHECKING([whether to enable assembly]) - test x$enable_asm = xno AC_MSG_RESULT([no]) --# disable if cross compiling on x86/x86_64 since we must run gen_matypes --if test x$enable_asm = xyes test x$cross_compiling = xyes; then --case $host_cpu in --i?86 | x86_64) --enable_asm=no --AC_MSG_RESULT([no, cross compiling]) --;; --esac --fi - # check for supported arches - if test x$enable_asm = xyes; then - case $host_cpu in -Index: git/src/mesa/x86/Makefile -=== git.orig/src/mesa/x86/Makefile 2009-09-01 16:40:02.0 +0100 -+++ git/src/mesa/x86/Makefile 2009-09-01 16:40:13.0 +0100 -@@ -14,19 +14,6 @@ - -I../tnl - - --default: gen_matypes matypes.h -- --clean: -- -rm -f matypes.h gen_matypes -- -- --gen_matypes: gen_matypes.c -- $(HOST_CC) $(ARCH_FLAGS) $(INCLUDE_DIRS) $(HOST_CFLAGS) gen_matypes.c -o gen_matypes -- --# need some special rules here, unfortunately --matypes.h: ../main/mtypes.h ../tnl/t_context.h gen_matypes -- ./gen_matypes matypes.h -- - common_x86_asm.o: matypes.h - 3dnow_normal.o: matypes.h - 3dnow_xform1.o: matypes.h diff --git a/meta/recipes-graphics/mesa/mesa-dri/crossfix.patch b/meta/recipes-graphics/mesa/mesa-dri/crossfix.patch deleted file mode 100644 index d300e2f..000 --- a/meta/recipes-graphics/mesa/mesa-dri/crossfix.patch +++ /dev/null @@ -1,18 +0,0 @@ -Upstream-Status: Pending - -Index: Mesa-7.5/bin/mklib -=== Mesa-7.5.orig/bin/mklib2009-08-12 13:01:34.0 +0100 -+++ Mesa-7.5/bin/mklib 2009-08-12 13:04:19.0 +0100 -@@ -234,9 +234,9 @@ - if [ x$LINK = x ] ; then - # -linker was not specified so set default link command now - if [ $CPLUSPLUS = 1 ] ; then --LINK=g++ -+LINK=$CXX - else --LINK=gcc -+LINK=$CC - fi - fi - diff --git a/meta/recipes-graphics/mesa/mesa-dri/i586/matypes.h b/meta/recipes-graphics/mesa/mesa-dri/i586/matypes.h deleted file mode 100644 index 98d2188..000 --- a/meta/recipes-graphics/mesa/mesa-dri/i586/matypes.h +++ /dev/null @@ -1,162 +0,0 @@ -/* - * This file is automatically generated from the Mesa internal type - * definitions. Do not edit directly. - */ - -#ifndef __ASM_TYPES_H__ -#define __ASM_TYPES_H__ - - - -/* = - * Offsets for GLcontext - */ - -#define CTX_DRIVER_CTX 996 - -#define CTX_LIGHT_ENABLED 39404 -#define CTX_LIGHT_SHADE_MODEL 39408 -#define CTX_LIGHT_COLOR_MAT_FACE 39412 -#define CTX_LIGHT_COLOR_MAT_MODE 39416 -#define CTX_LIGHT_COLOR_MAT_MASK 39420 -#define CTX_LIGHT_COLOR_MAT_ENABLED39424 -#define CTX_LIGHT_ENABLED_LIST 39432 -#define CTX_LIGHT_NEED_VERTS 43793 -#define CTX_LIGHT_FLAGS43796 -#define CTX_LIGHT_BASE_COLOR 43800 - - -/* = - * Offsets for struct vertex_buffer - */ - -#define VB_SIZE0 -#define VB_COUNT 4 - -#define VB_ELTS8 -#define VB_OBJ_PTR 12 -#define VB_EYE_PTR 16 -#define VB_CLIP_PTR20 -#define VB_PROJ_CLIP_PTR 24 -#define VB_CLIP_OR_MASK28
[OE-core] bitbake webkit-gtk fails with clean temp dir
Have pulled yesterday all the angstom layers (oe-core / meta-oe ..) and deleted all files from temp build dir. For bitbake webkit-gtk I get NOTE: package webkit-gtk-1.5.1+svnr90727-r0: task do_compile: Started ERROR: Function 'do_compile' failed (see /home/Superandy/tmp/oe-core-eglibc/work/armv7a-angstrom-linux-gnueabi/webkit-gtk-1.5.1+svnr90727-r0/temp/log.do_compile.13377 for further information) ERROR: Logfile of failure stored in: /home/Superandy/tmp/oe-core-eglibc/work/armv7a-angstrom-linux-gnueabi/webkit-gtk-1.5.1+svnr90727-r0/temp/log.do_compile.13377 Log data follows: | DEBUG: SITE files ['endian-little', 'bit-32', 'arm-common', 'common-linux', 'common-glibc', 'arm-linux', 'arm-linux-gnueabi', 'common'] | + cd /home/Superandy/tmp/oe-core-eglibc/work/armv7a-angstrom-linux-gnueabi/webkit-gtk-1.5.1+svnr90727-r0/ | + do_compile | + base_do_compile | + '[' -e Makefile -o -e makefile ']' | + oe_runmake | + '[' xmake = x ']' | + bbnote make -j 4 | + echo 'NOTE: make -j 4' | NOTE: make -j 4 | + make -j 4 | /usr/bin/perl -I./Source/WebCore/bindings/scripts ./Source/WebCore/bindings/scripts/generate-bindings.pl --include ./Source/WebCore/dom --include ./Source/WebCore/html --include ./Source/WebCore/css --include ./Source/WebCore/page --include ./Source/WebCore/xml --include ./Source/WebCore/svg --outputDir ./DerivedSources/webkit --defines LANGUAGE_GOBJECT=1 ENABLE_CHANNEL_MESSAGING=1 ENABLE_METER_TAG=1 ENABLE_PROGRESS_TAG=1 ENABLE_JAVASCRIPT_DEBUGGER=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DATABASE=1 ENABLE_DATALIST=1 ENABLE_EVENTSOURCE=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_FULLSCREEN_API=1 ENABLE_VIDEO_TRACK=1 ENABLE_XPATH=1 ENABLE_XSLT=1 ENABLE_WORKERS=1 ENABLE_SHARED_WORKERS=1 ENABLE_FILTERS=1 ENABLE_WEB_SOCKETS=1 ENABLE_BLOB=1 --generator GObject ./Source/WebCore/css/CSSRule.idl | /usr/bin/perl -I./Source/WebCore/bindings/scripts ./Source/WebCore/bindings/scripts/generate-bindings.pl --include ./Source/WebCore/dom --include ./Source/WebCore/html --include ./Source/WebCore/css --include ./Source/WebCore/page --include ./Source/WebCore/xml --include ./Source/WebCore/svg --outputDir ./DerivedSources/webkit --defines LANGUAGE_GOBJECT=1 ENABLE_CHANNEL_MESSAGING=1 ENABLE_METER_TAG=1 ENABLE_PROGRESS_TAG=1 ENABLE_JAVASCRIPT_DEBUGGER=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DATABASE=1 ENABLE_DATALIST=1 ENABLE_EVENTSOURCE=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_FULLSCREEN_API=1 ENABLE_VIDEO_TRACK=1 ENABLE_XPATH=1 ENABLE_XSLT=1 ENABLE_WORKERS=1 ENABLE_SHARED_WORKERS=1 ENABLE_FILTERS=1 ENABLE_WEB_SOCKETS=1 ENABLE_BLOB=1 --generator GObject ./Source/WebCore/css/CSSRuleList.idl | /usr/bin/perl -I./Source/WebCore/bindings/scripts ./Source/WebCore/bindings/scripts/generate-bindings.pl --include ./Source/WebCore/dom --include ./Source/WebCore/html --include ./Source/WebCore/css --include ./Source/WebCore/page --include ./Source/WebCore/xml --include ./Source/WebCore/svg --outputDir ./DerivedSources/webkit --defines LANGUAGE_GOBJECT=1 ENABLE_CHANNEL_MESSAGING=1 ENABLE_METER_TAG=1 ENABLE_PROGRESS_TAG=1 ENABLE_JAVASCRIPT_DEBUGGER=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DATABASE=1 ENABLE_DATALIST=1 ENABLE_EVENTSOURCE=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_FULLSCREEN_API=1 ENABLE_VIDEO_TRACK=1 ENABLE_XPATH=1 ENABLE_XSLT=1 ENABLE_WORKERS=1 ENABLE_SHARED_WORKERS=1 ENABLE_FILTERS=1 ENABLE_WEB_SOCKETS=1 ENABLE_BLOB=1 --generator GObject ./Source/WebCore/css/CSSStyleDeclaration.idl | /usr/bin/perl -I./Source/WebCore/bindings/scripts ./Source/WebCore/bindings/scripts/generate-bindings.pl --include ./Source/WebCore/dom --include ./Source/WebCore/html --include ./Source/WebCore/css --include ./Source/WebCore/page --include ./Source/WebCore/xml --include ./Source/WebCore/svg --outputDir ./DerivedSources/webkit --defines LANGUAGE_GOBJECT=1 ENABLE_CHANNEL_MESSAGING=1 ENABLE_METER_TAG=1 ENABLE_PROGRESS_TAG=1 ENABLE_JAVASCRIPT_DEBUGGER=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DATABASE=1 ENABLE_DATALIST=1 ENABLE_EVENTSOURCE=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_FULLSCREEN_API=1 ENABLE_VIDEO_TRACK=1 ENABLE_XPATH=1 ENABLE_XSLT=1 ENABLE_WORKERS=1 ENABLE_SHARED_WORKERS=1 ENABLE_FILTERS=1 ENABLE_WEB_SOCKETS=1 ENABLE_BLOB=1 --generator GObject ./Source/WebCore/css/CSSStyleSheet.idl | Unquoted string attributes may clash with future reserved word at Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm line 1036. | Unquoted string attributes may clash with future reserved word at Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm line 1036. | Unquoted string attributes may clash with future reserved word at Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm line 1036. | Couldn't open file ./DerivedSources/webkit/WebKitDOMCSSRuleListPrivate.h for writing at Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm line 1122. | Couldn't open file ./DerivedSources/webkit/WebKitDOMCSSStyleSheetPrivate.h for writing at
Re: [OE-core] [RFC] .la files cleanup
On Mon, 2011-10-03 at 14:58 +0400, Dmitry Eremin-Solenikov wrote:
My proposal would be to include a special task or a
do_install_append() part that
will remove specified .la files. (like ${libdir}/xorg/modules/*/.la,
${libdir}/matchbox-panel/*.la, etc.). I see this usually done in
do_install or in special do_install_append
parts, but I think it would be better to handle this globally.
I guess the ideal solution would be to find a way to stop libtool from
installing these things in the first place. It isn't totally obvious to
me that the .la files are a net benefit even for real shared libraries,
and for plugins I think they are probably a net loss in most/all cases.
When this issue last came up it seemed that Richard's preferred fix was
to just ship the .la files in FILES_${PN}-dev, and I guess that approach
does at least have the merit of simplicity. See:
http://lists.linuxtogo.org/pipermail/openembedded-core/2011-July/005533.html
p.
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [oe-core][PATCHv2 26/30] glx-use-tls: add from meta-oe layer
Can you add some commentary explaining why this is necessary -- i.e.
what exactly is lacking in uClibc to mean it doesn't have prober TLS
support?
p.
On Mon, 2011-10-03 at 15:28 +0200, Martin Jansa wrote:
* it's in .bbclass instead of .inc because it's used by mesa and
xserver-xf86 recipes
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta/classes/glx-use-tls.bbclass |7 +++
1 files changed, 7 insertions(+), 0 deletions(-)
create mode 100644 meta/classes/glx-use-tls.bbclass
diff --git a/meta/classes/glx-use-tls.bbclass
b/meta/classes/glx-use-tls.bbclass
new file mode 100644
index 000..7530872
--- /dev/null
+++ b/meta/classes/glx-use-tls.bbclass
@@ -0,0 +1,7 @@
+def get_tls_setting(bb, d):
+# until we have no prober TLS support in uclibc disable it
+if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') = 0 :
+return
+return --enable-glx-tls
+
+EXTRA_OECONF += ${@get_tls_setting(bb, d)}
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [oe-core][PATCHv2 26/30] glx-use-tls: add from meta-oe layer
On Mon, Oct 03, 2011 at 04:02:10PM +0100, Phil Blundell wrote:
Can you add some commentary explaining why this is necessary -- i.e.
what exactly is lacking in uClibc to mean it doesn't have prober TLS
support?
I'm not using uClibc myself and tracking original bbclass in OE-classic
leads to this commit
http://git.openembedded.org/cgit.cgi/openembedded/commit/packages/mesa/mesa-tls.inc?id=b527d8f723c98c77f2f5c5358062e5348493d767
So I'm CCing woglinde and he will probably explain it.
Regards,
p.
On Mon, 2011-10-03 at 15:28 +0200, Martin Jansa wrote:
* it's in .bbclass instead of .inc because it's used by mesa and
xserver-xf86 recipes
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta/classes/glx-use-tls.bbclass |7 +++
1 files changed, 7 insertions(+), 0 deletions(-)
create mode 100644 meta/classes/glx-use-tls.bbclass
diff --git a/meta/classes/glx-use-tls.bbclass
b/meta/classes/glx-use-tls.bbclass
new file mode 100644
index 000..7530872
--- /dev/null
+++ b/meta/classes/glx-use-tls.bbclass
@@ -0,0 +1,7 @@
+def get_tls_setting(bb, d):
+# until we have no prober TLS support in uclibc disable it
+if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') = 0 :
+return
+return --enable-glx-tls
+
+EXTRA_OECONF += ${@get_tls_setting(bb, d)}
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] bitbake webkit-gtk fails with clean temp dir
Op 3 okt. 2011 om 09:03 heeft Andreas Müller schnitzelt...@gmx.de het volgende geschreven: Have pulled yesterday all the angstom layers (oe-core / meta-oe ..) and deleted all files from temp build dir. For bitbake webkit-gtk I get NOTE: package webkit-gtk-1.5.1+svnr90727-r0: task do_compile: Started ERROR: Function 'do_compile' failed (see /home/Superandy/tmp/oe-core-eglibc/work/armv7a-angstrom-linux-gnueabi/webkit-gtk-1.5.1+svnr90727-r0/temp/log.do_compile.13377 for further information) ERROR: Logfile of failure stored in: /home/Superandy/tmp/oe-core-eglibc/work/armv7a-angstrom-linux-gnueabi/webkit-gtk-1.5.1+svnr90727-r0/temp/log.do_compile.13377 Log data follows: | DEBUG: SITE files ['endian-little', 'bit-32', 'arm-common', 'common-linux', 'common-glibc', 'arm-linux', 'arm-linux-gnueabi', 'common'] | + cd /home/Superandy/tmp/oe-core-eglibc/work/armv7a-angstrom-linux-gnueabi/webkit-gtk-1.5.1+svnr90727-r0/ | + do_compile | + base_do_compile | + '[' -e Makefile -o -e makefile ']' | + oe_runmake | + '[' xmake = x ']' | + bbnote make -j 4 | + echo 'NOTE: make -j 4' | NOTE: make -j 4 | + make -j 4 | /usr/bin/perl -I./Source/WebCore/bindings/scripts ./Source/WebCore/bindings/scripts/generate-bindings.pl --include ./Source/WebCore/dom --include ./Source/WebCore/html --include ./Source/WebCore/css --include ./Source/WebCore/page --include ./Source/WebCore/xml --include ./Source/WebCore/svg --outputDir ./DerivedSources/webkit --defines LANGUAGE_GOBJECT=1 ENABLE_CHANNEL_MESSAGING=1 ENABLE_METER_TAG=1 ENABLE_PROGRESS_TAG=1 ENABLE_JAVASCRIPT_DEBUGGER=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DATABASE=1 ENABLE_DATALIST=1 ENABLE_EVENTSOURCE=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_FULLSCREEN_API=1 ENABLE_VIDEO_TRACK=1 ENABLE_XPATH=1 ENABLE_XSLT=1 ENABLE_WORKERS=1 ENABLE_SHARED_WORKERS=1 ENABLE_FILTERS=1 ENABLE_WEB_SOCKETS=1 ENABLE_BLOB=1 --generator GObject ./Source/WebCore/css/CSSRule.idl | /usr/bin/perl -I./Source/WebCore/bindings/scripts ./Source/WebCore/bindings/scripts/generate-bindings.pl --include ./Source/WebCore/dom --include ./Source/WebCore/html --include ./Source/WebCore/css --include ./Source/WebCore/page --include ./Source/WebCore/xml --include ./Source/WebCore/svg --outputDir ./DerivedSources/webkit --defines LANGUAGE_GOBJECT=1 ENABLE_CHANNEL_MESSAGING=1 ENABLE_METER_TAG=1 ENABLE_PROGRESS_TAG=1 ENABLE_JAVASCRIPT_DEBUGGER=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DATABASE=1 ENABLE_DATALIST=1 ENABLE_EVENTSOURCE=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_FULLSCREEN_API=1 ENABLE_VIDEO_TRACK=1 ENABLE_XPATH=1 ENABLE_XSLT=1 ENABLE_WORKERS=1 ENABLE_SHARED_WORKERS=1 ENABLE_FILTERS=1 ENABLE_WEB_SOCKETS=1 ENABLE_BLOB=1 --generator GObject ./Source/WebCore/css/CSSRuleList.idl | /usr/bin/perl -I./Source/WebCore/bindings/scripts ./Source/WebCore/bindings/scripts/generate-bindings.pl --include ./Source/WebCore/dom --include ./Source/WebCore/html --include ./Source/WebCore/css --include ./Source/WebCore/page --include ./Source/WebCore/xml --include ./Source/WebCore/svg --outputDir ./DerivedSources/webkit --defines LANGUAGE_GOBJECT=1 ENABLE_CHANNEL_MESSAGING=1 ENABLE_METER_TAG=1 ENABLE_PROGRESS_TAG=1 ENABLE_JAVASCRIPT_DEBUGGER=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DATABASE=1 ENABLE_DATALIST=1 ENABLE_EVENTSOURCE=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_FULLSCREEN_API=1 ENABLE_VIDEO_TRACK=1 ENABLE_XPATH=1 ENABLE_XSLT=1 ENABLE_WORKERS=1 ENABLE_SHARED_WORKERS=1 ENABLE_FILTERS=1 ENABLE_WEB_SOCKETS=1 ENABLE_BLOB=1 --generator GObject ./Source/WebCore/css/CSSStyleDeclaration.idl | /usr/bin/perl -I./Source/WebCore/bindings/scripts ./Source/WebCore/bindings/scripts/generate-bindings.pl --include ./Source/WebCore/dom --include ./Source/WebCore/html --include ./Source/WebCore/css --include ./Source/WebCore/page --include ./Source/WebCore/xml --include ./Source/WebCore/svg --outputDir ./DerivedSources/webkit --defines LANGUAGE_GOBJECT=1 ENABLE_CHANNEL_MESSAGING=1 ENABLE_METER_TAG=1 ENABLE_PROGRESS_TAG=1 ENABLE_JAVASCRIPT_DEBUGGER=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DATABASE=1 ENABLE_DATALIST=1 ENABLE_EVENTSOURCE=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_FULLSCREEN_API=1 ENABLE_VIDEO_TRACK=1 ENABLE_XPATH=1 ENABLE_XSLT=1 ENABLE_WORKERS=1 ENABLE_SHARED_WORKERS=1 ENABLE_FILTERS=1 ENABLE_WEB_SOCKETS=1 ENABLE_BLOB=1 --generator GObject ./Source/WebCore/css/CSSStyleSheet.idl | Unquoted string attributes may clash with future reserved word at Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm line 1036. | Unquoted string attributes may clash with future reserved word at Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm line 1036. | Unquoted string attributes may clash with future reserved word at Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm line 1036. | Couldn't open file ./DerivedSources/webkit/WebKitDOMCSSRuleListPrivate.h for writing at
Re: [OE-core] bitbake webkit-gtk fails with clean temp dir
On 2011-10-03 09:24, Koen Kooi wrote: Op 3 okt. 2011 om 09:03 heeft Andreas Müllerschnitzelt...@gmx.de het volgende geschreven: Have pulled yesterday all the angstom layers (oe-core / meta-oe ..) and deleted all files from temp build dir. For bitbake webkit-gtk I get NOTE: package webkit-gtk-1.5.1+svnr90727-r0: task do_compile: Started ERROR: Function 'do_compile' failed (see /home/Superandy/tmp/oe-core-eglibc/work/armv7a-angstrom-linux-gnueabi/webkit-gtk-1.5.1+svnr90727-r0/temp/log.do_compile.13377 for further information) ERROR: Logfile of failure stored in: /home/Superandy/tmp/oe-core-eglibc/work/armv7a-angstrom-linux-gnueabi/webkit-gtk-1.5.1+svnr90727-r0/temp/log.do_compile.13377 Log data follows: | DEBUG: SITE files ['endian-little', 'bit-32', 'arm-common', 'common-linux', 'common-glibc', 'arm-linux', 'arm-linux-gnueabi', 'common'] | + cd /home/Superandy/tmp/oe-core-eglibc/work/armv7a-angstrom-linux-gnueabi/webkit-gtk-1.5.1+svnr90727-r0/ | + do_compile | + base_do_compile | + '[' -e Makefile -o -e makefile ']' | + oe_runmake | + '[' xmake = x ']' | + bbnote make -j 4 | + echo 'NOTE: make -j 4' | NOTE: make -j 4 | + make -j 4 | /usr/bin/perl -I./Source/WebCore/bindings/scripts ./Source/WebCore/bindings/scripts/generate-bindings.pl --include ./Source/WebCore/dom --include ./Source/WebCore/html --include ./Source/WebCore/css --include ./Source/WebCore/page --include ./Source/WebCore/xml --include ./Source/WebCore/svg --outputDir ./DerivedSources/webkit --defines LANGUAGE_GOBJECT=1 ENABLE_CHANNEL_MESSAGING=1 ENABLE_METER_TAG=1 ENABLE_PROGRESS_TAG=1 ENABLE_JAVASCRIPT_DEBUGGER=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DATABASE=1 ENABLE_DATALIST=1 ENABLE_EVENTSOURCE=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_FULLSCREEN_API=1 ENABLE_VIDEO_TRACK=1 ENABLE_XPATH=1 ENABLE_XSLT=1 ENABLE_WORKERS=1 ENABLE_SHARED_WORKERS=1 ENABLE_FILTERS=1 ENABLE_WEB_SOCKETS=1 ENABLE_BLOB=1 --generator GObject ./Source/WebCore/css/CSSRule.idl | /usr/bin/perl -I./Source/WebCore/bindings/scripts ./Source/WebCore/bindings/scripts/generate-bindings.pl --include ./Source/WebCore/dom --include ./Source/WebCore/html --include ./Source/WebCore/css --include ./Source/WebCore/page --include ./Source/WebCore/xml --include ./Source/WebCore/svg --outputDir ./DerivedSources/webkit --defines LANGUAGE_GOBJECT=1 ENABLE_CHANNEL_MESSAGING=1 ENABLE_METER_TAG=1 ENABLE_PROGRESS_TAG=1 ENABLE_JAVASCRIPT_DEBUGGER=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DATABASE=1 ENABLE_DATALIST=1 ENABLE_EVENTSOURCE=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_FULLSCREEN_API=1 ENABLE_VIDEO_TRACK=1 ENABLE_XPATH=1 ENABLE_XSLT=1 ENABLE_WORKERS=1 ENABLE_SHARED_WORKERS=1 ENABLE_FILTERS=1 ENABLE_WEB_SOCKETS=1 ENABLE_BLOB=1 --generator GObject ./Source/WebCore/css/CSSRuleList.idl | /usr/bin/perl -I./Source/WebCore/bindings/scripts ./Source/WebCore/bindings/scripts/generate-bindings.pl --include ./Source/WebCore/dom --include ./Source/WebCore/html --include ./Source/WebCore/css --include ./Source/WebCore/page --include ./Source/WebCore/xml --include ./Source/WebCore/svg --outputDir ./DerivedSources/webkit --defines LANGUAGE_GOBJECT=1 ENABLE_CHANNEL_MESSAGING=1 ENABLE_METER_TAG=1 ENABLE_PROGRESS_TAG=1 ENABLE_JAVASCRIPT_DEBUGGER=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DATABASE=1 ENABLE_DATALIST=1 ENABLE_EVENTSOURCE=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_FULLSCREEN_API=1 ENABLE_VIDEO_TRACK=1 ENABLE_XPATH=1 ENABLE_XSLT=1 ENABLE_WORKERS=1 ENABLE_SHARED_WORKERS=1 ENABLE_FILTERS=1 ENABLE_WEB_SOCKETS=1 ENABLE_BLOB=1 --generator GObject ./Source/WebCore/css/CSSStyleDeclaration.idl | /usr/bin/perl -I./Source/WebCore/bindings/scripts ./Source/WebCore/bindings/scripts/generate-bindings.pl --include ./Source/WebCore/dom --include ./Source/WebCore/html --include ./Source/WebCore/css --include ./Source/WebCore/page --include ./Source/WebCore/xml --include ./Source/WebCore/svg --outputDir ./DerivedSources/webkit --defines LANGUAGE_GOBJECT=1 ENABLE_CHANNEL_MESSAGING=1 ENABLE_METER_TAG=1 ENABLE_PROGRESS_TAG=1 ENABLE_JAVASCRIPT_DEBUGGER=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DATABASE=1 ENABLE_DATALIST=1 ENABLE_EVENTSOURCE=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_FULLSCREEN_API=1 ENABLE_VIDEO_TRACK=1 ENABLE_XPATH=1 ENABLE_XSLT=1 ENABLE_WORKERS=1 ENABLE_SHARED_WORKERS=1 ENABLE_FILTERS=1 ENABLE_WEB_SOCKETS=1 ENABLE_BLOB=1 --generator GObject ./Source/WebCore/css/CSSStyleSheet.idl | Unquoted string attributes may clash with future reserved word at Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm line 1036. | Unquoted string attributes may clash with future reserved word at Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm line 1036. | Unquoted string attributes may clash with future reserved word at Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm line 1036. | Couldn't open file ./DerivedSources/webkit/WebKitDOMCSSRuleListPrivate.h for writing at Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm line
[OE-core] sstate_clean() overzealous?
The sstate_clean() function in sstate.bbclass is doing (inter alia):
stfile = d.getVar(STAMP, True) + .do_ + ss['task']
[...]
oe.path.remove(stfile + .*)
oe.path.remove(stfile + _setscene + .*)
which means that, for tasks which set the stamp-extra-info flag to
${MACHINE}, it ends up blowing away the stamps for all machines rather
than just the current one. The net effect of this seems to be that
there is no way to have the setscene stamps populated for more than one
MACHINE at any time, and hence all those tasks get rerun every time you
change MACHINE even if nothing else has been altered.
Is this behaviour deliberate? It is certainly a little bit annoying but
I don't understand the internals of sstate well enough to judge what
exactly that glob is trying to accomplish.
thanks
p.
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC] .la files cleanup
On 10/03/2011 06:55 PM, Phil Blundell wrote:
On Mon, 2011-10-03 at 14:58 +0400, Dmitry Eremin-Solenikov wrote:
My proposal would be to include a special task or a
do_install_append() part that
will remove specified .la files. (like ${libdir}/xorg/modules/*/.la,
${libdir}/matchbox-panel/*.la, etc.). I see this usually done in
do_install or in special do_install_append
parts, but I think it would be better to handle this globally.
I guess the ideal solution would be to find a way to stop libtool from
installing these things in the first place. It isn't totally obvious to
me that the .la files are a net benefit even for real shared libraries,
and for plugins I think they are probably a net loss in most/all cases.
When this issue last came up it seemed that Richard's preferred fix was
to just ship the .la files in FILES_${PN}-dev, and I guess that approach
does at least have the merit of simplicity. See:
http://lists.linuxtogo.org/pipermail/openembedded-core/2011-July/005533.html
I see... Then I'd drop some local patches dropping .la files and just
push them into -dev packages.
RP, is that suitable for you?
--
With best wishes
Dmitry
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 1/2] Fix the --root option in shadow-native programs.
On 09/30/2011 05:10 PM, Julian Pidancet wrote:
The add_root_cmd_options.patch that we apply to shadow-native allow the
various programs from the shadow utility package to chroot() so they can
be used to modify etc/passwd and etc/group if they are located in a
sysroot.
Some of the shadow programs (gpasswd, useradd and usermod) need to parse
the command line in two passes. But we can't use getopt_long() twice
because getopt_long() reorders the command line arguments, and
consequently corrupts the option parsing during the second pass.
This patch fixes this issue by replacing the first pass by a very simple
manual walk of the command line to handle the --root argument.
This change is a patch of another patch, I apologize if it is
difficult to read. But IMHO it wouldn't make sense to put the patch for
this issue in another separated file.
The --root options in groupadd and useradd are needed to make the
useradd class work, and this issue was preventing to use useradd and
groupadd long options while using the class.
Signed-off-by: Julian Pidancetjulian.pidan...@gmail.com
---
.../shadow/files/add_root_cmd_options.patch| 180 ++--
1 files changed, 89 insertions(+), 91 deletions(-)
diff --git a/meta/recipes-extended/shadow/files/add_root_cmd_options.patch
b/meta/recipes-extended/shadow/files/add_root_cmd_options.patch
index c5f2bec..2604ad8 100644
--- a/meta/recipes-extended/shadow/files/add_root_cmd_options.patch
+++ b/meta/recipes-extended/shadow/files/add_root_cmd_options.patch
@@ -26,8 +26,8 @@ Workaround is specific to our build system.
Signed-off-by: Scott Garmanscott.a.gar...@intel.com
Julian,
Since you modified this patch, it would be helpful to explain what you
did in the patch itself and add an Signed-off-by line.
Thanks
Sau!
diff -urN shadow-4.1.4.3.orig//src/gpasswd.c shadow-4.1.4.3//src/gpasswd.c
shadow-4.1.4.3.orig//src/gpasswd.c 2011-02-13 09:58:16.0 -0800
-+++ shadow-4.1.4.3//src/gpasswd.c 2011-06-28 15:12:03.539504372 -0700
+--- shadow-4.1.4.3.orig//src/gpasswd.c 2011-09-29 12:00:45.21191 +0100
shadow-4.1.4.3//src/gpasswd.c 2011-09-29 12:09:54.59090 +0100
@@ -63,6 +63,7 @@
* (/etc/gshadow present) */
static bool is_shadowgrp;
@@ -52,7 +52,7 @@ diff -urN shadow-4.1.4.3.orig//src/gpasswd.c
shadow-4.1.4.3//src/gpasswd.c
-r, --remove-password remove the GROUP's
password\n
-R, --restrictrestrict access to GROUP to its
members\n
-M, --members USER,...set the list of members of
GROUP\n
-@@ -226,6 +229,55 @@
+@@ -226,6 +229,57 @@
}
/*
@@ -68,23 +68,26 @@ diff -urN shadow-4.1.4.3.orig//src/gpasswd.c
shadow-4.1.4.3//src/gpasswd.c
+ /*
+ * Parse the command line options.
+ */
-+ int flag;
-+ int option_index = 0;
-+ static struct option long_options[] = {
-+ {root, required_argument, NULL, 'Q'},
-+ {NULL, 0, NULL, '\0'}
-+ };
++ int i;
++char *root;
+
-+ while ((flag = getopt_long (argc, argv, a:A:d:gM:Q:rR,
long_options,option_index)) != -1) {
-+ switch (flag) {
-+ case 'Q':
-+ if ('/' != optarg[0]) {
++for (i = 0; i argc; i++) {
++ if (!strcmp (argv[i], --root) || !strcmp (argv[i], -Q)) {
++ if (i + 1 == argc) {
++ fprintf (stderr,
++ _(%s: option '%s' requires an
argument\n),
++ Prog, argv[i]);
++ exit (E_BAD_ARG);
++ }
++ root = argv[i + 1];
++
++ if ('/' != root[0]) {
+ fprintf (stderr,
+ _(%s: invalid chroot path '%s'\n),
-+ Prog, optarg);
++ Prog, root);
+ exit (E_BAD_ARG);
+ }
-+ newroot = optarg;
++ newroot = root;
+
+ if (access (newroot, F_OK) != 0) {
+ fprintf(stderr,
@@ -99,7 +102,6 @@ diff -urN shadow-4.1.4.3.orig//src/gpasswd.c
shadow-4.1.4.3//src/gpasswd.c
+ exit (E_BAD_ARG);
+ }
+ break;
-+ /* no-op on everything else - they will be hanled by
process_flags() */
+ }
+ }
+}
@@ -108,7 +110,7 @@ diff -urN shadow-4.1.4.3.orig//src/gpasswd.c
shadow-4.1.4.3//src/gpasswd.c
* process_flags - process the command line options and arguments
*/
static void process_flags (int argc, char **argv)
-@@ -235,6 +287,7 @@
+@@ -235,6 +289,7 @@
static struct option long_options[] = {
{add, required_argument,
Re: [OE-core] [PATCH v3 01/16] libnl2: Fix a race on route/pktloc_syntax.h
On Fri, Sep 30, 2011 at 12:26 PM, Martin Jansa martin.ja...@gmail.com wrote: On Fri, Sep 30, 2011 at 12:21:23PM -0500, Matthew McClintock wrote: From: Tom Rini tom_r...@mentor.com At issue is that route/pktloc.c (not generated) depends on route/pktloc_syntax.h (generated). On Fri, Sep 30, 2011 at 9:13 AM, Martin Jansa martin.ja...@gmail.com wrote: and when you're at it, please also add packaging changes from meta-oe, so we can remove libnl from meta-oe and keep only libnl1 there. Sorry, I'm not sure I follow. Are you referring to all the other stuff in the old openembedded? I'm not following this package particularly closely. * 9fef5f0 Add 'ucred' structure declaration in netlink headers for the integrity * f9e4241 libnl-1.1: rename to libnl1 and build only static lib * 4ccaf2c libnl_git: remove fix-pktloc-dep-race.patch from this version * 91e03b2 libnl: add libnl.inc and use INC_PR * 4702231 libnl: don't use /usr/include/libnl2 anymore * 5ef679a libnl: rename libnl2 to libnl as used in openembedded-core -M ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] bitbake webkit-gtk fails with clean temp dir
On Monday, October 03, 2011 05:29:52 PM Gary Thomas wrote: NOTE: package webkit-gtk-1.5.1+svnr90727-r0: task do_compile: Failed ERROR: Task 7 (/home/Superandy/data/oe-core/sources/openembedded-core/meta/recipes-sato/webkit/webkit-gtk_svn.bb, do_compile) failed with exit code '1' ideas what causes this? no idea, but I get the same error It builds in Yocto/Poky so you might compare with those recipes. Dit you pull [1] and rebuild webkit-gtk? some investigation later: by diff'ing log files created by working environment with the current environment I fell over log.do_configure: --disable-dependency-tracking was added in [1]. Tried manual bisecting by git reset --hard 288343e30604b944dc18fd82172febd314d9c520 é voilà: webkit-gtk builds again. Will send a patch with --enable-dependency-tracking after testing... Andreas [1] http://cgit.openembedded.org/cgit.cgi/openembedded-core/commit/?id=970e0ae610804638d00b0a6b85c6e2e895778e8e ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] help2man
On 9/29/2011 4:58 AM, Richard Purdie wrote: The more I look at and think about help2man, the more it looks like something we just shouldn't need/use. In summary, it runs a binary and captures its --help output. This rules it out from being useful in most cross compiling scenarios, i.e. all target packages. right. This should be disabled for cross builds. May be it should be disabled in autotools bbclass do_configure itself. In the -native/-cross cases, we don't really care about man pages. I'm therefore thinking we should really just drop the dependency and symlink help2man to /bin/false. The missing script in autotools should then just silently touch the man page files instead of regenerating them. I tried to figure out which recipes actually use help2man: $ grep HELP2MAN * -r --exclude=Makefile.in 2 /dev/null | grep -v missing and against a core-image-sato this gave: libtool libtasn1 gettext automake autoconf flex bison m4 which isn't that many recipes to go and beat up manually if necessary. It certainly doesn't warrant a global include in autotools.bbclass IMO. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3 01/16] libnl2: Fix a race on route/pktloc_syntax.h
On Mon, Oct 03, 2011 at 06:39:52PM +, McClintock Matthew-B29882 wrote: On Fri, Sep 30, 2011 at 12:26 PM, Martin Jansa martin.ja...@gmail.com wrote: On Fri, Sep 30, 2011 at 12:21:23PM -0500, Matthew McClintock wrote: From: Tom Rini tom_r...@mentor.com At issue is that route/pktloc.c (not generated) depends on route/pktloc_syntax.h (generated). On Fri, Sep 30, 2011 at 9:13 AM, Martin Jansa martin.ja...@gmail.com wrote: and when you're at it, please also add packaging changes from meta-oe, so we can remove libnl from meta-oe and keep only libnl1 there. Sorry, I'm not sure I follow. Are you referring to all the other stuff in the old openembedded? I'm not following this package particularly closely. just see diff oe-core/meta/recipes*/libnl* and meta-openembedded/meta-oe/recipes*/libnl* and it will be clearer Regards, * 9fef5f0 Add 'ucred' structure declaration in netlink headers for the integrity * f9e4241 libnl-1.1: rename to libnl1 and build only static lib * 4ccaf2c libnl_git: remove fix-pktloc-dep-race.patch from this version * 91e03b2 libnl: add libnl.inc and use INC_PR * 4702231 libnl: don't use /usr/include/libnl2 anymore * 5ef679a libnl: rename libnl2 to libnl as used in openembedded-core -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Selectable linker (ld or gold) per recipe
On 9/29/2011 7:08 AM, Phil Blundell wrote: On Tue, 2011-09-27 at 18:10 -0700, Khem Raj wrote: I have thought of that and we know about kernel and eglibc but we don't know about rest of apps that we build. I don't know if gold has been deployed distro wide thats why the approach was to have gold replace parts where it really matters then we might have packages where they use linker directly and or have own linker scripts which are tuned to ld and may yield something different with gold of-course those problems should be fixed but having something in place to make package wise choice sounded better to me. I think I would rather wait until such issues actually arise before trying to fix them. Adding per-recipe linker selection seems like quite a lot of mechanism, with associated potential fragility, to solve a problem that might not even exist in reality. Also, thinking about this more, I am not convinced that wrapping ld directly is going to work reliably. If I remember right, gcc inspects some attributes of the target linker (plugin support being the most obvious one) during configure and adapts itself accordingly. plugin support is now supported in both linkers 2.21+ should not be any issue any other differences between both linkers I am not aware that gcc would care when configuring itself Subsequently swapping out the linker under its feet at runtime seems like it would be a bad idea. If it does turn out that there are packages which simply must be built with BFD ld, I think we should either: a) just declare them incompatible with the ld-is-gold DISTRO_FEATURE, and say that the programs in question aren't supported by such DISTROs (which might or might not be a defensible position, depending on the extent to which such programs are a fringe interest); or this could be a starter b) fix the programs and/or gold to make them compatible, or if that's really intractable; or obviously wanted to avoid that c) work with upstream gcc to figurd yes c) build a parallel toolchain which uses BFD ld and has its own copy of gcc which is appropriately configured, and arrange for the recipes in question to find that toolchain in their $PATH. p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] webkit-gtk: add --enable-dependency-tracking to EXTRA_OECONF
After [1] build failed with error message
| Couldn't open file
./DerivedSources/webkit/WebKitDOMCSSStyleDeclarationPrivate.h for writing at
Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm line 1122.
| Couldn't open file ./DerivedSources/webkit/WebKitDOMCSSRulePrivate.h for
writing at Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm line 1122.
| Couldn't open file ./DerivedSources/webkit/WebKitDOMCSSStyleSheetPrivate.h
for writing at Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm line
1122.
| make: *** [DerivedSources/webkit/WebKitDOMCSSStyleDeclaration.h] Error 2
Discussion on this patch see [2]
Build tested in angstrom environment
[1]
http://cgit.openembedded.org/cgit.cgi/openembedded-core/commit/?id=970e0ae610804638d00b0a6b85c6e2e895778e8e
[2]
http://lists.linuxtogo.org/pipermail/openembedded-core/2011-October/010590.html
Signed-off-by: Andreas Müller schnitzelt...@gmx.de
---
meta/recipes-sato/webkit/webkit-gtk_svn.bb |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-sato/webkit/webkit-gtk_svn.bb
b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
index 5eb9b2e..d655999 100644
--- a/meta/recipes-sato/webkit/webkit-gtk_svn.bb
+++ b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
@@ -14,7 +14,7 @@ SRCREV_FORMAT = source
SRCREV = 90727
PV = 1.5.1+svnr${SRCPV}
-PR = r0
+PR = r1
SRC_URI = \
svn://svn.webkit.org/repository/webkit/trunk/;module=Source;proto=http;name=source
\
@@ -40,6 +40,7 @@ EXTRA_OECONF = \
--enable-fullscreen-api \
--enable-image-resizer \
--enable-link-prefetch \
+--enable-dependency-tracking \
UNICODE_CFLAGS=-D_REENTRANT \
--
1.7.4.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 10/16] Fix mdadm for powerpc64
On 9/29/2011 11:52 AM, Matthew McClintock wrote:
This fixes build failures from build warnings on powerpc64
Signed-off-by: Matthew McClintockm...@freescale.com
---
meta/recipes-extended/mdadm/mdadm_3.2.2.bb |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-extended/mdadm/mdadm_3.2.2.bb
b/meta/recipes-extended/mdadm/mdadm_3.2.2.bb
index 5d29ae7..1c83f89 100644
--- a/meta/recipes-extended/mdadm/mdadm_3.2.2.bb
+++ b/meta/recipes-extended/mdadm/mdadm_3.2.2.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM =
file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
file://mdmon.c;beginline=4;endline=18;md5=af7d8444d9c4d3e5c7caac0d9d34039d \
file://mdadm.h;beglinlne=4;endline=22;md5=462bc9936ac0d3da110191a3f9994161
-PR = r0
+PR = r1
SRC_URI = ${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.bz2
@@ -16,6 +16,7 @@ SRC_URI[md5sum] = 12ee2fbf3beddb60601fb7a4c4905651
SRC_URI[sha256sum] =
0d1a04e688b082bc88846e3f524abd50bc782b6ffc06123140f7d358c8f9b906
CFLAGS += -fno-strict-aliasing
+EXTRA_OEMAKE_append_powerpc64 = CXFLAGS=-Wno-error=format
inherit autotools
what kind of errors do you get ? and I wonder why they dont show up on
x86_64. It may be something to fix in the madadm code.
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] MINUTES: OE-TSC meeting 29-Sep-2011
On 9/30/2011 11:16 AM, Chris Larson wrote: On Fri, Sep 30, 2011 at 11:14 AM, Jeff Osier-Mixonje...@jefro.net wrote: 1. Jefro 2. a. some minutes not making it to mailing list, Jefro to post on wiki b. yocto evaluating gerrit, possible patchwork replacement for OE, khem will research ReviewBoard may be worth looking at as an alternative to gerritt, as well. thank you for pointer. If someone has used it then please inform us here on ml about its +/- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] MINUTES: OE-TSC meeting 1-Sep-2011
My apologies for the delay on posting this one. This should complete the set. Again, all minutes are now available at http://www.openembedded.org/wiki/TSC MINUTES: OE-TSC meeting 1-Sep-2011 Attending: Mark, Richard, Khem, Koen Apologies: Tom Notes: Jefro (not present) Agenda 1. pick a moderator 2. agenda items a. Yocto update b. oe-core release numbering 3. status on open subjects a. oe-core b. elections Results 1. Jefro 2. a. steering hard to bug fixing and stabilisation, branching shortly enabling free form user contrib repos on git.yp.org in 1-2 weeks b. oe-core to be 2011.something (poky is edison) 3. a. hitting critical mass on features, people starting to use it file bugs ti somewhat confused about layers vs different repos for poky/yocto b. RP volunteered; alphabetical election order (Khem, Koen, Mark, Tom) Raw Transcript (21:07:07) RP__: So I believe we have two agenda items plus the usual rolling one (21:07:17) RP__: Do we have anything on the rolling agenda we have a pressing need to cover? (21:10:37) RP__: so, since everyone is quiet I assume everyone doesn't have much to talk about (21:10:58) RP__: Yocto wise, we're steering hard to bug fixing and stabilisation atm (21:11:16) RP__: I think we'll want to branch shortly (21:11:26) RP__: which leads into my open of what to call the branch in oe-core (21:12:00) RP__: The poky branch will be edison for this release (21:12:23) koen: are we going to use the year.month like OE classic has? (21:13:19) koen: I'm not terribly fond of it, but it beats plain numbers or names (21:14:31) RP__: I know people who hate year.month too (21:14:35) RP__: so I doubt we can win (21:15:10) khem [~k...@99-57-141-118.lightspeed.sntcca.sbcglobal.net] entered the room. (21:15:11) mode (+v khem) by ChanServ (21:15:24) RP__: Is that branch going to be useful to people outside Yocto? (21:15:30) RP__: I'm hoping the answer is yes? (21:15:32) RP__: hi khem (21:15:36) khem: hello (21:16:02) koen: the oe-core branch is for the OE-core release, right? (21:16:10) khem: traffic delayed me (21:16:11) RP__: koen: yes (21:16:19) RP__: khem: I pasted scroll back for you (21:16:37) RP__: There wasn't much else of interest (21:17:03) khem: thanks (21:17:15) RP__: How about year.number (21:17:34) koen: 2011.r1 ? (21:17:40) koen: 2011.1 would be confusing :) (21:17:40) RP__: yes (21:17:48) fray: I thought when we talked earlier it was year . month (21:17:48) khem: rp yy.mm is nicers (21:17:54) fray: the month was the expected month vs actual.. (21:18:06) fray: i.e. if we expected to release in Sept.. it's be 2011.09 (21:18:12) ***RP__ is wondering if numbers like r1 and r2 make more sense (21:18:12) fray: even if it didn't come out til 10 or 11 (21:18:30) khem: r1 could mean release n (21:18:31) RP__: first release in 2011, second release in 2011 (21:18:37) koen: but we agree that at least the year would be in it? (21:18:41) fray: IMHo it should be year.something I don't really care about the something (21:18:53) khem: yeah thats ok (21:18:55) RP__: I think having the year is a reasonable reference frame (21:20:00) khem: 2011r1 2011r2 ... seems reasonable (21:20:12) koen: I'm fine with 2011something (21:20:41) koen: next question, when do we ask the layer maintainers to branch? (21:21:04) khem: first core should be tagged/branched (21:21:11) khem: then may be 2-3 weeks (21:21:47) RP__: koen: I'd suggest sometime after core :) (21:21:57) RP__: koen: The timing tbd by the layer maintainers? (21:22:15) koen: I phrased it wrong, sorry (21:22:29) koen: I meant when do we ask if they are going to branch (21:22:38) koen: and if so, when (21:23:21) RP__: koen: When OE-Core branches? (21:23:38) RP__: and I guess another question for here is do we think OE-Core is approaching branch point? (21:24:04) koen: like kergoth I can't say if oe-core is getting better or worse (21:24:28) khem: some layers might decide not to release but trunk is always to be followed (21:24:51) RP__: koen: Anything that would help make your mind up in that regard? (21:24:54) koen: we gain multilib, but the eglibc-locale stuff tooks weeks to debug and fix (21:25:48) khem: RP__: how about the hash-style fixes to gcc did that make sense ? (21:26:07) khem: I have been occupied didnt follow ml lately (21:26:15) fray: BTW I never posted, but I did try khem's gcc changes and they worked fine.. (21:26:17) koen: RP__: I can't really put my finger on what's bothering me with OE-core (21:26:39) ***fray has been heads down in prelinker problems for the past 2 1/2 weeks so I've been out of the look on oe-core.. (21:26:42) RP__: khem: I need to look at those patches again, I think there was something bothering me but offhand I can't remember what (21:26:45) khem: for me bitbake's memory consumption bothers me (21:26:49) fray: I
Re: [OE-core] [PATCH] eglibc-2.14: add patch to fix libdl crash
On 10/3/2011 2:30 AM, mo...@mnet-online.de wrote:
From: Klaus Kurzmannm...@fluxnetz.de
* Without this patch programs using alsa-lib crash (alsamixer for example).
* This patch is taken verbatim from ArchLinux.
can you add appropriate header for this?
secondly this reverts the license year text
from 2011 to 2010 that should not be needed.
Signed-off-by: Klaus Kurzmannm...@fluxnetz.de
---
.../eglibc-2.14/glibc-2.14-libdl-crash.patch | 132
meta/recipes-core/eglibc/eglibc_2.14.bb|3 +-
2 files changed, 134 insertions(+), 1 deletions(-)
create mode 100644
meta/recipes-core/eglibc/eglibc-2.14/glibc-2.14-libdl-crash.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.14/glibc-2.14-libdl-crash.patch
b/meta/recipes-core/eglibc/eglibc-2.14/glibc-2.14-libdl-crash.patch
new file mode 100644
index 000..ee29f8c
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-2.14/glibc-2.14-libdl-crash.patch
@@ -0,0 +1,132 @@
+diff --git a/elf/dl-close.c b/elf/dl-close.c
+index 73b2a2f..9bd91e3 100644
+--- a/elf/dl-close.c
b/elf/dl-close.c
+@@ -1,5 +1,5 @@
+ /* Close a shared object opened by `_dl_open'.
+- Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc.
++ Copyright (C) 1996-2007, 2009, 2010 Free Software Foundation, Inc.
+This file is part of the GNU C Library.
+
+The GNU C Library is free software; you can redistribute it and/or
+@@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map)
+ if (map-l_direct_opencount 0 || map-l_type != lt_loaded
+ || dl_close_state != not_pending)
+ {
+- if (map-l_direct_opencount == 0)
+- {
+-if (map-l_type == lt_loaded)
+- dl_close_state = rerun;
+-else if (map-l_type == lt_library)
+- {
+-struct link_map **oldp = map-l_initfini;
+-map-l_initfini = map-l_orig_initfini;
+-_dl_scope_free (oldp);
+- }
+- }
++ if (map-l_direct_opencount == 0 map-l_type == lt_loaded)
++ dl_close_state = rerun;
+
+ /* There are still references to this object. Do nothing more. */
+ if (__builtin_expect (GLRO(dl_debug_mask) DL_DEBUG_FILES, 0))
+diff --git a/elf/dl-deps.c b/elf/dl-deps.c
+index 9e30594..3890d00 100644
+--- a/elf/dl-deps.c
b/elf/dl-deps.c
+@@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map,
+ nneeded * sizeof needed[0]);
+ atomic_write_barrier ();
+ l-l_initfini = l_initfini;
++l-l_free_initfini = 1;
+ }
+
+ /* If we have no auxiliary objects just go on to the next map. */
+@@ -681,6 +682,7 @@ Filters not supported with LD_TRACE_PRELINKING));
+ l_initfini[nlist] = NULL;
+ atomic_write_barrier ();
+ map-l_initfini = l_initfini;
++ map-l_free_initfini = 1;
+ if (l_reldeps != NULL)
+ {
+ atomic_write_barrier ();
+@@ -689,5 +691,5 @@ Filters not supported with LD_TRACE_PRELINKING));
+ _dl_scope_free (old_l_reldeps);
+ }
+ if (old_l_initfini != NULL)
+- map-l_orig_initfini = old_l_initfini;
++_dl_scope_free (old_l_initfini);
+ }
+diff --git a/elf/dl-libc.c b/elf/dl-libc.c
+index 7be9483..a13fce3 100644
+--- a/elf/dl-libc.c
b/elf/dl-libc.c
+@@ -265,13 +265,13 @@ libc_freeres_fn (free_mem)
+
+ for (Lmid_t ns = 0; ns GL(dl_nns); ++ns)
+ {
+- /* Remove all additional names added to the objects. */
+ for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l-l_next)
+ {
+ struct libname_list *lnp = l-l_libname-next;
+
+ l-l_libname-next = NULL;
+
++/* Remove all additional names added to the objects. */
+ while (lnp != NULL)
+ {
+ struct libname_list *old = lnp;
+@@ -279,6 +279,10 @@ libc_freeres_fn (free_mem)
+ if (! old-dont_free)
+ free (old);
+ }
++
++/* Free the initfini dependency list. */
++if (l-l_free_initfini)
++ free (l-l_initfini);
+ }
+
+ if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0
+diff --git a/elf/rtld.c b/elf/rtld.c
+index 4a9109e..617e30e 100644
+--- a/elf/rtld.c
b/elf/rtld.c
+@@ -2251,6 +2251,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit
interface: %s; ignored.\n,
+ lnp-dont_free = 1;
+ lnp = lnp-next;
+ }
++l-l_free_initfini = 0;
+
+ if (l !=GL(dl_rtld_map))
+ _dl_relocate_object (l, l-l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0,
+diff --git a/include/link.h b/include/link.h
+index e877104..051b99a 100644
+--- a/include/link.h
b/include/link.h
+@@ -1,6 +1,6 @@
+ /* Data structure for communication from the run-time dynamic linker for
+loaded ELF shared objects.
+- Copyright (C) 1995-2006, 2007, 2009, 2010, 2011 Free Software Foundation,
Inc.
++ Copyright (C) 1995-2006, 2007, 2009, 2010 Free Software Foundation, Inc.
+This file is part of the GNU C Library.
+
+The GNU C Library is
Re: [OE-core] [oe-core][PATCH 02/13] xserver-xf86-dri-lite: remove COMPATIBLE_HOST
On 9/30/2011 12:27 AM, Martin Jansa wrote: * ie om-gta02 has mesa-dri module too Signed-off-by: Martin Jansamartin.ja...@gmail.com --- .../xorg-xserver/xserver-xf86-dri-lite.inc |3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc index 093e049..2e35917 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc @@ -10,6 +10,3 @@ EXTRA_OECONF += \ --with-pic \ --with-int10=x86emu \ - -# Due to mesa-dri -COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' how about powerpc and mips ? they will also become supported with this change have you tested that ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC] .la files cleanup
On 10/3/2011 7:55 AM, Phil Blundell wrote:
On Mon, 2011-10-03 at 14:58 +0400, Dmitry Eremin-Solenikov wrote:
My proposal would be to include a special task or a
do_install_append() part that
will remove specified .la files. (like ${libdir}/xorg/modules/*/.la,
${libdir}/matchbox-panel/*.la, etc.). I see this usually done in
do_install or in special do_install_append
parts, but I think it would be better to handle this globally.
I guess the ideal solution would be to find a way to stop libtool from
installing these things in the first place. It isn't totally obvious to
me that the .la files are a net benefit even for real shared libraries,
and for plugins I think they are probably a net loss in most/all cases.
I also have this opinion. I think we need to experiment by not
installing .la at all and see what breaks. I would guess very little
When this issue last came up it seemed that Richard's preferred fix was
to just ship the .la files in FILES_${PN}-dev, and I guess that approach
does at least have the merit of simplicity. See:
http://lists.linuxtogo.org/pipermail/openembedded-core/2011-July/005533.html
p.
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 10/16] Fix mdadm for powerpc64
On Mon, Oct 3, 2011 at 2:22 PM, Khem Raj raj.k...@gmail.com wrote:
-PR = r0
+PR = r1
SRC_URI =
${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.bz2
@@ -16,6 +16,7 @@ SRC_URI[md5sum] = 12ee2fbf3beddb60601fb7a4c4905651
SRC_URI[sha256sum] =
0d1a04e688b082bc88846e3f524abd50bc782b6ffc06123140f7d358c8f9b906
CFLAGS += -fno-strict-aliasing
+EXTRA_OEMAKE_append_powerpc64 = CXFLAGS=-Wno-error=format
inherit autotools
what kind of errors do you get ? and I wonder why they dont show up on
x86_64. It may be something to fix in the madadm code.
I can't find a log of this anywhere, it's probably the default
compiler warnings for our platform are different?
You could try enabling those errors and see if your build fails:
EXTRA_OEMAKE_append_x86-64 = CXFLAGS=-Werror=format
-M
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 10/16] Fix mdadm for powerpc64
On 10/3/2011 2:14 PM, McClintock Matthew-B29882 wrote:
On Mon, Oct 3, 2011 at 2:22 PM, Khem Rajraj.k...@gmail.com wrote:
-PR = r0
+PR = r1
SRC_URI =
${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.bz2
@@ -16,6 +16,7 @@ SRC_URI[md5sum] = 12ee2fbf3beddb60601fb7a4c4905651
SRC_URI[sha256sum] =
0d1a04e688b082bc88846e3f524abd50bc782b6ffc06123140f7d358c8f9b906
CFLAGS += -fno-strict-aliasing
+EXTRA_OEMAKE_append_powerpc64 = CXFLAGS=-Wno-error=format
inherit autotools
what kind of errors do you get ? and I wonder why they dont show up on
x86_64. It may be something to fix in the madadm code.
I can't find a log of this anywhere, it's probably the default
compiler warnings for our platform are different?
It would be handy to understand them since I dont see gcc
differentiating formats between ppc64 and x86_64 which both are 64bit
hosts. But obviously there is something missing.
You could try enabling those errors and see if your build fails:
If I had a ppc64 build around
EXTRA_OEMAKE_append_x86-64 = CXFLAGS=-Werror=format
-M
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] sstate_clean() overzealous?
On 10/3/2011 2:11 PM, McClintock Matthew-B29882 wrote:
On Mon, Oct 3, 2011 at 11:47 AM, Phil Blundellph...@gnu.org wrote:
The sstate_clean() function in sstate.bbclass is doing (inter alia):
stfile = d.getVar(STAMP, True) + .do_ + ss['task']
[...]
oe.path.remove(stfile + .*)
oe.path.remove(stfile + _setscene + .*)
which means that, for tasks which set the stamp-extra-info flag to
${MACHINE}, it ends up blowing away the stamps for all machines rather
than just the current one. The net effect of this seems to be that
there is no way to have the setscene stamps populated for more than one
MACHINE at any time, and hence all those tasks get rerun every time you
change MACHINE even if nothing else has been altered.
Is this behaviour deliberate? It is certainly a little bit annoying but
I don't understand the internals of sstate well enough to judge what
exactly that glob is trying to accomplish.
I've noticed that changing the MACHINE will also invalidate the
-native stuff as well.
hmmm so we can not share sstate parts for two machines in same tmpdir ?
-M
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] sstate_clean() overzealous?
On 10/03/2011 02:11 PM, McClintock Matthew-B29882 wrote:
On Mon, Oct 3, 2011 at 11:47 AM, Phil Blundellph...@gnu.org wrote:
The sstate_clean() function in sstate.bbclass is doing (inter alia):
stfile = d.getVar(STAMP, True) + .do_ + ss['task']
[...]
oe.path.remove(stfile + .*)
oe.path.remove(stfile + _setscene + .*)
which means that, for tasks which set the stamp-extra-info flag to
${MACHINE}, it ends up blowing away the stamps for all machines rather
than just the current one. The net effect of this seems to be that
there is no way to have the setscene stamps populated for more than one
MACHINE at any time, and hence all those tasks get rerun every time you
change MACHINE even if nothing else has been altered.
Is this behaviour deliberate? It is certainly a little bit annoying but
I don't understand the internals of sstate well enough to judge what
exactly that glob is trying to accomplish.
I've noticed that changing the MACHINE will also invalidate the
-native stuff as well.
I am not sure that's correct, since we use sstate with the Autobuilder
and it's shared across different hosts building different MACHINEs, we
don't see the -natives getting build, do you have any examples?
Sau!
-M
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] sstate_clean() overzealous?
On Mon, Oct 3, 2011 at 4:24 PM, Saul Wold saul.w...@intel.com wrote: I am not sure that's correct, since we use sstate with the Autobuilder and it's shared across different hosts building different MACHINEs, we don't see the -natives getting build, do you have any examples? I'm building with targets that are not upstream, so I can't comment on the upstream variant. There are different TUNES though. I'm actually currently in the process of looking at why sstate-cache is not being reused. Can you point at the autobuilder stuff? Is it going from fsl-mpc8315e-rdb to and x86_64 target? Or between two x86_64 targets? -M ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] sstate_clean() overzealous?
On Mon, Oct 3, 2011 at 4:18 PM, Khem Raj raj.k...@gmail.com wrote: hmmm so we can not share sstate parts for two machines in same tmpdir ? I'm not 100% sure I'm doing things properly but this is what I did: $ bitbake pseudo-native $ cp sstate-cache/* ~/sstate-cache $ rm -rf tmp/ $ bitbake pseudo-native Now sstate-cache is verified to be working then I changed machines and ran $ cp ~/sstate-cache/* sstate-cache/ $ bitbake pseudo-native bitbake starts rebuilding everything, and added -DDD I see SState cache is missing. -M ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] populate_sdk_rpm: Add missing /bin/sh from rpm ignore list for the SDK
On Fri, Sep 30, 2011 at 5:16 PM, Richard Purdie richard.pur...@linuxfoundation.org wrote: The target SDK packages don't need to fulfil a shell dependency so add /bin/sh to the list of packages we don't need to resolve. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org Acked-by: Matthew McClintock m...@freescale.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] MINUTES: OE-TSC meeting 29-Sep-2011
On 09/30/2011 11:16 AM, Chris Larson wrote: On Fri, Sep 30, 2011 at 11:14 AM, Jeff Osier-Mixonje...@jefro.net wrote: 1. Jefro 2. a. some minutes not making it to mailing list, Jefro to post on wiki b. yocto evaluating gerrit, possible patchwork replacement for OE, khem will research ReviewBoard may be worth looking at as an alternative to gerritt, as well. Not sure what kind of support it has for GIT, gerrit has git support which is why we want to evaluate it. Sau! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] sstate_clean() overzealous?
On Mon, Oct 3, 2011 at 4:29 PM, Matthew McClintock m...@freescale.com wrote:
On Mon, Oct 3, 2011 at 4:24 PM, Saul Wold saul.w...@intel.com wrote:
I am not sure that's correct, since we use sstate with the Autobuilder and
it's shared across different hosts building different MACHINEs, we don't see
the -natives getting build, do you have any examples?
I'm building with targets that are not upstream, so I can't comment on
the upstream variant. There are different TUNES though. I'm actually
currently in the process of looking at why sstate-cache is not being
reused.
Can you point at the autobuilder stuff? Is it going from
fsl-mpc8315e-rdb to and x86_64 target? Or between two x86_64 targets?
For example autoconf-native:
$ bitbake-diffsigs
../sstate-cache/sstate-autoconf-native-x86_64-linux-2.68-r2-x86_64-2-*siginfo
[mattsm@right build_p5020ds_release (master *$)]$ bitbake-diffsigs
../sstate-cache/sstate-autoconf-native-x86_64-linux-2.68-r2-x86_64-2-*siginfo
[snip]
basehash changed from bab02dfa833aca4810b0fae8c4ab48f9 to
e156f3fb86236bfc0262e6287bd73784
List of dependencies for variable baselib changed from
set(['BASELIB']) to set(['DEFAULTTUNE'])
Dependency on variable BASELIB was added
Dependency on Variable DEFAULTTUNE was removed
Variable baselib value changed from ${BASELIB} to
${@d.getVar('BASE_LIB_tune-' + (d.getVar('DEFAULTTUNE', True) or
'INVALID'), True) or 'lib'}
Hash for dependent task
virtual:native:/local/home/mattsm/git/poky/meta/recipes-devtools/autoconf/autoconf_2.68.bb.do_install
changed from e74616029727b6e61b00273425128f1d to
478e7900a2310f2669708e6909883865
Back tracking this appears to be a multilib issue since I have that
enabled on one of the -native packages:
../meta/conf/bitbake.conf:baselib = ${BASELIB}
../meta/conf/multilib.conf:baselib = ${@d.getVar('BASE_LIB_tune-' +
(d.getVar('DEFAULTTUNE', True) or 'INVALID'), True) or 'lib'}
Which causes the other differences
-M
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] MINUTES: OE-TSC meeting 29-Sep-2011
On Mon, Oct 3, 2011 at 2:53 PM, Saul Wold s...@linux.intel.com wrote: On 09/30/2011 11:16 AM, Chris Larson wrote: On Fri, Sep 30, 2011 at 11:14 AM, Jeff Osier-Mixonje...@jefro.net wrote: 1. Jefro 2. a. some minutes not making it to mailing list, Jefro to post on wiki b. yocto evaluating gerrit, possible patchwork replacement for OE, khem will research ReviewBoard may be worth looking at as an alternative to gerritt, as well. Not sure what kind of support it has for GIT, gerrit has git support which is why we want to evaluate it. They both support git. I wouldn't have suggested evaluating anything that didn't. -- Christopher Larson clarson at kergoth dot com Founder - BitBake, OpenEmbedded, OpenZaurus Maintainer - Tslib Senior Software Engineer, Mentor Graphics ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [RFC] Fix typo in meta/classes/sanity.bbclass
Signed-off-by: Matthew McClintock m...@freescale.com
---
Not sure if this is correct but it looks like a typo, also
there appears to be some issues with the fix as well
meta/classes/sanity.bbclass |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 4067408..cf30927 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -169,7 +169,7 @@ def check_sanity_validmachine(e):
messages = messages + 'TUNE_ARCH is unset. Please ensure your MACHINE
configuration includes a valid tune configuration file which will set this
correctly.\n'
# Check TARGET_ARCH is set correctly
-if data.getVar('TARGE_ARCH', e.data, False) == '${TUNE_ARCH}':
+if data.getVar('TARGET_ARCH', e.data, False) == '${TUNE_ARCH}':
messages = messages + 'TARGET_ARCH is being overwritten, likely by
your MACHINE configuration files.\nPlease use a valid tune configuration file
which should set this correctly automatically\nand avoid setting this in the
machine configuration. See the OE-Core mailing list for more information.\n'
# Check TARGET_OS is set
--
1.7.6.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
