- remove capabilities support on libgcript.

diff --git a/meta-wrt-tizen/recipes-support/libgcrypt/libgcrypt_1.5.3.bbappend b/meta-wrt-tizen/recipes-support/libgcrypt/libgcrypt_1.5.3.bbappend
new file mode 100644 (file)
index 0000000..14e0085
--- /dev/null
+++ b/meta-wrt-tizen/recipes-support/libgcrypt/libgcrypt_1.5.3.bbappend
@@ -0,0 +1 @@
+EXTRA_OECONF = "--without-pth --disable-asm "
\ No newline at end of file

diff --git a/meta-wrt-tizen/recipes-wrt/packagegroup/packagegroup-wrt.bb b/meta-wrt-tizen/recipes-wrt/packagegroup/packagegroup-wrt.bb
index a802405..73f548d 100644 (file)
--- a/meta-wrt-tizen/recipes-wrt/packagegroup/packagegroup-wrt.bb
+++ b/meta-wrt-tizen/recipes-wrt/packagegroup/packagegroup-wrt.bb
@@ -5,6 +5,7 @@ PR = "r1"
 
 inherit packagegroup
 
+
 RDEPENDS_${PN} = "wrt"
 RDEPENDS_${PN} += "wrt-commons"
 RDEPENDS_${PN} += "wrt-installer"
@@ -17,4 +18,7 @@ RDEPENDS_${PN} += " dlogutil "
 RDEPENDS_${PN} += " vim git strace gdb "
 RDEPENDS_${PN} += "eglibc-gconv-utf-32"
 
+RDEPENDS_${PN} += "procps"
+
 RDEPENDS_${PN} += "webkit2-efl"
+RDEPENDS_${PN} += "system-server"

diff --git a/meta-wrt-tizen/recipes-wrt/smartcard-service/smartcard-service-native_git.bb b/meta-wrt-tizen/recipes-wrt/smartcard-service/smartcard-service-native_git.bb
index 954bb06..2ebab06 100644 (file)
--- a/meta-wrt-tizen/recipes-wrt/smartcard-service/smartcard-service-native_git.bb
+++ b/meta-wrt-tizen/recipes-wrt/smartcard-service/smartcard-service-native_git.bb
@@ -8,6 +8,6 @@ S = "${WORKDIR}/git"
 
 LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
-SRC_URI += "git://review.tizen.org/platform/core/system/smartcard-service;protocol=ssh;tag=submit/tizen/20130710.124756"
+SRC_URI += "git://review.tizen.org/platform/core/connectivity/smartcard-service;protocol=ssh;tag=accepted/tizen/20130926.204307"
 require smartcard-service-native-extraconf.inc
 

diff --git a/meta-wrt-tizen/recipes-wrt/smartcard-service/smartcard-service_git.bb b/meta-wrt-tizen/recipes-wrt/smartcard-service/smartcard-service_git.bb
index 9c16c04..b1e6fe3 100644 (file)
--- a/meta-wrt-tizen/recipes-wrt/smartcard-service/smartcard-service_git.bb
+++ b/meta-wrt-tizen/recipes-wrt/smartcard-service/smartcard-service_git.bb
@@ -5,6 +5,6 @@ PRIORITY = "10"
 
 LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
-SRC_URI += "git://review.tizen.org/platform/core/system/smartcard-service;protocol=ssh;tag=submit/tizen/20130710.124756"
+SRC_URI += "git://review.tizen.org/platform/core/connectivity/smartcard-service;protocol=ssh;tag=accepted/tizen/20130926.204307"
 require smartcard-service-oe-extraconf.inc
 

diff --git a/meta-wrt-tizen/recipes-wrt/system-server/system-server-depends.inc b/meta-wrt-tizen/recipes-wrt/system-server/system-server-depends.inc
new file mode 100644 (file)
index 0000000..77b7103
--- /dev/null
+++ b/meta-wrt-tizen/recipes-wrt/system-server/system-server-depends.inc
@@ -0,0 +1,21 @@
+DEPENDS = ""
+#DEPENDS of system-server 
+DEPENDS += "libslp-tapi"
+inherit tizen_cmake
+DEPENDS += "attr"
+#Replace "DEPENDS" on gettext by "inherit gettext"
+inherit gettext
+DEPENDS += "libsvi"
+DEPENDS += "syspopup"
+DEPENDS += "edbus"
+DEPENDS += "dlog"
+DEPENDS += "libslp-pm"
+DEPENDS += "libdevice-node"
+DEPENDS += "usbutils"
+DEPENDS += "notification"
+DEPENDS += "libslp-sysman"
+DEPENDS += "virtual/libx11"
+DEPENDS += "heynoti"
+DEPENDS += "ecore"
+DEPENDS += "vconf"
+DEPENDS += "devman"

diff --git a/meta-wrt-tizen/recipes-wrt/system-server/system-server-extraconf.inc b/meta-wrt-tizen/recipes-wrt/system-server/system-server-extraconf.inc
new file mode 100644 (file)
index 0000000..8f198ff
--- /dev/null
+++ b/meta-wrt-tizen/recipes-wrt/system-server/system-server-extraconf.inc
@@ -0,0 +1,4 @@
+do_patch_append () {
+ sed -e 's,/usr/include/svi,${STAGING_DIR_HOST}/usr/include/svi ,' -i ${S}/sys_device_noti/CMakeLists.txt
+ sed -e 's,/usr/include/notification,${STAGING_DIR_HOST}/usr/include/notification ,' -i ${S}/sys_device_noti/CMakeLists.txt
+}
\ No newline at end of file

diff --git a/meta-wrt-tizen/recipes-wrt/system-server/system-server-native-extraconf.inc b/meta-wrt-tizen/recipes-wrt/system-server/system-server-native-extraconf.inc
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/meta-wrt-tizen/recipes-wrt/system-server/system-server-native_git.bb b/meta-wrt-tizen/recipes-wrt/system-server/system-server-native_git.bb
new file mode 100644 (file)
index 0000000..9cd204e
--- /dev/null
+++ b/meta-wrt-tizen/recipes-wrt/system-server/system-server-native_git.bb
@@ -0,0 +1,13 @@
+require system-server.inc
+
+PRIORITY = "9"
+
+inherit native
+
+S = "${WORKDIR}/git"
+
+LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+
+SRC_URI += "git://review.tizen.org/platform/core/system/system-server;protocol=ssh;tag=submit/tizen/20130710.124834"
+require system-server-native-extraconf.inc
+

diff --git a/meta-wrt-tizen/recipes-wrt/system-server/system-server-oe-extraconf.inc b/meta-wrt-tizen/recipes-wrt/system-server/system-server-oe-extraconf.inc
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/meta-wrt-tizen/recipes-wrt/system-server/system-server-rdepends.inc b/meta-wrt-tizen/recipes-wrt/system-server/system-server-rdepends.inc
new file mode 100644 (file)
index 0000000..6964f66
--- /dev/null
+++ b/meta-wrt-tizen/recipes-wrt/system-server/system-server-rdepends.inc
@@ -0,0 +1,6 @@
+RDEPENDS = ""
+#RDEPENDS of system-server (${PN})
+RDEPENDS_${PN} += "systemd"
+RDEPENDS_${PN} += "vconf"
+
+

diff --git a/meta-wrt-tizen/recipes-wrt/system-server/system-server-rprovides.inc b/meta-wrt-tizen/recipes-wrt/system-server/system-server-rprovides.inc
new file mode 100644 (file)
index 0000000..69e16e1
--- /dev/null
+++ b/meta-wrt-tizen/recipes-wrt/system-server/system-server-rprovides.inc
@@ -0,0 +1,4 @@
+#PROVIDES by system-server 
+PROVIDES += "system-server"
+RPROVIDES_system-server += "system-server"
+

diff --git a/meta-wrt-tizen/recipes-wrt/system-server/system-server.inc b/meta-wrt-tizen/recipes-wrt/system-server/system-server.inc
new file mode 100644 (file)
index 0000000..899292f
--- /dev/null
+++ b/meta-wrt-tizen/recipes-wrt/system-server/system-server.inc
@@ -0,0 +1,43 @@
+DESCRIPTION = "System server"
+HOMEPAGE = "http://nohomepage.org"
+SECTION = "Framework/system"
+LICENSE = "Apache"
+
+PROVIDES = ""
+
+PACKAGES = ""
+PACKAGES += "system-server"
+
+system-server_files = ""
+system-server_files += "system-server.manifest"
+system-server_files += "/etc/dbus-1/system.d/system-server.conf"
+system-server_files += "/etc/rc.d/init.d/system_server.sh"
+system-server_files += "/etc/rc.d/rc3.d/S35system-server"
+system-server_files += "/etc/rc.d/rc5.d/S00system-server"
+system-server_files += "/usr/bin/system_server"
+system-server_files += "/opt/etc/smack/accesses.d/system-server.rule"
+system-server_files += "/usr/bin/restart"
+system-server_files += "/usr/bin/movi_format.sh"
+system-server_files += "/usr/bin/sys_event"
+system-server_files += "/usr/bin/sys_device_noti"
+system-server_files += "/usr/bin/sys_pci_noti"
+system-server_files += "/lib/systemd/system/multi-user.target.wants/system-server.service"
+system-server_files += "/lib/systemd/system/system-server.service"
+system-server_files += "/usr/share/system-server/sys_device_noti/batt_full_icon.png"
+system-server_files += "/usr/share/system-server/udev-rules/91-system-server.rules"
+system-server_files += "/usr/share/system-server/sys_device_noti/res/locale/*/LC_MESSAGES/*.mo"
+system-server_files += "/usr/share/system-server/sys_pci_noti/res/locale/*/LC_MESSAGES/*.mo"
+
+FILES_${PN} = "${system-server_files}"
+
+PKG_system-server= "system-server"
+
+SRC_URI = ""
+
+inherit tizenBuildUtils
+
+S = "${WORKDIR}/git"
+
+require system-server-rdepends.inc
+require system-server-depends.inc
+require system-server-extraconf.inc

diff --git a/meta-wrt-tizen/recipes-wrt/system-server/system-server_git.bb b/meta-wrt-tizen/recipes-wrt/system-server/system-server_git.bb
new file mode 100644 (file)
index 0000000..328d5d9
--- /dev/null
+++ b/meta-wrt-tizen/recipes-wrt/system-server/system-server_git.bb
@@ -0,0 +1,10 @@
+require system-server.inc
+require system-server-rprovides.inc
+
+PRIORITY = "10"
+
+LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+
+SRC_URI += "git://review.tizen.org/platform/core/system/system-server;protocol=ssh;tag=submit/tizen/20130710.124834"
+require system-server-oe-extraconf.inc
+

diff --git a/meta-wrt-tizen/recipes-wrt/vconf/vconf-extraconf.inc b/meta-wrt-tizen/recipes-wrt/vconf/vconf-extraconf.inc
index e69de29..52d97e1 100644 (file)
--- a/meta-wrt-tizen/recipes-wrt/vconf/vconf-extraconf.inc
+++ b/meta-wrt-tizen/recipes-wrt/vconf/vconf-extraconf.inc
@@ -0,0 +1,5 @@
+SRC_URI += " file://vconf-init.patch "
+
+do_patch_append () {
+ cat ${WORKDIR}/vconf-init.patch | patch -s -p1 --fuzz=2
+}
\ No newline at end of file

diff --git a/meta-wrt-tizen/recipes-wrt/vconf/vconf/vconf-init.patch b/meta-wrt-tizen/recipes-wrt/vconf/vconf/vconf-init.patch
new file mode 100644 (file)
index 0000000..dd7baab
--- /dev/null
+++ b/meta-wrt-tizen/recipes-wrt/vconf/vconf/vconf-init.patch
@@ -0,0 +1,17 @@
+diff --git a/vconf-init b/vconf-init
+index fe3f07d..4b575ea 100755
+--- a/vconf-init
++++ b/vconf-init
+@@ -1,10 +1,9 @@
+ #!/bin/sh
+ 
+-mkdir /var/run/memory
++mkdir -p /var/run/memory
+ chmod 777 /var/run/memory
+ 
+ set -e
+ 
+-
+-cp -a /opt/var/kdb/memory_init/memory/* /var/run/memory
++ls /opt/var/kdb/memory_init/memory/* 1>/dev/null 2>/dev/null &&  cp -a /opt/var/kdb/memory_init/memory/* /var/run/memory
+ touch /tmp/vconf-initialized

diff --git a/proto-meta-Tizen_ivi_3.0/manifest_addon/manifest_addon.xml b/proto-meta-Tizen_ivi_3.0/manifest_addon/manifest_addon.xml
index ead3542..95e14ed 100644 (file)
--- a/proto-meta-Tizen_ivi_3.0/manifest_addon/manifest_addon.xml
+++ b/proto-meta-Tizen_ivi_3.0/manifest_addon/manifest_addon.xml
@@ -5,4 +5,5 @@
   <project name="libslp-tapi" path="framework/telephony/libslp-tapi" revision="refs/tags/2.2_release"/>
   <project name="capi-system-sensor" path="platform/core/api/sensor" revision="submit/tizen/20130710.102607-0-gc002b90828c97d2c1505fbd0448ce9af00cddf9d"/>
   <project name="notification" path="platform/core/api/notification" revision="submit/tizen/20130918.233920-0-g22075fff68729c4decd90672091c3c4075982435"/>
+  <project name="smartcard-service" path="platform/core/connectivity/smartcard-service" revision="accepted/tizen/20130926.204307"/>
 </manifest>
\ No newline at end of file

diff --git a/proto-meta-Tizen_ivi_3.0/specfile-patch/smartcard-service.spec.patch b/proto-meta-Tizen_ivi_3.0/specfile-patch/smartcard-service.spec.patch
deleted file mode 100644 (file)
index a18d228..0000000
--- a/proto-meta-Tizen_ivi_3.0/specfile-patch/smartcard-service.spec.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/packaging/smartcard-service.spec b/packaging/smartcard-service.spec
-index c52045b..c278ff0 100644
---- a/packaging/smartcard-service.spec
-+++ b/packaging/smartcard-service.spec
-@@ -66,7 +66,7 @@ smartcard service.
- 
- 
- %build
--mkdir obj-arm-limux-qnueabi
-+mkdir -p obj-arm-limux-qnueabi
- cd obj-arm-limux-qnueabi
- %cmake .. -DUSE_AUTOSTART=1 # daemon will be started when client makes instance by DBUS
- 

diff --git a/proto-meta-Tizen_ivi_3.0/specfile-patch/system-server.spec.patch b/proto-meta-Tizen_ivi_3.0/specfile-patch/system-server.spec.patch
new file mode 100644 (file)
index 0000000..753cce1
--- /dev/null
+++ b/proto-meta-Tizen_ivi_3.0/specfile-patch/system-server.spec.patch
@@ -0,0 +1,29 @@
+diff --git a/packaging/system-server.spec b/packaging/system-server.spec
+index 1357cd5..ab778e0 100755
+--- a/packaging/system-server.spec
++++ b/packaging/system-server.spec
+@@ -26,19 +26,20 @@ BuildRequires:  pkgconfig(notification)
+ BuildRequires:  pkgconfig(usbutils)
+ BuildRequires:  pkgconfig(device-node)
+ BuildRequires:        gettext
+-Requires(preun): /usr/bin/systemctl
+-Requires(post): /usr/bin/systemctl
++Requires(preun): /bin/systemctl
++Requires(post): /bin/systemctl
+ Requires(post): /usr/bin/vconftool
+-Requires(postun): /usr/bin/systemctl
++Requires(postun): /bin/systemctl
+ 
+ %description
+ Description: System server
+ 
+ %prep
+ %setup -q
+-%cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
++
+ 
+ %build
++%cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
+ cp %{SOURCE2} .
+ make %{?jobs:-j%jobs}
+