meta-tizen: Fix path for tizen-platform-config pkg.

Change-Id: Iafa344419c7e5135986f5199efb1871b9692a5bd
(From meta-tizen rev: 40c342f9d9e6be47c9dbcb796ebb91889efb552c)

Signed-off-by: Ronan Le Martret <ronan@fridu.net>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

diff --git a/meta-tizen/recipes-tizen/tizen-platform-config/tizen-platform-config-extraconf.inc b/meta-tizen/recipes-tizen/tizen-platform-config/tizen-platform-config-extraconf.inc
index c0b4955..4127622 100644 (file)
--- a/meta-tizen/recipes-tizen/tizen-platform-config/tizen-platform-config-extraconf.inc
+++ b/meta-tizen/recipes-tizen/tizen-platform-config/tizen-platform-config-extraconf.inc
@@ -5,11 +5,11 @@ do_configure() {
  sed -i 's@wrappersrcdir=.*@wrappersrcdir=$(PKG_CONFIG_SYSROOT_DIR)$(datadir)@' ${S}/src/Makefile.am
 }
 
-do_install_append_class-native() {
- sed -i "s@=/home@=${D}/home@g" ${D}${sysconfdir}/tizen-platform.conf
- sed -i "s@=/opt@=${D}/opt@g" ${D}${sysconfdir}/tizen-platform.conf
- sed -i "s@=/usr@=${D}/usr@g" ${D}${sysconfdir}/tizen-platform.conf
- sed -i "s@=/etc@=${D}/etc@g" ${D}${sysconfdir}/tizen-platform.conf
- sed -i "s@=/root@=${D}/root@g" ${D}${sysconfdir}/tizen-platform.conf
+do_install_append() {
+ sed -i "s@=/home@=\$SYSROOT/home@g" ${D}${sysconfdir}/tizen-platform.conf
+ sed -i "s@=/opt@=\$SYSROOT/opt@g" ${D}${sysconfdir}/tizen-platform.conf
+ sed -i "s@=/usr@=\$SYSROOT/usr@g" ${D}${sysconfdir}/tizen-platform.conf
+ sed -i "s@=/etc@=\$SYSROOT/etc@g" ${D}${sysconfdir}/tizen-platform.conf
+ sed -i "s@=/root@=\$SYSROOT/root@g" ${D}${sysconfdir}/tizen-platform.conf
 }
 

diff --git a/meta-tizen/recipes-tizen/tizen-platform-config/tizen-platform-config.inc b/meta-tizen/recipes-tizen/tizen-platform-config/tizen-platform-config.inc
index aafb269..fa08150 100644 (file)
--- a/meta-tizen/recipes-tizen/tizen-platform-config/tizen-platform-config.inc
+++ b/meta-tizen/recipes-tizen/tizen-platform-config/tizen-platform-config.inc
@@ -59,11 +59,17 @@ 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 -I%_fmoddir}" ; export FFLAGS ; 
    autotools_do_configure --build=${TARGET_SYS} --host=${HOST_SYS} \
-         --target=${TARGET_SYS} \
+         --target=x86_64-tizen-linux \
          --program-prefix= \
          --prefix=${prefix} \
          --exec-prefix=${prefix} \

diff --git a/meta-tizen/recipes-tizen/tizen-platform-wrapper/files/0001-Add-env-value-SYSROOT-for-root-fs-prefix.patch b/meta-tizen/recipes-tizen/tizen-platform-wrapper/files/0001-Add-env-value-SYSROOT-for-root-fs-prefix.patch
new file mode 100644 (file)
index 0000000..6c61883
--- /dev/null
+++ b/meta-tizen/recipes-tizen/tizen-platform-wrapper/files/0001-Add-env-value-SYSROOT-for-root-fs-prefix.patch
@@ -0,0 +1,91 @@
+From e2f6f775f696bebf5acad2c424bc1fde5ce7e0c0 Mon Sep 17 00:00:00 2001
+From: Ronan Le Martret <ronan@fridu.net>
+Date: Tue, 8 Jul 2014 10:40:21 +0200
+Subject: [PATCH 1/1] Add env value SYSROOT for root fs prefix.
+
+Change-Id: I5c57494317473dcd74c85cbc2bce19a6d68c2739
+Signed-off-by: Ronan Le Martret <ronan@fridu.net>
+---
+ src/foreign.c           |  5 +++++
+ src/foreign.h           |  7 ++++++-
+ src/tzplatform_config.c | 14 +++++++++++++-
+ 3 files changed, 24 insertions(+), 2 deletions(-)
+
+diff --git a/src/foreign.c b/src/foreign.c
+index dab1c21..b700274 100644
+--- a/src/foreign.c
++++ b/src/foreign.c
+@@ -85,6 +85,11 @@ enum fkey foreign( const char *name, size_t length)
+         default: break;
+         }
+     }
++#if _FOREIGN_HAS_(SYSROOT)
++    else if (length == 7 && name[0]=='S' && name[1]=='Y' && name[2]=='S' && name[3]=='R' && name[4]=='O' && name[5]=='O' && name[6]=='T') {
++      return SYSROOT;
++    }
++#endif
+     return _FOREIGN_INVALID_;
+ }
+ 
+diff --git a/src/foreign.h b/src/foreign.h
+index 3c9066f..a918bd8 100644
+--- a/src/foreign.h
++++ b/src/foreign.h
+@@ -31,9 +31,11 @@
+ #define _FOREIGN_MASK_EHOME_  16
+ #define _FOREIGN_MASK_EUID_   32
+ #define _FOREIGN_MASK_EUSER_  64
++#define _FOREIGN_MASK_SYSROOT_  128
+ 
+ #define _FOREIGNS_TO_USE_   ( _FOREIGN_MASK_HOME_  \
+-                            | _FOREIGN_MASK_USER_  )
++                            | _FOREIGN_MASK_USER_  \
++                            | _FOREIGN_MASK_SYSROOT_)
+ 
+ #define _FOREIGN_HAS_(x)  (0 != ((_FOREIGNS_TO_USE_) & (_FOREIGN_MASK_##x##_)))
+ 
+@@ -60,6 +62,9 @@ enum fkey {
+ #if _FOREIGN_HAS_(EUSER)
+     EUSER,
+ #endif
++#if _FOREIGN_HAS_(SYSROOT)
++    SYSROOT,
++#endif
+     _FOREIGN_COUNT_
+ };
+ 
+diff --git a/src/tzplatform_config.c b/src/tzplatform_config.c
+index 735fef6..184ebb3 100644
+--- a/src/tzplatform_config.c
++++ b/src/tzplatform_config.c
+@@ -65,7 +65,8 @@ static inline void unlock() { }
+ 
+ #define _HAS_IDS_   (  _FOREIGN_HAS_(UID)  \
+                     || _FOREIGN_HAS_(EUID) \
+-                    || _FOREIGN_HAS_(GID)  )
++                    || _FOREIGN_HAS_(GID)  \
++                    || _FOREIGN_HAS_(SYSROOT) )
+ 
+ #define _HAS_PWS_   (  _FOREIGN_HAS_(HOME)  \
+                     || _FOREIGN_HAS_(USER)  \
+@@ -292,6 +293,17 @@ static const char *getcb( struct parsing *parsing,
+     size_t offset;
+     struct reading *reading = parsing->data;
+ 
++    if (strncmp( key, "SYSROOT", 7) == 0){
++      char * res_sysroot=getenv("SYSROOT");
++
++      if (res_sysroot == NULL){
++          return "" ;
++      }
++      else{
++          return res_sysroot;
++      }
++    }
++
+     /* try to find a tzplatform variable */
+     vara = hashvar( key, length);
+     if (vara) {
+-- 
+1.8.1.4
+

diff --git a/meta-tizen/recipes-tizen/tizen-platform-wrapper/tizen-platform-wrapper-extraconf.inc b/meta-tizen/recipes-tizen/tizen-platform-wrapper/tizen-platform-wrapper-extraconf.inc
index 317a9e0..16cefca 100644 (file)
--- a/meta-tizen/recipes-tizen/tizen-platform-wrapper/tizen-platform-wrapper-extraconf.inc
+++ b/meta-tizen/recipes-tizen/tizen-platform-wrapper/tizen-platform-wrapper-extraconf.inc
@@ -1,4 +1,8 @@
+SRC_URI += "file://0001-Add-env-value-SYSROOT-for-root-fs-prefix.patch"
+
 do_configure_append_class-native() {
  sed -i "s@\"/etc/tizen-platform.conf\"@\"${sysconfdir}/tizen-platform.conf\"@g" ${S}/src/tzplatform_config.c
  sed -i "s@\"/etc/tizen-platform.conf\"@\"${sysconfdir}/tizen-platform.conf\"@g" ${S}/src/toolbox.c
 }
+
+

diff --git a/meta-tizen/recipes-tizen/tizen-platform-wrapper/tizen-platform-wrapper.inc b/meta-tizen/recipes-tizen/tizen-platform-wrapper/tizen-platform-wrapper.inc
index b3f10b9..fa29e7a 100644 (file)
--- a/meta-tizen/recipes-tizen/tizen-platform-wrapper/tizen-platform-wrapper.inc
+++ b/meta-tizen/recipes-tizen/tizen-platform-wrapper/tizen-platform-wrapper.inc
@@ -42,11 +42,17 @@ 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 -I%_fmoddir}" ; export FFLAGS ; 
    autotools_do_configure --build=${TARGET_SYS} --host=${HOST_SYS} \
-         --target=${TARGET_SYS} \
+         --target=x86_64-tizen-linux \
          --program-prefix= \
          --prefix=${prefix} \
          --exec-prefix=${prefix} \