From 908ce2bf7f82168fb2f2b86fc6a75f538e157ccd Mon Sep 17 00:00:00 2001 From: Sunmin Lee Date: Tue, 22 Aug 2017 09:08:46 +0900 Subject: [PATCH] Remove dummy resource for non-gui target The target gui not supported does not require gui codes to be compiled. This patch excludes gui sources from non-gui tota-ua package. Change-Id: I4a6930525e9f2836e3e8b52765eeda5dd0ec28bd Signed-off-by: Sunmin Lee --- CMakeLists.txt | 4 ++-- packaging/tota-ua.spec | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a58628..ec0185a 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,7 +93,7 @@ ADD_EXECUTABLE(${EXECNAME} ${SRCS}) TARGET_LINK_LIBRARIES(${EXECNAME} ${pkgs_LDFLAGS} ${LIBS}) INSTALL(TARGETS ${EXECNAME} DESTINATION ${BINDIR}) +IF(NOT "${FOTA_PARTITION_TYPE}" STREQUAL "PART_RPI3") INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/${MODELDIR}/images DESTINATION ${RESDIR}) -# LICENSE file ADD_SUBDIRECTORY(fota_gui) - +ENDIF(NOT "${FOTA_PARTITION_TYPE}" STREQUAL "PART_RPI3") diff --git a/packaging/tota-ua.spec b/packaging/tota-ua.spec index acaa678..8383e5b 100755 --- a/packaging/tota-ua.spec +++ b/packaging/tota-ua.spec @@ -69,7 +69,6 @@ rm -rf %{buildroot} pushd build_rpi3 %make_install mv %{buildroot}%{_bindir}/delta.ua %{buildroot}%{_bindir}/delta.ua.rpi3 -mv %{buildroot}%{_datadir}/fota/res/images %{buildroot}%{_datadir}/fota/res/images_rpi3 popd pushd build_tw1 @@ -82,7 +81,6 @@ popd %post target_rpi3 mv %{_bindir}/delta.ua.rpi3 %{_bindir}/delta.ua -mv %{_datadir}/fota/res/images_rpi3 %{_datadir}/fota/res/images %post target_tw1 mv %{_bindir}/delta.ua.tw1 %{_bindir}/delta.ua @@ -98,7 +96,6 @@ mv %{_datadir}/initrd-recovery/initrd.list.d/41-tota-ua.list.tw1 \ %files target_rpi3 %defattr(-,root,root,-) -%{_datadir}/fota/res/images_rpi3 %{_bindir}/delta.ua.rpi3 %files target_tw1 -- 2.7.4