From 1162b78d6f99da52cd7d122e4295c618184e41cd Mon Sep 17 00:00:00 2001 From: Lianhao Lu Date: Fri, 16 Sep 2011 20:32:50 +0800 Subject: Misc: Added MLPREFIX to final pkg names in case of DEBIAN_NAMES. [YOCTO #1486] Added MLPREFIX to the final package names of library packages in case of DEBIAN_NAMES. Signed-off-by: Lianhao Lu --- meta/recipes-core/libxml/libxml2.inc | 2 +- meta/recipes-core/libxml/libxml2_2.7.8.bb | 2 +- meta/recipes-gnome/gtk+/gtk+_2.12.7.bb | 4 ++-- meta/recipes-gnome/gtk+/gtk+_2.16.6.bb | 4 ++-- meta/recipes-gnome/gtk+/gtk+_2.22.1.bb | 4 ++-- meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/meta/recipes-core/libxml/libxml2.inc b/meta/recipes-core/libxml/libxml2.inc index dfe6a9ad28..cf789b27ce 100644 --- a/meta/recipes-core/libxml/libxml2.inc +++ b/meta/recipes-core/libxml/libxml2.inc @@ -34,7 +34,7 @@ export LDFLAGS += "-ldl" python populate_packages_prepend () { # autonamer would call this libxml2-2, but we don't want that if bb.data.getVar('DEBIAN_NAMES', d, 1): - bb.data.setVar('PKG_libxml2', 'libxml2', d) + bb.data.setVar('PKG_libxml2', '${MLPREFIX}libxml2', d) } PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale" diff --git a/meta/recipes-core/libxml/libxml2_2.7.8.bb b/meta/recipes-core/libxml/libxml2_2.7.8.bb index 616fd09f93..3909839d46 100644 --- a/meta/recipes-core/libxml/libxml2_2.7.8.bb +++ b/meta/recipes-core/libxml/libxml2_2.7.8.bb @@ -1,6 +1,6 @@ require libxml2.inc -PR = "r0" +PR = "r1" SRC_URI[md5sum] = "8127a65e8c3b08856093099b52599c86" SRC_URI[sha256sum] = "cda23bc9ebd26474ca8f3d67e7d1c4a1f1e7106364b690d822e009fdc3c417ec" diff --git a/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb b/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb index 7de748c0b9..00c4ee8eae 100644 --- a/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb +++ b/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb @@ -1,6 +1,6 @@ require gtk+.inc -PR = "r11" +PR = "r12" SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \ file://xsettings.patch \ @@ -47,5 +47,5 @@ python populate_packages_prepend () { do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s') if (bb.data.getVar('DEBIAN_NAMES', d, 1)): - bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d) + bb.data.setVar('PKG_${PN}', '${MLPREFIX}libgtk-2.0', d) } diff --git a/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb b/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb index 18f61e762b..09b917f13f 100644 --- a/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb +++ b/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb @@ -1,6 +1,6 @@ require gtk+.inc -PR = "r7" +PR = "r8" SRC_URI = "http://download.gnome.org/sources/gtk+/2.16/gtk+-${PV}.tar.bz2 \ file://xsettings.patch \ @@ -47,5 +47,5 @@ python populate_packages_prepend () { do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s') if (bb.data.getVar('DEBIAN_NAMES', d, 1)): - bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d) + bb.data.setVar('PKG_${PN}', '${MLPREFIX}libgtk-2.0', d) } diff --git a/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb b/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb index 55620d2930..ba90e0ee5f 100644 --- a/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb +++ b/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ file://gtk/gtk.h;endline=27;md5=c59e0b4490dd135a5726ebf851f9b17f \ file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e0bf7d861b0614202 \ file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c" -PR = "r2" +PR = "r3" SRC_URI = "http://download.gnome.org/sources/gtk+/2.22/gtk+-${PV}.tar.bz2 \ file://xsettings.patch \ @@ -50,5 +50,5 @@ python populate_packages_prepend () { do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s') if (bb.data.getVar('DEBIAN_NAMES', d, 1)): - bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d) + bb.data.setVar('PKG_${PN}', '${MLPREFIX}libgtk-2.0', d) } diff --git a/meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb b/meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb index 33c8a1e782..ac7dfb116d 100644 --- a/meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb +++ b/meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb @@ -18,14 +18,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=90b90b60eb30f65fc9c2673d7cf59e24" DEPENDS += "virtual/libx11 libxrender freetype fontconfig" PROVIDES = "xft" -PR = "r1" +PR = "r2" PE = "1" XORG_PN = "libXft" python () { if bb.data.getVar('DEBIAN_NAMES', d, 1): - bb.data.setVar('PKG_${PN}', 'libxft2', d) + bb.data.setVar('PKG_${PN}', '${MLPREFIX}libxft2', d) } FILES_${PN} = "${libdir}/lib*${SOLIBS}" -- cgit 1.2.3-korg