Fix lib path to support 64bit

- Change hardcoded lib path(/usr/lib) to rpmlib macro({_libdir})
- Remove unused fota_gui_test

Change-Id: I5d0ea3539c1494ca998e009e4b1c11abc3b54b69
Signed-off-by: Jeon Sang-Heon <sh95.jeon@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644 (file)
index 0000000..e4a948b
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,6 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+PROJECT(initrd-fota)
+
+CONFIGURE_FILE(${INITRD_FOTA_SCRIPTS_DIR}/40-fota.list.in
+                               ${INITRD_FOTA_SCRIPTS_DIR}/40-fota.list
+                               @ONLY)
\ No newline at end of file

diff --git a/packaging/initrd-fota.spec b/packaging/initrd-fota.spec
index 8df52f910d8175e9b4229c33145ac823072c0578..6635e46177d20875509d6aab6a631b8bfb6f8f98 100755 (executable)
--- a/packaging/initrd-fota.spec
+++ b/packaging/initrd-fota.spec
@@ -23,7 +23,9 @@ package for building partition image for RAMDISK2 (ramdisk-recovery.img)
 %setup -q
 
 %build
-
+%cmake . \
+       -DINITRD_FOTA_LIB_DIR=%{_libdir} \
+       -DINITRD_FOTA_SCRIPTS_DIR=scripts
 
 %install
 

diff --git a/scripts/40-fota.list b/scripts/40-fota.list
deleted file mode 100755 (executable)
index 1e463ff..0000000
--- a/scripts/40-fota.list
+++ /dev/null
@@ -1,42 +0,0 @@
-# ---- Target contents ----------------------------------------------------- #
-MVWITHLIBS="
-/usr/lib/initrd-recovery/fota/fota-init.sh
-/usr/lib/initrd-recovery/fota/fus_rw-init.sh
-/usr/lib/initrd-recovery/minireboot
-/usr/bin/delta.ua
-/usr/lib/libtota.so.1.0.0
-/usr/lib/lib7zip.so.0.0.0
-"
-
-WITHLIBS="
-/bin/grep
-/bin/bash
-/bin/echo
-/bin/ls
-/bin/tar
-/bin/chroot
-/bin/cat
-/bin/chmod
-/bin/ln
-/bin/mkdir
-/bin/mount
-/bin/rm
-/bin/rmdir
-/bin/sed
-/bin/sleep
-/bin/sync
-/bin/umount
-/bin/cp
-/bin/sort
-/bin/cut
-/bin/tr
-/bin/wc
-/usr/sbin/agetty
-"
-
-# LinkFileName:Target
-SYMLINKS="
-/bin/sh:bash
-/sbin/fota-init:/usr/lib/initrd-recovery/fota/fota-init.sh
-/sbin/fus_rw-init:/usr/lib/initrd-recovery/fota/fus_rw-init.sh
-"

diff --git a/scripts/40-fota.list.in b/scripts/40-fota.list.in
new file mode 100755 (executable)
index 0000000..769d834
--- /dev/null
+++ b/scripts/40-fota.list.in
@@ -0,0 +1,42 @@
+# ---- Target contents ----------------------------------------------------- #
+MVWITHLIBS="
+@INITRD_FOTA_LIB_DIR@/initrd-recovery/fota/fota-init.sh
+@INITRD_FOTA_LIB_DIR@/initrd-recovery/fota/fus_rw-init.sh
+@INITRD_FOTA_LIB_DIR@/initrd-recovery/minireboot
+/usr/bin/delta.ua
+@INITRD_FOTA_LIB_DIR@/libtota.so.1.0.0
+@INITRD_FOTA_LIB_DIR@/lib7zip.so.0.0.0
+"
+
+WITHLIBS="
+/bin/grep
+/bin/bash
+/bin/echo
+/bin/ls
+/bin/tar
+/bin/chroot
+/bin/cat
+/bin/chmod
+/bin/ln
+/bin/mkdir
+/bin/mount
+/bin/rm
+/bin/rmdir
+/bin/sed
+/bin/sleep
+/bin/sync
+/bin/umount
+/bin/cp
+/bin/sort
+/bin/cut
+/bin/tr
+/bin/wc
+/usr/sbin/agetty
+"
+
+# LinkFileName:Target
+SYMLINKS="
+/bin/sh:bash
+/sbin/fota-init:@INITRD_FOTA_LIB_DIR@/initrd-recovery/fota/fota-init.sh
+/sbin/fus_rw-init:@INITRD_FOTA_LIB_DIR@/initrd-recovery/fota/fus_rw-init.sh
+"

diff --git a/scripts/fota-init.sh b/scripts/fota-init.sh
index 9e1f39fb31f331716c85c7fcc9e814ea6aed138c..a5c5ccf80d1f2bd3ae79cba9dba5d621379893ed 100755 (executable)
--- a/scripts/fota-init.sh
+++ b/scripts/fota-init.sh
@@ -291,9 +291,6 @@ if [ "$FOTA_GUI_ENABLE" = "1" ]; then
 fi
 do_fota_update
 fota_result=$?
-if [ "$FOTA_GUI_ENABLE" = "1" ]; then
-       /usr/bin/fota_gui_test -1
-fi
 if [ "$fota_result" = "0" ]; then
        /bin/rm -fr ${DELTA_DIR}/*
 fi