Add profile specific configurations

Change-Id: I5c42a32d6039a12a3bf21a29979c654a99ac3769
Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>

diff --git a/conf/layer.conf b/conf/layer.conf
index 877aa2a..a460563 100644 (file)
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -54,7 +54,8 @@ PREFERRED_VERSION_libav = "9.13"
 PREFERRED_VERSION_linux-yocto = "3.14.4+git%"
 
 WESTONSTARTUP ??= "weston-common"
+IMAGECONFIG ??= "config-tizen-common"
 
 INHERIT += "metatizen"
 
-FILESYSTEM_PERMS_TABLES = "tizen-fs-perms.txt"
\ No newline at end of file
+FILESYSTEM_PERMS_TABLES = "tizen-fs-perms.txt"

diff --git a/recipes-image/config-image/config-image.bb b/recipes-image/config-image/config-image.bb
index 68bf0ea..332a615 100644 (file)
--- a/recipes-image/config-image/config-image.bb
+++ b/recipes-image/config-image/config-image.bb
@@ -5,6 +5,8 @@ PR = "r1"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
+RDEPENDS_${PN} += "weston"
+
 do_install() {
   mkdir -p ${D}${sysconfdir}
   echo "Tizen on Yocto" > ${D}${sysconfdir}/tizen

diff --git a/recipes-image/config-tizen-profiles/config-tizen-common.bb b/recipes-image/config-tizen-profiles/config-tizen-common.bb
new file mode 100644 (file)
index 0000000..07144be
--- /dev/null
+++ b/recipes-image/config-tizen-profiles/config-tizen-common.bb
@@ -0,0 +1,21 @@
+LICENSE = "GPL-2.0"
+LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+
+inherit useradd
+
+USERADD_PACKAGES = "${PN}"
+
+GROUPADD_PARAM_${PN} = "-g 191 display;-g 100 users;-g 1004 input;-g 190 systemd-journal;-g 54 lock"
+
+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; "
+USERADD_PARAM_${PN} += " -d /home/bob   -m -u 5002   -g users   -G users,display -r -s /bin/sh bob; "
+USERADD_PARAM_${PN} += " -d /home/carol -m -u 5003   -g users   -G users,display -r -s /bin/sh carol; "
+USERADD_PARAM_${PN} += " -d /home/guest -m -u 9999   -g users   -G users,display -r -s /bin/sh guest; "
+USERADD_PARAM_${PN} += " -d /home/app   -m -u 5000   -g users   -G users,display -r -s /bin/sh app "
+
+do_install() {
+    install -d ${D}/etc/config-tizen-common
+}
+
+FILES_${PN} += "/etc/config-tizen-common"

diff --git a/recipes-image/config-tizen-profiles/config-tizen-ivi.bb b/recipes-image/config-tizen-profiles/config-tizen-ivi.bb
new file mode 100644 (file)
index 0000000..7490587
--- /dev/null
+++ b/recipes-image/config-tizen-profiles/config-tizen-ivi.bb
@@ -0,0 +1,16 @@
+LICENSE = "GPL-2.0"
+LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+
+inherit useradd
+
+USERADD_PACKAGES = "${PN}"
+
+GROUPADD_PARAM_${PN} = "-g 100 users; -g 5000 app; -g 192 weston-launch"
+
+USERADD_PARAM_${PN} += " -u 5000 -d /home/app   -m -g users -G users,weston-launch -r -s /bin/sh app "
+
+do_install() {
+    install -d ${D}/etc/config-tizen-ivi
+}
+
+FILES_${PN} += "/etc/config-tizen-ivi"

diff --git a/recipes-image/images/tizen-core-image-minimal.bb b/recipes-image/images/tizen-core-image-minimal.bb
index 1847c98..c6e1331 100644 (file)
--- a/recipes-image/images/tizen-core-image-minimal.bb
+++ b/recipes-image/images/tizen-core-image-minimal.bb
@@ -17,6 +17,9 @@ DEPENDS += " tar-replacement-native "
 CORE_IMAGE_BASE_INSTALL += "connman"
 CORE_IMAGE_BASE_INSTALL += "${WESTONSTARTUP}"
 
+# Profile specific configuration - default is Tizen common
+CORE_IMAGE_BASE_INSTALL += "${IMAGECONFIG}"
+
 CORE_IMAGE_BASE_INSTALL += "mesa-megadriver"
 CORE_IMAGE_BASE_INSTALL += "libegl-gallium"
 CORE_IMAGE_BASE_INSTALL += "libegl-mesa"

diff --git a/recipes-image/images/tizen-ivi-core-image.bb b/recipes-image/images/tizen-ivi-core-image.bb
index 354f7dd..9c9d4b1 100644 (file)
--- a/recipes-image/images/tizen-ivi-core-image.bb
+++ b/recipes-image/images/tizen-ivi-core-image.bb
@@ -6,7 +6,8 @@ LICENSE = "MIT"
 
 DESCRIPTION = "A Tizen ivi image base on Tizen common ."
 
-WESTONSTARTUP="weston-ivi"
+WESTONSTARTUP = "weston-ivi"
+IMAGECONFIG = "config-tizen-ivi"
 
 CORE_IMAGE_EXTRA_INSTALL += "Modello_AMBSimulator"
 CORE_IMAGE_EXTRA_INSTALL += "Modello_Appmanager"
@@ -49,7 +50,7 @@ CORE_IMAGE_EXTRA_INSTALL += "genivi-shell"
 CORE_IMAGE_EXTRA_INSTALL += "weston-ivi-shell"
 
 # Crosswalk
-CORE_IMAGE_EXTRA_INSTALL += "packagegroup-tizen-crosswalk"
+#CORE_IMAGE_EXTRA_INSTALL += "packagegroup-tizen-crosswalk"
 
 # Time zone
 CORE_IMAGE_EXTRA_INSTALL += "tzdata"

diff --git a/recipes-tizen/weston-common/weston-common-extraconf.inc b/recipes-tizen/weston-common/weston-common-extraconf.inc
index d9152fe..df20a1c 100644 (file)
--- a/recipes-tizen/weston-common/weston-common-extraconf.inc
+++ b/recipes-tizen/weston-common/weston-common-extraconf.inc
@@ -1,5 +1,3 @@
-inherit useradd
-
 FILESEXTRAPATHS_append := "${THISDIR}/weston-common"
 
 SRC_URI += "file://0001-Yocto-correct-paths-to-ln-and-chmod.patch"
@@ -7,16 +5,6 @@ SRC_URI += "file://0002-Add-a-script-to-export-UID.patch"
 SRC_URI += "file://0003-Automatically-restart-display-manager.patch"
 SRC_URI += "file://0004-Modifications-for-yocto-build.patch"
 
-USERADD_PACKAGES = "${PN}"
-
-GROUPADD_PARAM_${PN} = "-g 191 display;-g 100 users;-g 1004 input;-g 190 systemd-journal;-g 54 lock"
-
-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; "
-USERADD_PARAM_${PN} += " -d /home/bob   -m -u 5002   -g users   -G users,display -r -s /bin/sh bob; "
-USERADD_PARAM_${PN} += " -d /home/carol -m -u 5003   -g users   -G users,display -r -s /bin/sh carol; "
-USERADD_PARAM_${PN} += " -d /home/guest -m -u 9999   -g users   -G users,display -r -s /bin/sh guest; "
-USERADD_PARAM_${PN} += " -d /home/app   -m -u 5000   -g users   -G users,display -r -s /bin/sh app "
 
 do_install_append() {
     install -m 755 uid.sh ${D}/etc/profile.d

diff --git a/recipes-tizen/weston-ivi-shell/weston-ivi-shell-extraconf.inc b/recipes-tizen/weston-ivi-shell/weston-ivi-shell-extraconf.inc
index 82e3545..1e742a7 100644 (file)
--- a/recipes-tizen/weston-ivi-shell/weston-ivi-shell-extraconf.inc
+++ b/recipes-tizen/weston-ivi-shell/weston-ivi-shell-extraconf.inc
@@ -1,11 +1,5 @@
-inherit useradd
-
-GROUPADD_PARAM_${PN} = "-g 100 users; -g 5000 app; -g 192 weston-launch;-g 1004 input;-g 190 systemd-journal;-g 54 lock"
-
-USERADD_PARAM_${PN} += " -u 5000 -d /home/app   -m -g users -G users,weston-launch -r -s /bin/sh app  "
-#USERADD_PARAM_${PN} += " -u 9999 -d /home/guest -m -g users -G users,weston-launch -r -s /bin/sh guest "
-
-USERADD_PACKAGES = "${PN}"
+DEPENDS += "config-tizen-ivi"
+RDEPENDS_${PN} += "config-tizen-ivi"
 
 do_configure_prepend() {
     # pkg-config check for wayland scanner even though it is present and wayland-scanner.pc seems ok.