mirror of
https://git.yoctoproject.org/poky
synced 2026-02-12 03:33:02 +01:00
Globally replace 'base_contains' calls with 'bb.utils.contains'
The base_contains is kept as a compatibility method and we ought to not use it in OE-Core so we can remove it from base metadata in future. (From OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
08a38a7865
commit
4c14b09498
@@ -85,16 +85,16 @@ do_install_append() {
|
||||
# Disable zypper channel support
|
||||
rm -f ${D}${libdir}/python*/site-packages/smart/plugins/zyppchannelsync.py*
|
||||
|
||||
if [ -z "${@base_contains('PACKAGECONFIG', 'rpm', 'rpm', '', d)}" ]; then
|
||||
if [ -z "${@bb.utils.contains('PACKAGECONFIG', 'rpm', 'rpm', '', d)}" ]; then
|
||||
rm -f ${D}${libdir}/python*/site-packages/smart/plugins/rpmdir.py*
|
||||
rm -rf ${D}${libdir}/python*/site-packages/smart/backends/rpm
|
||||
fi
|
||||
|
||||
if [ -z "${@base_contains('PACKAGECONFIG', 'qt4', 'qt4', '', d)}" ]; then
|
||||
if [ -z "${@bb.utils.contains('PACKAGECONFIG', 'qt4', 'qt4', '', d)}" ]; then
|
||||
rm -rf ${D}${libdir}/python*/site-packages/smart/interfaces/qt4
|
||||
fi
|
||||
|
||||
if [ -z "${@base_contains('PACKAGECONFIG', 'gtk+', 'gtk', '', d)}" ]; then
|
||||
if [ -z "${@bb.utils.contains('PACKAGECONFIG', 'gtk+', 'gtk', '', d)}" ]; then
|
||||
rm -rf ${D}${libdir}/python*/site-packages/smart/interfaces/gtk
|
||||
fi
|
||||
}
|
||||
@@ -115,9 +115,9 @@ do_install_append_class-nativesdk() {
|
||||
}
|
||||
|
||||
PACKAGES = "${PN}-dev ${PN}-dbg ${PN}-doc smartpm \
|
||||
${@base_contains('PACKAGECONFIG', 'rpm', '${PN}-backend-rpm', '', d)} \
|
||||
${@base_contains('PACKAGECONFIG', 'qt4', '${PN}-interface-qt4', '', d)} \
|
||||
${@base_contains('PACKAGECONFIG', 'gtk', '${PN}-interface-gtk', '', d)} \
|
||||
${@bb.utils.contains('PACKAGECONFIG', 'rpm', '${PN}-backend-rpm', '', d)} \
|
||||
${@bb.utils.contains('PACKAGECONFIG', 'qt4', '${PN}-interface-qt4', '', d)} \
|
||||
${@bb.utils.contains('PACKAGECONFIG', 'gtk', '${PN}-interface-gtk', '', d)} \
|
||||
${PN}-interface-images ${PN}"
|
||||
|
||||
RDEPENDS_smartpm = "${PN}"
|
||||
|
||||
Reference in New Issue
Block a user