From d4db6714f55810866cb4268c8db4722d66d0f16c Mon Sep 17 00:00:00 2001 From: Hyotaek Shim Date: Thu, 8 Mar 2018 08:50:30 +0900 Subject: [PATCH] Minor fixes: chmod files, rename dbus conf file, etc. Change-Id: Ia23bfea0d18dd65f9c3a7a504f0b7b4817980d89 Signed-off-by: Hyotaek Shim --- CMakeLists.txt | 4 ++-- apps/CMakeLists.txt | 0 apps/extended-sd/CMakeLists.txt | 0 apps/extended-sd/org.tizen.extended-sd.xml | 0 .../resource/images/extended_storage_sd_card.png | Bin .../org.tizen.system.storage.conf | 0 packaging/storaged.spec | 2 +- src/auto-test/block.c | 0 src/auto-test/storage.c | 0 src/shared/apps.c | 0 src/shared/apps.h | 0 src/shared/dbus_macro.h | 0 12 files changed, 3 insertions(+), 3 deletions(-) mode change 100755 => 100644 CMakeLists.txt mode change 100755 => 100644 apps/CMakeLists.txt mode change 100755 => 100644 apps/extended-sd/CMakeLists.txt mode change 100755 => 100644 apps/extended-sd/org.tizen.extended-sd.xml mode change 100755 => 100644 apps/extended-sd/resource/images/extended_storage_sd_card.png rename scripts/storaged.conf => conf/org.tizen.system.storage.conf (100%) mode change 100755 => 100644 mode change 100755 => 100644 src/auto-test/block.c mode change 100755 => 100644 src/auto-test/storage.c mode change 100755 => 100644 src/shared/apps.c mode change 100755 => 100644 src/shared/apps.h mode change 100755 => 100644 src/shared/dbus_macro.h diff --git a/CMakeLists.txt b/CMakeLists.txt old mode 100755 new mode 100644 index 4fefdc7..e949ab8 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,6 +29,7 @@ SET(PKG_MODULES ) ADD_DEFINITIONS("-DLIBPATH=\"${LIB_INSTALL_DIR}\"") +ADD_DEFINITIONS("-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64") INCLUDE(FindPkgConfig) pkg_check_modules(${PROJECT_NAME}_pkgs REQUIRED ${PKG_MODULES}) @@ -38,7 +39,6 @@ FOREACH(flag ${${PROJECT_NAME}_pkgs_CFLAGS}) ENDFOREACH(flag) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden -Werror -rdynamic -Wno-deprecated-declarations") -SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64") SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -g -fno-omit-frame-pointer -finstrument-functions") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -lrt -fPIE") SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie") @@ -47,7 +47,7 @@ ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS}) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${${PROJECT_NAME}_pkgs_LDFLAGS} "-ldl" "-lm") INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin) -INSTALL(FILES ${CMAKE_SOURCE_DIR}/scripts/storaged.conf DESTINATION /etc/dbus-1/system.d) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/conf/org.tizen.system.storage.conf DESTINATION /etc/dbus-1/system.d) INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/systemd/ DESTINATION lib/systemd/system FILES_MATCHING PATTERN "storaged.service") diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/apps/extended-sd/CMakeLists.txt b/apps/extended-sd/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/apps/extended-sd/org.tizen.extended-sd.xml b/apps/extended-sd/org.tizen.extended-sd.xml old mode 100755 new mode 100644 diff --git a/apps/extended-sd/resource/images/extended_storage_sd_card.png b/apps/extended-sd/resource/images/extended_storage_sd_card.png old mode 100755 new mode 100644 diff --git a/scripts/storaged.conf b/conf/org.tizen.system.storage.conf old mode 100755 new mode 100644 similarity index 100% rename from scripts/storaged.conf rename to conf/org.tizen.system.storage.conf diff --git a/packaging/storaged.spec b/packaging/storaged.spec index 1b2122c..15b86c9 100644 --- a/packaging/storaged.spec +++ b/packaging/storaged.spec @@ -132,7 +132,7 @@ systemctl daemon-reload %files %manifest %{name}.manifest %license LICENSE.Apache-2.0 -%config %{_sysconfdir}/dbus-1/system.d/storaged.conf +%config %{_sysconfdir}/dbus-1/system.d/org.tizen.system.storage.conf %{_unitdir}/multi-user.target.wants/storaged.service %{_unitdir}/storaged.service %{_bindir}/storaged diff --git a/src/auto-test/block.c b/src/auto-test/block.c old mode 100755 new mode 100644 diff --git a/src/auto-test/storage.c b/src/auto-test/storage.c old mode 100755 new mode 100644 diff --git a/src/shared/apps.c b/src/shared/apps.c old mode 100755 new mode 100644 diff --git a/src/shared/apps.h b/src/shared/apps.h old mode 100755 new mode 100644 diff --git a/src/shared/dbus_macro.h b/src/shared/dbus_macro.h old mode 100755 new mode 100644 -- 2.34.1