Modify to be buildable for emulator(32-bit)

1. Building scripts for emulator are modified that can be used by the
   gbs build.
2. Emulator informations are added to .xml files of hal:
   * To make rootstrap for emulator(32-bit) include hal files, emulator
     section is added to the corresponding .xml files.

Change-Id: I919e804762ab015906ed57d94b3fb4a2d7b16e73
Signed-off-by: SangYoun Kwak <sy.kwak@samsung.com>

diff --git a/generate_rootstrap.sh b/generate_rootstrap.sh
index 105134fa0f471c1fa055c9cffee9a61adab3f200..8f48d09a2e8c5c9c4cb086f7620b827695c77025 100755 (executable)
--- a/generate_rootstrap.sh
+++ b/generate_rootstrap.sh
@@ -12,7 +12,7 @@ function prepare_generation {
        sed -i 's@^export GBS_BUILDROOT=""@export GBS_BUILDROOT="'${copy_dest}'"@' "./rs-config"
 }
 
-function generate_rootstrap_i586 {
+function generate_rootstrap_ix86 {
        ./script/convert32.sh
        if [[ $? -ne 0 ]]; then
                echo "Failed to convert .xml files into 32-bit."
@@ -88,8 +88,8 @@ function generate_rootstrap {
                        generate_rootstrap_aarch64
                        return $?
                        ;;
-               "i586")
-                       generate_rootstrap_i586
+               "i386")
+                       generate_rootstrap_ix86
                        return $?
                        ;;
                "x86_64")

diff --git a/make_rootstrap.sh b/make_rootstrap.sh
index e92e4648ff64a74093834fffdb0f58774c850565..b49b2d7b688f3479ad166f06261bef9d0ec460dc 100755 (executable)
--- a/make_rootstrap.sh
+++ b/make_rootstrap.sh
@@ -326,9 +326,9 @@ if [ "$OPT_TARGET" = true ]; then
 
        if [ "$INTERNAL" = false ]; then
                echo "remove Non-Public EFL API"
-               $CMD_API_FILTER .target>/dev/null #EFL filter
+               $CMD_API_FILTER ${GBS_BUILDROOT} > /dev/null #EFL filter
                echo "remove Non-Public GDBUS API"
-               $CMD_API_GDBUS_FILTER .target>/dev/null #GDBUS filter
+               $CMD_API_GDBUS_FILTER ${GBS_BUILDROOT} > /dev/null #GDBUS filter
        fi
        #echo "remove Public GDBUS API"
        #$CMD_API_GDBUS_FILTER .target>/dev/null #GDBUS filter
@@ -354,10 +354,10 @@ if [ "$OPT_EMULATOR" = true ]; then
        remove_dir ${DIR_TMP} ${DIR_EMULATOR}
        callRootstrapGen emulator ${RPM_PKG_SVR_EMULATOR} ${BASE_PKG_SVR_EMULATOR}
 
-       log "[INFO] Postscript ${DIR_EMULATOR}";
+       log "[INFO] Postscript ${GBS_BUILDROOT}";
 
-       mv ${DIR_EMULATOR}/usr/include/asm-x86 ${DIR_EMULATOR}/usr/include/asm
-       mv ${DIR_EMULATOR}/usr/include/base/deprecated/* ${DIR_EMULATOR}/usr/include/base/
+       mv ${GBS_BUILDROOT}/usr/include/asm-x86 ${GBS_BUILDROOT}/usr/include/asm
+       mv ${GBS_BUILDROOT}/usr/include/base/deprecated/* ${GBS_BUILDROOT}/usr/include/base/
 
        if [ "$INTERNAL" = false ]; then
                echo "remove Non-Public EFL API"
@@ -368,16 +368,16 @@ if [ "$OPT_EMULATOR" = true ]; then
 
        if [ "$INTERNAL" = true ]; then
                log "[INFO] Skip .. removing dlog-internal.h"
-               find ${DIR_EMULATOR} -name "dlog.h" -exec perl -pi -e 's/#include\ \"dlog-internal\.h\"//g' {} \;
+               find ${GBS_BUILDROOT} -name "dlog.h" -exec perl -pi -e 's/#include\ \"dlog-internal\.h\"//g' {} \;
        else
-               find ${DIR_EMULATOR} -name "dlog.h" -exec perl -pi -e 's/#include\ \"dlog-internal\.h\"//g' {} \;
+               find ${GBS_BUILDROOT} -name "dlog.h" -exec perl -pi -e 's/#include\ \"dlog-internal\.h\"//g' {} \;
        fi
 
-       if [ ! -d "${DIR_EMULATOR}/usr/lib" ]; then
-               mkdir -p ${DIR_EMULATOR}/usr/lib
+       if [ ! -d "${GBS_BUILDROOT}/usr/lib" ]; then
+               mkdir -p ${GBS_BUILDROOT}/usr/lib
        fi
 
-       for FILE in $(find ${DIR_EMULATOR} -name "*.so.*mobile");
+       for FILE in $(find ${GBS_BUILDROOT} -name "*.so.*mobile");
        do
                mv ${FILE} ${FILE%.mobile};
        done;

diff --git a/packaging/hal-rootstrap.spec b/packaging/hal-rootstrap.spec
index a3de9985139bcee09ea00bfa0412f8059147eeb2..4d673a387a22f1f0eab2fb1e68d5b4b6d5582477 100644 (file)
--- a/packaging/hal-rootstrap.spec
+++ b/packaging/hal-rootstrap.spec
@@ -12,7 +12,7 @@ Release:      1
 #Group: 
 License:       Apache-2.0
 Source0:       %{name}-%{version}.tar.gz
-ExclusiveArch:  %{arm}
+ExclusiveArch:  %{arm} %{ix86}
 
 BuildRequires: cmake
 BuildRequires: xmlstarlet

diff --git a/rs_resource/HAL/hal-api-audio-rs.xml b/rs_resource/HAL/hal-api-audio-rs.xml
index 9f10d9f0f6eb4c2b2ff7bca6ee9f31e6e6771a1f..db90dd5192e97444b981d4bbd008949cda216ec9 100644 (file)
--- a/rs_resource/HAL/hal-api-audio-rs.xml
+++ b/rs_resource/HAL/hal-api-audio-rs.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0"?>
 <rootstrap name="hal-api-audio">
   <email></email>
+  <emulator>
+    <rpm accept="hal-api-audio" arch="i686"/>
+    <rpm accept="hal-api-audio-devel" arch="i686"/>
+  </emulator>
   <target>
     <rpm accept="hal-api-audio" arch="armv7l"/>
     <rpm accept="hal-api-audio-devel" arch="armv7l"/>

diff --git a/rs_resource/HAL/hal-api-bluetooth-rs.xml b/rs_resource/HAL/hal-api-bluetooth-rs.xml
index d3a63e3489e86559dfc89f33df98d9f9ff583a6d..567e6cf454e30afb5eda02d0d4d918272fff41c2 100644 (file)
--- a/rs_resource/HAL/hal-api-bluetooth-rs.xml
+++ b/rs_resource/HAL/hal-api-bluetooth-rs.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0"?>
 <rootstrap name="hal-api-bluetooth">
   <email></email>
+  <emulator>
+    <rpm accept="hal-api-bluetooth" arch="i686"/>
+    <rpm accept="hal-api-bluetooth-devel" arch="i686"/>
+  </emulator>
   <target>
     <rpm accept="hal-api-bluetooth" arch="armv7l"/>
     <rpm accept="hal-api-bluetooth-devel" arch="armv7l"/>

diff --git a/rs_resource/HAL/hal-api-camera-rs.xml b/rs_resource/HAL/hal-api-camera-rs.xml
index 2b5eaaa7ed6af97ee49e457b4936e9e93d2b41be..a5f59d6427a704e29a8cfb572eea989f3a89e530 100644 (file)
--- a/rs_resource/HAL/hal-api-camera-rs.xml
+++ b/rs_resource/HAL/hal-api-camera-rs.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0"?>
 <rootstrap name="hal-api-camera">
   <email></email>
+  <emulator>
+    <rpm accept="hal-api-camera" arch="i686"/>
+    <rpm accept="hal-api-camera-devel" arch="i686"/>
+  </emulator>
   <target>
     <rpm accept="hal-api-camera" arch="armv7l"/>
     <rpm accept="hal-api-camera-devel" arch="armv7l"/>

diff --git a/rs_resource/HAL/hal-api-common-rs.xml b/rs_resource/HAL/hal-api-common-rs.xml
index 7ff4b59b3f827b8e172b7aa9aa531e43249ed81e..0b40a5c5ce4679154498bfe514ae69496e1f9793 100644 (file)
--- a/rs_resource/HAL/hal-api-common-rs.xml
+++ b/rs_resource/HAL/hal-api-common-rs.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0"?>
 <rootstrap name="hal-api-common">
   <email></email>
+  <emulator>
+    <rpm accept="hal-api-common" arch="i686"/>
+    <rpm accept="hal-api-common-devel" arch="i686"/>
+  </emulator>
   <target>
     <rpm accept="hal-api-common" arch="armv7l"/>
     <rpm accept="hal-api-common-devel" arch="armv7l"/>

diff --git a/rs_resource/HAL/hal-api-device-rs.xml b/rs_resource/HAL/hal-api-device-rs.xml
index d841d2047f3188468b98f1d903c1b700ef3ed6fd..af4556a96df40a724fccf8d54d000defbbf3e836 100644 (file)
--- a/rs_resource/HAL/hal-api-device-rs.xml
+++ b/rs_resource/HAL/hal-api-device-rs.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0"?>
 <rootstrap name="hal-api-device">
   <email></email>
+  <emulator>
+    <rpm accept="hal-api-device" arch="i686"/>
+    <rpm accept="hal-api-device-devel" arch="i686"/>
+  </emulator>
   <target>
     <rpm accept="hal-api-device" arch="armv7l"/>
     <rpm accept="hal-api-device-devel" arch="armv7l"/>

diff --git a/rs_resource/HAL/hal-api-location-rs.xml b/rs_resource/HAL/hal-api-location-rs.xml
index 4b8d764ac26de0e8f9a4d5bcd0cd7befb88e91e0..f6eda58630d8beab26b99719a8a2ec2238146765 100644 (file)
--- a/rs_resource/HAL/hal-api-location-rs.xml
+++ b/rs_resource/HAL/hal-api-location-rs.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0"?>
 <rootstrap name="hal-api-location">
   <email></email>
+  <emulator>
+    <rpm accept="hal-api-location" arch="i686"/>
+    <rpm accept="hal-api-location-devel" arch="i686"/>
+  </emulator>
   <target>
     <rpm accept="hal-api-location" arch="armv7l"/>
     <rpm accept="hal-api-location-devel" arch="armv7l"/>

diff --git a/rs_resource/HAL/hal-api-nfc-rs.xml b/rs_resource/HAL/hal-api-nfc-rs.xml
index 912d284033198f2df8dbdea979163cf17f8f0981..0003f544095d81c6849f9c62001befa1de32bcc6 100644 (file)
--- a/rs_resource/HAL/hal-api-nfc-rs.xml
+++ b/rs_resource/HAL/hal-api-nfc-rs.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0"?>
 <rootstrap name="hal-api-nfc">
   <email></email>
+  <emulator>
+    <rpm accept="hal-api-nfc" arch="i686"/>
+    <rpm accept="hal-api-nfc-devel" arch="i686"/>
+  </emulator>
   <target>
     <rpm accept="hal-api-nfc" arch="armv7l"/>
     <rpm accept="hal-api-nfc-devel" arch="armv7l"/>

diff --git a/rs_resource/HAL/hal-api-power-rs.xml b/rs_resource/HAL/hal-api-power-rs.xml
index 6f52431438085e7640afa7c627bbac133bfae725..80785d151ad24c932b56e40ca39b9d11e32b7268 100644 (file)
--- a/rs_resource/HAL/hal-api-power-rs.xml
+++ b/rs_resource/HAL/hal-api-power-rs.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0"?>
 <rootstrap name="hal-api-power">
   <email></email>
+  <emulator>
+    <rpm accept="hal-api-power" arch="i686"/>
+    <rpm accept="hal-api-power-devel" arch="i686"/>
+  </emulator>
   <target>
     <rpm accept="hal-api-power" arch="armv7l"/>
     <rpm accept="hal-api-power-devel" arch="armv7l"/>

diff --git a/rs_resource/HAL/hal-api-radio-rs.xml b/rs_resource/HAL/hal-api-radio-rs.xml
index 4ab59e3c7f9fcec806d98d0db39f97076178cc13..f0ad3ae596b717d59a0f46eb69375965741d0385 100644 (file)
--- a/rs_resource/HAL/hal-api-radio-rs.xml
+++ b/rs_resource/HAL/hal-api-radio-rs.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0"?>
 <rootstrap name="hal-api-radio">
   <email></email>
+  <emulator>
+    <rpm accept="hal-api-radio" arch="i686"/>
+    <rpm accept="hal-api-radio-devel" arch="i686"/>
+  </emulator>
   <target>
     <rpm accept="hal-api-radio" arch="armv7l"/>
     <rpm accept="hal-api-radio-devel" arch="armv7l"/>

diff --git a/rs_resource/HAL/hal-api-sensor-rs.xml b/rs_resource/HAL/hal-api-sensor-rs.xml
index 390d5f1a550c71a0991d8994706a62bc235b4087..50d0dc5375b5e2dec9e38c5b79b46dfd2cbe3611 100644 (file)
--- a/rs_resource/HAL/hal-api-sensor-rs.xml
+++ b/rs_resource/HAL/hal-api-sensor-rs.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0"?>
 <rootstrap name="hal-api-sensor">
   <email></email>
+  <emulator>
+    <rpm accept="hal-api-sensor" arch="i686"/>
+    <rpm accept="hal-api-sensor-devel" arch="i686"/>
+  </emulator>
   <target>
     <rpm accept="hal-api-sensor" arch="armv7l"/>
     <rpm accept="hal-api-sensor-devel" arch="armv7l"/>

diff --git a/rs_resource/HAL/hal-api-tbm-rs.xml b/rs_resource/HAL/hal-api-tbm-rs.xml
index e9cd3a6a18be2391f725d303bf1b49a7accc1b71..7c19811e0dfbdcc9691f49e81b2b7cd42c4aa31e 100644 (file)
--- a/rs_resource/HAL/hal-api-tbm-rs.xml
+++ b/rs_resource/HAL/hal-api-tbm-rs.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0"?>
 <rootstrap name="hal-api-tbm">
   <email></email>
+  <emulator>
+    <rpm accept="hal-api-tbm" arch="i686"/>
+    <rpm accept="hal-api-tbm-devel" arch="i686"/>
+  </emulator>
   <target>
     <rpm accept="hal-api-tbm" arch="armv7l"/>
     <rpm accept="hal-api-tbm-devel" arch="armv7l"/>

diff --git a/rs_resource/HAL/hal-api-tdm-rs.xml b/rs_resource/HAL/hal-api-tdm-rs.xml
index f992599322377c9d6c612cf645f17b23d4297387..3dbd70cd1cd5157974ffc55a68dd026f3957939b 100644 (file)
--- a/rs_resource/HAL/hal-api-tdm-rs.xml
+++ b/rs_resource/HAL/hal-api-tdm-rs.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0"?>
 <rootstrap name="hal-api-tdm">
   <email></email>
+  <emulator>
+    <rpm accept="hal-api-tdm" arch="i686"/>
+    <rpm accept="hal-api-tdm-devel" arch="i686"/>
+  </emulator>
   <target>
     <rpm accept="hal-api-tdm" arch="armv7l"/>
     <rpm accept="hal-api-tdm-devel" arch="armv7l"/>

diff --git a/rs_resource/HAL/hal-api-uwb-rs.xml b/rs_resource/HAL/hal-api-uwb-rs.xml
index 49d02d4ce433a162f94c9458113aa05ea7f828c9..bc22d386f4f20e98828552cb22bbcb81010dca73 100644 (file)
--- a/rs_resource/HAL/hal-api-uwb-rs.xml
+++ b/rs_resource/HAL/hal-api-uwb-rs.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0"?>
 <rootstrap name="hal-api-uwb">
   <email></email>
+  <emulator>
+    <rpm accept="hal-api-uwb" arch="i686"/>
+    <rpm accept="hal-api-uwb-devel" arch="i686"/>
+  </emulator>
   <target>
     <rpm accept="hal-api-uwb" arch="armv7l"/>
     <rpm accept="hal-api-uwb-devel" arch="armv7l"/>

diff --git a/rs_resource/HAL/hal-api-wifi-rs.xml b/rs_resource/HAL/hal-api-wifi-rs.xml
index d32a1b727c9f92cc4ddf0fab46bf36d1c7d19a3a..54111240bc7589ad5f2b6df63bcb89c79d5a01ac 100644 (file)
--- a/rs_resource/HAL/hal-api-wifi-rs.xml
+++ b/rs_resource/HAL/hal-api-wifi-rs.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0"?>
 <rootstrap name="hal-api-wifi">
   <email></email>
+  <emulator>
+    <rpm accept="hal-api-wifi" arch="i686"/>
+    <rpm accept="hal-api-wifi-devel" arch="i686"/>
+  </emulator>
   <target>
     <rpm accept="hal-api-wifi" arch="armv7l"/>
     <rpm accept="hal-api-wifi-devel" arch="armv7l"/>

diff --git a/rs_resource/HAL/hal-api-zigbee-rs.xml b/rs_resource/HAL/hal-api-zigbee-rs.xml
index d2a07880bdfe150c803cb0760304e1b42482dc1c..944b9fb77ebea2aa86142f16659743e07dfbf1ee 100644 (file)
--- a/rs_resource/HAL/hal-api-zigbee-rs.xml
+++ b/rs_resource/HAL/hal-api-zigbee-rs.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0"?>
 <rootstrap name="hal-api-zigbee">
   <email></email>
+  <emulator>
+    <rpm accept="hal-api-zigbee" arch="i686"/>
+    <rpm accept="hal-api-zigbee-devel" arch="i686"/>
+  </emulator>
   <target>
     <rpm accept="hal-api-zigbee" arch="armv7l"/>
     <rpm accept="hal-api-zigbee-devel" arch="armv7l"/>