Update headed rootstrap

Change-Id: I3995edd57e8609c61cee047bf69abcc4714c3011
Signed-off-by: sangwook lee <sangwook96.lee@samsung.com>

diff --git a/make_rootstrap.sh b/make_rootstrap.sh
index 053407e..d55ce8a 100755 (executable)
--- a/make_rootstrap.sh
+++ b/make_rootstrap.sh
@@ -378,14 +378,14 @@ if [ "$OPT_EMULATOR" = true ]; then
     if [ "$PLATFORM_VERSION" == "3.0" ] || [ "$PLATFORM_VERSION" == "4.0" ] || [ "$PLATFORM_VERSION" == "5.0" ] || [ "$PLATFORM_VERSION" == "5.5" ] || [ "$PLATFORM_VERSION" == "6.0" ] || [ "$PLATFORM_VERSION" == "6.5" ] || [ "$PLATFORM_VERSION" == "7.0" ] || [ "$PLATFORM_VERSION" == "7.5" ]
     then
         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 ${DIR_EMULATOR}/usr/include/base/deprecated/* ${DIR_EMULATOR}/usr/include/base/
     fi
 
     if [ "$INTERNAL" = false ]; then    
         echo "remove Non-Public EFL API"
-        $CMD_API_FILTER .target>/dev/null #EFL filter
+        $CMD_API_FILTER .emulator>/dev/null #EFL filter
         echo "remove Non-Public GDBUS API"
-        $CMD_API_GDBUS_FILTER .target>/dev/null #GDBUS filter
+        $CMD_API_GDBUS_FILTER .emulator>/dev/null #GDBUS filter
     fi
 
     if [ "$INTERNAL" = true ]; then

diff --git a/package_rootstrap.sh b/package_rootstrap.sh
index eeb5304..7aae84f 100755 (executable)
--- a/package_rootstrap.sh
+++ b/package_rootstrap.sh
@@ -164,12 +164,12 @@ function pkg_build_internal()
     fi
 
     xmlstarlet ed -L -u "//property[@key='DEV_PACKAGE_CONFIG_PATH']/@value" -v "${DEV_PACKAGE_CONFIG_PATH}" ${DIR_PLUGIN_DEST}/${RS_ID}.xml
-    
-    #if [[ ${TYPE} == *"device64"* ]]; then 
-    #    xmlstarlet ed -L -u "//rootstrap/@architecture" -v "aarch64" ${DIR_PLUGIN_DEST}/${RS_ID}.xml
-    #elif [[ ${TYPE} == *"emulator64"* ]]; then
-    #    xmlstarlet ed -L -u "//rootstrap/@architecture" -v "x86_64" ${DIR_PLUGIN_DEST}/${RS_ID}.xml
-    #fi
+
+    if [[ ${TYPE} == *"device64"* ]]; then
+        xmlstarlet ed -L -u "//rootstrap/@architecture" -v "aarch64" ${DIR_PLUGIN_DEST}/${RS_ID}.xml
+    elif [[ ${TYPE} == *"emulator64"* ]]; then
+        xmlstarlet ed -L -u "//rootstrap/@architecture" -v "x86_64" ${DIR_PLUGIN_DEST}/${RS_ID}.xml
+    fi
 
     # Rename Plugin XML
     #log_info "mv ${DIR_PLUGIN}/${PLATFORM_PROFILE}-${PLATFORM_VERSION}-${TYPE}*.xml ${DIR_PLUGIN}/${RS_ID}.xml"

diff --git a/script/api_filter_7.5.py b/script/api_filter_7.5.py
index b07035b..d00bf00 100755 (executable)
--- a/script/api_filter_7.5.py
+++ b/script/api_filter_7.5.py
@@ -23,10 +23,10 @@ def processEAPI(fp, line, buf, update):
     # handle blacklist API
     if not funcname in whitelist:
         if update:
-            buf[-1] = "//" + buf[-1]
+            buf[-1] = "///@{" + str.rstrip(buf[-1]) + " ///@}\n"
         eol = True
         while eol:
-            line = "//" + line
+            line = "///@{" + str.rstrip(line) + "///@}\n"
             buf.append(line)
             if ";" in line:
                 eol = False

diff --git a/script/convert64.sh b/script/convert64.sh
index 6255ee1..7757aa3 100755 (executable)
--- a/script/convert64.sh
+++ b/script/convert64.sh
@@ -24,11 +24,11 @@ sed -i "s@SNAPSHOT_URL_POSTFIX_EMULATOR=.*@SNAPSHOT_URL_POSTFIX_EMULATOR=\"${SNA
 sed -i "s@SNAPSHOT_URL_POSTFIX_TARGET=.*@SNAPSHOT_URL_POSTFIX_TARGET=\"${SNAPSHOT_URL_POSTFIX_TARGET}\"@" rs-config
 
 # Post Script
-#git checkout ./make_rootstrap_64.sh
-#sed -i "s/asm-arm/asm-arm64/g" make_rootstrap_64.sh
-#sed -i "s/asm-x86/asm-ia64/g" make_rootstrap_64.sh
+git checkout ./make_rootstrap.sh
+sed -i "s/asm-arm/asm-arm64/g" make_rootstrap.sh
+sed -i "s/asm-x86/asm-ia64/g" make_rootstrap.sh
 
-#git checkout ./script/rootstrap_gen_1.0_64.sh
-#POSTLINKER_PATH=${PWD_BACKUP}"/script/postlinker"
-#sed -i "s@POSTLINKER_PATH=.*postlinker.*\$@POSTLINKER_PATH=\$\{PWD_BACKUP\}/script/postlinker_64@" ./script/rootstrap_gen_1.0_64.sh
-#sed -i "s@/usr/lib@/usr/lib64@" ./script/rootstrap_gen_1.0_64.sh
+git checkout ./script/rootstrap_gen_1.0.sh
+POSTLINKER_PATH=${PWD_BACKUP}"/script/postlinker"
+sed -i "s@POSTLINKER_PATH=.*postlinker.*\$@POSTLINKER_PATH=\$\{PWD_BACKUP\}/script/postlinker_64@" ./script/rootstrap_gen_1.0.sh
+sed -i "s@/usr/lib@/usr/lib64@" ./script/rootstrap_gen_1.0.sh

diff --git a/script/rootstrap_gen_1.0.sh b/script/rootstrap_gen_1.0.sh
index a82ab62..79499d9 100755 (executable)
--- a/script/rootstrap_gen_1.0.sh
+++ b/script/rootstrap_gen_1.0.sh
@@ -429,7 +429,7 @@ done #finish copy header & library
 ##################################################################
 log "************* Post link *******************"
 log "# POSTLINKER_PATH=$POSTLINKER_PATH"
-for i in $(find ${DEST}/usr/lib64 -name "*.so" -o -name "*.so.*")
+for i in $(find ${DEST}/usr/lib -name "*.so" -o -name "*.so.*")
 do
     ${POSTLINKER_PATH} $i >/dev/null 1>&2
 done

diff --git a/script/rootstrap_gen_1.0_64.sh b/script/rootstrap_gen_1.0_64.sh
index ee22a61..420e0b6 100755 (executable)
--- a/script/rootstrap_gen_1.0_64.sh
+++ b/script/rootstrap_gen_1.0_64.sh
@@ -317,7 +317,7 @@ PWD_BACKUP=`pwd`
 DEST=${PWD_BACKUP}/.${ROOTSTRAP_TYPE}
 TMP=${PWD_BACKUP}/".tmp"
 RPM_Directory=${PWD_BACKUP}/".rpm"
-POSTLINKER_PATH=${PWD_BACKUP}/script/postlinker_64
+POSTLINKER_PATH=${PWD_BACKUP}"/script/postlinker_64"
 
 if [ ! -e $POSTLINKER_PATH ]
 then

diff --git a/script/rootstrap_plugin_gen_1.0.sh b/script/rootstrap_plugin_gen_1.0.sh
index 09b900d..6c30660 100755 (executable)
--- a/script/rootstrap_plugin_gen_1.0.sh
+++ b/script/rootstrap_plugin_gen_1.0.sh
@@ -246,7 +246,7 @@ then
 
 #emulator
 TYPE="emulator"
-ARCH="i386"
+ARCH="i586"
 
 RS_PATH="#{SBI_HOME}/../../platforms/tizen-${PLATFORM_VERSION}/${PLATFORM_PROFILE}/rootstraps/${PLATFORM_PROFILE}-${PLATFORM_VERSION}-${TYPE}.core"
 DEV_PACKAGE_CONFIG_PATH="#{SBI_HOME}/../../platforms/tizen-${PLATFORM_VERSION}/${PLATFORM_PROFILE}/rootstraps/info/${PLATFORM_PROFILE}-${PLATFORM_VERSION}-${TYPE}.core.dev.xml"