summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonan Le Martret <ronan@fridu.net>2014-12-30 14:52:46 +0100
committerPatrick Ohly <patrick.ohly@intel.com>2015-01-09 09:24:01 -0800
commit6125b4e9ac0118d86d8423b6135ec8ab8cf42780 (patch)
tree28a1c9f967ea2b48eea3e0d5589f90550997aaf0
parent59bc9aa93a79e8705e66264613a17262ea9ee831 (diff)
downloadtizen-distro-6125b4e9ac0118d86d8423b6135ec8ab8cf42780.tar.gz
tizen-distro-6125b4e9ac0118d86d8423b6135ec8ab8cf42780.tar.bz2
tizen-distro-6125b4e9ac0118d86d8423b6135ec8ab8cf42780.zip
meta-tizen: fix image Tizen profil
Change-Id: I17c663e5ce1b9364be92ce8d37e40dba0b236220 (From meta-tizen rev: b34470f037b20153ccb654c238e2fc95725d492d) Signed-off-by: Ronan Le Martret <ronan@fridu.net> Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
-rw-r--r--meta-tizen/meta-tizen-common-base/conf/distro/tizen.conf1
-rw-r--r--meta-tizen/meta-tizen-common-demo/recipes-image/config-tizen-profiles/config-tizen-ivi.bb5
-rw-r--r--meta-tizen/meta-tizen-common-demo/recipes-image/images/tizen-core-image-minimal.bb6
-rw-r--r--meta-tizen/meta-tizen-common-demo/recipes-image/images/tizen-ivi-core-image.bb1
4 files changed, 9 insertions, 4 deletions
diff --git a/meta-tizen/meta-tizen-common-base/conf/distro/tizen.conf b/meta-tizen/meta-tizen-common-base/conf/distro/tizen.conf
index 47de525d9a..3e8abbd4a5 100644
--- a/meta-tizen/meta-tizen-common-base/conf/distro/tizen.conf
+++ b/meta-tizen/meta-tizen-common-base/conf/distro/tizen.conf
@@ -31,6 +31,7 @@ IMAGE_ROOTFS_SIZE_ext3 = "262144"
# Use weston from Tizen since it contains Tizen specific patches
WESTONSTARTUP ??= "weston-common"
IMAGECONFIG ??= "config-tizen-common"
+TLMCONFIG ??= "tlm-config-tizen-common"
PREFERRED_PROVIDER_python-dbus = "dbus-python"
PREFERRED_PROVIDER_jpeg = "libjpeg-turbo"
diff --git a/meta-tizen/meta-tizen-common-demo/recipes-image/config-tizen-profiles/config-tizen-ivi.bb b/meta-tizen/meta-tizen-common-demo/recipes-image/config-tizen-profiles/config-tizen-ivi.bb
index 476931216f..771366dc13 100644
--- a/meta-tizen/meta-tizen-common-demo/recipes-image/config-tizen-profiles/config-tizen-ivi.bb
+++ b/meta-tizen/meta-tizen-common-demo/recipes-image/config-tizen-profiles/config-tizen-ivi.bb
@@ -39,5 +39,6 @@ GROUPADD_PARAM_${PN} += "; --system -g 6026 db_wrt "
-USERADD_PARAM_${PN} += " -u 5000 -d /home/app -m -g users -G users,weston-launch -r -s /bin/sh app "
-USERADD_PARAM_${PN} += "; -d /usr/apps -m -g root --system -s /bin/false tizenglobalapp "
+USERADD_PARAM_${PN} += " -u 116 -d /home/genivi -m -g users -G users,input,tty,video,weston-launch -r -s /bin/sh genivi "
+USERADD_PARAM_${PN} += "; -u 5000 -d /home/app -m -g users -G users,weston-launch,tty -r -s /bin/sh app "
+USERADD_PARAM_${PN} += "; -d /usr/apps -m -g root --system -s /bin/false tizenglobalapp "
diff --git a/meta-tizen/meta-tizen-common-demo/recipes-image/images/tizen-core-image-minimal.bb b/meta-tizen/meta-tizen-common-demo/recipes-image/images/tizen-core-image-minimal.bb
index fd5c99cd9b..5ae752884d 100644
--- a/meta-tizen/meta-tizen-common-demo/recipes-image/images/tizen-core-image-minimal.bb
+++ b/meta-tizen/meta-tizen-common-demo/recipes-image/images/tizen-core-image-minimal.bb
@@ -20,6 +20,10 @@ CORE_IMAGE_BASE_INSTALL += "${WESTONSTARTUP}"
# Profile specific configuration - default is Tizen common
CORE_IMAGE_BASE_INSTALL += "${IMAGECONFIG}"
+CORE_IMAGE_BASE_INSTALL += "tlm"
+CORE_IMAGE_BASE_INSTALL += "${TLMCONFIG}"
+
+
CORE_IMAGE_BASE_INSTALL += "mesa-megadriver"
CORE_IMAGE_BASE_INSTALL += "libegl-gallium"
CORE_IMAGE_BASE_INSTALL += "libegl-mesa"
@@ -30,8 +34,6 @@ CORE_IMAGE_BASE_INSTALL += "mesa-driver-pipe-vmwgfx"
CORE_IMAGE_BASE_INSTALL += "mesa-driver-pipe-i915"
CORE_IMAGE_BASE_INSTALL += "libgles1-mesa"
CORE_IMAGE_BASE_INSTALL += "libgles2-mesa"
-CORE_IMAGE_BASE_INSTALL += "tlm-config-common"
-CORE_IMAGE_BASE_INSTALL += "tlm"
CORE_IMAGE_BASE_INSTALL += "gum-utils"
CORE_IMAGE_BASE_INSTALL += "meta-common"
CORE_IMAGE_BASE_INSTALL += "pam"
diff --git a/meta-tizen/meta-tizen-common-demo/recipes-image/images/tizen-ivi-core-image.bb b/meta-tizen/meta-tizen-common-demo/recipes-image/images/tizen-ivi-core-image.bb
index 1c44fbbaa6..113c794476 100644
--- a/meta-tizen/meta-tizen-common-demo/recipes-image/images/tizen-ivi-core-image.bb
+++ b/meta-tizen/meta-tizen-common-demo/recipes-image/images/tizen-ivi-core-image.bb
@@ -9,6 +9,7 @@ DESCRIPTION = "A Tizen IVI image based on Tizen common ."
WESTONSTARTUP = "weston-ivi"
WESTONINI = "weston-ivi-config"
IMAGECONFIG = "config-tizen-ivi"
+TLMCONFIG ??= "tlm-config-ivi-singleseat"
CORE_IMAGE_EXTRA_INSTALL += "automotive-message-broker"
CORE_IMAGE_EXTRA_INSTALL += "efl-theme-tizen-hd"