From 087ef05f8bc2f1f93ac25f78b2d889b0b1317323 Mon Sep 17 00:00:00 2001 From: =?utf8?q?K=C3=A9vin=20THIERRY?= Date: Wed, 17 Sep 2014 08:45:06 +0200 Subject: [PATCH] meta-tizen: Create group weston-launch in profile config MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Create group weston-launch in config-tizen-common and config-tizen-ivi recipes instead of weston recipe to prevent the case where user belonging to the group weston-launch are created before the group is (which cause an error). Change-Id: I1ad479bc35ff9bd2aa75782e7e7f7e0a70eb0a7e (From meta-tizen rev: 4b55a23c5e8dd577c09a91c74cd9308ba4e59501) Signed-off-by: Kévin THIERRY Signed-off-by: Patrick Ohly --- .../recipes-image/config-tizen-profiles/config-tizen-common.bb | 2 +- meta-tizen/recipes-image/config-tizen-profiles/config-tizen-ivi.bb | 2 +- meta-tizen/recipes-tizen/weston/weston-extraconf.inc | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/meta-tizen/recipes-image/config-tizen-profiles/config-tizen-common.bb b/meta-tizen/recipes-image/config-tizen-profiles/config-tizen-common.bb index 51e8318..d508214 100644 --- a/meta-tizen/recipes-image/config-tizen-profiles/config-tizen-common.bb +++ b/meta-tizen/recipes-image/config-tizen-profiles/config-tizen-common.bb @@ -8,7 +8,7 @@ inherit allarch useradd USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "-g 191 display; -g 100 users; -g 1004 input; -g 190 systemd-journal; -g 54 lock" +GROUPADD_PARAM_${PN} = "-g 191 display; -g 100 users; -g 1004 input; -g 190 systemd-journal; -g 54 lock; --system -g 192 weston-launch" USERADD_PARAM_${PN} = " -d /run/display -m -u 115 -g display -G users,input,tty,display -s /bin/sh display; " USERADD_PARAM_${PN} += " -d /home/alice -m -u 5001 -g users -G users,display -r -s /bin/sh alice; " diff --git a/meta-tizen/recipes-image/config-tizen-profiles/config-tizen-ivi.bb b/meta-tizen/recipes-image/config-tizen-profiles/config-tizen-ivi.bb index 761d0ce..f49f535 100644 --- a/meta-tizen/recipes-image/config-tizen-profiles/config-tizen-ivi.bb +++ b/meta-tizen/recipes-image/config-tizen-profiles/config-tizen-ivi.bb @@ -8,6 +8,6 @@ inherit allarch useradd USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "-g 100 users; -g 5000 app; -g 54 lock; -g 190 systemd-journal " +GROUPADD_PARAM_${PN} = "-g 100 users; -g 5000 app; -g 54 lock; -g 190 systemd-journal; --system -g 192 weston-launch " USERADD_PARAM_${PN} += " -u 5000 -d /home/app -m -g users -G users,weston-launch -r -s /bin/sh app " diff --git a/meta-tizen/recipes-tizen/weston/weston-extraconf.inc b/meta-tizen/recipes-tizen/weston/weston-extraconf.inc index fcf909e..f74798f 100644 --- a/meta-tizen/recipes-tizen/weston/weston-extraconf.inc +++ b/meta-tizen/recipes-tizen/weston/weston-extraconf.inc @@ -1,5 +1,3 @@ -inherit useradd - RDEPENDS_${PN} += "xkeyboard-config" RRECOMMENDS_${PN} = "liberation-fonts" @@ -8,9 +6,6 @@ RDEPENDS_${PN}_remove = "weston-startup" SRC_URI += "file://make-lcms-explicitly-configurable.patch" SRC_URI += "file://make-libwebp-explicitly-configurable.patch" -USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system -g 192 weston-launch" - EXTRA_OECONF += " \ --enable-wayland-compositor \ --disable-vaapi-recorder \ -- 2.7.4