summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2012-06-12 14:11:24 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-13 12:11:23 (GMT)
commit7f017cab0b3e4d5a4fc356eccd8eb8429b0531d0 (patch)
tree7359d2123614d9cd5a106e214b5a5c4071e9a6ff
parentd8d95d10bd6945047b4bab9ff9a4e948c73db205 (diff)
downloadpoky-1.3_M1.tar.gz
connman: bump PR and add some comments1.3_M1.rc11.3_M1.final1.3_M1
The comments are for informing anyone who wants to change USERADD_PARAMs to make sure it's in sync with the one in xserver-nodm-init, in order for rootless X to work. (From OE-Core rev: c4d0b1c5438039dab07103c151c0c5a76a4c9499) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/connman/connman.inc4
-rw-r--r--meta/recipes-connectivity/connman/connman_0.79.bb2
-rw-r--r--meta/recipes-graphics/x11-common/xserver-nodm-init.bb2
3 files changed, 7 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index eb174c5..3412323 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -20,6 +20,8 @@ DEPENDS = "dbus glib-2.0 ppp iptables gnutls \
20 ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \ 20 ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \
21 " 21 "
22 22
23INC_PR = "r6"
24
23TIST = "--enable-tist" 25TIST = "--enable-tist"
24TIST_powerpc = "" 26TIST_powerpc = ""
25 27
@@ -46,6 +48,8 @@ EXTRA_OECONF += "\
46INITSCRIPT_NAME = "connman" 48INITSCRIPT_NAME = "connman"
47INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ." 49INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ."
48 50
51# IMPORTANT: because xuser is shared with rootless X, please make sure the
52# USERADD_PARAM is in sync with the one in xserver-nodm-init.bb
49USERADD_PACKAGES = "${PN}" 53USERADD_PACKAGES = "${PN}"
50USERADD_PARAM_${PN} = "--create-home \ 54USERADD_PARAM_${PN} = "--create-home \
51 --groups video,tty,audio \ 55 --groups video,tty,audio \
diff --git a/meta/recipes-connectivity/connman/connman_0.79.bb b/meta/recipes-connectivity/connman/connman_0.79.bb
index ec3d147..898fb11 100644
--- a/meta/recipes-connectivity/connman/connman_0.79.bb
+++ b/meta/recipes-connectivity/connman/connman_0.79.bb
@@ -11,4 +11,4 @@ SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git \
11 file://test-set-ipv6-method-api-fix.patch \ 11 file://test-set-ipv6-method-api-fix.patch \
12 file://connman" 12 file://connman"
13S = "${WORKDIR}/git" 13S = "${WORKDIR}/git"
14PR = "r5" 14PR = "${INC_PR}.0"
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
index 1b95261..8fca056 100644
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
+++ b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
@@ -30,6 +30,8 @@ INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ."
30 30
31# Use fixed Xusername of xuser for now, this will need to be 31# Use fixed Xusername of xuser for now, this will need to be
32# fixed if the Xusername changes from xuser 32# fixed if the Xusername changes from xuser
33# IMPORTANT: because xuser is shared with connman, please make sure the
34# USERADD_PARAM is in sync with the one in connman.inc
33USERADD_PACKAGES = "${PN}" 35USERADD_PACKAGES = "${PN}"
34USERADD_PARAM_${PN} = "--create-home \ 36USERADD_PARAM_${PN} = "--create-home \
35 --groups video,tty,audio \ 37 --groups video,tty,audio \