Patchwork [meta-oe,1/1] xorg-xserver-common.inc: usr ${datadir} instead of /usr/share

login
register
mail settings
Submitter Otavio Salvador
Date Sept. 14, 2011, 1:18 p.m.
Message ID <1eb2612347e83d9906021429768912fcd036951a.1316006259.git.otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/11367/
State New, archived
Headers show

Comments

Otavio Salvador - Sept. 14, 2011, 1:18 p.m.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 .../xorg-xserver/xorg-xserver-common.inc           |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
Paul Menzel - Sept. 14, 2011, 2:24 p.m.
Am Mittwoch, den 14.09.2011, 13:18 +0000 schrieb Otavio Salvador:

There is a typo in the commit summary: s/usr/use/.

What distributions do not use `/usr/`?

> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>
> ---
>  .../xorg-xserver/xorg-xserver-common.inc           |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)

Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>


Thanks,

Paul
Otavio Salvador - Sept. 14, 2011, 2:29 p.m.
On Wed, Sep 14, 2011 at 11:24, Paul Menzel
<paulepanter@users.sourceforge.net> wrote:
> Am Mittwoch, den 14.09.2011, 13:18 +0000 schrieb Otavio Salvador:
>
> There is a typo in the commit summary: s/usr/use/.
>
> What distributions do not use `/usr/`?

We need it to build a local and reduced chroot of a product.
Phil Blundell - Sept. 14, 2011, 2:54 p.m.
On Wed, 2011-09-14 at 16:24 +0200, Paul Menzel wrote:
> Am Mittwoch, den 14.09.2011, 13:18 +0000 schrieb Otavio Salvador:
> 
> There is a typo in the commit summary: s/usr/use/.
> 
> What distributions do not use `/usr/`?

Micro doesn't, for one.

p.

Patch

diff --git a/meta-oe/recipes-graphics/xorg-xserver/xorg-xserver-common.inc b/meta-oe/recipes-graphics/xorg-xserver/xorg-xserver-common.inc
index e68008e..06763bb 100644
--- a/meta-oe/recipes-graphics/xorg-xserver/xorg-xserver-common.inc
+++ b/meta-oe/recipes-graphics/xorg-xserver/xorg-xserver-common.inc
@@ -3,7 +3,7 @@  SECTION = "x11/base"
 LICENSE = "MIT-X"
 LIC_FILES_CHKSUM = "file://COPYING;md5=3dd2bbe3563837f80ed8926b06c1c353"
 
-INC_PR = "r20"
+INC_PR = "r21"
 
 # xf86-*-* packages depend on an X server built with the xfree86 DDX
 # so we have a virtual to represent that:
@@ -44,7 +44,7 @@  EXTRA_OECONF += " --enable-xcalibrate \
                   --disable-xfbdev \
                   --disable-xnest \
                   --disable-kdrive-vesa \
-                  --with-default-font-path="/usr/share/fonts/X11/misc" \
+                  --with-default-font-path="${datadir}/fonts/X11/misc" \
                   ac_cv_file__usr_share_sgml_X11_defs_ent=no"
 
 # CONFIG_MANAGER_OPTION is used only in recipes which support those options
@@ -65,7 +65,7 @@  FILES_${PN}-xprint = "${libdir}/X11/xserver/*/print"
 FILES_${PN}-xvfb = "${bindir}/Xvfb"
 FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
 FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so ${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt ${datadir}/X11/xorg.conf.d"
-FILES_${PN}-doc += "${libdir}/X11/doc /usr/share/X11/xkb/compiled/README.compiled"
+FILES_${PN}-doc += "${libdir}/X11/doc ${datadir}/X11/xkb/compiled/README.compiled"
 FILES_${PN}-xephyr = "${bindir}/Xephyr"
 
 FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \