Patchwork [6/7] polkit: fix multilib packaging issue

login
register
mail settings
Submitter Constantin Musca
Date Dec. 17, 2012, 9:16 a.m.
Message ID <23ce21241cd9ea2a513679a8c5033dfd58b2410f.1355732782.git.constantinx.musca@intel.com>
Download mbox | patch
Permalink /patch/41177/
State Accepted
Commit 49ef0b13e826c04adc8d4411eea87bdd60344a96
Headers show

Comments

Constantin Musca - Dec. 17, 2012, 9:16 a.m.
- use BPN instead of PN (PN includes MLPREFIX)
- fix the following warning:
WARNING: QA Issue: lib32-polkit: Files/directories were installed but not shipped
  /usr/share/polkit-1
  /usr/share/polkit-1/actions
  /usr/share/polkit-1/actions/org.freedesktop.policykit.policy
  /usr/share/polkit-1/actions/org.freedesktop.policykit.examples.pkexec.policy
  /usr/lib/polkit-1
  /usr/lib/polkit-1/extensions
  /usr/lib/polkit-1/extensions/libnullbackend.so
  /usr/lib/polkit-1/extensions/libnullbackend.a
  /usr/lib/polkit-1/extensions/libnullbackend.la
  /usr/lib/polkit-1/extensions/.debug
  /usr/lib/polkit-1/extensions/.debug/libnullbackend.so

[YOCTO #3438]

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
---
 meta/recipes-extended/polkit/polkit_0.104.bb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Patch

diff --git a/meta/recipes-extended/polkit/polkit_0.104.bb b/meta/recipes-extended/polkit/polkit_0.104.bb
index 67c375a..74b5379 100644
--- a/meta/recipes-extended/polkit/polkit_0.104.bb
+++ b/meta/recipes-extended/polkit/polkit_0.104.bb
@@ -10,7 +10,7 @@  DEPENDS = "expat glib-2.0 intltool-native gobject-introspection-stub"
 PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
 PACKAGECONFIG[pam] = "--with-authfw=pam,--with-authfw=shadow,libpam,libpam"
 
-PR = "r7"
+PR = "r8"
 
 PAM_SRC_URI = "file://polkit-1_pam.patch"
 SRC_URI = "http://hal.freedesktop.org/releases/polkit-${PV}.tar.gz \
@@ -27,12 +27,12 @@  EXTRA_OECONF = "--with-os-type=moblin --disable-man-pages --disable-introspectio
 inherit autotools gtk-doc pkgconfig
 
 do_install_append() {
-	rm -f ${D}${libdir}/${PN}-1/extensions/*.a
+	rm -f ${D}${libdir}/${BPN}-1/extensions/*.a
 }
 
-FILES_${PN} += "${libdir}/${PN}-1/extensions/*.so \
-                ${datadir}/${PN}-1/actions/* \
+FILES_${PN} += "${libdir}/${BPN}-1/extensions/*.so \
+                ${datadir}/${BPN}-1/actions/* \
                 ${datadir}/dbus-1/system-services/*"
-FILES_${PN}-dbg += "${libdir}/${PN}-1/extensions/.debug/*.so"
-FILES_${PN}-dev += "${libdir}/${PN}-1/extensions/*.la "
+FILES_${PN}-dbg += "${libdir}/${BPN}-1/extensions/.debug/*.so"
+FILES_${PN}-dev += "${libdir}/${BPN}-1/extensions/*.la "