- rename package sensor.
authorRonan Le Martret <ronan@fridu.net>
Wed, 4 Sep 2013 12:46:46 +0000 (14:46 +0200)
committerRonan Le Martret <ronan@fridu.net>
Wed, 4 Sep 2013 12:46:46 +0000 (14:46 +0200)
23 files changed:
meta-wrt-tizen/conf/layer.conf
meta-wrt-tizen/recipes-wrt/app-core/app-core-depends.inc
meta-wrt-tizen/recipes-wrt/app-core/app-core-rdepends.inc
meta-wrt-tizen/recipes-wrt/capi-system-sensor/capi-system-sensor-depends.inc [moved from meta-wrt-tizen/recipes-wrt/sensor/sensor-depends.inc with 80% similarity]
meta-wrt-tizen/recipes-wrt/capi-system-sensor/capi-system-sensor-extraconf.inc [moved from meta-wrt-tizen/recipes-wrt/sensor/sensor-oe-extraconf.inc with 100% similarity]
meta-wrt-tizen/recipes-wrt/capi-system-sensor/capi-system-sensor-native-extraconf.inc [moved from meta-wrt-tizen/recipes-wrt/sensor/sensor-native-extraconf.inc with 100% similarity]
meta-wrt-tizen/recipes-wrt/capi-system-sensor/capi-system-sensor-native_git.bb [moved from meta-wrt-tizen/recipes-wrt/sensor/sensor-native_git.bb with 76% similarity]
meta-wrt-tizen/recipes-wrt/capi-system-sensor/capi-system-sensor-oe-extraconf.inc [new file with mode: 0644]
meta-wrt-tizen/recipes-wrt/capi-system-sensor/capi-system-sensor-rdepends.inc [new file with mode: 0644]
meta-wrt-tizen/recipes-wrt/capi-system-sensor/capi-system-sensor-rprovides.inc [moved from meta-wrt-tizen/recipes-wrt/sensor/sensor-rprovides.inc with 100% similarity]
meta-wrt-tizen/recipes-wrt/capi-system-sensor/capi-system-sensor.inc [moved from meta-wrt-tizen/recipes-wrt/sensor/sensor.inc with 88% similarity]
meta-wrt-tizen/recipes-wrt/capi-system-sensor/capi-system-sensor_git.bb [moved from meta-wrt-tizen/recipes-wrt/sensor/sensor_git.bb with 65% similarity]
meta-wrt-tizen/recipes-wrt/dlog/dlog-rdepends.inc
meta-wrt-tizen/recipes-wrt/dlog/dlog.inc
meta-wrt-tizen/recipes-wrt/privacy-manager/privacy-manager.inc
meta-wrt-tizen/recipes-wrt/sensor/sensor-extraconf.inc [deleted file]
meta-wrt-tizen/recipes-wrt/sensor/sensor-rdepends.inc [deleted file]
meta-wrt-tizen/recipes-wrt/webkit-efl/webkit-efl-depends.inc
meta-wrt-tizen/recipes-wrt/wrt-plugins-tizen/wrt-plugins-tizen-depends.inc
proto-meta-Tizen_ivi_3.0/.spec2yoctorc
proto-meta-Tizen_ivi_3.0/manifest_addon/manifest_addon.xml
proto-meta-Tizen_ivi_3.0/specfile-initial/capi-system-sensor/packaging/capi-system-sensor.spec [new file with mode: 0644]
proto-meta-Tizen_ivi_3.0/specfile-initial/dlog/packaging/dlog.spec

index b8b7aea..052a8d4 100644 (file)
@@ -17,4 +17,3 @@ BBFILES := "${BBFILES} \
 LICENSE_FLAGS_WHITELIST = "commercial"
 
 PREFERRED_PROVIDER_jpeg = "libjpeg-turbo"
-PREFERRED_PROVIDER_sensor = "sensor"
\ No newline at end of file
index f392894..48ed1a0 100644 (file)
@@ -6,7 +6,7 @@ DEPENDS += "librua"
 DEPENDS += "libx11"
 DEPENDS += "dlog"
 DEPENDS += "glib-2.0"
-DEPENDS += "libslp-sensor"
 DEPENDS += "elementary"
 DEPENDS += "ecore"
+DEPENDS += "sensor"
 DEPENDS += "vconf"
index 378dc77..87a678b 100644 (file)
@@ -4,10 +4,10 @@ RDEPENDS_${PN}-efl += "pkgconfig"
 
 #RDEPENDS of app-core-common-devel (${PN}-common-devel)
 RDEPENDS_${PN}-common-devel += "elementary"
-RDEPENDS_${PN}-common-devel += "aul-1"
+RDEPENDS_${PN}-common-devel += "sensor"
 RDEPENDS_${PN}-common-devel += "app-core-common"
 RDEPENDS_${PN}-common-devel += "vconf"
-RDEPENDS_${PN}-common-devel += "libslp-sensor"
+RDEPENDS_${PN}-common-devel += "aul-1"
 
 #RDEPENDS of app-core-common (${PN}-common)
 RDEPENDS_${PN}-common += "pkgconfig"
@@ -1,6 +1,6 @@
 DEPENDS = ""
 #DEPENDS of capi-system-sensor 
+DEPENDS += "sensor"
 DEPENDS += "cmake-native"
-DEPENDS += "libslp-sensor"
-DEPENDS += "dlog"
 DEPENDS += "common"
+DEPENDS += "dlog"
@@ -1,4 +1,4 @@
-require sensor.inc
+require capi-system-sensor.inc
 
 PRIORITY = "9"
 
@@ -9,5 +9,5 @@ S = "${WORKDIR}/git"
 LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
 SRC_URI += "git://review.tizen.org/platform/core/api/sensor;protocol=ssh;tag=submit/tizen/20130710.102607"
-require sensor-native-extraconf.inc
+require capi-system-sensor-native-extraconf.inc
 
diff --git a/meta-wrt-tizen/recipes-wrt/capi-system-sensor/capi-system-sensor-oe-extraconf.inc b/meta-wrt-tizen/recipes-wrt/capi-system-sensor/capi-system-sensor-oe-extraconf.inc
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/meta-wrt-tizen/recipes-wrt/capi-system-sensor/capi-system-sensor-rdepends.inc b/meta-wrt-tizen/recipes-wrt/capi-system-sensor/capi-system-sensor-rdepends.inc
new file mode 100644 (file)
index 0000000..d54a847
--- /dev/null
@@ -0,0 +1,5 @@
+RDEPENDS = ""
+#RDEPENDS of capi-system-sensor-devel (${PN}-devel)
+RDEPENDS_${PN}-devel += "capi-system-sensor"
+
+
@@ -29,6 +29,6 @@ inherit tizenBuildUtils
 
 S = "${WORKDIR}/git"
 
-require sensor-rdepends.inc
-require sensor-depends.inc
-require sensor-extraconf.inc
+require capi-system-sensor-rdepends.inc
+require capi-system-sensor-depends.inc
+require capi-system-sensor-extraconf.inc
@@ -1,10 +1,10 @@
-require sensor.inc
-require sensor-rprovides.inc
+require capi-system-sensor.inc
+require capi-system-sensor-rprovides.inc
 
 PRIORITY = "10"
 
 LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
 SRC_URI += "git://review.tizen.org/platform/core/api/sensor;protocol=ssh;tag=submit/tizen/20130710.102607"
-require sensor-oe-extraconf.inc
+require capi-system-sensor-oe-extraconf.inc
 
index fe61670..5390d9d 100644 (file)
@@ -1,8 +1,4 @@
 RDEPENDS = ""
-#RDEPENDS of dlog (${PN})
-RDEPENDS_${PN} += "coreutils"
-RDEPENDS_${PN} += "vconf"
-
 #RDEPENDS of dlogutil (${PN}util)
 RDEPENDS_${PN}util += "libdlog"
 RDEPENDS_${PN}util += "systemd"
index 96ad8e8..6bea034 100644 (file)
@@ -1,7 +1,7 @@
 DESCRIPTION = "Logging service"
 HOMEPAGE = "http://nohomepage.org"
 SECTION = "System/Libraries"
-LICENSE = "Apache"
+LICENSE = "Apache-2.0"
 
 PROVIDES = ""
 
@@ -12,19 +12,12 @@ PACKAGES += "libdlog-devel"
 
 libdlog_files = ""
 libdlog_files += "dlog.manifest"
-libdlog_files += "/usr/lib/libdlog.so.0"
-libdlog_files += "/usr/lib/libdlog.so.0.0.0"
+libdlog_files += "/usr/lib/libdlog.so.*"
 
 dlogutil_files = ""
 dlogutil_files += "dlog.manifest"
-dlogutil_files += "/usr/share/license/dlog"
-dlogutil_files += "LICENSE.APLv2"
-dlogutil_files += "/etc/rc.d/init.d/dlog.sh"
-dlogutil_files += "/etc/rc.d/rc3.d/S05dlog"
-dlogutil_files += "/lib/systemd/system/tizen-debug-level.service"
 dlogutil_files += "/lib/systemd/system/dlog-main.service"
 dlogutil_files += "/lib/systemd/system/dlog-radio.service"
-dlogutil_files += "/lib/systemd/system/basic.target.wants/tizen-debug-level.service"
 dlogutil_files += "/lib/systemd/system/multi-user.target.wants/dlog-main.service"
 dlogutil_files += "/lib/systemd/system/multi-user.target.wants/dlog-radio.service"
 
index 0b8214c..a2f78cc 100644 (file)
@@ -22,7 +22,7 @@ privacy-manager-client_files += "/etc/package-manager/parserlib/libprivileges.so
 privacy-manager-server_files = ""
 privacy-manager-server_files += "packaging/privacy-manager-server.manifest"
 privacy-manager-server_files += "/usr/bin/*"
-privacy-manager-server_files += "/usr/lib/systemd/*"
+privacy-manager-server_files += "/lib/systemd/system/*"
 privacy-manager-server_files += "/opt/dbspace/.privacylist.db"
 
 capi-security-privacy-manager-devel_files = ""
diff --git a/meta-wrt-tizen/recipes-wrt/sensor/sensor-extraconf.inc b/meta-wrt-tizen/recipes-wrt/sensor/sensor-extraconf.inc
deleted file mode 100644 (file)
index 17ea556..0000000
+++ /dev/null
@@ -1 +0,0 @@
-inherit tizen_cmake
\ No newline at end of file
diff --git a/meta-wrt-tizen/recipes-wrt/sensor/sensor-rdepends.inc b/meta-wrt-tizen/recipes-wrt/sensor/sensor-rdepends.inc
deleted file mode 100644 (file)
index e6851dd..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-RDEPENDS = ""
-#RDEPENDS of capi-system-sensor-devel (capi-system-${PN}-devel)
-RDEPENDS_capi-system-${PN}-devel += "capi-system-sensor"
-
-
index c15f677..e4b4999 100644 (file)
@@ -29,7 +29,6 @@ DEPENDS += "libxt"
 DEPENDS += "libsvi"
 DEPENDS += "sqlite3"
 DEPENDS += "libxext"
-DEPENDS += "sensor"
 DEPENDS += "icu"
 DEPENDS += "flex"
 DEPENDS += "edbus"
@@ -40,6 +39,7 @@ DEPENDS += "evas"
 DEPENDS += "eeze"
 DEPENDS += "glib-2.0"
 DEPENDS += "media-server"
+DEPENDS += "capi-system-sensor"
 DEPENDS += "device"
 DEPENDS += "ecore"
 DEPENDS += "mesa"
index af76394..1583111 100644 (file)
@@ -10,7 +10,6 @@ DEPENDS += "pkgconfig(capi-content-media-content)"
 DEPENDS += "pkgconfig(smartcard-service-common)"
 #Replace "DEPENDS" on gettext by "inherit gettext"
 inherit gettext
-DEPENDS += "libslp-sensor"
 DEPENDS += "pkgconfig(smartcard-service)"
 DEPENDS += "runtime-info"
 DEPENDS += "pkgconfig(email-service)"
@@ -40,6 +39,7 @@ DEPENDS += "pkgmgr-info"
 DEPENDS += "pkgconfig(capi-web-favorites)"
 DEPENDS += "slp-pkgmgr"
 DEPENDS += "webkit-efl"
+DEPENDS += "capi-system-sensor"
 DEPENDS += "device"
 DEPENDS += "pkgconfig(capi-location-route)"
 DEPENDS += "libnet-client"
index a555f0b..9404f72 100644 (file)
@@ -19,7 +19,7 @@ manifest=tizen_common_3.0_manifest, wrt_addon
 arch=x86_64
 recipes_dir_sources=${HOME}/yoctoTizen/meta-wrt-tizen/recipes-wrt
 blacklist_autoreconf=tizen_ivi_autoreconf
-whitelist=wrt, wrt-commons, wrt-installer, wrt-plugins-common, wrt-plugins-tizen, wrt-security, system-settings, url-download, ui-gadget-1, slp-pkgmgr, libiri, dlog, libhaptic,haptic, cert-svc, notification, aul-1, secure-storage, libprivilege-control, app-manager, app-svc, smack, bundle,  app-checker, libslp-utilx, app-core, app2sd, libslp-sysman, vconf, common, libslp-sensor,sensor, libcryptsvc, librua, xdgmime, pkgmgr-info, ail, application, runtime-info, vconf-internal-keys,alarm-manager, security-server, libslp-pm, libslp-db-util, libslp-tapi, heynoti, iniparser, libtbm, libdri2,com-core, libdevice-node, xmlsec1, dukgenerator, devman, download-provider, connection, libnet-client, libwifi-direct, privacy-manager, shortcut, package-manager, geocoder, libslp-location, webkit-efl,libsf-common, network-info, libmm-utility, gtest, power, location-manager, device, media-server, tts, libmm-common, libmm-session, libmm-player, libmm-log, libsvi, leveldb,libmm-sound, drm-client, libmm-ta, audio-session-manager, avsystem,alsa-scenario-0.2
+whitelist=wrt, wrt-commons, wrt-installer, wrt-plugins-common, wrt-plugins-tizen, wrt-security, system-settings, url-download, ui-gadget-1, slp-pkgmgr, libiri, dlog, libhaptic,haptic, cert-svc, notification, aul-1, secure-storage, libprivilege-control, app-manager, app-svc, smack, bundle,  app-checker, libslp-utilx, app-core, app2sd, libslp-sysman, vconf, common, libslp-sensor,capi-system-sensor, libcryptsvc, librua, xdgmime, pkgmgr-info, ail, application, runtime-info, vconf-internal-keys,alarm-manager, security-server, libslp-pm, libslp-db-util, libslp-tapi, heynoti, iniparser, libtbm, libdri2,com-core, libdevice-node, xmlsec1, dukgenerator, devman, download-provider, connection, libnet-client, libwifi-direct, privacy-manager, shortcut, package-manager, geocoder, libslp-location, webkit-efl,libsf-common, network-info, libmm-utility, gtest, power, location-manager, device, media-server, tts, libmm-common, libmm-session, libmm-player, libmm-log, libsvi, leveldb,libmm-sound, drm-client, libmm-ta, audio-session-manager, avsystem,alsa-scenario-0.2
 provided-extra=wrt-provided-extra
 
 [substitute]
@@ -418,7 +418,7 @@ libmm-player=pkgconfig(mm-player)
 libmm-log=pkgconfig(mm-log)
 libjpeg-turbo=libjpeg-turbo-devel
 gstreamer1.0=pkgconfig(gstreamer-1.0)
-sensor=pkgconfig(capi-system-sensor)
+capi-system-sensor=pkgconfig(capi-system-sensor)
 enchant=pkgconfig(enchant)
 cairo=pkgconfig(cairo)
 libsvi=pkgconfig(feedback)
index fcd1550..15d95fd 100644 (file)
@@ -4,4 +4,5 @@
   <default remote="tizen-gerrit"/>
   <project name="connection" path="platform/core/api/connection" revision="refs/tags/submit/tizen/20130710.102326"/> 
   <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"/>
 </manifest>
\ No newline at end of file
diff --git a/proto-meta-Tizen_ivi_3.0/specfile-initial/capi-system-sensor/packaging/capi-system-sensor.spec b/proto-meta-Tizen_ivi_3.0/specfile-initial/capi-system-sensor/packaging/capi-system-sensor.spec
new file mode 100644 (file)
index 0000000..5cb956e
--- /dev/null
@@ -0,0 +1,59 @@
+Name:       capi-system-sensor
+Summary:    A Sensor library in TIZEN C API
+Version:    0.1.17
+Release:    1
+Group:      framework/system
+License:    Apache 2.0
+Source0:    %{name}-%{version}.tar.gz
+Source1001:    capi-system-sensor.manifest
+BuildRequires:  cmake
+BuildRequires:  pkgconfig(dlog)
+BuildRequires:  pkgconfig(sensor)
+BuildRequires:  pkgconfig(capi-base-common)
+
+%description
+
+
+%package devel
+Summary:  A Sensor library in TIZEN C API (Development)
+Group:    framework/system
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+
+
+
+%prep
+%setup -q
+cp %{SOURCE1001} .
+
+
+%build
+MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
+%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
+
+
+make %{?jobs:-j%jobs}
+
+%install
+rm -rf %{buildroot}
+%make_install
+
+mkdir -p %{buildroot}/usr/share/license
+cp LICENSE %{buildroot}/usr/share/license/%{name}
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+
+%files
+%manifest %{name}.manifest
+%{_libdir}/libcapi-system-sensor.so.*
+
+%files devel
+%manifest %{name}.manifest
+%{_includedir}/system/sensors.h
+%{_libdir}/pkgconfig/*.pc
+%{_libdir}/libcapi-system-sensor.so
+/usr/share/license/%{name}
index ea0c435..183e06c 100755 (executable)
@@ -1,32 +1,27 @@
 Name:       dlog
 Summary:    Logging service
 Version:    0.4.1
-Release:    5
+Release:    15
 Group:      System/Libraries
-License:    Apache License, Version 2.0
+License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 Source101:  dlog-main.service
 Source102:  dlog-radio.service
 Source103:  dlog.manifest
-Source104:  tizen-debug-level.service
 
 BuildRequires: pkgconfig(libsystemd-journal)
-Requires(post): /usr/bin/vconftool
-Requires(post): coreutils
 
 %description
 dlog API library
 
 %package -n libdlog
 Summary:    Logging service dlog API
-Group:      Development/Libraries
 
 %description -n libdlog
 dlog API library
 
 %package -n libdlog-devel
 Summary:    Logging service dlog API
-Group:      Development/Libraries
 Requires:   lib%{name} = %{version}-%{release}
 
 %description -n libdlog-devel
@@ -35,7 +30,6 @@ dlog API library
 
 %package -n dlogutil
 Summary:    Print log data to the screen
-Group:      Development/Libraries
 Requires:   lib%{name} = %{version}-%{release}
 Requires(post): /usr/bin/systemctl
 Requires(postun): /usr/bin/systemctl
@@ -44,46 +38,31 @@ Requires(preun): /usr/bin/systemctl
 %description -n dlogutil
 Utilities for print log data
 
-
 %prep
 %setup -q
 cp %{SOURCE103} .
 
-
 %build
 %autogen --disable-static
-%configure --disable-static
+%configure --disable-static --without-systemd-journal
 make %{?jobs:-j%jobs}
 
 %install
-rm -rf %{buildroot}
 %make_install
-mkdir -p %{buildroot}/opt/etc/dlog
-cp %{_builddir}/%{name}-%{version}/.dloglevel %{buildroot}/opt/etc/dlog/.dloglevel
-mkdir -p %{buildroot}/etc/profile.d/
-cp %{_builddir}/%{name}-%{version}/tizen_platform_env.sh %{buildroot}/etc/profile.d/tizen_platform_env.sh
+mkdir -p %{buildroot}/opt/etc/dump.d/default.d
+cp %{_builddir}/%{name}-%{version}/dlog_dump.sh %{buildroot}/opt/etc/dump.d/default.d/dlog_dump.sh
 mkdir -p %{buildroot}/usr/bin/
 cp %{_builddir}/%{name}-%{version}/dlogctrl %{buildroot}/usr/bin/dlogctrl
 
-mkdir -p %{buildroot}/%{_sysconfdir}/rc.d/rc3.d
-rm -f %{buildroot}/%{_sysconfdir}/etc/rc.d/rc3.d/S05dlog
-ln -s ../init.d/dlog.sh %{buildroot}/%{_sysconfdir}/rc.d/rc3.d/S05dlog
-
 mkdir -p %{buildroot}%{_unitdir}/basic.target.wants
 mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
 
 install -m 0644 %SOURCE101 %{buildroot}%{_unitdir}
 install -m 0644 %SOURCE102 %{buildroot}%{_unitdir}
-install -m 0644 %SOURCE104 %{buildroot}%{_unitdir}
 
 ln -s ../dlog-main.service %{buildroot}%{_unitdir}/multi-user.target.wants/dlog-main.service
 ln -s ../dlog-radio.service %{buildroot}%{_unitdir}/multi-user.target.wants/dlog-radio.service
-ln -s ../tizen-debug-level.service %{buildroot}%{_unitdir}/basic.target.wants/tizen-debug-level.service
 
-mkdir -p %{buildroot}/usr/share/license
-cp LICENSE.APLv2 %{buildroot}/usr/share/license/%{name}
-
-mkdir -p %{buildroot}/opt/etc/dlog
 
 %preun -n dlogutil
 if [ $1 == 0 ]; then
@@ -102,30 +81,23 @@ fi
 systemctl daemon-reload
 
 %post -n libdlog -p /sbin/ldconfig
+
 %postun -n libdlog -p /sbin/ldconfig
 
 %files  -n dlogutil
 %manifest %{name}.manifest
-/usr/share/license/%{name}
-%doc LICENSE.APLv2
-%attr(755,root,root) /opt/etc/dlog/.dloglevel
-%attr(755,root,root) /etc/profile.d/tizen_platform_env.sh
+%license LICENSE.APLv2
+%attr(755,root,root) /opt/etc/dump.d/default.d/dlog_dump.sh
 %attr(755,root,app_logging) %{_bindir}/dlogutil
 %attr(755,root,app_logging) %{_bindir}/dlogctrl
-%{_sysconfdir}/rc.d/init.d/dlog.sh
-%{_sysconfdir}/rc.d/rc3.d/S05dlog
-%{_unitdir}/tizen-debug-level.service
 %{_unitdir}/dlog-main.service
 %{_unitdir}/dlog-radio.service
-%{_unitdir}/basic.target.wants/tizen-debug-level.service
 %{_unitdir}/multi-user.target.wants/dlog-main.service
 %{_unitdir}/multi-user.target.wants/dlog-radio.service
-%attr(775,root,app_logging) %dir /opt/etc/dlog
 
 %files  -n libdlog
 %manifest %{name}.manifest
-%{_libdir}/libdlog.so.0
-%{_libdir}/libdlog.so.0.0.0
+%{_libdir}/libdlog.so.*
 
 %files -n libdlog-devel
 %manifest %{name}.manifest