Patchwork [meta-fsl-arm] xserver-xorg: don't fail if files to remove are missing

login
register
mail settings
Submitter Gary Thomas
Date May 7, 2013, 3:43 p.m.
Message ID <51892115.6010203@mlbassoc.com>
Download mbox | patch
Permalink /patch/49479/
State Rejected
Delegated to: Otavio Salvador
Headers show

Comments

Gary Thomas - May 7, 2013, 3:43 p.m.
On 2013-05-07 09:34, Otavio Salvador wrote:
> On Tue, May 7, 2013 at 12:29 PM, Gary Thomas <gary@mlbassoc.com> wrote:
>> On 2013-05-07 09:22, Otavio Salvador wrote:
>>>
>>> On Tue, May 7, 2013 at 12:16 PM, Gary Thomas <gary@mlbassoc.com> wrote:
>>>>
>>>> On 2013-05-07 09:10, Otavio Salvador wrote:
>>>>>
>>>>>
>>>>> On Tue, May 7, 2013 at 11:58 AM, Eric Bénard <eric@eukrea.com> wrote:
>>>>>>
>>>>>>
>>>>>> Hi,
>>>>>>
>>>>>> Le Tue, 7 May 2013 10:37:48 -0300,
>>>>>> Otavio Salvador <otavio@ossystems.com.br> a écrit :
>>>>>>
>>>>>>> On Tue, May 7, 2013 at 10:36 AM, Eric Bénard <eric@eukrea.com> wrote:
>>>>>>>>
>>>>>>>>
>>>>>>>> Le Tue, 7 May 2013 10:20:43 -0300,
>>>>>>>> Otavio Salvador <otavio@ossystems.com.br> a écrit :
>>>>>>>>
>>>>>>>>> On Tue, May 7, 2013 at 7:07 AM, Eric Bénard <eric@eukrea.com> wrote:
>>>>>>>>>>
>>>>>>>>>>
>>>>>>>>>> Signed-off-by: Eric Bénard <eric@eukrea.com>
>>>>>>>>>
>>>>>>>>>
>>>>>>>>>
>>>>>>>>> I am worring about how you ended without the dri.h here. You weren't
>>>>>>>>> suppose to lack this fine as we build with DRI enabled.
>>>>>>>>>
>>>>>>>>> Did you change something in your local.conf?
>>>>>>>>>
>>>>>>>> OK I miss opengl in DISTRO_FEATURES (I started with a base oe-core
>>>>>>>> configuration ;-)
>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>> I wonder what we should do here. In case it lacks opengl feature. What
>>>>>>> you think?
>>>>>>>
>>>>>> at least maybe we should write it in the README
>>>>>
>>>>>
>>>>>
>>>>> I think we could handle it properly in the xserver-xorg package, it
>>>>> could not remove the these files and not depends on the DRI things.
>>>>
>>>>
>>>>
>>>> While you are fixing this, can you please make this a .bbappend instead
>>>> of
>>>> overriding/replacing the main recipe from OE-core?
>>>
>>>
>>> Not easy as we're  downgrading the version in use. So we need to have
>>> the specific patches and like.
>>
>>
>> Yes I see that now - sorry for the noise, but there may need to be a patch
>> for this one as well as xkbcomp currently goes missing in the images because
>> of a change in OE-core.
>
> I didn't follow you, can you elaborate it a bit more?

I'll post a patch to OE-core shortly, but at the moment xkbcomp will be
missing from any images created because of this commit to OE-core:

     xkeyboard-config: Remove xkbcomp from RDEPENDS_${PN}

     Nothing in this package uses xkbcomp so depending on it here is not appropriate.
     Whatever package(s) is/are invoking that binary should be the ones to depend
     on it.

     (From OE-Core rev: bdcc5e8f1286d288baf410458efc39a59b68d751)

     Signed-off-by: Phil Blundell <philb@gnu.org>
     Signed-off-by: Saul Wold <sgw@linux.intel.com>
     Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Something like this should do (I'm testing now):
Otavio Salvador - May 7, 2013, 4:50 p.m.
On Tue, May 7, 2013 at 12:43 PM, Gary Thomas <gary@mlbassoc.com> wrote:
> On 2013-05-07 09:34, Otavio Salvador wrote:
>>
>> On Tue, May 7, 2013 at 12:29 PM, Gary Thomas <gary@mlbassoc.com> wrote:
>>>
>>> On 2013-05-07 09:22, Otavio Salvador wrote:
>>>>
>>>>
>>>> On Tue, May 7, 2013 at 12:16 PM, Gary Thomas <gary@mlbassoc.com> wrote:
>>>>>
>>>>>
>>>>> On 2013-05-07 09:10, Otavio Salvador wrote:
>>>>>>
>>>>>>
>>>>>>
>>>>>> On Tue, May 7, 2013 at 11:58 AM, Eric Bénard <eric@eukrea.com> wrote:
>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>> Hi,
>>>>>>>
>>>>>>> Le Tue, 7 May 2013 10:37:48 -0300,
>>>>>>> Otavio Salvador <otavio@ossystems.com.br> a écrit :
>>>>>>>
>>>>>>>> On Tue, May 7, 2013 at 10:36 AM, Eric Bénard <eric@eukrea.com>
>>>>>>>> wrote:
>>>>>>>>>
>>>>>>>>>
>>>>>>>>>
>>>>>>>>> Le Tue, 7 May 2013 10:20:43 -0300,
>>>>>>>>> Otavio Salvador <otavio@ossystems.com.br> a écrit :
>>>>>>>>>
>>>>>>>>>> On Tue, May 7, 2013 at 7:07 AM, Eric Bénard <eric@eukrea.com>
>>>>>>>>>> wrote:
>>>>>>>>>>>
>>>>>>>>>>>
>>>>>>>>>>>
>>>>>>>>>>> Signed-off-by: Eric Bénard <eric@eukrea.com>
>>>>>>>>>>
>>>>>>>>>>
>>>>>>>>>>
>>>>>>>>>>
>>>>>>>>>> I am worring about how you ended without the dri.h here. You
>>>>>>>>>> weren't
>>>>>>>>>> suppose to lack this fine as we build with DRI enabled.
>>>>>>>>>>
>>>>>>>>>> Did you change something in your local.conf?
>>>>>>>>>>
>>>>>>>>> OK I miss opengl in DISTRO_FEATURES (I started with a base oe-core
>>>>>>>>> configuration ;-)
>>>>>>>>
>>>>>>>>
>>>>>>>>
>>>>>>>>
>>>>>>>> I wonder what we should do here. In case it lacks opengl feature.
>>>>>>>> What
>>>>>>>> you think?
>>>>>>>>
>>>>>>> at least maybe we should write it in the README
>>>>>>
>>>>>>
>>>>>>
>>>>>>
>>>>>> I think we could handle it properly in the xserver-xorg package, it
>>>>>> could not remove the these files and not depends on the DRI things.
>>>>>
>>>>>
>>>>>
>>>>>
>>>>> While you are fixing this, can you please make this a .bbappend instead
>>>>> of
>>>>> overriding/replacing the main recipe from OE-core?
>>>>
>>>>
>>>>
>>>> Not easy as we're  downgrading the version in use. So we need to have
>>>> the specific patches and like.
>>>
>>>
>>>
>>> Yes I see that now - sorry for the noise, but there may need to be a
>>> patch
>>> for this one as well as xkbcomp currently goes missing in the images
>>> because
>>> of a change in OE-core.
>>
>>
>> I didn't follow you, can you elaborate it a bit more?
>
>
> I'll post a patch to OE-core shortly, but at the moment xkbcomp will be
> missing from any images created because of this commit to OE-core:
>
>     xkeyboard-config: Remove xkbcomp from RDEPENDS_${PN}
>
>     Nothing in this package uses xkbcomp so depending on it here is not
> appropriate.
>     Whatever package(s) is/are invoking that binary should be the ones to
> depend
>     on it.
>
>     (From OE-Core rev: bdcc5e8f1286d288baf410458efc39a59b68d751)
>
>     Signed-off-by: Phil Blundell <philb@gnu.org>
>     Signed-off-by: Saul Wold <sgw@linux.intel.com>
>     Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>
> Something like this should do (I'm testing now):
>
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> b/meta/recipes-graphics/xorg-xserver/xserver-xorg.in
> index 795410b..3edc1a4 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> @@ -65,7 +65,7 @@ PACKAGES =+ "${PN}-security-policy \
>               ${PN}-module-libxf4bpp"
>
>  RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb
> xserver-xf86-config"
> -RDEPENDS_${PN}-xvfb += "xkeyboard-config"
> +RDEPENDS_${PN}-xvfb += "xkeyboard-config xkbcomp"
>  RDEPENDS_${PN}-module-exa = "${PN} (= ${EXTENDPKGV})"
>
>  FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards
> ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdi

Yeah, seems the way to go :)

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Patch

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.in
index 795410b..3edc1a4 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -65,7 +65,7 @@  PACKAGES =+ "${PN}-security-policy \
               ${PN}-module-libxf4bpp"

  RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config"
-RDEPENDS_${PN}-xvfb += "xkeyboard-config"
+RDEPENDS_${PN}-xvfb += "xkeyboard-config xkbcomp"
  RDEPENDS_${PN}-module-exa = "${PN} (= ${EXTENDPKGV})"

  FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdi