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. (From OE-Core rev: 1162b78d6f99da52cd7d122e4295c618184e41cd) Signed-off-by: Lianhao Lu <lianhao.lu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
27f8868509
commit
aab71071d7
|
@ -34,7 +34,7 @@ export LDFLAGS += "-ldl"
|
||||||
python populate_packages_prepend () {
|
python populate_packages_prepend () {
|
||||||
# autonamer would call this libxml2-2, but we don't want that
|
# autonamer would call this libxml2-2, but we don't want that
|
||||||
if bb.data.getVar('DEBIAN_NAMES', d, 1):
|
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"
|
PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
require libxml2.inc
|
require libxml2.inc
|
||||||
|
|
||||||
PR = "r0"
|
PR = "r1"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "8127a65e8c3b08856093099b52599c86"
|
SRC_URI[md5sum] = "8127a65e8c3b08856093099b52599c86"
|
||||||
SRC_URI[sha256sum] = "cda23bc9ebd26474ca8f3d67e7d1c4a1f1e7106364b690d822e009fdc3c417ec"
|
SRC_URI[sha256sum] = "cda23bc9ebd26474ca8f3d67e7d1c4a1f1e7106364b690d822e009fdc3c417ec"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
require gtk+.inc
|
require gtk+.inc
|
||||||
|
|
||||||
PR = "r11"
|
PR = "r12"
|
||||||
|
|
||||||
SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \
|
SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \
|
||||||
file://xsettings.patch \
|
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')
|
do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s')
|
||||||
|
|
||||||
if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
|
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)
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
require gtk+.inc
|
require gtk+.inc
|
||||||
|
|
||||||
PR = "r7"
|
PR = "r8"
|
||||||
|
|
||||||
SRC_URI = "http://download.gnome.org/sources/gtk+/2.16/gtk+-${PV}.tar.bz2 \
|
SRC_URI = "http://download.gnome.org/sources/gtk+/2.16/gtk+-${PV}.tar.bz2 \
|
||||||
file://xsettings.patch \
|
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')
|
do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s')
|
||||||
|
|
||||||
if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
|
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)
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
|
||||||
file://gtk/gtk.h;endline=27;md5=c59e0b4490dd135a5726ebf851f9b17f \
|
file://gtk/gtk.h;endline=27;md5=c59e0b4490dd135a5726ebf851f9b17f \
|
||||||
file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e0bf7d861b0614202 \
|
file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e0bf7d861b0614202 \
|
||||||
file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c"
|
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 \
|
SRC_URI = "http://download.gnome.org/sources/gtk+/2.22/gtk+-${PV}.tar.bz2 \
|
||||||
file://xsettings.patch \
|
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')
|
do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s')
|
||||||
|
|
||||||
if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
|
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)
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,14 +18,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=90b90b60eb30f65fc9c2673d7cf59e24"
|
||||||
DEPENDS += "virtual/libx11 libxrender freetype fontconfig"
|
DEPENDS += "virtual/libx11 libxrender freetype fontconfig"
|
||||||
PROVIDES = "xft"
|
PROVIDES = "xft"
|
||||||
|
|
||||||
PR = "r1"
|
PR = "r2"
|
||||||
PE = "1"
|
PE = "1"
|
||||||
|
|
||||||
XORG_PN = "libXft"
|
XORG_PN = "libXft"
|
||||||
|
|
||||||
python () {
|
python () {
|
||||||
if bb.data.getVar('DEBIAN_NAMES', d, 1):
|
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}"
|
FILES_${PN} = "${libdir}/lib*${SOLIBS}"
|
||||||
|
|
Loading…
Reference in New Issue