Merge branch 'master' into develop

Change-Id: Ief27bf7e7dbdb5798e2d4043a119959750f5b3e6
Signed-off-by: ChangHyun Lee <leechwin.lee@samsung.com>

diff --git a/systemd/tic-core.service b/systemd/tic-core.service
new file mode 100644 (file)
index 0000000..4002452
--- /dev/null
+++ b/systemd/tic-core.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Tizen Image Creator (TIC) - Core
+After=network.target
+
+[Service]
+EnvironmentFile=/etc/profile
+Type=simple
+User=score
+Group=score
+ExecStart=/usr/local/bin/tic-core start
+ExecReload=/bin/kill -HUP $MAINPID
+StandardOutput=tty+journal+console
+
+[Install]
+WantedBy=multi-user.target

diff --git a/systemd/tic-core.sh b/systemd/tic-core.sh
new file mode 100755 (executable)
index 0000000..f363604
--- /dev/null
+++ b/systemd/tic-core.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+# Default port is 8082
+# /usr/local/bin/tic-core start --port=8082
+/usr/local/bin/tic-core start

diff --git a/tic/parser/view_parser.py b/tic/parser/view_parser.py
index eac7a55..73ef588 100644 (file)
--- a/tic/parser/view_parser.py
+++ b/tic/parser/view_parser.py
@@ -76,7 +76,7 @@ def make_view_data(pkg_group):
 
                             if pkg.get('meta'):
                                 if not pkg['name'] in children:
-                                    meta_nodes.append(make_linked_meta_node(pkg['name'], pkg['summary']))
+                                    meta_nodes.append(make_linked_meta_node(pkg['name'], pkg['summary'], meta_info['category']))
                             else:
                                 meta_nodes.append(make_node(pkg, meta_info.get('category')))
         # Added 'zz' to non meta-package because they are to be listed last
@@ -91,8 +91,8 @@ def make_view_data(pkg_group):
         return n
     def make_meta_node(pkgname, viewtext):
         return dict(text=viewtext, metaname=pkgname, nodes=[])
-    def make_linked_meta_node(pkgname, viewtext):
-        return dict(text='<i>'+viewtext+'</i>', metaname=pkgname, nodes=[])
+    def make_linked_meta_node(pkgname, viewtext, cat):
+        return dict(text='<i>'+viewtext+'</i>', metaname=pkgname, nodes=[], category=cat)
     def is_blank_ui_meta_node(pkgname):
         return (pkgname[-8:-2] == '__UI__')
     def handle_ui_meta_node(tag, node):