Skip to contentSkip to conversation

xserver-xorg: don't fail if files to remove are missing

PATCH In review Eric Bénard 3 participants 16 messages May 7, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xserver-xorg: don't fail if files to remove are missing

---
 recipes-graphics/xorg-xserver/xserver-xorg_1.11.4.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-graphics/xorg-xserver/xserver-xorg_1.11.4.bb +1 -1
index 59a751b..b2e14e5 100644
@@ -17,7 +17,7 @@ PR = "${INC_PR}.0"
 
 do_install_append_mx6 () {
     # FIXME: This is a workaround to ensure we use Vivante DRI
-    rm ${D}${includedir}/xorg/dri.h \
+    rm -f ${D}${includedir}/xorg/dri.h \
        ${D}${includedir}/xorg/sarea.h \
        ${D}${includedir}/xorg/dristruct.h
 }
Signature · 1 line
1.7.10.4
#2 lore raw
Quoted 8 lines · Otavio Salvador
Quoted 1 line · Eric Bénard

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?

nothing I'm on a plain config with oe-core + meta-oe + meta-fsl-arm* all on dylan/HEAD

Eric

#3 lore raw
Quoted 6 lines · Eric Bénard
Quoted 3 lines · Otavio Salvador
Quoted 1 line · Eric Bénard
Quoted 7 lines
Quoted 5 lines

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?

nothing I'm on a plain config with oe-core + meta-oe + meta-fsl-arm* all on dylan/HEAD

Right, the key here is OE-Core. It does not provide the 'opengl' DISTRO_FEATURE by default thus you end with it disabed.

--
Otavio Salvador O.S. Systems
E-mail: [email protected] http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br

#4 lore raw
In reply to Otavio Salvador
Quoted 8 lines · Otavio Salvador
Quoted 1 line · Eric Bénard

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 ;-)

Eric

#5 lore raw
Quoted 6 lines · Eric Bénard
Quoted 3 lines · Otavio Salvador
Quoted 1 line · Eric Bénard
Quoted 7 lines
Quoted 5 lines

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?

--
Otavio Salvador O.S. Systems
E-mail: [email protected] http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br

#6 lore raw

Hi,

Quoted 10 lines · Otavio Salvador
Quoted 9 lines · Eric Bénard
Quoted 6 lines · Otavio Salvador
Quoted 1 line · Eric Bénard

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.

Quoted 8 lines
Quoted 4 lines
Quoted 2 lines

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

Eric

#7 lore raw
Quoted 17 lines · Eric Bénard

Hi,

Quoted 12 lines · Otavio Salvador
Quoted 11 lines · Eric Bénard
Quoted 8 lines · Otavio Salvador
Quoted 1 line · Eric Bénard

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?

Quoted 7 lines
Quoted 6 lines
Quoted 2 lines

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.

--
Otavio Salvador O.S. Systems
E-mail: [email protected] http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br

#8 lore raw
Quoted 21 lines · Otavio Salvador
Quoted 20 lines · Eric Bénard

Hi,

Quoted 15 lines · Otavio Salvador
Quoted 13 lines · Eric Bénard
Quoted 8 lines · Otavio Salvador
Quoted 1 line · Eric Bénard

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 ;-)

Quoted 7 lines
Quoted 4 lines
Quoted 3 lines

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?

Signature · 4 lines
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------
#9 lore raw
Quoted 34 lines · Gary Thomas
Quoted 33 lines · Otavio Salvador
Quoted 29 lines · Eric Bénard

Hi,

Quoted 13 lines · Otavio Salvador
Quoted 12 lines · Eric Bénard
Quoted 8 lines · Otavio Salvador
Quoted 2 lines · Eric Bénard

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.

Quoted 9 lines
Quoted 4 lines
Quoted 2 lines

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

Quoted 6 lines
Quoted 2 lines

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.

--
Otavio Salvador O.S. Systems
E-mail: [email protected] http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br

#10 lore raw
Quoted 39 lines · Otavio Salvador
Quoted 38 lines · Gary Thomas
Quoted 35 lines · Otavio Salvador
Quoted 21 lines · Eric Bénard

Hi,

Quoted 15 lines · Otavio Salvador
Quoted 14 lines · Eric Bénard
Quoted 10 lines · Otavio Salvador
Quoted 2 lines · Eric Bénard

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?

Quoted 8 lines
Quoted 7 lines
Quoted 2 lines

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.

Quoted 5 lines
Quoted 2 lines

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.

Signature · 4 lines
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------
#11 lore raw
Quoted 55 lines · Gary Thomas
Quoted 54 lines · Otavio Salvador
Quoted 50 lines · Gary Thomas
Quoted 36 lines · Otavio Salvador
Quoted 33 lines · Eric Bénard

Hi,

Quoted 26 lines · Otavio Salvador
Quoted 12 lines · Eric Bénard
Quoted 7 lines · Otavio Salvador
Quoted 3 lines · Eric Bénard
Quoted 7 lines
Quoted 5 lines

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?

Quoted 6 lines
Quoted 1 line

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?

Quoted 7 lines
Quoted 2 lines

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?

--
Otavio Salvador O.S. Systems
E-mail: [email protected] http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br

#12 lore raw
Quoted 60 lines · Otavio Salvador
Quoted 59 lines · Gary Thomas
Quoted 56 lines · Otavio Salvador
Quoted 42 lines · Gary Thomas
Quoted 40 lines · Otavio Salvador
Quoted 34 lines · Eric Bénard

Hi,

Quoted 18 lines · Otavio Salvador
Quoted 17 lines · Eric Bénard
Quoted 12 lines · Otavio Salvador
Quoted 3 lines · Eric Bénard

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?

Quoted 8 lines
Quoted 2 lines

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

Quoted 8 lines
Quoted 2 lines

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.

Quoted 5 lines
Quoted 3 lines

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)

Something like this should do (I'm testing now):

meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +1 -1
index 795410b..3edc1a4 100644
@@ -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
Signature · 4 lines
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------
#13 lore raw
Quoted 123 lines · Gary Thomas
Quoted 78 lines · Otavio Salvador
Quoted 76 lines · Gary Thomas
Quoted 71 lines · Otavio Salvador
Quoted 60 lines · Gary Thomas
Quoted 46 lines · Otavio Salvador
Quoted 42 lines · Eric Bénard

Hi,

Quoted 34 lines · Otavio Salvador
Quoted 16 lines · Eric Bénard
Quoted 10 lines · Otavio Salvador
Quoted 4 lines · Eric Bénard
Quoted 8 lines
Quoted 6 lines

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?

Quoted 7 lines
Quoted 1 line

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.

Quoted 3 lines

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.

Quoted 8 lines
Quoted 5 lines

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)

Something like this should do (I'm testing now):

meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +0 -0
index 795410b..3edc1a4 100644
@@ -65,7 +65,7 @@ PACKAGES =+ "${PN}-security-policy \
              ${PN}-module-libxf4bpp"
 
 RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb

xserver-xf86-config"

meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +1 -1
-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
Quoted 1 line

${libdir}/X11/getconfig ${libdir}/X11/etc ${libdi

Yeah, seems the way to go :)

--
Otavio Salvador O.S. Systems
E-mail: [email protected] http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br

#14 lore raw
In reply to Otavio Salvador
Quoted 21 lines · Otavio Salvador
Quoted 20 lines · Eric Bénard

Hi,

Quoted 15 lines · Otavio Salvador
Quoted 13 lines · Eric Bénard
Quoted 8 lines · Otavio Salvador
Quoted 1 line · Eric Bénard

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 ;-)

Quoted 8 lines
Quoted 4 lines
Quoted 3 lines

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.

well the README will at least tell people to enable that in a pure oe-core configuration so that they get the 3D graphic drivers.

Eric

#15 lore raw
Quoted 27 lines · Eric Bénard
Quoted 24 lines · Otavio Salvador
Quoted 23 lines · Eric Bénard

Hi,

Quoted 18 lines · Otavio Salvador
Quoted 6 lines · Eric Bénard
Quoted 3 lines · Otavio Salvador
Quoted 1 line · Eric Bénard
Quoted 7 lines
Quoted 5 lines

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?

Quoted 7 lines
Quoted 5 lines
Quoted 1 line

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.

well the README will at least tell people to enable that in a pure oe-core configuration so that they get the 3D graphic drivers.

Could you please send the patch for the README?

While you're on it, are you willing to rework the xserver-xorg to work without opengl?

--
Otavio Salvador O.S. Systems
E-mail: [email protected] http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br