Patchwork xinit: Fix `startx` looking for `mcookie` in sysroot

login
register
mail settings
Submitter Paul Menzel
Date Nov. 8, 2011, 12:31 p.m.
Message ID <1320755519.3915.15.camel@mattotaupa>
Download mbox | patch
Permalink /patch/14507/
State New
Headers show

Comments

Paul Menzel - Nov. 8, 2011, 12:31 p.m.
Date: Tue, 8 Nov 2011 13:00:32 +0100

`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
        
            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>
---
1. Please note that I did neither build nor run tested this patch and just noticed the error trying the demo image.
2. Koen mentioned something on IRC wanting to get rid of `startx` entirely. But this patch should be applied nevertheless.
---
 meta/recipes-graphics/xorg-app/xinit_1.3.0.bb |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
Koen Kooi - Nov. 8, 2011, 12:47 p.m.
Op 8 nov. 2011, om 13:31 heeft Paul Menzel het volgende geschreven:

> Date: Tue, 8 Nov 2011 13:00:32 +0100
> 
> `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
> 
>            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>
> ---
> 1. Please note that I did neither build nor run tested this patch and just noticed the error trying the demo image.
> 2. Koen mentioned something on IRC wanting to get rid of `startx` entirely. But this patch should be applied nevertheless.
> ---
> meta/recipes-graphics/xorg-app/xinit_1.3.0.bb |    6 +++++-
> 1 files changed, 5 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 ee7c64d..cdfc843 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,13 @@ systems. When this first client exits, xinit will kill the X server and \
> then terminate."
> 
> LIC_FILES_CHKSUM = "file://COPYING;md5=0d4b5eef75f1584ccbdc5e4a34314407"
> -PR = "r0"
> +RDEPENDS_${PN} += "util-linux-ng"

RDEPENDS go below do_install

regards,

Koen

Patch

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 ee7c64d..cdfc843 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,13 @@  systems. When this first client exits, xinit will kill the X server and \
 then terminate."
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=0d4b5eef75f1584ccbdc5e4a34314407"
-PR = "r0"
+RDEPENDS_${PN} += "util-linux-ng"
+
+PR = "r1"
 PE = "1"
 
+EXTRA_OECONF = "ac_cv_path_MCOOKIE=${bindir}/mcookie"
+
 FILES_${PN} += "${libdir}X11/xinit"
 
 SRC_URI[md5sum] = "bc4e8b7d1919597cc37a0d24aa149dda"