From 1053a6a8e15851ef139d8aa4683849fc2fc277e1 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 8 Nov 2011 13:00:32 +0100 Subject: xinit: Fix `startx` looking for `mcookie` in sysroot MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `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 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 Signed-off-by: Tom Rini fixes this issue. Commit 7f6cec6f [2] Author: Frans Meulenbroeks 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 --- meta/recipes-graphics/xorg-app/xinit_1.3.0.bb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'meta/recipes-graphics/xorg-app') 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 \ then terminate." LIC_FILES_CHKSUM = "file://COPYING;md5=0d4b5eef75f1584ccbdc5e4a34314407" -PR = "r0" + +PR = "r1" PE = "1" +EXTRA_OECONF = "ac_cv_path_MCOOKIE=${bindir}/mcookie" + +RDEPENDS_${PN} += "util-linux" + FILES_${PN} += "${libdir}X11/xinit" SRC_URI[md5sum] = "bc4e8b7d1919597cc37a0d24aa149dda" -- cgit 1.2.3-korg