diff options
| author |   Kazumasa Mitsunari <kazumasa_mitsunari_za@mail.toyota.co.jp> | 2016-08-12 15:42:27 +0900 |
|---|---|---|
| committer | Kazumasa Mitsunari <kazumasa_mitsunari_za@mail.toyota.co.jp> | 2016-08-12 15:45:31 +0900 |
| commit | 4d69498592cb466a6795a38eab70d06963b85510 (patch) | |
| tree | 26f2883b0811011c9b17f7fc4adb002b93bcefe0 | |
| parent | 1373af5fb64ca08473be784ba6cf3068c33f0416 (diff) | |
Revert "Correct SRC_URI" and "Update pkgmgr-info"
This reverts commit 1373af5fb64ca08473be784ba6cf3068c33f0416.
This reverts commit d7684c0ab78235658cbf8891bd3bdb9ab111d561.
Signed-off-by: Kazumasa Mitsunari <kazumasa_mitsunari_za@mail.toyota.co.jp>
3 files changed, 4 insertions, 24 deletions
diff --git a/meta-application-manager/recipes-application-framework/pkgmgr-info/pkgmgr-info/TizenCommonCMakeMacro.patch b/meta-application-manager/recipes-application-framework/pkgmgr-info/pkgmgr-info/TizenCommonCMakeMacro.patch index 672b235..1983693 100644 --- a/meta-application-manager/recipes-application-framework/pkgmgr-info/pkgmgr-info/TizenCommonCMakeMacro.patch +++ b/meta-application-manager/recipes-application-framework/pkgmgr-info/pkgmgr-info/TizenCommonCMakeMacro.patch @@ -13,25 +13,14 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index bd24c9c..513d28a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -2,7 +2,6 @@ +@@ -5,7 +5,6 @@ PROJECT(pkgmgr-info C) - PROJECT(pkgmgr-info C) - + SET(VERSION 0.0.17) + SET(VERSION_MAJOR 0) -INCLUDE(TizenCommon) SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "\${prefix}") -@@ -50,8 +50,8 @@ - src/pkgmgrinfo_basic.c - src/pkgmgrinfo_private.c) - --SET_TARGET_PROPERTIES(pkgmgr-info PROPERTIES SOVERSION ${MAJORVER}) --SET_TARGET_PROPERTIES(pkgmgr-info PROPERTIES VERSION ${FULLVER}) -+SET_TARGET_PROPERTIES(pkgmgr-info PROPERTIES SOVERSION "${MAJORVER}") -+SET_TARGET_PROPERTIES(pkgmgr-info PROPERTIES VERSION "${FULLVER}") - TARGET_LINK_LIBRARIES(pkgmgr-info pkgmgr_parser ${libpkgs_LDFLAGS}) - - CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/pkgmgr-info.pc.in ${CMAKE_BINARY_DIR}/pkgmgr-info.pc @ONLY) diff --git a/parser/CMakeLists.txt b/parser/CMakeLists.txt index 8904ecc..f183758 100755 --- a/parser/CMakeLists.txt diff --git a/meta-application-manager/recipes-application-framework/pkgmgr-info/pkgmgr-info_%.bbappend b/meta-application-manager/recipes-application-framework/pkgmgr-info/pkgmgr-info_%.bbappend deleted file mode 100644 index 1ddaf11..0000000 --- a/meta-application-manager/recipes-application-framework/pkgmgr-info/pkgmgr-info_%.bbappend +++ /dev/null @@ -1,6 +0,0 @@ -SRC_URI_remove = "git://review.tizen.org/platform/core/appfw/pkgmgr-info;tag=b5c4655153dd8ba3619f1c15f85d2549812daf06;nobranch=1" - -SRC_URI_prepend = "git://review.tizen.org/platform/core/appfw/pkgmgr-info;tag=93eeb1859dde996a09fa1907fe0503e33df4f4e6;nobranch=1" - -pkgmgr-info_files += "${prefix}/include/pkgmgrinfo_type.h" -pkgmgr-info_files += "${prefix}/include/pkgmgrinfo_basic.h" diff --git a/meta-application-manager/recipes-others/tizen-platform-config/tizen-platform-config_%.bbappend b/meta-application-manager/recipes-others/tizen-platform-config/tizen-platform-config_%.bbappend index 460710f..e16c554 100644 --- a/meta-application-manager/recipes-others/tizen-platform-config/tizen-platform-config_%.bbappend +++ b/meta-application-manager/recipes-others/tizen-platform-config/tizen-platform-config_%.bbappend @@ -1,6 +1,3 @@ SRC_URI_remove = "git://review.tizen.org/platform/core/appfw/tizen-platform-config;tag=c2b552bd395f4d28f0e369cc1ead4ff18d89a126;nobranch=1" -SRC_URI_prepend = " \ - git://review.tizen.org/platform/core/system/tizen-platform-config;tag=983a697aa098c23a48c34691fa8a7ca9f117817e;nobranch=1" - file://0001-modified-global-tizen-to-agl.patch \ - " +SRC_URI_prepend = "git://review.tizen.org/platform/core/system/tizen-platform-config;tag=983a697aa098c23a48c34691fa8a7ca9f117817e;nobranch=1" |