From 30c0920e4c2d89322199527ef0f6303db61ffbdf Mon Sep 17 00:00:00 2001
From: Ronan Le Martret <ronan@fridu.net>
Date: Wed, 18 Jun 2014 16:30:08 +0200
Subject: [PATCH] Fix libslp-sensor and sensor files packaging

Change-Id: Ibf5c1554f3b0e02cc778b66ea9631f6b98c460af
Signed-off-by: Ronan Le Martret <ronan@fridu.net>
---
 recipes-tizen/libslp-sensor/libslp-sensor.inc | 61 ++++++++++++------------
 recipes-tizen/sensor/sensor.inc               | 68 ++++++++++++++-------------
 2 files changed, 66 insertions(+), 63 deletions(-)

diff --git a/recipes-tizen/libslp-sensor/libslp-sensor.inc b/recipes-tizen/libslp-sensor/libslp-sensor.inc
index 4a24b41..c6c9ca9 100644
--- a/recipes-tizen/libslp-sensor/libslp-sensor.inc
+++ b/recipes-tizen/libslp-sensor/libslp-sensor.inc
@@ -12,10 +12,10 @@ inherit autotools-brokensep
 BBCLASSEXTEND = ""
 PROVIDES = ""
 
-#PROVIDES by sensor 
+#PROVIDES by sensor
 
 
-#PROVIDES by sensor-dev 
+#PROVIDES by sensor-dev
 
 
 RDEPENDS = ""
@@ -24,7 +24,7 @@ RDEPENDS_sensor-dev += "sensor"
 
 
 DEPENDS = ""
-#DEPENDS of sensor 
+#DEPENDS of sensor
 DEPENDS += "libsf-common"
 DEPENDS_append_class-native = " cmake-native"
 DEPENDS_append_class-target = " cmake-native"
@@ -36,8 +36,8 @@ do_prep() {
  chmod -Rf a+rX,u+w,g-w,o-w ${S}
  #setup -q -n sensor-0.5.27
  cp ${S}/packaging/sensor.manifest ${S}/packaging/sensor-devel.manifest .
- 
- 
+
+
 }
 do_patch_append() {
     bb.build.exec_func('do_prep', d)
@@ -51,15 +51,15 @@ do_compile() {
  LANG=C
  export LANG
  unset DISPLAY
- CFLAGS="-O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables" ; export CFLAGS ; 
- CXXFLAGS="${CXXFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CXXFLAGS ; 
- FFLAGS="${FFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -I%_fmoddir}" ; export FFLAGS ; 
- LD_AS_NEEDED=1; export LD_AS_NEEDED ; 
- 
- 
-   CFLAGS="${CFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CFLAGS ; 
-   CXXFLAGS="${CXXFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CXXFLAGS ; 
-   FFLAGS="${FFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export FFLAGS ; 
+ CFLAGS="-O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables" ; export CFLAGS ;
+ CXXFLAGS="${CXXFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CXXFLAGS ;
+ FFLAGS="${FFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -I%_fmoddir}" ; export FFLAGS ;
+ LD_AS_NEEDED=1; export LD_AS_NEEDED ;
+
+
+   CFLAGS="${CFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CFLAGS ;
+   CXXFLAGS="${CXXFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CXXFLAGS ;
+   FFLAGS="${FFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export FFLAGS ;
    cmake \
          -DCMAKE_VERBOSE_MAKEFILE=ON \
          -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
@@ -70,12 +70,12 @@ do_compile() {
          -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \
          -DCMAKE_SKIP_RPATH:BOOL=ON \
          -DBUILD_SHARED_LIBS:BOOL=ON .
- 
- 
+
+
  make -j16
- 
- 
- 
+
+
+
 }
 
 do_install() {
@@ -84,20 +84,20 @@ do_install() {
  LANG=C
  export LANG
  unset DISPLAY
- rm -rf ${D} 
- mkdir -p ${D} 
- 
- 
+ rm -rf ${D}
+ mkdir -p ${D}
+
+
    oe_runmake \
          DESTDIR=${D} \
          INSTALL_ROOT=${D} \
          BINDIR=${prefix}/bin \
-   install  
-   rm -f ${D}${infodir}/dir 
-   find ${D} -regex ".*\.la$" | xargs rm -f -- 
+   install
+   rm -f ${D}${infodir}/dir
+   find ${D} -regex ".*\.la$" | xargs rm -f --
    find ${D} -regex ".*\.a$" | xargs rm -f --
- 
- 
+
+
 }
 
 pkg_postinst_${PN}() {
@@ -112,6 +112,7 @@ pkg_postrm_${PN}() {
     /sbin/ldconfig
 }
 
+PACKAGES = "${PN}-dbg ${PN}-doc"
 PACKAGES += " sensor "
 PACKAGES += " sensor-dev "
 
@@ -125,8 +126,8 @@ sensor-dev_files += "${prefix}/include/sensor/*.h"
 sensor-dev_files += "${prefix}/lib/libsensor.so"
 sensor-dev_files += "${prefix}/lib/pkgconfig/sensor.pc"
 
-FILES_${PN} = "${sensor_files}"
-FILES_${PN}-dev = "${sensor-dev_files}"
+FILES_sensor = "${sensor_files}"
+FILES_sensor-dev = "${sensor-dev_files}"
 
 PKG_sensor= "sensor"
 PKG_sensor-dev= "sensor-dev"
diff --git a/recipes-tizen/sensor/sensor.inc b/recipes-tizen/sensor/sensor.inc
index edd50b1..84c5fac 100644
--- a/recipes-tizen/sensor/sensor.inc
+++ b/recipes-tizen/sensor/sensor.inc
@@ -12,10 +12,10 @@ inherit autotools-brokensep
 BBCLASSEXTEND = ""
 PROVIDES = ""
 
-#PROVIDES by capi-system-sensor-dev 
+#PROVIDES by capi-system-sensor-dev
 
 
-#PROVIDES by capi-system-sensor 
+#PROVIDES by capi-system-sensor
 
 
 RDEPENDS = ""
@@ -24,7 +24,7 @@ RDEPENDS_capi-system-${PN}-dev += "capi-system-sensor"
 
 
 DEPENDS = ""
-#DEPENDS of capi-system-sensor 
+#DEPENDS of capi-system-sensor
 DEPENDS_append_class-native = " cmake-native"
 DEPENDS_append_class-target = " cmake-native"
 DEPENDS += "libslp-sensor"
@@ -36,9 +36,9 @@ do_prep() {
  chmod -Rf a+rX,u+w,g-w,o-w ${S}
  #setup -q
  cp ${S}/packaging/capi-system-sensor.manifest .
- 
- 
- 
+
+
+
 }
 do_patch_append() {
     bb.build.exec_func('do_prep', d)
@@ -52,16 +52,16 @@ do_compile() {
  LANG=C
  export LANG
  unset DISPLAY
- CFLAGS="-O2 -g" ; export CFLAGS ; 
- CXXFLAGS="${CXXFLAGS:--O2 -g}" ; export CXXFLAGS ; 
- FFLAGS="${FFLAGS:--O2 -g -I%_fmoddir}" ; export FFLAGS ; 
- LD_AS_NEEDED=1; export LD_AS_NEEDED ; 
- 
+ CFLAGS="-O2 -g" ; export CFLAGS ;
+ CXXFLAGS="${CXXFLAGS:--O2 -g}" ; export CXXFLAGS ;
+ FFLAGS="${FFLAGS:--O2 -g -I%_fmoddir}" ; export FFLAGS ;
+ LD_AS_NEEDED=1; export LD_AS_NEEDED ;
+
  MAJORVER=`echo 0.1.17 | awk 'BEGIN {FS="."}{print $1}'`
- 
-   CFLAGS="${CFLAGS:--O2 -g}" ; export CFLAGS ; 
-   CXXFLAGS="${CXXFLAGS:--O2 -g}" ; export CXXFLAGS ; 
-   FFLAGS="${FFLAGS:--O2 -g}" ; export FFLAGS ; 
+
+   CFLAGS="${CFLAGS:--O2 -g}" ; export CFLAGS ;
+   CXXFLAGS="${CXXFLAGS:--O2 -g}" ; export CXXFLAGS ;
+   FFLAGS="${FFLAGS:--O2 -g}" ; export FFLAGS ;
    cmake \
          -DCMAKE_VERBOSE_MAKEFILE=ON \
          -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
@@ -72,12 +72,12 @@ do_compile() {
          -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \
          -DCMAKE_SKIP_RPATH:BOOL=ON \
          -DBUILD_SHARED_LIBS:BOOL=ON . -DFULLVER=0.1.17 -DMAJORVER=${MAJORVER}
- 
- 
+
+
  make -j16
- 
- 
- 
+
+
+
 }
 
 do_install() {
@@ -86,26 +86,26 @@ do_install() {
  LANG=C
  export LANG
  unset DISPLAY
- rm -rf ${D} 
- mkdir -p ${D} 
- 
  rm -rf ${D}
- 
+ mkdir -p ${D}
+
+ rm -rf ${D}
+
    oe_runmake \
          DESTDIR=${D} \
          INSTALL_ROOT=${D} \
          BINDIR=${prefix}/bin \
-   install  
-   rm -f ${D}${infodir}/dir 
-   find ${D} -regex ".*\.la$" | xargs rm -f -- 
+   install
+   rm -f ${D}${infodir}/dir
+   find ${D} -regex ".*\.la$" | xargs rm -f --
    find ${D} -regex ".*\.a$" | xargs rm -f --
- 
+
  mkdir -p ${D}/usr/share/license
  cp LICENSE ${D}/usr/share/license/capi-system-sensor
- 
- 
-}
 
+
+}
+PACKAGES = "${PN}-dbg ${PN}-doc"
 PACKAGES += " capi-system-sensor-dev "
 PACKAGES += " capi-system-sensor "
 
@@ -120,8 +120,10 @@ capi-system-sensor_files = ""
 capi-system-sensor_files += "capi-system-sensor.manifest"
 capi-system-sensor_files += "${prefix}/lib/libcapi-system-sensor.so.*"
 
-FILES_${PN}-dev = "${capi-system-sensor-dev_files}"
-FILES_${PN} = "${capi-system-sensor_files}"
+FILES_capi-system-sensor-dev = "${capi-system-sensor-dev_files}"
+FILES_capi-system-sensor = "${capi-system-sensor_files}"
+
+FILES_sensor = ""
 
 PKG_capi-system-sensor-dev= "capi-system-sensor-dev"
 PKG_capi-system-sensor= "capi-system-sensor"
-- 
2.7.4