Skip to contentSkip to conversation

Fix usage of hardcoded path

PATCH In review Otavio Salvador 3 participants 5 messages Sep 14, 2011

lore
Share & tools
lore

Otavio Salvador

author
#0 lore raw

cover Fix usage of hardcoded path

The following changes since commit 0a2a6e16334c15f460ea5eba426e3f6f1d3d1936:

xf86-input-void: add 1.4.0 recipe (2011-09-14 13:08:10 +0200)

are available in the git repository at:
git://github.com/OSSystems/meta-oe master
https://github.com/OSSystems/meta-oe/tree/master

Otavio Salvador (1):
xorg-xserver-common.inc: usr ${datadir} instead of /usr/share

 .../xorg-xserver/xorg-xserver-common.inc           |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
Signature · 1 line
1.7.2.5
author
#1 lore raw

PATCH 1/1 xorg-xserver-common.inc: usr ${datadir} instead of /usr/share

Signed-off-by Otavio Salvador <[email protected]>
---
 .../xorg-xserver/xorg-xserver-common.inc           |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
meta-oe/recipes-graphics/xorg-xserver/xorg-xserver-common.inc +3 -3
index e68008e..06763bb 100644
@@ -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 \
Signature · 1 line
1.7.2.5
Acked-by on v1 1/1
#2 lore raw

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

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/?

Quoted 5 lines
Signed-off-by Otavio Salvador <[email protected]>
---
 .../xorg-xserver/xorg-xserver-common.inc           |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
Acked-by Paul Menzel <[email protected]>

Thanks,

Paul

author
#3 lore raw

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

Quoted 5 lines · Paul Menzel

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.

Signature · 3 lines
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

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

In reply to Paul Menzel
Quoted 5 lines · Paul Menzel

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.