create a tizen-ivi-Modello image

Change-Id: Ie364bd15b0af8d7e30bb961f3e45034d48fc8c12
Signed-off-by: Ronan Le Martret <ronan@fridu.net>

diff --git a/recipes-image/images/tizen-common-core-image-crosswalk-dev.bb b/recipes-image/images/tizen-common-core-image-crosswalk-dev.bb
index 43f6af0..90dba6b 100644 (file)
--- a/recipes-image/images/tizen-common-core-image-crosswalk-dev.bb
+++ b/recipes-image/images/tizen-common-core-image-crosswalk-dev.bb
@@ -4,16 +4,4 @@ DESCRIPTION = "A weston image with Tizen common and \
 is suitable for development work."
 
 IMAGE_FEATURES += "dev-pkgs tools-debug debug-tweaks ssh-server-openssh"
-CORE_IMAGE_EXTRA_INSTALL += "attr"
-CORE_IMAGE_EXTRA_INSTALL += "util-linux-agetty"
-CORE_IMAGE_EXTRA_INSTALL += "strace"
-CORE_IMAGE_EXTRA_INSTALL += "gdb"
-CORE_IMAGE_EXTRA_INSTALL += "lsof"
-CORE_IMAGE_EXTRA_INSTALL += "screen"
-CORE_IMAGE_EXTRA_INSTALL += "ldd"
-CORE_IMAGE_EXTRA_INSTALL += "libcap"
-CORE_IMAGE_EXTRA_INSTALL += "sudo"
-CORE_IMAGE_EXTRA_INSTALL += "connman-client"
-CORE_IMAGE_EXTRA_INSTALL += "git"
-CORE_IMAGE_EXTRA_INSTALL += "python-json"
-CORE_IMAGE_EXTRA_INSTALL += "ps-mem"
\ No newline at end of file
+CORE_IMAGE_EXTRA_INSTALL += "packagegroup-tizen-dev-tools"
\ No newline at end of file

diff --git a/recipes-image/images/tizen-common-core-image-minimal-dev.bb b/recipes-image/images/tizen-common-core-image-minimal-dev.bb
index 38e11ee..55b3200 100644 (file)
--- a/recipes-image/images/tizen-common-core-image-minimal-dev.bb
+++ b/recipes-image/images/tizen-common-core-image-minimal-dev.bb
@@ -4,14 +4,4 @@ DESCRIPTION = "A weston image with Tizen common and \
 is suitable for development work."
 
 IMAGE_FEATURES += "dev-pkgs tools-debug debug-tweaks ssh-server-openssh"
-CORE_IMAGE_EXTRA_INSTALL += "attr"
-CORE_IMAGE_EXTRA_INSTALL += "util-linux-agetty"
-CORE_IMAGE_EXTRA_INSTALL += "strace"
-CORE_IMAGE_EXTRA_INSTALL += "gdb"
-CORE_IMAGE_EXTRA_INSTALL += "lsof"
-CORE_IMAGE_EXTRA_INSTALL += "screen"
-CORE_IMAGE_EXTRA_INSTALL += "ldd"
-CORE_IMAGE_EXTRA_INSTALL += "libcap"
-CORE_IMAGE_EXTRA_INSTALL += "sudo"
-CORE_IMAGE_EXTRA_INSTALL += "connman-client"
-CORE_IMAGE_EXTRA_INSTALL += "ps-mem"
\ No newline at end of file
+CORE_IMAGE_EXTRA_INSTALL += "packagegroup-tizen-dev-tools"
\ No newline at end of file

diff --git a/recipes-image/images/tizen-ivi-Modello-image-dev.bb b/recipes-image/images/tizen-ivi-Modello-image-dev.bb
new file mode 100644 (file)
index 0000000..cc85806
--- /dev/null
+++ b/recipes-image/images/tizen-ivi-Modello-image-dev.bb
@@ -0,0 +1,7 @@
+require recipes-image/images/tizen-ivi-Modello-image.bb
+
+DESCRIPTION = "A Tizen ivi image base on Tizen ivi with Modello and \
+               is suitable for development work."
+
+IMAGE_FEATURES += "dev-pkgs tools-debug debug-tweaks ssh-server-openssh"
+CORE_IMAGE_EXTRA_INSTALL += "packagegroup-tizen-dev-tools"
\ No newline at end of file

diff --git a/recipes-image/images/tizen-ivi-Modello-image.bb b/recipes-image/images/tizen-ivi-Modello-image.bb
new file mode 100644 (file)
index 0000000..1b7321a
--- /dev/null
+++ b/recipes-image/images/tizen-ivi-Modello-image.bb
@@ -0,0 +1,14 @@
+require recipes-image/images/tizen-ivi-core-image.bb
+
+SUMMARY = "Tizen IVI Modello image"
+
+LICENSE = "MIT"
+
+DESCRIPTION = "A Tizen IVI image based on Tizen ivi with Modello ."
+
+
+# Modello packages
+CORE_IMAGE_EXTRA_INSTALL += "packagegroup-tizen-ivi-modello"
+
+# Crosswalk
+CORE_IMAGE_EXTRA_INSTALL += "packagegroup-tizen-crosswalk"
\ No newline at end of file

diff --git a/recipes-image/images/tizen-ivi-core-image.bb b/recipes-image/images/tizen-ivi-core-image.bb
index 1889f31..b8e9498 100644 (file)
--- a/recipes-image/images/tizen-ivi-core-image.bb
+++ b/recipes-image/images/tizen-ivi-core-image.bb
@@ -1,6 +1,6 @@
 require recipes-image/images/tizen-core-image-minimal.bb
 
-SUMMARY = "Tizen IVI image"
+SUMMARY = "Tizen IVI core image"
 
 LICENSE = "MIT"
 
@@ -9,10 +9,6 @@ DESCRIPTION = "A Tizen IVI image based on Tizen common ."
 WESTONSTARTUP = "weston-ivi"
 IMAGECONFIG = "config-tizen-ivi"
 
-# Modello packages
-CORE_IMAGE_EXTRA_INSTALL += "packagegroup-tizen-ivi-modello"
-
-
 CORE_IMAGE_EXTRA_INSTALL += "automotive-message-broker"
 CORE_IMAGE_EXTRA_INSTALL += "efl-theme-tizen-hd"
 CORE_IMAGE_EXTRA_INSTALL += "festival"
@@ -35,8 +31,5 @@ CORE_IMAGE_EXTRA_INSTALL += "udev-rules-ivi"
 CORE_IMAGE_EXTRA_INSTALL += "genivi-shell"
 CORE_IMAGE_EXTRA_INSTALL += "weston-ivi-shell"
 
-# Crosswalk
-CORE_IMAGE_EXTRA_INSTALL += "packagegroup-tizen-crosswalk"
-
 # Time zone
 CORE_IMAGE_EXTRA_INSTALL += "tzdata"

diff --git a/recipes-image/packagegroups/packagegroups-ivi.bb b/recipes-image/packagegroups/packagegroups-ivi.bb
index f863a4c..5994469 100644 (file)
--- a/recipes-image/packagegroups/packagegroups-ivi.bb
+++ b/recipes-image/packagegroups/packagegroups-ivi.bb
@@ -21,8 +21,9 @@ RDEPENDS_packagegroup-tizen-ivi-ico = " \
                                         "
 
 # Modello modules
-# To add: "Modello_Phone", "Modello_Installer" (related to BTY-36)
+# To add: "Modello_Phone"
 RDEPENDS_packagegroup-tizen-ivi-modello = " \
+                                            Modello_Installer-xwalk \ 
                                             Modello_AMBSimulator \
                                             Modello_Appmanager \
                                             Modello_Common \

diff --git a/recipes-image/packagegroups/packagegroups-tizen-dev.bb b/recipes-image/packagegroups/packagegroups-tizen-dev.bb
new file mode 100644 (file)
index 0000000..28a21a3
--- /dev/null
+++ b/recipes-image/packagegroups/packagegroups-tizen-dev.bb
@@ -0,0 +1,27 @@
+SUMMARY = "Tizen dev tools packagegroups"
+LICENSE = "MIT"
+DESCRIPTION = "Tizen dev tools packages."
+
+inherit packagegroup
+
+PACKAGES = "\
+            packagegroup-tizen-dev-tools\
+            "
+
+# dev tools fonts packages
+RDEPENDS_packagegroup-tizen-dev-tools = " \
+                                        attr \
+                                        acl \
+                                        util-linux-agetty \
+                                        strace \
+                                        gdb \
+                                        lsof \
+                                        screen \
+                                        ldd \
+                                        libcap \
+                                        sudo \
+                                        connman-client \
+                                        git \
+                                        python-json \
+                                        dlogutil \
+                                        "
\ No newline at end of file

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 16c4971..adf8394 100644 (file)
--- a/recipes-tizen/weston-ivi-shell/weston-ivi-shell-extraconf.inc
+++ b/recipes-tizen/weston-ivi-shell/weston-ivi-shell-extraconf.inc
@@ -85,31 +85,15 @@ pkg_postinst_${PN} () {
 
 PACKAGES += " weston-ivi-shell-clients-dbg "
 
-FILES_weston-ivi-shell-clients-dbg += "/usr/bin/ivi/.debug/weston-cliptest"
-FILES_weston-ivi-shell-clients-dbg += "/usr/bin/ivi/.debug/weston-smoke"
-FILES_weston-ivi-shell-clients-dbg += "/usr/bin/ivi/.debug/weston-editor"
-FILES_weston-ivi-shell-clients-dbg += "/usr/bin/ivi/.debug/weston-transformed"
-FILES_weston-ivi-shell-clients-dbg += "/usr/bin/ivi/.debug/weston-clickdot"
-FILES_weston-ivi-shell-clients-dbg += "/usr/bin/ivi/.debug/weston-calibrator"
-FILES_weston-ivi-shell-clients-dbg += "/usr/bin/ivi/.debug/weston-resizor"
-FILES_weston-ivi-shell-clients-dbg += "/usr/bin/ivi/.debug/weston-simple-egl"
-FILES_weston-ivi-shell-clients-dbg += "/usr/bin/ivi/.debug/weston-simple-touch"
-FILES_weston-ivi-shell-clients-dbg += "/usr/bin/ivi/.debug/weston-image"
-FILES_weston-ivi-shell-clients-dbg += "/usr/bin/ivi/.debug/weston-flower"
-FILES_weston-ivi-shell-clients-dbg += "/usr/bin/ivi/.debug/weston-simple-shm"
-FILES_weston-ivi-shell-clients-dbg += "/usr/bin/ivi/.debug/weston-subsurfaces"
-FILES_weston-ivi-shell-clients-dbg += "/usr/bin/ivi/.debug/weston-fullscreen"
-FILES_weston-ivi-shell-clients-dbg += "/usr/bin/ivi/.debug/weston-eventdemo"
-FILES_weston-ivi-shell-clients-dbg += "/usr/bin/ivi/.debug/weston-dnd"
+FILES_weston-ivi-shell-clients-dbg += "${prefix}/bin/ivi/.debug"
+FILES_${PN}-dbg += "${prefix}/lib/weston/.debug"
 
-FILES_${PN}-dbg += "/usr/lib/weston/.debug/hmi-controller.so"
-FILES_${PN}-dbg += "/usr/lib/weston/.debug/ivi-shell.so"
-FILES_${PN}-dbg += "/usr/lib/weston/.debug/ivi-layout.so"
 
-FILES_${PN} += "/usr/lib/weston-ivi-shell/weston-ivi-shell-user-interface"
-FILES_${PN} += "/usr/lib/weston-ivi-shell/weston-keyboard"
-FILES_${PN} += "/usr/lib/weston-ivi-shell/weston-desktop-shell"
-FILES_${PN} += "/usr/lib/weston-ivi-shell/weston-screenshooter"
-FILES_${PN} += "/usr/lib/weston-ivi-shell/weston-simple-im"
+FILES_${PN} += "${prefix}/lib/weston-ivi-shell/weston-ivi-shell-user-interface"
+FILES_${PN} += "${prefix}/lib/weston-ivi-shell/weston-keyboard"
+FILES_${PN} += "${prefix}/lib/weston-ivi-shell/weston-desktop-shell"
+FILES_${PN} += "${prefix}/lib/weston-ivi-shell/weston-screenshooter"
+FILES_${PN} += "${prefix}/lib/weston-ivi-shell/weston-simple-im"
+FILES_${PN} += "${prefix}/lib/weston/cms-static.so"
 
-FILES_${PN}-dev += "/usr/include/weston/ivi-shell-ext.h"
+FILES_${PN}-dev += "${prefix}/include/weston/ivi-shell-ext.h"

diff --git a/recipes-tizen/weston/weston-extraconf.inc b/recipes-tizen/weston/weston-extraconf.inc
index c9a7964..8220a89 100644 (file)
--- a/recipes-tizen/weston/weston-extraconf.inc
+++ b/recipes-tizen/weston/weston-extraconf.inc
@@ -3,6 +3,8 @@ inherit useradd
 RDEPENDS_${PN} += "xkeyboard-config"
 RRECOMMENDS_${PN} = "liberation-fonts"
 
+RDEPENDS_${PN}_remove = "weston-startup"
+
 SRC_URI += "file://make-lcms-explicitly-configurable.patch"
 SRC_URI += "file://make-libwebp-explicitly-configurable.patch"
 
@@ -39,6 +41,8 @@ FILES_${PN} += "${prefix}/lib/weston/weston-desktop-shell"
 FILES_${PN} += "${prefix}/lib/weston/cms-static.so"
 FILES_${PN} += "${prefix}/lib/weston/weston-screenshooter"
 FILES_${PN} += "${prefix}/lib/weston/weston-simple-im"
+
 FILES_${PN} += "${prefix}/bin/weston-scaler"
 FILES_${PN} += "${prefix}/bin/weston-stacking"
 FILES_${PN} += "${prefix}/bin/weston-multi-resource"
+