From: Karol Lewandowski Date: Tue, 26 Apr 2022 20:23:13 +0000 (+0200) Subject: Fix plugin installation path to /usr/lib X-Git-Tag: submit/tizen/20220630.103030~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=848860c5546c0b5998010295a39125faa015cc1b;p=platform%2Fcore%2Fsystem%2Fupdate-control.git Fix plugin installation path to /usr/lib /usr/lib/libupdate-control-plugin.so is fixed in src/update_control.c, so this is where plugin must be installed, regardless of actual architecture's libdir (/usr/lib vs /usr/lib64). Change-Id: I1d964ef93711f6e7444c66fad374f5f4f9da13cc --- diff --git a/packaging/update-control.spec b/packaging/update-control.spec index eaf2965..d103c7c 100644 --- a/packaging/update-control.spec +++ b/packaging/update-control.spec @@ -107,4 +107,5 @@ ln -s ../%{service_file} %{buildroot}/%{_unitdir}/multi-user.target.wants/%{serv %files plugin %manifest %{name}.manifest %license LICENSE -%{_libdir}/libupdate-control-plugin.so* +# path is fixed in src/update_control.c +/usr/lib/libupdate-control-plugin.so* diff --git a/src/plugin/CMakeLists.txt b/src/plugin/CMakeLists.txt index adcf42a..5167faa 100644 --- a/src/plugin/CMakeLists.txt +++ b/src/plugin/CMakeLists.txt @@ -48,4 +48,4 @@ SET_TARGET_PROPERTIES(${fw_name} CLEAN_DIRECT_OUTPUT 1 ) -INSTALL(TARGETS ${fw_name} DESTINATION ${LIB_INSTALL_DIR}) +INSTALL(TARGETS ${fw_name} DESTINATION /usr/lib) diff --git a/update-manager/CMakeLists.txt b/update-manager/CMakeLists.txt index 41108c1..064b2c4 100644 --- a/update-manager/CMakeLists.txt +++ b/update-manager/CMakeLists.txt @@ -39,4 +39,4 @@ FILE(GLOB SOURCE_FILES ) ADD_EXECUTABLE(${PKG_NAME} ${SOURCE_FILES}) TARGET_LINK_LIBRARIES(${PKG_NAME} ${${PKG_NAME}_LDFLAGS} "-ldl") -INSTALL(TARGETS ${PKG_NAME} DESTINATION bin) \ No newline at end of file +INSTALL(TARGETS ${PKG_NAME} DESTINATION bin)