From 9b3c30dad85cc2da2ee859103b3d26b21ffffc33 Mon Sep 17 00:00:00 2001 From: Valentin Cupif Date: Thu, 22 May 2014 11:28:12 +0200 Subject: [PATCH] meta-tizen: Fix privacy-manager build for yocto Change-Id: Iccef96be8847a4d9758e099517db5cf5eba5be61 (From meta-tizen rev: 138ee0fcf2ba4c9cad2569d3e8bcd2b34909289a) Signed-off-by: Valentin Cupif Signed-off-by: Patrick Ohly --- .../privacy-manager/privacy-manager-extraconf.inc | 53 ++++++++++++++++++++++ .../fix-include-directories-in-CMakeList.txt.patch | 24 ++++++++++ 2 files changed, 77 insertions(+) create mode 100644 meta-tizen/recipes-tizen/privacy-manager/privacy-manager/fix-include-directories-in-CMakeList.txt.patch diff --git a/meta-tizen/recipes-tizen/privacy-manager/privacy-manager-extraconf.inc b/meta-tizen/recipes-tizen/privacy-manager/privacy-manager-extraconf.inc index e69de29..1f3bbc6 100644 --- a/meta-tizen/recipes-tizen/privacy-manager/privacy-manager-extraconf.inc +++ b/meta-tizen/recipes-tizen/privacy-manager/privacy-manager-extraconf.inc @@ -0,0 +1,53 @@ +SRC_URI += "file://fix-include-directories-in-CMakeList.txt.patch" + + +privacy-manager-client_files = "" +privacy-manager-client_files += "privacy-manager-client.manifest" +privacy-manager-client_files += "${prefix}/lib/libprivacy-manager-client.so.*" +privacy-manager-client_files += "${prefix}/share/privacy-manager/privacy-filter-list.ini" +privacy-manager-client_files += "${prefix}/lib/libprivileges.so" +privacy-manager-client_files += "${prefix}/lib/systemd/system/multi-user.target.wants" + +privacy-manager-server_files = "" +privacy-manager-server_files += "privacy-manager-server.manifest" +privacy-manager-server_files += "${prefix}/lib/libprivacy-manager-server.so.*" +privacy-manager-server_files += "/opt/dbspace/.privacylist.db" +privacy-manager-server_files += "${prefix}/bin/*" + +privacy-manager-server-dev_files = "" +privacy-manager-server-dev_files += "${prefix}/include/privacy_manager/server/privacy_manager_daemon.h" +privacy-manager-server-dev_files += "${prefix}/lib/pkgconfig/privacy-manager-server.pc" +privacy-manager-server-dev_files += "${prefix}/lib/libprivacy-manager-server.so" + +capi-security-privacy-manager_files = "" +capi-security-privacy-manager_files += "${prefix}/lib/libcapi-security-privacy-manager.so.*" +capi-security-privacy-manager_files += "capi-security-privacy-manager.manifest" + +privacy-manager-client-dev_files = "" +privacy-manager-client-dev_files += "privacy-manager-client-devel.manifest" +privacy-manager-client-dev_files += "${prefix}/include/*" +privacy-manager-client-dev_files += "${prefix}/lib/pkgconfig/privacy-manager-client.pc" +privacy-manager-client-dev_files += "${prefix}/lib/libprivacy-manager-client.so" + +capi-security-privacy-manager-dev_files = "" +capi-security-privacy-manager-dev_files += "capi-security-privacy-manager-devel.manifest" +capi-security-privacy-manager-dev_files += "${prefix}/include/privacymgr/*.h" +capi-security-privacy-manager-dev_files += "${prefix}/lib/libcapi-security-privacy-manager.so" +capi-security-privacy-manager-dev_files += "${prefix}/lib/pkgconfig/capi-security-privacy-manager.pc" + + +INSANE_SKIP_${PN} = "already-stripped" + +FILES_privacy-manager-client = "${privacy-manager-client_files}" +FILES_${PN} = "${privacy-manager-server_files}" +FILES_${PN}-dev = "${privacy-manager-server-dev_files}" +FILES_capi-security-privacy-manager = "${capi-security-privacy-manager_files}" +FILES_privacy-manager-client-dev = "${privacy-manager-client-dev_files}" +FILES_capi-security-privacy-manager-dev = "${capi-security-privacy-manager-dev_files}" + +PKG_privacy-manager-client= "privacy-manager-client" +PKG_privacy-manager-server= "privacy-manager-server" +PKG_privacy-manager-server-dev= "privacy-manager-server-dev" +PKG_capi-security-privacy-manager= "capi-security-privacy-manager" +PKG_privacy-manager-client-dev= "privacy-manager-client-dev" +PKG_capi-security-privacy-manager-dev= "capi-security-privacy-manager-dev" diff --git a/meta-tizen/recipes-tizen/privacy-manager/privacy-manager/fix-include-directories-in-CMakeList.txt.patch b/meta-tizen/recipes-tizen/privacy-manager/privacy-manager/fix-include-directories-in-CMakeList.txt.patch new file mode 100644 index 0000000..baa56f4 --- /dev/null +++ b/meta-tizen/recipes-tizen/privacy-manager/privacy-manager/fix-include-directories-in-CMakeList.txt.patch @@ -0,0 +1,24 @@ +diff --git a/pkgmgr_plugin/CMakeLists.txt b/pkgmgr_plugin/CMakeLists.txt +index b8a0488..00f8428 100644 +--- a/pkgmgr_plugin/CMakeLists.txt ++++ b/pkgmgr_plugin/CMakeLists.txt +@@ -12,11 +12,7 @@ FOREACH(flag ${privileges_CFLAGS}) + ENDFOREACH(flag) + + INCLUDE_DIRECTORIES( +- /usr/include +- /usr/include/glib-2.0 +- /usr/include/libxml2 +- /usr/include/package_manager +- /usr/include/dlog ++ "${pkg_INCLUDE_DIRS}" + "${CMAKE_SOURCE_DIR}/client/inc/" + "${CMAKE_SOURCE_DIR}/common/inc/" + ) +@@ -61,5 +57,5 @@ ADD_CUSTOM_COMMAND(TARGET ${this_target} + COMMENT "strip ${this_target}" + ) + +-INSTALL(TARGETS ${this_target} DESTINATION "../etc/package-manager/parserlib") ++INSTALL(TARGETS ${this_target} DESTINATION lib) + -- 2.7.4