summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Menzel <paulepanter@users.sourceforge.net>2011-11-08 13:00:32 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-10 12:08:59 +0000
commit4a8678a5032a546507ecba408dfef6db48d5ceab (patch)
tree951891275b153ff38c0e92d229100854ebd0ab05
parentadf45e7450c0215fedc99e3868d36108489e9e29 (diff)
downloadpoky-4a8678a5032a546507ecba408dfef6db48d5ceab.tar.gz
xinit: Fix `startx` looking for `mcookie` in sysroot
`startx` run on a system based on the demo systemd image [1] and `opkg`-installed packages fails with the following error. /usr/bin/startx: line 139: /OE/tentacle/build/tmp-angstrom_2010_x/sysroots/x68_64-linux/usr/bin/mcookie: No such file or directory Applying commit 443bcc07 [1] from OE-classic Author: Tom Rini <tom_rini@mentor.com> Date: Thu Apr 7 10:36:43 2011 -0700 xinit: Fix mcookie / util-linux-ng dependency xinit just needs to know the runtime path of mcookie so we need to RDEPEND on util-linux-ng and pass the runtime path in via EXTRA_OECONF (From OE-Core rev: 1053a6a8e15851ef139d8aa4683849fc2fc277e1) Signed-off-by: Tom Rini <tom_rini@mentor.com> fixes this issue. Commit 7f6cec6f [2] Author: Frans Meulenbroeks <fransmeulenbroeks@gmail.com> Date: Sun Feb 21 18:11:30 2010 +0100 xinit: add dependency on util-linux-ng […] tried to address the same problem but apparently did not help, because Tom still had problems. [1] http://www.angstrom-distribution.org/demo/beagleboard/Angstrom-systemd-image-eglibc-ipk-v2011.11-core-beagleboard.rootfs.tar.bz2 [2] http://git.openembedded.org/openembedded/commit/443bcc0785bc004e471b3750a34d12d2fd2e5dad [3] http://git.openembedded.org/openembedded/commit/7f6cec6f0adb6203a6dbaf8a43c67c2c4f8bf84e Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-app/xinit_1.3.0.bb7
1 files changed, 6 insertions, 1 deletions
diff --git a/meta/recipes-graphics/xorg-app/xinit_1.3.0.bb b/meta/recipes-graphics/xorg-app/xinit_1.3.0.bb
index ee7c64d928..6953cccd2c 100644
--- a/meta/recipes-graphics/xorg-app/xinit_1.3.0.bb
+++ b/meta/recipes-graphics/xorg-app/xinit_1.3.0.bb
@@ -9,9 +9,14 @@ systems. When this first client exits, xinit will kill the X server and \
9then terminate." 9then terminate."
10 10
11LIC_FILES_CHKSUM = "file://COPYING;md5=0d4b5eef75f1584ccbdc5e4a34314407" 11LIC_FILES_CHKSUM = "file://COPYING;md5=0d4b5eef75f1584ccbdc5e4a34314407"
12PR = "r0" 12
13PR = "r1"
13PE = "1" 14PE = "1"
14 15
16EXTRA_OECONF = "ac_cv_path_MCOOKIE=${bindir}/mcookie"
17
18RDEPENDS_${PN} += "util-linux"
19
15FILES_${PN} += "${libdir}X11/xinit" 20FILES_${PN} += "${libdir}X11/xinit"
16 21
17SRC_URI[md5sum] = "bc4e8b7d1919597cc37a0d24aa149dda" 22SRC_URI[md5sum] = "bc4e8b7d1919597cc37a0d24aa149dda"