diff options
author | Kyungwook Tak <k.tak@samsung.com> | 2016-12-05 17:16:42 +0900 |
---|---|---|
committer | Kyungwook Tak <k.tak@samsung.com> | 2016-12-05 17:16:46 +0900 |
commit | 5335b01f4278e391dd90cdca799b26dfaecbde07 (patch) | |
tree | 6a2d87ef3a7a69054842b6226e124a87489e4a5b | |
parent | a8b74d4ef54ccb432090a6f8d6bb3b16f5582acb (diff) | |
parent | 0778e0964f8fecd8ce06c307eddc2ccf1632fc2b (diff) | |
download | libwebappenc-5335b01f4278e391dd90cdca799b26dfaecbde07.tar.gz libwebappenc-5335b01f4278e391dd90cdca799b26dfaecbde07.tar.bz2 libwebappenc-5335b01f4278e391dd90cdca799b26dfaecbde07.zip |
Merge branch 'tizen' into tizen_3.0submit/tizen_3.0/20161205.022357accepted/tizen/3.0/wearable/20161205.234416accepted/tizen/3.0/tv/20161205.234348accepted/tizen/3.0/mobile/20161205.234310accepted/tizen/3.0/ivi/20161205.234444accepted/tizen/3.0/common/20161206.125348
Change-Id: Iceabc2db52f6cd004d9a4880eaf91425c425cb71
Signed-off-by: Kyungwook Tak <k.tak@samsung.com>
-rw-r--r-- | packaging/libwebappenc.spec | 2 | ||||
-rwxr-xr-x | scripts/200.wae.sh.in (renamed from scripts/wae-upgrade.sh.in) | 4 | ||||
-rw-r--r-- | scripts/CMakeLists.txt | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/packaging/libwebappenc.spec b/packaging/libwebappenc.spec index 9f8faef..760f3e2 100644 --- a/packaging/libwebappenc.spec +++ b/packaging/libwebappenc.spec @@ -103,7 +103,7 @@ fi %dir %attr(770, %user_name, %group_name) %{rw_share_dir}/wae/app_dek %attr(660, %user_name, %group_name) %{rw_share_dir}/wae/app_dek/* -%attr(775,root,root) %{upgrade_script_dir}/wae-upgrade.sh +%attr(775,root,root) %{upgrade_script_dir}/200.wae.sh %{upgrade_data_dir}/wae/app_dek/* %files devel diff --git a/scripts/wae-upgrade.sh.in b/scripts/200.wae.sh.in index 652962b..29d9497 100755 --- a/scripts/wae-upgrade.sh.in +++ b/scripts/200.wae.sh.in @@ -15,13 +15,13 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin # See the License for the specific language governing permissions and # limitations under the License. # -# @file wae-upgrade.sh.in +# @file 200.wae.sh.in # @author Kyungwook Tak (k.tak@samsung.com) # @brief Platform upgrade support WAE_DIR=@RW_SHARE_DIR@/wae -mv @UPGRADE_DATA_DIR@/wae $WAE_DIR +cp -rf @UPGRADE_DATA_DIR@/wae $WAE_DIR chsmack -a "@SMACK_DOMAIN@" $WAE_DIR -r chown -R @USER_NAME@:@GROUP_NAME@ $WAE_DIR diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index c73467e..f4098fc 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -12,5 +12,5 @@ # See the License for the specific language governing permissions and # limitations under the License. # -CONFIGURE_FILE(wae-upgrade.sh.in wae-upgrade.sh @ONLY) -INSTALL(FILES wae-upgrade.sh DESTINATION ${UPGRADE_SCRIPT_DIR}) +CONFIGURE_FILE(200.wae.sh.in 200.wae.sh @ONLY) +INSTALL(FILES 200.wae.sh DESTINATION ${UPGRADE_SCRIPT_DIR}) |