From: Ronan Le Martret Date: Tue, 30 Sep 2014 17:03:09 +0000 (+0200) Subject: Fix pkgmgr X-Git-Tag: ivi_rev_0.2~11 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=63545698caf0d06686f4390f84d67c3903b888e4;p=scm%2Fbb%2Fmeta-tizen.git Fix pkgmgr Change-Id: I84ed1077856188457aa34031fc582ee9b5d54610 Signed-off-by: Ronan Le Martret --- diff --git a/recipes-tizen/pkgmgr/pkgmgr.inc b/recipes-tizen/pkgmgr/pkgmgr.inc index 9e3290b..be7fc54 100644 --- a/recipes-tizen/pkgmgr/pkgmgr.inc +++ b/recipes-tizen/pkgmgr/pkgmgr.inc @@ -44,10 +44,6 @@ RDEPENDS = "" RDEPENDS_${PN}-client += "shared-mime-info" RDEPENDS_${PN}-client += "pkgmgr" -#RDEPENDS of pkgmgr (${PN}) -RDEPENDS_${PN} += "libcap" -RDEPENDS_${PN} += "shadow" - #RDEPENDS of pkgmgr-server (${PN}-server) RDEPENDS_${PN}-server += "pkgmgr" @@ -80,6 +76,8 @@ DEPENDS += "ail" DEPENDS += "smack" DEPENDS += "bundle" DEPENDS += "ecore" +DEPENDS_append_class-native = " fdupes-native" +DEPENDS_append_class-target = " fdupes-native" DEPENDS += "tizen-platform-config" DEPENDS += "dbus-glib" @@ -120,7 +118,7 @@ do_compile() { ${EXTRA_OECMAKE} . \ -DX11_SUPPORT=Off - make -j16 + oe_runmake -j16 @@ -150,13 +148,34 @@ do_install() { mkdir -p ${D}${sysconfdir}/package-manager/backend mkdir -p ${D}${sysconfdir}/package-manager/backendlib - mkdir -p ${D}/etc/opt/upgrade + mkdir -p ${D}${sysconfdir}/opt/upgrade mkdir -p ${D}${sysconfdir}/package-manager/server #find_lang package-manager + _target=""; + _symlinks=0; + + fdupes -q -n -r ${D} | + while read _file; do + if test -z "$_target" ; then + _target="$_file"; + else + if test -z "$_file" ; then + _target=""; + continue ; + fi ; + if test "$_symlinks" = 1; then + ln -sf "${_target#${D}}" "$_file"; + else + ln -f "$_target" "$_file"; + fi ; + fi ; + done + + } pkg_postinst_pkgmgr-installer() { @@ -177,7 +196,7 @@ pkg_postinst_${PN}() { [ "x$D" == "x" ] && ldconfig # For pkgmgr-install: # Update mime database to support package mime types - update-mime-database /usr/share/mime + update-mime-database $D${prefix}/share/mime } diff --git a/recipes-tizen/pkgmgr/pkgmgr_git.bb b/recipes-tizen/pkgmgr/pkgmgr_git.bb index e42270c..2bb06e1 100644 --- a/recipes-tizen/pkgmgr/pkgmgr_git.bb +++ b/recipes-tizen/pkgmgr/pkgmgr_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/core/appfw/slp-pkgmgr;tag=c44df8e20261ddc2905fdd1ee3badbd5810361d6;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/appfw/slp-pkgmgr;tag=6f045429815c83046d9e44f3f1005122fb78bc16;nobranch=1" BBCLASSEXTEND += " native "