Cleanup apply_patches.sh calls

apply_patches.sh doesn't get args. patch dir is hard-coded inside as
patchdir=${TOPDIR}/tizen_src/build/patches

This patch now calls apply_patches.sh without any argument.

Also, it deletes the bash applyPatch function which is unused.

Bug: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=13129
Reviewed by: Antonio Gomes, SeungSeop Park

Change-Id: Icdcab46796f1351251bf9a237002e5bdfffafc32
Signed-off-by: Arnaud Renevier <a.renevier@samsung.com>

diff --git a/tizen_src/build/common.sh b/tizen_src/build/common.sh
index 0a04cf4..a3bf74b 100755 (executable)
--- a/tizen_src/build/common.sh
+++ b/tizen_src/build/common.sh
@@ -4,17 +4,6 @@ export SCRIPTDIR=$(readlink -e $(dirname $0))
 export TOPDIR=$(readlink -f "${SCRIPTDIR}/../..")
 export CHROME_SRC="${TOPDIR}"
 
-function applyPatch {
-  directory=$1
-  shift
-  patchfile=$1
-  shift
-  echo Applying $patchfile in $directory
-  pushd "$directory" > /dev/null
-  patch -p1 $@ < "$patchfile"
-  popd > /dev/null
-}
-
 function getHostOs() {
   echo $(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')
 }

diff --git a/tizen_src/build/cross_build_mobile.sh b/tizen_src/build/cross_build_mobile.sh
index e462808..b1bf06c 100755 (executable)
--- a/tizen_src/build/cross_build_mobile.sh
+++ b/tizen_src/build/cross_build_mobile.sh
@@ -21,12 +21,12 @@ function rollbackGbsSysrootChanges() {
 
 function preBuild() {
   adaptGbsSysrootToCrossCompilation $1
-  ${SCRIPTDIR}/apply_patches.sh ${SCRIPTDIR}/patches
+  ${SCRIPTDIR}/apply_patches.sh
 }
 
 function postBuild() {
   rollbackGbsSysrootChanges $1
-  ${SCRIPTDIR}/apply_patches.sh -r ${SCRIPTDIR}/patches
+  ${SCRIPTDIR}/apply_patches.sh -r
 }
 
 if [ -z "$GYP_GENERATOR_OUTPUT" ]; then

diff --git a/tizen_src/build/cross_build_tv.sh b/tizen_src/build/cross_build_tv.sh
index fec7dd6..c646780 100755 (executable)
--- a/tizen_src/build/cross_build_tv.sh
+++ b/tizen_src/build/cross_build_tv.sh
@@ -21,12 +21,12 @@ function rollbackGbsSysrootChanges() {
 
 function preBuild() {
   adaptGbsSysrootToCrossCompilation $1
-  ${SCRIPTDIR}/apply_patches.sh ${SCRIPTDIR}/patches
+  ${SCRIPTDIR}/apply_patches.sh
 }
 
 function postBuild() {
   rollbackGbsSysrootChanges $1
-  ${SCRIPTDIR}/apply_patches.sh -r ${SCRIPTDIR}/patches
+  ${SCRIPTDIR}/apply_patches.sh -r
 }
 
 if [ -z "$GYP_GENERATOR_OUTPUT" ]; then

diff --git a/tizen_src/packaging/chromium-efl.spec b/tizen_src/packaging/chromium-efl.spec
index 19ddabb..f9994c9 100644 (file)
--- a/tizen_src/packaging/chromium-efl.spec
+++ b/tizen_src/packaging/chromium-efl.spec
@@ -264,10 +264,10 @@ Selenium WebDriver for t-browser
 
 # TODO : This execution will be removed by multimedia team
 # Bug : http://107.108.218.239/bugzilla/show_bug.cgi?id=10516
-trap 'tizen_src/build/apply_patches.sh -r tizen_src/build/patches;\
+trap 'tizen_src/build/apply_patches.sh -r;\
       error_report $0 $LINENO' ERR SIGINT SIGTERM SIGQUIT
 
-tizen_src/build/apply_patches.sh tizen_src/build/patches
+tizen_src/build/apply_patches.sh
 
 # workaround for new nss library : search it in /usr/lib first, rather than /lib (system nss)
 export LD_RUN_PATH=%{_libdir}
@@ -398,7 +398,7 @@ cp third_party/icu/android/icudtl.dat "%{OUTPUT_FOLDER}"
 
 # TODO : This execution will be removed by multimedia team
 # Bug : http://107.108.218.239/bugzilla/show_bug.cgi?id=10516
-tizen_src/build/apply_patches.sh -r tizen_src/build/patches
+tizen_src/build/apply_patches.sh -r
 
 # XXX Workaround for using rpmlint with emulator build on Tizen_TV 3.0
 #