* [oe-core 0/4] Qt4, armv6, xserver-xorg changes
From: Martin Jansa @ 2011-10-12 7:44 UTC (permalink / raw)
To: openembedded-core
The following changes since commit 486b17af3e4cced76e9852e7634f75ea87433db2:
shared-mime-info: Fix a parallel make race (2011-10-11 18:06:56 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib jansa/pull
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/pull
GNUtoo (1):
conf: machine: includes: add armv6-novfp support
Martin Jansa (1):
xserver-xorg: drop xorg-minimal-fonts from RDEPENDS
Simon Busch (2):
qt4-embedded: remove dependency on tslib and use std. linux input
qt4-x11-free: bring back pkg-config fixups
meta/conf/machine/include/arm/arch-armv6.inc | 45 +++++++++++++-------
meta/conf/machine/include/tune-arm1136j-s.inc | 10 ++++
.../xorg-xserver/xserver-xorg-1.11.1.inc | 2 +
.../xorg-xserver/xserver-xorg-common.inc | 1 -
meta/recipes-qt/qt4/files/qte.sh | 2 +-
meta/recipes-qt/qt4/qt4-embedded.inc | 6 +-
meta/recipes-qt/qt4/qt4-x11-free.inc | 16 +++++++-
7 files changed, 60 insertions(+), 22 deletions(-)
create mode 100644 meta/conf/machine/include/tune-arm1136j-s.inc
--
1.7.7
^ permalink raw reply
* Re: [PATCHv3 01/31] xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite
From: Cui, Dexuan @ 2011-10-12 7:22 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Martin Jansa
In-Reply-To: <1865303E0DED764181A9D882DEF65FB6D23164E84D@shsmsx502.ccr.corp.intel.com>
BTW, I sent out 2 patches (to poky@yoctoproject.org) for bug 1670: http://bugzilla.pokylinux.org/show_bug.cgi?id=1670#c2
Thanks,
-- Dexuan
> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org
> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
> Cui, Dexuan
> Sent: Wednesday, October 12, 2011 11:49 AM
> To: Patches and discussions about the oe-core layer
> Cc: Martin Jansa
> Subject: Re: [OE-core] [oe-core][PATCHv3 01/31] xserver-xf86(-dri)-lite: rename
> to xserver-xorg and xserver-xorg-lite
>
> Glad to see the patches to upgrade xserver and libx11. Good work! :-)
>
> BTW, we also need to upgrade meta-intel's side since BSP can't build now:
> http://bugzilla.pokylinux.org/show_bug.cgi?id=1670
> I'm working on this bug.
>
> Thanks,
> -- Dexuan
>
>
> > -----Original Message-----
> > From: openembedded-core-bounces@lists.openembedded.org
> > [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf
> Of
> > Martin Jansa
> > Sent: Saturday, October 08, 2011 1:05 AM
> > To: openembedded-core@lists.openembedded.org
> > Subject: [OE-core] [oe-core][PATCHv3 01/31] 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.Jansa@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 +-
> > ...ver-xf86-common.inc => xserver-xorg-common.inc} | 1 +
> > ...xserver-xf86-lite.inc => xserver-xorg-lite.inc} | 4 +---
> > .../crosscompile.patch | 0
> > .../fix_open_max_preprocessor_error.patch | 0
> > .../macro_tweak.patch | 2 +-
> > ...-lite_1.10.1.bb => xserver-xorg-lite_1.10.1.bb} | 2 +-
> > ...{xserver-xf86-dri-lite.inc => xserver-xorg.inc} | 2 +-
> > .../cache-xkbcomp-output-for-fast-start-up.patch | 0
> > .../crosscompile.patch | 0
> > .../fix_macros1.patch | 0
> > .../fix_open_max_preprocessor_error.patch | 0
> > .../macro_tweak.patch | 2 +-
> > ...6-dri-lite_1.10.1.bb => xserver-xorg_1.10.1.bb} | 2 +-
> > ...er-xf86-dri-lite_git.bb => xserver-xorg_git.bb} | 2 +-
> > 19 files changed, 27 insertions(+), 28 deletions(-)
> > rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-common.inc =>
> > xserver-xorg-common.inc} (96%)
> > rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite.inc =>
> > xserver-xorg-lite.inc} (95%)
> > rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite =>
> > xserver-xorg-lite}/crosscompile.patch (100%)
> > rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite =>
> > xserver-xorg-lite}/fix_open_max_preprocessor_error.patch (100%)
> > rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite =>
> > xserver-xorg-lite}/macro_tweak.patch (93%)
> > rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite_1.10.1.bb
> =>
> > xserver-xorg-lite_1.10.1.bb} (89%)
> > rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite.inc =>
> > xserver-xorg.inc} (97%)
> > rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite =>
> > xserver-xorg}/cache-xkbcomp-output-for-fast-start-up.patch (100%)
> > rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite =>
> > xserver-xorg}/crosscompile.patch (100%)
> > rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite =>
> > xserver-xorg}/fix_macros1.patch (100%)
> > rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite =>
> > xserver-xorg}/fix_open_max_preprocessor_error.patch (100%)
> > rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite =>
> > xserver-xorg}/macro_tweak.patch (93%)
> > rename
> meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite_1.10.1.bb =>
> > xserver-xorg_1.10.1.bb} (93%)
> > rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite_git.bb =>
> > xserver-xorg_git.bb} (94%)
> >
> > 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 7b6c4a9..8af80c7 100644
> > --- a/meta/conf/distro/include/distro_tracking_fields.inc
> > +++ b/meta/conf/distro/include/distro_tracking_fields.inc
> > @@ -3683,14 +3683,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.yu@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.yu@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.yu@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"
> > @@ -5908,8 +5908,8 @@ DISTRO_PN_ALIAS_pn-pseudo = "Windriver"
> >
> > DISTRO_PN_ALIAS_pn-btrfs-tools = "Debian=btrfs-tools
> Fedora=btrfs-progs"
> > DISTRO_PN_ALIAS_pn-rt-tests = "Debian=rt-tests Ubuntu=rt-tests"
> > -DISTRO_PN_ALIAS_pn-xserver-xf86-lite = "Fedora=xorg-x11-server
> > Ubuntu=xserver-xorg"
> > -DISTRO_PN_ALIAS_pn-xserver-xf86-dri-lite = "Fedora=xorg-x11-server
> > Ubuntu=xserver-xorg"
> > +DISTRO_PN_ALIAS_pn-xserver-xorg = "Fedora=xorg-x11-server
> > Ubuntu=xserver-xorg"
> > +DISTRO_PN_ALIAS_pn-xserver-xorg = "Fedora=xorg-x11-server
> > Ubuntu=xserver-xorg"
> > DISTRO_PN_ALIAS_pn-xserver-kdrive = "Fedora=xorg-x11-server
> > Ubuntu=xserver-xorg"
> > DISTRO_PN_ALIAS_pn-dtc = "Fedora=dtc Ubuntu=dtc"
> > DISTRO_PN_ALIAS_pn-dtc-native = "Fedora=dtc Ubuntu=dtc"
> > diff --git a/meta/conf/machine/qemux86-64.conf
> > b/meta/conf/machine/qemux86-64.conf
> > index 18a7513..f28cf08 100644
> > --- a/meta/conf/machine/qemux86-64.conf
> > +++ b/meta/conf/machine/qemux86-64.conf
> > @@ -4,8 +4,8 @@
> >
> > PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
> > PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
> > -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
> > -PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
> > +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
> > +PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
> >
> > require conf/machine/include/tune-x86_64.inc
> > require conf/machine/include/qemu.inc
> > @@ -17,7 +17,7 @@ KERNEL_IMAGETYPE = "bzImage"
> > SERIAL_CONSOLE = "115200 ttyS0"
> >
> > # We bypass swrast but we need it to be present for X to load correctly
> > -XSERVER ?= "xserver-xf86-dri-lite \
> > +XSERVER ?= "xserver-xorg \
> > mesa-dri-driver-swrast \
> > xf86-input-vmmouse \
> > xf86-input-keyboard \
> > diff --git a/meta/conf/machine/qemux86.conf
> > b/meta/conf/machine/qemux86.conf
> > index 5d0d03e..75c9042 100644
> > --- a/meta/conf/machine/qemux86.conf
> > +++ b/meta/conf/machine/qemux86.conf
> > @@ -4,8 +4,8 @@
> >
> > PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
> > PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
> > -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
> > -PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
> > +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
> > +PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
> >
> > require conf/machine/include/tune-i586.inc
> > require conf/machine/include/qemu.inc
> > @@ -17,7 +17,7 @@ KERNEL_IMAGETYPE = "bzImage"
> > SERIAL_CONSOLE = "115200 ttyS0"
> >
> > # We bypass swrast but we need it to be present for X to load correctly
> > -XSERVER ?= "xserver-xf86-dri-lite \
> > +XSERVER ?= "xserver-xorg \
> > mesa-dri-driver-swrast \
> > xf86-input-vmmouse \
> > xf86-input-keyboard \
> > diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
> > index b9da33a..5e4b435 100644
> > --- a/meta/conf/multilib.conf
> > +++ b/meta/conf/multilib.conf
> > @@ -442,7 +442,7 @@ BBCLASSEXTEND_append_pn-xrandr = "
> > ${MULTILIBS}"
> > BBCLASSEXTEND_append_pn-xrestop = " ${MULTILIBS}"
> > BBCLASSEXTEND_append_pn-xserver-nodm-init = " ${MULTILIBS}"
> > BBCLASSEXTEND_append_pn-xserver-xf86-config = " ${MULTILIBS}"
> > -BBCLASSEXTEND_append_pn-xserver-xf86-dri-lite = " ${MULTILIBS}"
> > +BBCLASSEXTEND_append_pn-xserver-xorg = " ${MULTILIBS}"
> > BBCLASSEXTEND_append_pn-xset = " ${MULTILIBS}"
> > BBCLASSEXTEND_append_pn-xtrans = " ${MULTILIBS}"
> > BBCLASSEXTEND_append_pn-xtscal = " ${MULTILIBS}"
> > diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
> > b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
> > similarity index 96%
> > rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
> > rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
> > index 17d456c..78c5f2e 100644
> > --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
> > +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
> > @@ -7,6 +7,7 @@ LIC_FILES_CHKSUM =
> > "file://COPYING;md5=3dd2bbe3563837f80ed8926b06c1c353"
> >
> > # xf86-*-* packages depend on an X server built with the xfree86 DDX
> > # so we have a virtual to represent that:
> > +# deprecated, we should use virtual/xserver instead
> > PROVIDES = "virtual/xserver-xf86"
> >
> > # Other packages tend to just care that there is *an* X server:
> > diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
> > b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
> > similarity index 95%
> > rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
> > rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
> > index 131c258..f1cef1b 100644
> > --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
> > +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
> > @@ -1,6 +1,4 @@
> > -require xserver-xf86-common.inc
> > -
> > -PROVIDES += "xserver-xf86-lite"
> > +require xserver-xorg-common.inc
> >
> > 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"
> >
> > diff --git
> >
> a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch
> > b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/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-xorg-lite/crosscompile.patch
> > diff --git
> >
> a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/fix_open_max_preproc
> > essor_error.patch
> >
> b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/fix_open_max_preproc
> > essor_error.patch
> > similarity index 100%
> > rename from
> >
> meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/fix_open_max_preproces
> > sor_error.patch
> > rename to
> >
> meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/fix_open_max_preproce
> > ssor_error.patch
> > diff --git
> > a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch
> > b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/macro_tweak.patch
> > similarity index 93%
> > rename from
> > meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch
> > rename to
> > meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/macro_tweak.patch
> > index 2b75427..2b32d4e 100644
> > ---
> a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch
> > +++
> > b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/macro_tweak.patch
> > @@ -2,7 +2,7 @@ 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
> > +xserver-kdrive-1.7.99.2 and xserver-xorg(-lite). Once they
> > are all upgraded to 1.8.99.904, the the files/macro_tweak.patch
> > can be safely replace by this patch.
> >
> > diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
> > b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.10.1.bb
> > similarity index 89%
> > rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
> > rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.10.1.bb
> > index e42f27d..63b2c38 100644
> > --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
> > +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.10.1.bb
> > @@ -1,4 +1,4 @@
> > -require xserver-xf86-lite.inc
> > +require xserver-xorg-lite.inc
> >
> > LIC_FILES_CHKSUM =
> > "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
> >
> > diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
> > b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> > similarity index 97%
> > rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
> > rename to meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> > index 6b13873..9bc0ee4 100644
> > --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
> > +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> > @@ -1,4 +1,4 @@
> > -require xserver-xf86-common.inc
> > +require xserver-xorg-common.inc
> >
> > 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"
> >
> > diff --git
> >
> a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/cache-xkbcomp-out
> > put-for-fast-start-up.patch
> >
> b/meta/recipes-graphics/xorg-xserver/xserver-xorg/cache-xkbcomp-output-for
> > -fast-start-up.patch
> > similarity index 100%
> > rename from
> >
> meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/cache-xkbcomp-outpu
> > t-for-fast-start-up.patch
> > rename to
> >
> meta/recipes-graphics/xorg-xserver/xserver-xorg/cache-xkbcomp-output-for-fa
> > st-start-up.patch
> > diff --git
> > a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch
> > b/meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch
> > similarity index 100%
> > rename from
> > meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch
> > rename to
> > meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch
> > diff --git
> >
> a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_macros1.patch
> > b/meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_macros1.patch
> > similarity index 100%
> > rename from
> > meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_macros1.patch
> > rename to
> > meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_macros1.patch
> > diff --git
> >
> a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_prep
> > rocessor_error.patch
> >
> b/meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocess
> > or_error.patch
> > similarity index 100%
> > rename from
> >
> meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_prepro
> > cessor_error.patch
> > rename to
> >
> meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor
> > _error.patch
> > diff --git
> >
> a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patc
> > h b/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
> > similarity index 93%
> > rename from
> > meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch
> > rename to
> > meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
> > index 2b75427..2b32d4e 100644
> > ---
> >
> a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patc
> > h
> > +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
> > @@ -2,7 +2,7 @@ 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
> > +xserver-kdrive-1.7.99.2 and xserver-xorg(-lite). Once they
> > are all upgraded to 1.8.99.904, the the files/macro_tweak.patch
> > can be safely replace by this patch.
> >
> > diff --git
> a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
> > b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.bb
> > similarity index 93%
> > rename from
> > meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
> > rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.bb
> > index b797f97..0194798 100644
> > --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
> > +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.bb
> > @@ -1,4 +1,4 @@
> > -require xserver-xf86-dri-lite.inc
> > +require xserver-xorg.inc
> >
> > LIC_FILES_CHKSUM =
> > "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
> >
> > diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
> > b/meta/recipes-graphics/xorg-xserver/xserver-xorg_git.bb
> > similarity index 94%
> > rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
> > rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_git.bb
> > index 87ba040..beef06a 100644
> > --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
> > +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_git.bb
> > @@ -1,4 +1,4 @@
> > -require xserver-xf86-dri-lite.inc
> > +require xserver-xorg.inc
> >
> > LIC_FILES_CHKSUM =
> > "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
> >
> > --
> > 1.7.7
> >
> >
> > _______________________________________________
> > 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
^ permalink raw reply
* [PATCHv2] eglibc-2.14: add patch to fix libdl crash
From: Martin Jansa @ 2011-10-12 7:03 UTC (permalink / raw)
To: openembedded-core; +Cc: Klaus Kurzmann
In-Reply-To: <1317634209-3154-1-git-send-email-mokml@mnet-online.de>
From: Klaus Kurzmann <mok@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 <mok@fluxnetz.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../eglibc-2.14/glibc-2.14-libdl-crash.patch | 131 ++++++++++++++++++++
meta/recipes-core/eglibc/eglibc_2.14.bb | 5 +-
2 files changed, 134 insertions(+), 2 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 0000000..e1f135c
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-2.14/glibc-2.14-libdl-crash.patch
@@ -0,0 +1,131 @@
+Without this patch programs using alsa-lib crash (alsamixer for example).
+Removed Copyright reverts
+
+Upstream-Status: Pending
+
+http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9
+http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html
+
+many distributions are using this already
+http://chakra-project.org/ccr/packages/glibc/glibc/PKGBUILD
+http://mailman.archlinux.org/pipermail/arch-commits/2011-June/137142.html
+http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/glibc/current/SOURCES/glibc-2.14-libdl-crash.patch?view=markup&pathrev=691343
+http://repos.archlinuxppc.org/wsvn/filedetails.php?repname=packages&path=%2Fglibc%2Ftrunk%2Fglibc-2.14-libdl-crash.patch
+
+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
+@@ -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
+@@ -192,6 +192,9 @@ struct link_map
+ during LD_TRACE_PRELINKING=1
+ contains any DT_SYMBOLIC
+ libraries. */
++ unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be
++ freed, ie. not allocated with
++ the dummy malloc in ld.so. */
+
+ /* Collected information about own RPATH directories. */
+ struct r_search_path_struct l_rpath_dirs;
+@@ -240,9 +243,6 @@ struct link_map
+
+ /* List of object in order of the init and fini calls. */
+ struct link_map **l_initfini;
+- /* The init and fini list generated at startup, saved when the
+- object is also loaded dynamically. */
+- struct link_map **l_orig_initfini;
+
+ /* List of the dependencies introduced through symbol binding. */
+ struct link_map_reldeps
diff --git a/meta/recipes-core/eglibc/eglibc_2.14.bb b/meta/recipes-core/eglibc/eglibc_2.14.bb
index b2821db..571d39d 100644
--- a/meta/recipes-core/eglibc/eglibc_2.14.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.14.bb
@@ -3,7 +3,7 @@ require eglibc.inc
SRCREV = "15225"
DEPENDS += "gperf-native"
-PR = "r0"
+PR = "r1"
PR_append = "+svnr${SRCPV}"
EGLIBC_BRANCH="eglibc-2_14"
@@ -19,7 +19,8 @@ SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http
file://ppc-sqrt.patch \
file://multilib_readlib.patch \
file://eglibc-rpc-export-again.patch \
- "
+ file://glibc-2.14-libdl-crash.patch \
+ "
LIC_FILES_CHKSUM = "file://LICENSES;md5=98a1128c4b58120182cbea3b1752d8b9 \
file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \
file://posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \
--
1.7.7
^ permalink raw reply related
* Re: [PATCHv3 01/31] xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite
From: Cui, Dexuan @ 2011-10-12 3:48 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Martin Jansa
In-Reply-To: <8267017169d00aaa5a487a6f5d72cd67dad9c327.1318007055.git.Martin.Jansa@gmail.com>
Glad to see the patches to upgrade xserver and libx11. Good work! :-)
BTW, we also need to upgrade meta-intel's side since BSP can't build now:
http://bugzilla.pokylinux.org/show_bug.cgi?id=1670
I'm working on this bug.
Thanks,
-- Dexuan
> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org
> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
> Martin Jansa
> Sent: Saturday, October 08, 2011 1:05 AM
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [oe-core][PATCHv3 01/31] 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.Jansa@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 +-
> ...ver-xf86-common.inc => xserver-xorg-common.inc} | 1 +
> ...xserver-xf86-lite.inc => xserver-xorg-lite.inc} | 4 +---
> .../crosscompile.patch | 0
> .../fix_open_max_preprocessor_error.patch | 0
> .../macro_tweak.patch | 2 +-
> ...-lite_1.10.1.bb => xserver-xorg-lite_1.10.1.bb} | 2 +-
> ...{xserver-xf86-dri-lite.inc => xserver-xorg.inc} | 2 +-
> .../cache-xkbcomp-output-for-fast-start-up.patch | 0
> .../crosscompile.patch | 0
> .../fix_macros1.patch | 0
> .../fix_open_max_preprocessor_error.patch | 0
> .../macro_tweak.patch | 2 +-
> ...6-dri-lite_1.10.1.bb => xserver-xorg_1.10.1.bb} | 2 +-
> ...er-xf86-dri-lite_git.bb => xserver-xorg_git.bb} | 2 +-
> 19 files changed, 27 insertions(+), 28 deletions(-)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-common.inc =>
> xserver-xorg-common.inc} (96%)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite.inc =>
> xserver-xorg-lite.inc} (95%)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite =>
> xserver-xorg-lite}/crosscompile.patch (100%)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite =>
> xserver-xorg-lite}/fix_open_max_preprocessor_error.patch (100%)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite =>
> xserver-xorg-lite}/macro_tweak.patch (93%)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite_1.10.1.bb =>
> xserver-xorg-lite_1.10.1.bb} (89%)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite.inc =>
> xserver-xorg.inc} (97%)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite =>
> xserver-xorg}/cache-xkbcomp-output-for-fast-start-up.patch (100%)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite =>
> xserver-xorg}/crosscompile.patch (100%)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite =>
> xserver-xorg}/fix_macros1.patch (100%)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite =>
> xserver-xorg}/fix_open_max_preprocessor_error.patch (100%)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite =>
> xserver-xorg}/macro_tweak.patch (93%)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite_1.10.1.bb =>
> xserver-xorg_1.10.1.bb} (93%)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite_git.bb =>
> xserver-xorg_git.bb} (94%)
>
> 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 7b6c4a9..8af80c7 100644
> --- a/meta/conf/distro/include/distro_tracking_fields.inc
> +++ b/meta/conf/distro/include/distro_tracking_fields.inc
> @@ -3683,14 +3683,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.yu@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.yu@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.yu@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"
> @@ -5908,8 +5908,8 @@ DISTRO_PN_ALIAS_pn-pseudo = "Windriver"
>
> DISTRO_PN_ALIAS_pn-btrfs-tools = "Debian=btrfs-tools Fedora=btrfs-progs"
> DISTRO_PN_ALIAS_pn-rt-tests = "Debian=rt-tests Ubuntu=rt-tests"
> -DISTRO_PN_ALIAS_pn-xserver-xf86-lite = "Fedora=xorg-x11-server
> Ubuntu=xserver-xorg"
> -DISTRO_PN_ALIAS_pn-xserver-xf86-dri-lite = "Fedora=xorg-x11-server
> Ubuntu=xserver-xorg"
> +DISTRO_PN_ALIAS_pn-xserver-xorg = "Fedora=xorg-x11-server
> Ubuntu=xserver-xorg"
> +DISTRO_PN_ALIAS_pn-xserver-xorg = "Fedora=xorg-x11-server
> Ubuntu=xserver-xorg"
> DISTRO_PN_ALIAS_pn-xserver-kdrive = "Fedora=xorg-x11-server
> Ubuntu=xserver-xorg"
> DISTRO_PN_ALIAS_pn-dtc = "Fedora=dtc Ubuntu=dtc"
> DISTRO_PN_ALIAS_pn-dtc-native = "Fedora=dtc Ubuntu=dtc"
> diff --git a/meta/conf/machine/qemux86-64.conf
> b/meta/conf/machine/qemux86-64.conf
> index 18a7513..f28cf08 100644
> --- a/meta/conf/machine/qemux86-64.conf
> +++ b/meta/conf/machine/qemux86-64.conf
> @@ -4,8 +4,8 @@
>
> PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
> PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
> -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
> -PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
> +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
> +PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
>
> require conf/machine/include/tune-x86_64.inc
> require conf/machine/include/qemu.inc
> @@ -17,7 +17,7 @@ KERNEL_IMAGETYPE = "bzImage"
> SERIAL_CONSOLE = "115200 ttyS0"
>
> # We bypass swrast but we need it to be present for X to load correctly
> -XSERVER ?= "xserver-xf86-dri-lite \
> +XSERVER ?= "xserver-xorg \
> mesa-dri-driver-swrast \
> xf86-input-vmmouse \
> xf86-input-keyboard \
> diff --git a/meta/conf/machine/qemux86.conf
> b/meta/conf/machine/qemux86.conf
> index 5d0d03e..75c9042 100644
> --- a/meta/conf/machine/qemux86.conf
> +++ b/meta/conf/machine/qemux86.conf
> @@ -4,8 +4,8 @@
>
> PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
> PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
> -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
> -PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
> +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
> +PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
>
> require conf/machine/include/tune-i586.inc
> require conf/machine/include/qemu.inc
> @@ -17,7 +17,7 @@ KERNEL_IMAGETYPE = "bzImage"
> SERIAL_CONSOLE = "115200 ttyS0"
>
> # We bypass swrast but we need it to be present for X to load correctly
> -XSERVER ?= "xserver-xf86-dri-lite \
> +XSERVER ?= "xserver-xorg \
> mesa-dri-driver-swrast \
> xf86-input-vmmouse \
> xf86-input-keyboard \
> diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
> index b9da33a..5e4b435 100644
> --- a/meta/conf/multilib.conf
> +++ b/meta/conf/multilib.conf
> @@ -442,7 +442,7 @@ BBCLASSEXTEND_append_pn-xrandr = "
> ${MULTILIBS}"
> BBCLASSEXTEND_append_pn-xrestop = " ${MULTILIBS}"
> BBCLASSEXTEND_append_pn-xserver-nodm-init = " ${MULTILIBS}"
> BBCLASSEXTEND_append_pn-xserver-xf86-config = " ${MULTILIBS}"
> -BBCLASSEXTEND_append_pn-xserver-xf86-dri-lite = " ${MULTILIBS}"
> +BBCLASSEXTEND_append_pn-xserver-xorg = " ${MULTILIBS}"
> BBCLASSEXTEND_append_pn-xset = " ${MULTILIBS}"
> BBCLASSEXTEND_append_pn-xtrans = " ${MULTILIBS}"
> BBCLASSEXTEND_append_pn-xtscal = " ${MULTILIBS}"
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
> b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
> similarity index 96%
> rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
> rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
> index 17d456c..78c5f2e 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
> @@ -7,6 +7,7 @@ LIC_FILES_CHKSUM =
> "file://COPYING;md5=3dd2bbe3563837f80ed8926b06c1c353"
>
> # xf86-*-* packages depend on an X server built with the xfree86 DDX
> # so we have a virtual to represent that:
> +# deprecated, we should use virtual/xserver instead
> PROVIDES = "virtual/xserver-xf86"
>
> # Other packages tend to just care that there is *an* X server:
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
> b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
> similarity index 95%
> rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
> rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
> index 131c258..f1cef1b 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
> @@ -1,6 +1,4 @@
> -require xserver-xf86-common.inc
> -
> -PROVIDES += "xserver-xf86-lite"
> +require xserver-xorg-common.inc
>
> 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"
>
> diff --git
> a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch
> b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/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-xorg-lite/crosscompile.patch
> diff --git
> a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/fix_open_max_preproc
> essor_error.patch
> b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/fix_open_max_preproc
> essor_error.patch
> similarity index 100%
> rename from
> meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/fix_open_max_preproces
> sor_error.patch
> rename to
> meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/fix_open_max_preproce
> ssor_error.patch
> diff --git
> a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch
> b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/macro_tweak.patch
> similarity index 93%
> rename from
> meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch
> rename to
> meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/macro_tweak.patch
> index 2b75427..2b32d4e 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch
> +++
> b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/macro_tweak.patch
> @@ -2,7 +2,7 @@ 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
> +xserver-kdrive-1.7.99.2 and xserver-xorg(-lite). Once they
> are all upgraded to 1.8.99.904, the the files/macro_tweak.patch
> can be safely replace by this patch.
>
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
> b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.10.1.bb
> similarity index 89%
> rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
> rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.10.1.bb
> index e42f27d..63b2c38 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.10.1.bb
> @@ -1,4 +1,4 @@
> -require xserver-xf86-lite.inc
> +require xserver-xorg-lite.inc
>
> LIC_FILES_CHKSUM =
> "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
>
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
> b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> similarity index 97%
> rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
> rename to meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> index 6b13873..9bc0ee4 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> @@ -1,4 +1,4 @@
> -require xserver-xf86-common.inc
> +require xserver-xorg-common.inc
>
> 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"
>
> diff --git
> a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/cache-xkbcomp-out
> put-for-fast-start-up.patch
> b/meta/recipes-graphics/xorg-xserver/xserver-xorg/cache-xkbcomp-output-for
> -fast-start-up.patch
> similarity index 100%
> rename from
> meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/cache-xkbcomp-outpu
> t-for-fast-start-up.patch
> rename to
> meta/recipes-graphics/xorg-xserver/xserver-xorg/cache-xkbcomp-output-for-fa
> st-start-up.patch
> diff --git
> a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch
> b/meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch
> similarity index 100%
> rename from
> meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch
> rename to
> meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch
> diff --git
> a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_macros1.patch
> b/meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_macros1.patch
> similarity index 100%
> rename from
> meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_macros1.patch
> rename to
> meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_macros1.patch
> diff --git
> a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_prep
> rocessor_error.patch
> b/meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocess
> or_error.patch
> similarity index 100%
> rename from
> meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_prepro
> cessor_error.patch
> rename to
> meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor
> _error.patch
> diff --git
> a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patc
> h b/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
> similarity index 93%
> rename from
> meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch
> rename to
> meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
> index 2b75427..2b32d4e 100644
> ---
> a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patc
> h
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
> @@ -2,7 +2,7 @@ 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
> +xserver-kdrive-1.7.99.2 and xserver-xorg(-lite). Once they
> are all upgraded to 1.8.99.904, the the files/macro_tweak.patch
> can be safely replace by this patch.
>
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
> b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.bb
> similarity index 93%
> rename from
> meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
> rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.bb
> index b797f97..0194798 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.bb
> @@ -1,4 +1,4 @@
> -require xserver-xf86-dri-lite.inc
> +require xserver-xorg.inc
>
> LIC_FILES_CHKSUM =
> "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
>
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
> b/meta/recipes-graphics/xorg-xserver/xserver-xorg_git.bb
> similarity index 94%
> rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
> rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_git.bb
> index 87ba040..beef06a 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_git.bb
> @@ -1,4 +1,4 @@
> -require xserver-xf86-dri-lite.inc
> +require xserver-xorg.inc
>
> LIC_FILES_CHKSUM =
> "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
>
> --
> 1.7.7
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply
* [PATCH 2/2] pcmanfm: Upgrade to 0.9.9
From: edwin.zhai @ 2011-10-12 2:20 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1318385789.git.edwin.zhai@intel.com>
From: Zhai Edwin <edwin.zhai@intel.com>
Update owl-window-menu.patch.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
| 53 ++++++++++----------
.../pcmanfm/{pcmanfm_0.9.8.bb => pcmanfm_0.9.9.bb} | 6 +-
2 files changed, 29 insertions(+), 30 deletions(-)
rename meta/recipes-sato/pcmanfm/{pcmanfm_0.9.8.bb => pcmanfm_0.9.9.bb} (87%)
--git a/meta/recipes-sato/pcmanfm/files/owl-window-menu.patch b/meta/recipes-sato/pcmanfm/files/owl-window-menu.patch
index 0826a16..88b154e 100644
--- a/meta/recipes-sato/pcmanfm/files/owl-window-menu.patch
+++ b/meta/recipes-sato/pcmanfm/files/owl-window-menu.patch
@@ -5,10 +5,10 @@ Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Upstream-Status: Inappropriate [enable feature]
-Index: pcmanfm-0.9.7/configure.ac
+Index: pcmanfm-0.9.9/configure.ac
===================================================================
---- pcmanfm-0.9.7.orig/configure.ac 2010-07-27 10:28:12.000000000 +0800
-+++ pcmanfm-0.9.7/configure.ac 2010-07-27 18:03:42.000000000 +0800
+--- pcmanfm-0.9.9.orig/configure.ac 2011-08-10 05:28:31.000000000 +0800
++++ pcmanfm-0.9.9/configure.ac 2011-10-10 15:47:33.000000000 +0800
@@ -70,6 +70,8 @@
gtk_modules="gtk+-2.0 >= 2.16.0"
@@ -18,21 +18,21 @@ Index: pcmanfm-0.9.7/configure.ac
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
-Index: pcmanfm-0.9.7/src/main-win.c
+Index: pcmanfm-0.9.9/src/main-win.c
===================================================================
---- pcmanfm-0.9.7.orig/src/main-win.c 2010-07-27 10:56:08.000000000 +0800
-+++ pcmanfm-0.9.7/src/main-win.c 2010-07-27 17:28:59.000000000 +0800
-@@ -36,6 +36,8 @@
- #include "main-win.h"
+--- pcmanfm-0.9.9.orig/src/main-win.c 2011-08-10 05:28:32.000000000 +0800
++++ pcmanfm-0.9.9/src/main-win.c 2011-10-10 15:50:48.000000000 +0800
+@@ -37,6 +37,8 @@
#include "pref.h"
+ #include "tab-page.h"
+#include "libowl/owlwindowmenu.h"
+
static void fm_main_win_finalize (GObject *object);
G_DEFINE_TYPE(FmMainWin, fm_main_win, GTK_TYPE_WINDOW);
-@@ -466,9 +468,27 @@
- fm_main_win_chdir(win, path);
+@@ -400,9 +402,27 @@
+ }
}
+/* Transfer gtk_ui_manager menubar to gtk menubar */
@@ -53,30 +53,29 @@ Index: pcmanfm-0.9.7/src/main-win.c
+ return main_menu;
+}
+
- static void fm_main_win_init(FmMainWin *self)
+ static void fm_main_win_init(FmMainWin *win)
{
-- GtkWidget *vbox, *menubar, *toolitem, *scroll;
-+ GtkWidget *vbox, *menubar, *owl_menubar, *toolitem, *scroll;
+- GtkWidget *vbox, *menubar, *toolitem, *btn;
++ GtkWidget *vbox, *menubar, *owl_menubar, *toolitem, *btn;
GtkUIManager* ui;
GtkActionGroup* act_grp;
GtkAction* act;
-@@ -537,7 +557,6 @@
-
- self->popup = gtk_ui_manager_get_widget(ui, "/popup");
+@@ -456,7 +476,6 @@
+ win->popup = gtk_ui_manager_get_widget(ui, "/popup");
+ gtk_menu_attach_to_widget(GTK_WIDGET(win->popup), win, NULL);
- gtk_box_pack_start( (GtkBox*)vbox, menubar, FALSE, TRUE, 0 );
- gtk_box_pack_start( (GtkBox*)vbox, self->toolbar, FALSE, TRUE, 0 );
+ gtk_box_pack_start( (GtkBox*)vbox, win->toolbar, FALSE, TRUE, 0 );
/* load bookmarks menu */
-@@ -586,6 +605,11 @@
- gtk_container_add( (GtkContainer*)self, vbox );
- gtk_widget_show_all(vbox);
+@@ -517,6 +536,10 @@
-+ owl_menubar = ui_menubar_to_menu(menubar);
-+ gtk_widget_show_all (owl_menubar);
-+ owl_set_window_menu (GTK_WINDOW(self),
-+ GTK_MENU(owl_menubar));
+ gtk_container_add( (GtkContainer*)win, vbox );
+ gtk_widget_show_all(vbox);
+
- /* create new tab */
- fm_main_win_add_tab(self, fm_path_get_home());
- gtk_widget_grab_focus(self->folder_view);
++ owl_menubar = ui_menubar_to_menu(menubar);
++ gtk_widget_show_all(owl_menubar);
++ owl_set_window_menu(GTK_WINDOW(win), GTK_MENU(owl_menubar));
+ }
+
+
diff --git a/meta/recipes-sato/pcmanfm/pcmanfm_0.9.8.bb b/meta/recipes-sato/pcmanfm/pcmanfm_0.9.9.bb
similarity index 87%
rename from meta/recipes-sato/pcmanfm/pcmanfm_0.9.8.bb
rename to meta/recipes-sato/pcmanfm/pcmanfm_0.9.9.bb
index f48bb67..af283f6 100644
--- a/meta/recipes-sato/pcmanfm/pcmanfm_0.9.8.bb
+++ b/meta/recipes-sato/pcmanfm/pcmanfm_0.9.9.bb
@@ -11,7 +11,7 @@ SECTION = "x11"
DEPENDS = "gtk+ startup-notification libfm"
DEPENDS_append_poky = " libowl"
-PR = "r1"
+PR = "r0"
COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|mips.*|powerpc.*)-(linux|freebsd.*)'
@@ -24,8 +24,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.gz \
SRC_URI_append_poky = " file://owl-window-menu.patch"
-SRC_URI[md5sum] = "4a7fdc0526ed14e3293d784c0ce27dea"
-SRC_URI[sha256sum] = "a9335baf127d133da1b2873b3065545bd278fadd4b33e4b91e3d10b165961b68"
+SRC_URI[md5sum] = "f31ed6defb600f7046a456220d8efa3a"
+SRC_URI[sha256sum] = "bc48af4ade638b47e4207cc274f6e38c2bd3786a811d20da47c3df9907c6fb6c"
inherit autotools pkgconfig
--
1.7.1
^ permalink raw reply related
* [PATCH 1/2] libfm: Upgrade to 0.1.16
From: edwin.zhai @ 2011-10-12 2:20 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1318385789.git.edwin.zhai@intel.com>
From: Zhai Edwin <edwin.zhai@intel.com>
Remove obsolete use_deprecate_func.patch, and add configure_fix.patch to update
configure.ac
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
.../libfm/libfm-0.1.14/use_deprecate_func.patch | 13 -------------
.../libfm/libfm-0.1.16/configure_fix.patch | 19 +++++++++++++++++++
.../libfm/{libfm_0.1.14.bb => libfm_0.1.16.bb} | 8 ++++----
3 files changed, 23 insertions(+), 17 deletions(-)
delete mode 100644 meta/recipes-support/libfm/libfm-0.1.14/use_deprecate_func.patch
create mode 100644 meta/recipes-support/libfm/libfm-0.1.16/configure_fix.patch
rename meta/recipes-support/libfm/{libfm_0.1.14.bb => libfm_0.1.16.bb} (73%)
diff --git a/meta/recipes-support/libfm/libfm-0.1.14/use_deprecate_func.patch b/meta/recipes-support/libfm/libfm-0.1.14/use_deprecate_func.patch
deleted file mode 100644
index 79fc9ce..0000000
--- a/meta/recipes-support/libfm/libfm-0.1.14/use_deprecate_func.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-diff -ruN libfm-0.1.14-orig//src/Makefile.am libfm-0.1.14/src/Makefile.am
---- libfm-0.1.14-orig//src/Makefile.am 2011-04-26 10:01:44.297664993 +0800
-+++ libfm-0.1.14/src/Makefile.am 2011-04-26 10:02:10.637665004 +0800
-@@ -285,7 +285,6 @@
- $(GIO_CFLAGS) \
- -DGIO_MODULE_DIR=\"$(giomodulesdir)\" \
- -DGVFS_LOCALEDIR=\""$(localedir)"\" \
-- -DG_DISABLE_DEPRECATED \
- $(NULL)
-
- libgiofm_la_LDFLAGS = \
diff --git a/meta/recipes-support/libfm/libfm-0.1.16/configure_fix.patch b/meta/recipes-support/libfm/libfm-0.1.16/configure_fix.patch
new file mode 100644
index 0000000..351e6e7
--- /dev/null
+++ b/meta/recipes-support/libfm/libfm-0.1.16/configure_fix.patch
@@ -0,0 +1,19 @@
+Update configure.ac after docs removed in 0.1.16
+
+Upstream-Status: Pending
+
+Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+Index: libfm-0.1.16/configure.ac
+===================================================================
+--- libfm-0.1.16.orig/configure.ac 2011-10-10 15:13:21.000000000 +0800
++++ libfm-0.1.16/configure.ac 2011-10-10 15:13:30.000000000 +0800
+@@ -153,9 +153,6 @@
+ data/Makefile
+ data/ui/Makefile
+ po/Makefile.in
+- docs/Makefile
+- docs/reference/Makefile
+- docs/reference/libfm/Makefile
+ libfm.pc
+ libfm-gtk.pc
+ ])
diff --git a/meta/recipes-support/libfm/libfm_0.1.14.bb b/meta/recipes-support/libfm/libfm_0.1.16.bb
similarity index 73%
rename from meta/recipes-support/libfm/libfm_0.1.14.bb
rename to meta/recipes-support/libfm/libfm_0.1.16.bb
index 38f1d73..293937f 100644
--- a/meta/recipes-support/libfm/libfm_0.1.14.bb
+++ b/meta/recipes-support/libfm/libfm_0.1.16.bb
@@ -10,12 +10,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
SECTION = "x11/libs"
DEPENDS = "gtk+ menu-cache intltool-native"
-PR = "r3"
+PR = "r0"
SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.gz \
- file://use_deprecate_func.patch"
+ file://configure_fix.patch"
-SRC_URI[md5sum] = "d55e51dced6bb9ef46665243b079761f"
-SRC_URI[sha256sum] = "e97bf3f9ed4f33b9f0be73e67d360b89337cccf816361faacd8422722269806b"
+SRC_URI[md5sum] = "c09bce415ff6dc2dd835e28aeddeabe3"
+SRC_URI[sha256sum] = "ed49365319b941757c155b3790a2adf73f5072227c578d9bcba7329c6f9fcd3b"
inherit autotools pkgconfig
--
1.7.1
^ permalink raw reply related
* [PATCH 0/2] Upgrade libfm/pcmanfm
From: edwin.zhai @ 2011-10-12 2:20 UTC (permalink / raw)
To: openembedded-core
From: Zhai Edwin <edwin.zhai@intel.com>
All,
These 2 patches upgrade libfm and pcmanfm. Pls. help to review and pull.
Thanks,
Edwin
The following changes since commit 0d8c8cf462e5df446669355b554b3d5fdc532a11:
mutter: update to 2.29.1 and fix SRC_URI (2011-10-07 11:35:50 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib gzhai/master2
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=gzhai/master2
Zhai Edwin (2):
libfm: Upgrade to 0.1.16
pcmanfm: Upgrade to 0.9.9
.../pcmanfm/files/owl-window-menu.patch | 53 ++++++++++----------
.../pcmanfm/{pcmanfm_0.9.8.bb => pcmanfm_0.9.9.bb} | 6 +-
.../libfm/libfm-0.1.14/use_deprecate_func.patch | 13 -----
.../libfm/libfm-0.1.16/configure_fix.patch | 19 +++++++
.../libfm/{libfm_0.1.14.bb => libfm_0.1.16.bb} | 8 ++--
5 files changed, 52 insertions(+), 47 deletions(-)
rename meta/recipes-sato/pcmanfm/{pcmanfm_0.9.8.bb => pcmanfm_0.9.9.bb} (87%)
delete mode 100644 meta/recipes-support/libfm/libfm-0.1.14/use_deprecate_func.patch
create mode 100644 meta/recipes-support/libfm/libfm-0.1.16/configure_fix.patch
rename meta/recipes-support/libfm/{libfm_0.1.14.bb => libfm_0.1.16.bb} (73%)
^ permalink raw reply
* Re: oe parse fails
From: Khem Raj @ 2011-10-12 2:00 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: openembedded-devel
In-Reply-To: <201110120110.38951.schnitzeltony@gmx.de>
On Tue, Oct 11, 2011 at 4:10 PM, Andreas Müller <schnitzeltony@gmx.de> wrote:
> Angstrom environment / fresh pull / clean tmp dir -> error
>
> Pseudo is not present but is required, building this first before the main build
> NOTE: angstrom DOES NOT support libiconv because the eglibc provided iconv library is used | ETA: 00:00:34
> NOTE: angstrom DOES NOT support libiconv because the eglibc provided iconv library is used
> NOTE: angstrom DOES NOT support gconf-dbus because gconf-dbus has been merged back into main GConf | ETA: 00:00:34
> NOTE: angstrom DOES NOT support gconf-dbus-native because gconf-dbus has been merged back into main GConf
> ERROR: Could not include required file recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc############################################################## | ETA: 00:00:09
> ERROR: Command execution failed: Exited with 1
>
the recent xorg changes in oe-core needs to be adapted into layers. I
have posted some patches, they may be wrong
but they help in getting over the parse issues while using angstrom.
> Andreas
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
^ permalink raw reply
* Comparing sig's for some recipes - task dependecies
From: McClintock Matthew-B29882 @ 2011-10-12 1:30 UTC (permalink / raw)
To: openembedded-core@openembedded.org
All,
I'm doing some basic sstate testing as follows (note: strace is just
an example package used):
$ cd /opt/yocto/cache-build/p1020rdb
$ source oe-init-env-build
$ bitbake strace
$ cd /opt/yocto/cache-test/p1020rdb
$ source oe-init-env-build
$ cp /opt/yocto/cache-build/p1020rdb/build/sstate-cache/* sstate-cache/
$ bitbake strace
I'm left with two instances of some sstate-cache:
$ bitbake-diffsig
sstate-cache/sstate-strace-ppce5500-fsl-linux-4.5.20-r2-ppce5500-2-*_deploy-rpm.tgz.siginfo
Dependency on task
/opt/yocto/cache-test/meta/recipes-devtools/perl/perl_5.12.3.bb.do_package
was added
Dependency on task
virtual:native:/opt/yocto/cache-test/meta/recipes-devtools/pseudo/pseudo_1.1.1.bb.do_populate_sysroot
was added
Dependency on task
/opt/yocto/cache-test/meta/recipes-devtools/strace/strace_4.5.20.bb.do_package
was added
Dependency on task
virtual:native:/opt/yocto/cache-test/meta/recipes-devtools/rpm/rpm_5.4.0.bb.do_populate_sysroot
was added
Dependency on task
virtual:native:/opt/yocto/cache-build/p1020rdb/meta/recipes-devtools/pseudo/pseudo_1.1.1.bb.do_populate_sysroot
was removed
Dependency on task
/opt/yocto/cache-build/p1020rdb/meta/recipes-devtools/strace/strace_4.5.20.bb.do_package
was removed
Dependency on task
/opt/yocto/cache-build/p1020rdb/meta/recipes-devtools/perl/perl_5.12.3.bb.do_package
was removed
Dependency on task
virtual:native:/opt/yocto/cache-build/p1020rdb/meta/recipes-devtools/rpm/rpm_5.4.0.bb.do_populate_sysroot
was removed
It seems like just the task paths are changing which should not really
be an issue? Although I admit it could for some packages. This seems
to be happening for a lot of packages I'm building as well and not
just strace.
-M
^ permalink raw reply
* oe parse fails
From: Andreas Müller @ 2011-10-11 23:10 UTC (permalink / raw)
To: openembedded-core; +Cc: openembedded-devel
Angstrom environment / fresh pull / clean tmp dir -> error
Pseudo is not present but is required, building this first before the main build
NOTE: angstrom DOES NOT support libiconv because the eglibc provided iconv library is used | ETA: 00:00:34
NOTE: angstrom DOES NOT support libiconv because the eglibc provided iconv library is used
NOTE: angstrom DOES NOT support gconf-dbus because gconf-dbus has been merged back into main GConf | ETA: 00:00:34
NOTE: angstrom DOES NOT support gconf-dbus-native because gconf-dbus has been merged back into main GConf
ERROR: Could not include required file recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc############################################################## | ETA: 00:00:09
ERROR: Command execution failed: Exited with 1
Andreas
^ permalink raw reply
* [RFC PATCH 1/1] insane.bbclass: add qa check to ensure declared packages exist
From: Joshua Lock @ 2011-10-11 22:29 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1318371066.git.josh@linux.intel.com>
This patch adds an extra package sanity check to test whether any extra
packages defined by the recipe (i.e. anything other than -dev, -dbg, -doc,
-staticdev and -locale packages) are actually created.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
meta/classes/insane.bbclass | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index b861e85..ccc0d1c 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -520,6 +520,8 @@ python do_package_qa () {
g = globals()
walk_sane = True
rdepends_sane = True
+ exists = True
+
for package in packages.split():
skip = (bb.data.getVar('INSANE_SKIP_' + package, d, True) or "").split()
if skip:
@@ -539,13 +541,18 @@ python do_package_qa () {
bb.note("Checking Package: %s" % package)
path = "%s/%s" % (pkgdest, package)
+ if not package.endswith("-dev") and not package.endswith("-dbg") and not package.endswith("-doc") and not package.endswith("-staticdev") and not package.endswith("-locale"):
+ contents_len = os.listdir(path)
+ if not contents_len:
+ bb.error("QA Issue: PACKAGE %s defined but not created" % package)
+ exists = False
if not package_qa_walk(path, warnchecks, errorchecks, skip, package, d):
walk_sane = False
if not package_qa_check_rdepends(package, pkgdest, skip, d):
rdepends_sane = False
- if not walk_sane or not rdepends_sane:
+ if not walk_sane or not rdepends_sane or not exists:
bb.fatal("QA run found fatal errors. Please consider fixing them.")
bb.note("DONE with PACKAGE QA")
}
--
1.7.6.4
^ permalink raw reply related
* [RFC PATCH 0/1] QA check for defined packages
From: Joshua Lock @ 2011-10-11 22:29 UTC (permalink / raw)
To: openembedded-core
Folks,
I'm looking for some comments on this WIP patch.
The reason I've added this is because the hob GUI requires us to offer much
more reliable metadata - we show the user available packages, as defined by
each recipe, to add to their image. Should a recipe define a package and yet
not actually create it and the user has included that in their image we cause
errors at build time.
However whilst the idea seems sound enough, there are some caveats - running
a world build with this patch I see failures fairly early on at least a few
of which I'd expect we'll need to special-case:
* eglibc-local
* linux-yocto
* linux-libc-headers
* gcc-runtime
Thoughts?
Thanks,
Joshua
Please review the following changes for suitability for inclusion. If you have
any objections or suggestions for improvement, please respond to the patches. If
you agree with the changes, please provide your Acked-by.
The following changes since commit 486b17af3e4cced76e9852e7634f75ea87433db2:
shared-mime-info: Fix a parallel make race (2011-10-11 18:06:56 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib rfcqacheck
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rfcqacheck
Joshua Lock (1):
insane.bbclass: add qa check to ensure declared packages exist
meta/classes/insane.bbclass | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
--
1.7.6.4
^ permalink raw reply
* Re: [oe] git server move
From: Khem Raj @ 2011-10-11 21:39 UTC (permalink / raw)
To: openembedded-devel; +Cc: openembedded-core
In-Reply-To: <1318361177.3726.1.camel@mattotaupa>
On Tue, Oct 11, 2011 at 12:26 PM, Paul Menzel
<paulepanter@users.sourceforge.net> wrote:
> Dear Cliff,
>
>
> Am Dienstag, den 11.10.2011, 15:11 -0400 schrieb Cliff Brake:
>> Hi, we are moving git.openembedded.org to a new server.
>
> is there more information about the reasons? Is it just a new machine?
> Where is it hosted now?
Its just a new machine at same space. This is a 64bit instance all OE services
are being moved to this server and the old instance will be decommissioned.
>
>> SSH access on the old server has been disabled. git:// still works there.
>>
>> As soon as DNS propagates, SSH access will work with the new server.
>>
>> Let me know if you see any problems.
>>
>> SSH keys will likely change, so expect messages about that.
>
> So what are the fingerprints of the new keys? ;-)
>
>
> Thanks,
>
> Paul
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
>
^ permalink raw reply
* Re: [PATCH v3 01/16] libnl2: Fix a race on route/pktloc_syntax.h
From: Saul Wold @ 2011-10-11 21:02 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Cc: Matthew McClintock, Koen Kooi
In-Reply-To: <CBC51C50-4E8D-45AC-98D5-7131F7A5A28E@dominion.thruhere.net>
On 10/11/2011 01:59 PM, Koen Kooi wrote:
>
> Op 11 okt. 2011, om 22:47 heeft Saul Wold het volgende geschreven:
>
>> On 09/30/2011 10:21 AM, Matthew McClintock wrote:
>>> From: Tom Rini<tom_rini@mentor.com>
>>>
>>> At issue is that route/pktloc.c (not generated) depends on
>>> route/pktloc_syntax.h (generated).
>>>
>>> Signed-off-by: Tom Rini<tom_rini@mentor.com>
>>> Signed-off-by: Matthew McClintock<msm@freescale.com>
>>> ---
>>> .../libnl/fix-pktloc_syntax_h-race.patch | 26 ++++++++++++++++++++
>> I just noticed that this patch get put in the libnl directory, not the libnl-2.0 directory.
>>
>> Can you pull all the libnl changes together and resbumit this, also is there a reason you can not just update this to the latest libnl 3.2.1?
>
> libnl3 is *again* incompatible with its previous version, like libnl2 is incompatible with libnl1.
>
Koen,
Thanks for that bit of info, I had not gotten much further into
investigating libnl, other than seeing the newer version out there.
Sau!
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
^ permalink raw reply
* Re: [PATCH v3 01/16] libnl2: Fix a race on route/pktloc_syntax.h
From: Koen Kooi @ 2011-10-11 20:59 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Matthew McClintock
In-Reply-To: <4E94AB7A.6050603@intel.com>
Op 11 okt. 2011, om 22:47 heeft Saul Wold het volgende geschreven:
> On 09/30/2011 10:21 AM, Matthew McClintock wrote:
>> From: Tom Rini<tom_rini@mentor.com>
>>
>> At issue is that route/pktloc.c (not generated) depends on
>> route/pktloc_syntax.h (generated).
>>
>> Signed-off-by: Tom Rini<tom_rini@mentor.com>
>> Signed-off-by: Matthew McClintock<msm@freescale.com>
>> ---
>> .../libnl/fix-pktloc_syntax_h-race.patch | 26 ++++++++++++++++++++
> I just noticed that this patch get put in the libnl directory, not the libnl-2.0 directory.
>
> Can you pull all the libnl changes together and resbumit this, also is there a reason you can not just update this to the latest libnl 3.2.1?
libnl3 is *again* incompatible with its previous version, like libnl2 is incompatible with libnl1.
^ permalink raw reply
* Re: [PATCH v3 01/16] libnl2: Fix a race on route/pktloc_syntax.h
From: McClintock Matthew-B29882 @ 2011-10-11 20:57 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <4E94AB7A.6050603@intel.com>
On Tue, Oct 11, 2011 at 3:47 PM, Saul Wold <saul.wold@intel.com> wrote:
> On 09/30/2011 10:21 AM, Matthew McClintock wrote:
>>
>> From: Tom Rini<tom_rini@mentor.com>
>>
>> At issue is that route/pktloc.c (not generated) depends on
>> route/pktloc_syntax.h (generated).
>>
>> Signed-off-by: Tom Rini<tom_rini@mentor.com>
>> Signed-off-by: Matthew McClintock<msm@freescale.com>
>> ---
>> .../libnl/fix-pktloc_syntax_h-race.patch | 26
>> ++++++++++++++++++++
>
> I just noticed that this patch get put in the libnl directory, not the
> libnl-2.0 directory.
>
> Can you pull all the libnl changes together and resbumit this, also is there
> a reason you can not just update this to the latest libnl 3.2.1?
Are you referring to this: http://patches.openembedded.org/patch/12749/
> Cab you test that against the wpa-supplicant which seems to be libnl's sole
> dependee.
I can't - don't have a board with wireless - dont't have a wireless network...
-M
^ permalink raw reply
* Re: [PATCH v3 01/16] libnl2: Fix a race on route/pktloc_syntax.h
From: Saul Wold @ 2011-10-11 20:47 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Matthew McClintock
In-Reply-To: <1317403283-17471-1-git-send-email-msm@freescale.com>
On 09/30/2011 10:21 AM, Matthew McClintock wrote:
> From: Tom Rini<tom_rini@mentor.com>
>
> At issue is that route/pktloc.c (not generated) depends on
> route/pktloc_syntax.h (generated).
>
> Signed-off-by: Tom Rini<tom_rini@mentor.com>
> Signed-off-by: Matthew McClintock<msm@freescale.com>
> ---
> .../libnl/fix-pktloc_syntax_h-race.patch | 26 ++++++++++++++++++++
I just noticed that this patch get put in the libnl directory, not the
libnl-2.0 directory.
Can you pull all the libnl changes together and resbumit this, also is
there a reason you can not just update this to the latest libnl 3.2.1?
Cab you test that against the wpa-supplicant which seems to be libnl's
sole dependee.
Thanks
Sau!
> meta/recipes-support/libnl/libnl_2.0.bb | 3 +-
> 2 files changed, 28 insertions(+), 1 deletions(-)
> create mode 100644 meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch
>
> diff --git a/meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch b/meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch
> new file mode 100644
> index 0000000..05d75db
> --- /dev/null
> +++ b/meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch
> @@ -0,0 +1,26 @@
> +Upstream-Status: Inappropriate [configuration]
> +
> +libnl has progressed to 0.3.2 and there does not appear to be any
> +"make -j" issues with this build after my limited testing on that
> +newer version so we can assume this issue is fixed upstream
> +
> +Index: libnl-2.0/lib/Makefile.am
> +===================================================================
> +--- libnl-2.0.orig/lib/Makefile.am
> ++++ libnl-2.0/lib/Makefile.am
> +@@ -27,11 +27,15 @@ CLEANFILES = \
> + route/pktloc_grammar.c route/pktloc_grammar.h \
> + route/pktloc_syntax.c route/pktloc_syntax.h
> +
> ++BUILT_SOURCES = route/pktloc_syntax.h route/pktloc_grammar.h
> ++
> + # Hack to avoid using ylwrap. It does not function correctly in combination
> + # with --header-file=
> ++route/pktloc_grammar.h: route/pktloc_grammar.c
> + route/pktloc_grammar.c: route/pktloc_grammar.l
> + $(LEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^
> +
> ++route/pktloc_syntax.h: route/pktloc_syntax.c
> + route/pktloc_syntax.c: route/pktloc_syntax.y
> + $(YACC) -d $(YFLAGS) -o $@ $^
> +
> diff --git a/meta/recipes-support/libnl/libnl_2.0.bb b/meta/recipes-support/libnl/libnl_2.0.bb
> index 0dfcaf6..5339846 100644
> --- a/meta/recipes-support/libnl/libnl_2.0.bb
> +++ b/meta/recipes-support/libnl/libnl_2.0.bb
> @@ -6,10 +6,11 @@ LICENSE = "LGPLv2.1"
> LIC_FILES_CHKSUM = "file://COPYING;md5=2b41e13261a330ee784153ecbb6a82bc"
>
> DEPENDS = "flex-native bison-native"
> -PR = "r2"
> +PR = "r3"
>
> SRC_URI= "http://www.infradead.org/~tgr/libnl/files/${BPN}-${PV}.tar.gz \
> file://fix-makefile.patch \
> + file://fix-pktloc_syntax_h-race.patch \
> "
>
> SRC_URI[md5sum] = "6aaf1e9802a17a7d702bb0638044ffa7"
^ permalink raw reply
* [PATCH 1/2] image-live.bbclass: allow override of initrd image
From: Otavio Salvador @ 2011-10-11 19:18 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1318360701.git.otavio@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta/classes/image-live.bbclass | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass
index 1d184a1..e85ac1e 100644
--- a/meta/classes/image-live.bbclass
+++ b/meta/classes/image-live.bbclass
@@ -1,13 +1,14 @@
AUTO_SYSLINUXCFG = "1"
-INITRD ?= "${DEPLOY_DIR_IMAGE}/core-image-minimal-initramfs-${MACHINE}.cpio.gz"
+INITRD_IMAGE ?= "core-image-minimal-initramfs"
+INITRD ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}-${MACHINE}.cpio.gz"
APPEND += "root=/dev/ram0 "
TIMEOUT = "10"
LABELS += "boot install"
ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3"
-do_bootimg[depends] += "core-image-minimal-initramfs:do_rootfs"
+do_bootimg[depends] += "${INITRD_IMAGE}:do_rootfs"
do_bootimg[depends] += "${IMAGE_BASENAME}:do_rootfs"
inherit bootimg
--
1.7.2.5
^ permalink raw reply related
* [PATCH 2/2] initramfs-live-boot: make it more generic and easy to use
From: Otavio Salvador @ 2011-10-11 19:18 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1318360701.git.otavio@ossystems.com.br>
The script was making some assumptions that enforced many requirement
in the machine kernel configuration and usage, besides it were too
while booting.
Changes included:
* fix indentation;
* rdepends on udev;
* allow use of isofs as module;
* remove rootdelay param parsing as it was unused;
* don't verbosely kill udevd and mknod;
* mount devtmpfs into rootfs, if available, before swithing root;
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta/recipes-core/initrdscripts/files/init-live.sh | 32 ++++++++++++-------
.../initrdscripts/initramfs-live-boot_1.0.bb | 3 +-
2 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/meta/recipes-core/initrdscripts/files/init-live.sh b/meta/recipes-core/initrdscripts/files/init-live.sh
index c054863..eb5ab5b 100644
--- a/meta/recipes-core/initrdscripts/files/init-live.sh
+++ b/meta/recipes-core/initrdscripts/files/init-live.sh
@@ -13,6 +13,11 @@ early_setup() {
mkdir /sys
mount -t proc proc /proc
mount -t sysfs sysfs /sys
+
+ # support modular kernel
+ modprobe isofs 2> /dev/null
+
+ mkdir /run
udevd --daemon
udevadm trigger --action=add
}
@@ -25,21 +30,25 @@ read_args() {
root=*)
ROOT_DEVICE=$optarg ;;
rootfstype=*)
- ROOT_FSTYPE=$optarg ;;
- rootdelay=*)
- rootdelay=$optarg ;;
- LABEL=*)
- label=$optarg ;;
- video=*)
- video_mode=$arg ;;
- vga=*)
- vga_mode=$arg ;;
+ modprobe $optarg 2> /dev/null ;;
+ LABEL=*)
+ label=$optarg ;;
+ video=*)
+ video_mode=$arg ;;
+ vga=*)
+ vga_mode=$arg ;;
esac
done
}
boot_live_root() {
- killall udevd
+ killall udevd 2>/dev/null
+
+ # use devtmpfs if available
+ if grep -q devtmpfs /proc/filesystems; then
+ mount -t devtmpfs devtmpfs $ROOT_MOUNT/dev
+ fi
+
cd $ROOT_MOUNT
exec switch_root -c /dev/console $ROOT_MOUNT /sbin/init
}
@@ -78,7 +87,7 @@ done
case $label in
boot)
mkdir $ROOT_MOUNT
- mknod /dev/loop0 b 7 0
+ mknod /dev/loop0 b 7 0 2>/dev/null
if ! $MOUNT -o rw,loop,noatime,nodiratime /media/$i/$ISOLINUX/$ROOT_IMAGE $ROOT_MOUNT ; then
fatal "Couldnt mount rootfs image"
@@ -97,4 +106,3 @@ case $label in
fatal "Installation image failed"
;;
esac
-
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
index b404f8c..e85a0e1 100644
--- a/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
@@ -1,9 +1,10 @@
DESCRIPTION = "A live image init script"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+RDEPENDS = "udev"
SRC_URI = "file://init-live.sh"
-PR = "r6"
+PR = "r7"
do_install() {
install -m 0755 ${WORKDIR}/init-live.sh ${D}/init
--
1.7.2.5
^ permalink raw reply related
* [PATCH 0/2] Image building related fixes
From: Otavio Salvador @ 2011-10-11 19:18 UTC (permalink / raw)
To: openembedded-core
The following changes since commit 4732222c46652951e66aae377631f4a361179d8f:
Fix sysprof for powerpc64 (2011-10-10 09:54:03 +0100)
are available in the git repository at:
git://github.com/OSSystems/oe-core master
https://github.com/OSSystems/oe-core/tree/HEAD
Otavio Salvador (2):
image-live.bbclass: allow override of initrd image
initramfs-live-boot: make it more generic and easy to use
meta/classes/image-live.bbclass | 5 ++-
meta/recipes-core/initrdscripts/files/init-live.sh | 32 ++++++++++++-------
.../initrdscripts/initramfs-live-boot_1.0.bb | 3 +-
3 files changed, 25 insertions(+), 15 deletions(-)
--
1.7.2.5
^ permalink raw reply
* Re: How to overlay files/fs-perms.txt?
From: Mark Hatle @ 2011-10-11 19:12 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <4E9492E7.3070301@windriver.com>
On 10/11/11 2:03 PM, Mark Hatle wrote:
> On 10/11/11 5:42 AM, Koen Kooi wrote:
>> Hi,
>>
>> In angstrom we have base-files overlayed to clean out /var and files/fs-perms.txt is getting in the way of that:
>>
>> koen@dominion:/OE/tentacle/sources/openembedded-core/meta$ grep localstate files/fs-perms.txt
>> ${localstatedir}/cache link volatile/cache
>> ${localstatedir}/run link volatile/run
>> ${localstatedir}/log link volatile/log
>> ${localstatedir}/lock link volatile/lock
>> ${localstatedir}/tmp link volatile/tmp
>>
>> In angstrom those aren't symlinks anymore, but tmpfs bind mounts managed by systemd.
Sorry to reply to my reply... but I just realized I left one thing out.
Follow the items below, and add entries for each of the links and list then as
directory types instead. The code will load the files in order.. any duplicates
the last setting is what is used.
--Mark
>> So, how doI overlay that file in this oe-core layer universe?
>
> This came up recently in regards to the Yocto documentation. Below is the
> snipped of conversation we had working on docs:
>
>>> I was discussing the fs-perms.txt file and the FILESYSTEM_PERMS_TABLES variable
>>> with Paul. We got the point of user-scenarios. Paul said that he would
>>> recommend not setting the variable at all and just letting it default to our
>>> fs-perms.txt file. At which point I asked why have the variable then? Paul
>>> pointed me off to you at that point.
>>>
>> Reasons to set it.
>>
>> You have custom files/directories in your layer and need to specify them via a
>> custom fs-perms.txt file. (More then one can be specified...) The file (or
>> files) is "distribution specific". I.e. the distribution the developer is
>> creating needs a consistent fs-perms.txt across the entire work product. For
>> directories shared between packages, that use non-standard permissions, owners
>> and/or groups, this is the way to synchronize the information. (Note, it's
>> better to sync within the packages themselves, but that is not always possible
>> to do.. primarily for the core package set.)
>>
>>> So what I am trying to understand here is how a customer would go about using
>>> their own fs-perms.txt file. Since we have the FILESYSTEM_PERMS_TABLES variable
>>> I presume someone can set it to point to an fs-perms.txt file of their own. Can
>>> tell me how they do that with some answers to the following?
>>>
>> FILESYSTEM_PERMS_TABLES is by default "files/fs-perms.txt". One or more file
>> can be added to this list. Each file listed will be scanned for via the BBPATH.
>> So you might end up with a "files/intel-perms.txt". This could be an Intel
>> specific version of the file. Or set it to "files/fs-perms.txt
>> files/intel-perms.txt". In this case it will use BOTH the default and the newly
>> mentioned intel-perms.txt.
>>
>>> · They create their own file following the syntax of the fs-perms.txt
>>> file we supply and put it anywhere they want?
>> The path specified must be within the BBPATH.
>>
>>> · They edit the existing fs-perms.txt file we supply? (probably not a
>>> good idea but thought I would ask)
>> It is best for them to supply their own file and include it in addition to the
>> default file -- or completely replace the stock file. (editing the stock
>> version makes long term maintenance more difficult if we need to make changes to
>> it in the future.)
>>
>>> · Where do they set the FILESYSTEM_PERMS_TABLES variable? We set it in
>>> a place that they should not edit.
>> local.conf or any other place where bitbake variables can be set.
>>
>>> · Is the FILESYSTEM_PERMS-TABLES variable something that should just
>>> remain hidden?
>> I doubt it will be useful for general purpose stuff.. It's really for
>> distribution creators, more then distribution "users". Most of our (Yocto and
>> OE-Core) user base are "users". They use what we give them as a basis for their
>> work, and then add to it. A distribution creator is someone who is going to
>> potentially chance the rules of the filesystem and where things belong to suit
>> their (or their customers) needs.
>
> Hopefully this helps.
>
> --Mark
>
>> regards,
>>
>> Koen
>> _______________________________________________
>> 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
^ permalink raw reply
* git server move
From: Cliff Brake @ 2011-10-11 19:11 UTC (permalink / raw)
To: openembedded-devel,
Patches and discussions about the oe-core layer
Hi, we are moving git.openembedded.org to a new server.
SSH access on the old server has been disabled. git:// still works there.
As soon as DNS propagates, SSH access will work with the new server.
Let me know if you see any problems.
SSH keys will likely change, so expect messages about that.
Thanks,
Cliff
--
=================
http://bec-systems.com
^ permalink raw reply
* Re: How to overlay files/fs-perms.txt?
From: Mark Hatle @ 2011-10-11 19:03 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <DDA1B8C5-0867-406F-BB88-0D33B7501900@dominion.thruhere.net>
On 10/11/11 5:42 AM, Koen Kooi wrote:
> Hi,
>
> In angstrom we have base-files overlayed to clean out /var and files/fs-perms.txt is getting in the way of that:
>
> koen@dominion:/OE/tentacle/sources/openembedded-core/meta$ grep localstate files/fs-perms.txt
> ${localstatedir}/cache link volatile/cache
> ${localstatedir}/run link volatile/run
> ${localstatedir}/log link volatile/log
> ${localstatedir}/lock link volatile/lock
> ${localstatedir}/tmp link volatile/tmp
>
> In angstrom those aren't symlinks anymore, but tmpfs bind mounts managed by systemd.
>
> So, how doI overlay that file in this oe-core layer universe?
This came up recently in regards to the Yocto documentation. Below is the
snipped of conversation we had working on docs:
>> I was discussing the fs-perms.txt file and the FILESYSTEM_PERMS_TABLES variable
>> with Paul. We got the point of user-scenarios. Paul said that he would
>> recommend not setting the variable at all and just letting it default to our
>> fs-perms.txt file. At which point I asked why have the variable then? Paul
>> pointed me off to you at that point.
>>
> Reasons to set it.
>
> You have custom files/directories in your layer and need to specify them via a
> custom fs-perms.txt file. (More then one can be specified...) The file (or
> files) is "distribution specific". I.e. the distribution the developer is
> creating needs a consistent fs-perms.txt across the entire work product. For
> directories shared between packages, that use non-standard permissions, owners
> and/or groups, this is the way to synchronize the information. (Note, it's
> better to sync within the packages themselves, but that is not always possible
> to do.. primarily for the core package set.)
>
>> So what I am trying to understand here is how a customer would go about using
>> their own fs-perms.txt file. Since we have the FILESYSTEM_PERMS_TABLES variable
>> I presume someone can set it to point to an fs-perms.txt file of their own. Can
>> tell me how they do that with some answers to the following?
>>
> FILESYSTEM_PERMS_TABLES is by default "files/fs-perms.txt". One or more file
> can be added to this list. Each file listed will be scanned for via the BBPATH.
> So you might end up with a "files/intel-perms.txt". This could be an Intel
> specific version of the file. Or set it to "files/fs-perms.txt
> files/intel-perms.txt". In this case it will use BOTH the default and the newly
> mentioned intel-perms.txt.
>
>> · They create their own file following the syntax of the fs-perms.txt
>> file we supply and put it anywhere they want?
> The path specified must be within the BBPATH.
>
>> · They edit the existing fs-perms.txt file we supply? (probably not a
>> good idea but thought I would ask)
> It is best for them to supply their own file and include it in addition to the
> default file -- or completely replace the stock file. (editing the stock
> version makes long term maintenance more difficult if we need to make changes to
> it in the future.)
>
>> · Where do they set the FILESYSTEM_PERMS_TABLES variable? We set it in
>> a place that they should not edit.
> local.conf or any other place where bitbake variables can be set.
>
>> · Is the FILESYSTEM_PERMS-TABLES variable something that should just
>> remain hidden?
> I doubt it will be useful for general purpose stuff.. It's really for
> distribution creators, more then distribution "users". Most of our (Yocto and
> OE-Core) user base are "users". They use what we give them as a basis for their
> work, and then add to it. A distribution creator is someone who is going to
> potentially chance the rules of the filesystem and where things belong to suit
> their (or their customers) needs.
Hopefully this helps.
--Mark
> regards,
>
> Koen
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply
* Re: [PATCHv3 00/31] Xorg related changes
From: Khem Raj @ 2011-10-11 18:06 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <4E1CC160-8612-47C0-A2DB-E66830F84366@dominion.thruhere.net>
On Tue, Oct 11, 2011 at 12:37 AM, Koen Kooi <koen@dominion.thruhere.net> wrote:
> I know it's small, it's a minimal collection of fonts from my debian system a few years ago :) It's not a real package, just a hack to get an ancient X working years ago.
if its not needed throw it out.
^ permalink raw reply
* Re: shared-mime-info: Fix a parallel make race
From: Richard Purdie @ 2011-10-11 17:43 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <F3F33339-BAD6-4175-AD3C-5F58D2B08660@dominion.thruhere.net>
On Mon, 2011-10-10 at 15:28 +0200, Koen Kooi wrote:
> Op 10 okt. 2011, om 14:54 heeft Richard Purdie het volgende geschreven:
>
> >
> >
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > ---
> > diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch b/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch
> > new file mode 100644
> > index 0000000..9e86a71
> > --- a/dev/null
> > +++ b/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch
> > @@ -0,0 +1,32 @@
> > +The Makefile used by shared-mime-info is one big race with the SUBDIRS
> > +option and the dependency specifically calling make all combining to
> > +create multiple make instances all of which may try and build targets
> > +like update-mime-database.
> > +
> > +This patch removes those options meaning make can correctly identify
> > +dependencies and stop itself racing itself.
> > +
> > +RP 10/10/2011
> > +
> > +Upstream-status: Pending
> > +
> > +Index: shared-mime-info-0.91/Makefile.am
> > +===================================================================
> > +--- shared-mime-info-0.91.orig/Makefile.am 2011-10-10 21:47:19.834173921 +0100
> > ++++ shared-mime-info-0.91/Makefile.am 2011-10-10 21:45:57.000000000 +0100
> > +@@ -1,5 +1,3 @@
> > +-SUBDIRS=. po
> > +-
> > + INCLUDES = $(ALL_CFLAGS)
> > +
> > + packagesdir = $(datadir)/mime/packages
> > +@@ -70,8 +68,7 @@
> > +
> > + all: check create-pot
> > +
> > +-create-pot:
> > +- $(MAKE) -C po shared-mime-info.pot
> > ++create-pot: po
> > +
> > + check: create-pot freedesktop.org.xml update-mime-database check-translations
> > + if test -e $(top_builddir)/freedesktop.org.xml; then \
> > diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb b/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb
> > index 76d2756..ac2dde1 100644
> > --- a/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb
> > +++ b/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb
> > @@ -4,3 +4,4 @@ PR = "r0"
> > SRC_URI[md5sum] = "982a211560ba4c47dc791ccff34e8fbc"
> > SRC_URI[sha256sum] = "98cfebe1d809afb24934e634373821e2a1dfa86fc6462cab230589a1c80988bd"
> >
> > +SRC_URI =+ "file://parallelmake.patch"
>
> Missing PR bump
Merged to master, with a PR bump.
Cheers,
Richard
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox