Merge "Remove profile build dependencies - There will be base package and sub pacakge... accepted/tizen/common/20160922.120442 accepted/tizen/ivi/20160925.234102 accepted/tizen/mobile/20160925.234023 accepted/tizen/tv/20160925.234058 accepted/tizen/wearable/20160925.234045 submit/tizen/20160922.004002
authorKim Kidong <kd0228.kim@samsung.com>
Thu, 22 Sep 2016 00:35:26 +0000 (17:35 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Thu, 22 Sep 2016 00:35:26 +0000 (17:35 -0700)
1  2 
CMakeLists.txt
packaging/security-config.spec

diff --cc CMakeLists.txt
index b49a8b8b2eb315026da95df17b0a20edc163d7e1,6a9d250481c5b0cc0374ec51ee48172dd81935b7..a24d579aff50d96c71a5b067025ae2a90d286602
@@@ -14,12 -14,10 +14,10 @@@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/confi
  INSTALL(FILES ${CMAKE_SOURCE_DIR}/config/security-config.conf DESTINATION /usr/lib/tmpfiles.d/)
  INSTALL(FILES ${CMAKE_SOURCE_DIR}/config/90_user-content-permissions.post DESTINATION ${SYSCONF_INSTALL_DIR}/gumd/useradd.d)
  INSTALL(FILES ${CMAKE_SOURCE_DIR}/config/91_user-dbspace-permissions.post DESTINATION ${SYSCONF_INSTALL_DIR}/gumd/useradd.d)
 -INSTALL(FILES ${CMAKE_SOURCE_DIR}/upgrade/10.security.upgrade.sh DESTINATION /usr/share/upgrade/scripts)
 +INSTALL(FILES ${CMAKE_SOURCE_DIR}/upgrade/011.security_upgrade.sh DESTINATION /usr/share/upgrade/scripts)
  
- IF("${PROFILE}" STREQUAL "mobile" OR "${PROFILE}" STREQUAL "wearable")
  INSTALL(FILES ${CMAKE_SOURCE_DIR}/smack/onlycap DESTINATION /etc/smack)
  INSTALL(FILES ${CMAKE_SOURCE_DIR}/smack/smack_default_labeling DESTINATION /usr/share/security-config)
- ENDIF()
  
  INSTALL(FILES
      ${CMAKE_SOURCE_DIR}/packaging/security-config.manifest
index f4eab714e6090db97fc86f026b2b463e00efadde,774c9a151a60b208c93fe491b2db154b2fb5a879..8c8e3d19e162205657b4a87d57cd623ee622287a
@@@ -59,10 -101,11 +101,11 @@@ rm /usr/share/security-config/test/capa
  %attr(755,root,root) /usr/share/security-config/test/path_check_test/*
  %attr(755,root,root) /usr/share/security-config/test/smack_basic_test/*
  %attr(755,root,root) /usr/share/security-config/test/security_mount_option_test/*
 -%attr(755,root,root) /usr/share/upgrade/scripts/10.security.upgrade.sh
 +%attr(755,root,root) /usr/share/upgrade/scripts/011.security_upgrade.sh
  %attr(755,root,root) %{_sysconfdir}/gumd/useradd.d/90_user-content-permissions.post
  %attr(755,root,root) %{_sysconfdir}/gumd/useradd.d/91_user-dbspace-permissions.post
- %if ("%{?profile}" == "mobile" || "%{?profile}" == "wearable")
+ %files profile_mobile
  %attr(-,root,root) %{_unitdir}/security-config.service
  %attr(-,root,root) %{_unitdir}/multi-user.target.wants/security-config.service
  %attr(755,root,root) /usr/share/security-config/smack_default_labeling