following Architecture(armv7l, aarch64), initrd install file's variable is changedtizen_6.0.m2_releasesubmit/tizen_6.0_hotfix/20201103.115104submit/tizen_6.0_hotfix/20201102.192904submit/tizen_6.0/20201029.205504submit/tizen/20200929.022457accepted/tizen/unified/20201005.005838accepted/tizen/6.0/unified/hotfix/20201103.050618accepted/tizen/6.0/unified/20201030.103526tizen_6.0_hotfixtizen_6.0_bkup_20201110accepted/tizen_6.0_unified_hotfix

Change-Id: I4a06412e78442ea138386982280c4db114da8373

4 files changed, 12 insertions, 5 deletions

diff --git a/42-tota-gui-common.list b/42-tota-gui-common.list.in
index 1b2cbcf..6259430 100644
--- a/42-tota-gui-common.list
+++ b/42-tota-gui-common.list.in
@@ -121,6 +121,6 @@ VERBATIMS="
 WITHLIBS="
 /usr/bin/fota_gui
 /usr/bin/system-recovery_gui
-/usr/lib/tdm/libtdm-default.so
-/usr/lib/bufmgr/libtbm_default.so
+@SYSTEM_RECOVERY_LIBDIR@/tdm/libtdm-default.so
+@SYSTEM_RECOVERY_LIBDIR@/bufmgr/libtbm_default.so
 "
diff --git a/42-tota-gui-wearable.list b/42-tota-gui-wearable.list.in
index 6e45816..e131aaa 100644
--- a/42-tota-gui-wearable.list
+++ b/42-tota-gui-wearable.list.in
@@ -119,6 +119,6 @@ VERBATIMS="
 
 WITHLIBS="
 /usr/bin/fota_gui
-/usr/lib/tdm/libtdm-default.so
-/usr/lib/bufmgr/libtbm_default.so
+@SYSTEM_RECOVERY_LIBDIR@/tdm/libtdm-default.so
+@SYSTEM_RECOVERY_LIBDIR@/bufmgr/libtbm_default.so
 "
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e44287..e2aabe9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,6 +8,7 @@ STRING(FIND ${CMAKE_C_FLAGS} "mhard-float" IFFOUND2)
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/)
 
+SET(SYSTEM_RECOVERY_LIBDIR ${LIBDIR})
 SET(PACKAGE ${PROJECT_NAME})
 SET(PKGNAME "${PACKAGE}")
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
@@ -37,6 +38,11 @@ ADD_DEFINITIONS("-DPREFIX=\"${PREFIX}\"")
 
 SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed -pie")
 
+SET(INITRD_TOTA_GUI_LIST_FILE_COMMON ${CMAKE_CURRENT_SOURCE_DIR}/42-tota-gui-common.list)
+CONFIGURE_FILE(${INITRD_TOTA_GUI_LIST_FILE_COMMON}.in ${INITRD_TOTA_GUI_LIST_FILE_COMMON} @ONLY)
+SET(INITRD_TOTA_GUI_LIST_FILE_WEARABLE ${CMAKE_CURRENT_SOURCE_DIR}/42-tota-gui-wearable.list)
+CONFIGURE_FILE(${INITRD_TOTA_GUI_LIST_FILE_WEARABLE}.in ${INITRD_TOTA_GUI_LIST_FILE_WEARABLE} @ONLY)
+
 ADD_SUBDIRECTORY(fota_gui_common)
 ADD_SUBDIRECTORY(fota_gui_wearable)
 ADD_SUBDIRECTORY(rw-update-ani-wearable)
diff --git a/packaging/firmware-update-system-ui.spec b/packaging/firmware-update-system-ui.spec
index f1b836e..44274e4 100644
--- a/packaging/firmware-update-system-ui.spec
+++ b/packaging/firmware-update-system-ui.spec
@@ -44,7 +44,8 @@ cp %{SOURCE1001} .
 export LDFLAGS+="-Wl,--rpath=%{_prefix}/lib -Wl,--as-needed"
 LDFLAGS="$LDFLAGS"
 
-%cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} 
+%cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+		-DLIBDIR=%{_libdir}
 
 make %{?jobs:-j%jobs}