--- oe-core/meta/recipes-graphics/x11-common/xserver-nodm-init.bb   2013-02-12 10:28:10.896996198 +0000
+++ meta-oe/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb 2012-09-04 12:09:27.049044218 +0100
@@ -2,38 +2,23 @@
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 SECTION = "x11"
-PR = "r30"
-RDEPENDS_${PN} = "sudo"

-SRC_URI = "file://xserver-nodm \
-           file://Xusername \
-           file://gplv2-license.patch"
+PR = "r17"

+SRC_URI = "file://xserver-nodm \
+           file://gplv2-license.patch \
+"
 S = "${WORKDIR}"

-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-do_install() {
-    install -d ${D}${sysconfdir}
-    install -d ${D}${sysconfdir}/init.d
-    install xserver-nodm ${D}${sysconfdir}/init.d
-    if [ "${ROOTLESS_X}" = "1" ] ; then
-        install -d ${D}${sysconfdir}/X11
-        install Xusername ${D}${sysconfdir}/X11
-    fi
-}
-
-inherit update-rc.d useradd
+inherit allarch update-rc.d

 INITSCRIPT_NAME = "xserver-nodm"
-INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ."
+INITSCRIPT_PARAMS = "start 01 5 2 . stop 01 0 1 6 ."
+INITSCRIPT_PARAMS_shr = "start 90 5 2 . stop 90 0 1 6 ."

-# Use fixed Xusername of xuser for now, this will need to be
-# fixed if the Xusername changes from xuser
-# IMPORTANT: because xuser is shared with connman, please make sure the
-# USERADD_PARAM is in sync with the one in connman.inc
-USERADD_PACKAGES = "${PN}"
-USERADD_PARAM_${PN} = "--create-home \
-                       --groups video,tty,audio \
-                       --user-group xuser"
+do_install() {
+   install -d ${D}${sysconfdir}/init.d
+   install xserver-nodm ${D}${sysconfdir}/init.d
+}

+RDEPENDS_${PN} = "xserver-common (>= 1.30) xinit"