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>

18 files changed, 74 insertions, 14 deletions

diff --git a/generate_rootstrap.sh b/generate_rootstrap.sh
index 105134f..8f48d09 100755
--- 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 e92e464..b49b2d7 100755
--- 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 a3de998..4d673a3 100644
--- 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 9f10d9f..db90dd5 100644
--- 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 d3a63e3..567e6cf 100644
--- 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 2b5eaaa..a5f59d6 100644
--- 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 7ff4b59..0b40a5c 100644
--- 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 d841d20..af4556a 100644
--- 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 4b8d764..f6eda58 100644
--- 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 912d284..0003f54 100644
--- 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 6f52431..80785d1 100644
--- 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 4ab59e3..f0ad3ae 100644
--- 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 390d5f1..50d0dc5 100644
--- 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 e9cd3a6..7c19811 100644
--- 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 f992599..3dbd70c 100644
--- 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 49d02d4..bc22d38 100644
--- 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 d32a1b7..5411124 100644
--- 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 d2a0788..944b9fb 100644
--- 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"/>