mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-12-15 23:05:34 +01:00
Fix DeprecationWarning about regexps
* fixes: meta-oe/meta-networking/recipes-support/strongswan/strongswan_5.9.4.bb:125: DeprecationWarning: invalid escape sequence \. meta-oe/meta-networking/recipes-support/strongswan/strongswan_5.9.4.bb:126: DeprecationWarning: invalid escape sequence \. meta-oe/meta-networking/recipes-support/strongswan/strongswan_5.9.4.bb:128: DeprecationWarning: invalid escape sequence \. meta-oe/meta-networking/recipes-support/strongswan/strongswan_5.9.4.bb:129: DeprecationWarning: invalid escape sequence \. meta-oe/meta-networking/recipes-support/strongswan/strongswan_5.9.4.bb:130: DeprecationWarning: invalid escape sequence \. meta-oe/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb:18: DeprecationWarning: invalid escape sequence \. meta-oe/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+2.0.1.bb:21: DeprecationWarning: invalid escape sequence \. meta-oe/meta-oe/recipes-multimedia/libcdio/libcdio_2.1.0.bb:28: DeprecationWarning: invalid escape sequence \. oe-core/meta/classes/package.bbclass:1342: DeprecationWarning: invalid escape sequence \. oe-core/meta/classes/package.bbclass:1343: DeprecationWarning: invalid escape sequence \- oe-core/meta/classes/package.bbclass:1343: DeprecationWarning: invalid escape sequence \. oe-core/meta/classes/package.bbclass:1344: DeprecationWarning: invalid escape sequence \. oe-core/meta/classes/package.bbclass:1345: DeprecationWarning: invalid escape sequence \. oe-core/meta/classes/package.bbclass:1348: DeprecationWarning: invalid escape sequence \. oe-core/meta/classes/package.bbclass:1350: DeprecationWarning: invalid escape sequence \. oe-core/meta/classes/package.bbclass:1353: DeprecationWarning: invalid escape sequence \. oe-core/meta/classes/package.bbclass:1355: DeprecationWarning: invalid escape sequence \. oe-core/meta/classes/package.bbclass:1358: DeprecationWarning: invalid escape sequence \. oe-core/meta/classes/package.bbclass:1360: DeprecationWarning: invalid escape sequence \. oe-core/meta/classes/package.bbclass:1365: DeprecationWarning: invalid escape sequence \. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Martin Jansa
Khem Raj
parent
bfd22261ef
commit
856902b8c0
|
|
@ -64,8 +64,8 @@ python populate_packages:prepend () {
|
|||
postinst = d.getVar('plugin_postinst')
|
||||
pkgs = []
|
||||
|
||||
pkgs += do_split_packages(d, oe.path.join(rygel_libdir, "plugins"), 'librygel-(.*)\.so$', d.expand('${PN}-plugin-%s'), 'Rygel plugin for %s', postinst=postinst, extra_depends=d.expand('${PN}'))
|
||||
pkgs += do_split_packages(d, oe.path.join(rygel_libdir, "plugins"), '(.*)\.plugin$', d.expand('${PN}-plugin-%s'), 'Rygel plugin for %s', postinst=postinst, extra_depends=d.expand('${PN}'))
|
||||
pkgs += do_split_packages(d, oe.path.join(rygel_libdir, "plugins"), r'librygel-(.*)\.so$', d.expand('${PN}-plugin-%s'), 'Rygel plugin for %s', postinst=postinst, extra_depends=d.expand('${PN}'))
|
||||
pkgs += do_split_packages(d, oe.path.join(rygel_libdir, "plugins"), r'(.*)\.plugin$', d.expand('${PN}-plugin-%s'), 'Rygel plugin for %s', postinst=postinst, extra_depends=d.expand('${PN}'))
|
||||
|
||||
metapkg = d.getVar('PN') + '-meta'
|
||||
d.setVar('RDEPENDS:' + metapkg, ' '.join(pkgs))
|
||||
|
|
|
|||
|
|
@ -91,10 +91,10 @@ FILES:dvb-zap-data = "${docdir}/dvb-apps/szap"
|
|||
|
||||
python populate_packages:prepend () {
|
||||
dvb_libdir = bb.data.expand('${libdir}', d)
|
||||
do_split_packages(d, dvb_libdir, '^lib(.*)\.so$', 'lib%s', 'DVB %s package', extra_depends='', allow_links=True)
|
||||
do_split_packages(d, dvb_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'DVB %s development package', extra_depends='${PN}-dev')
|
||||
do_split_packages(d, dvb_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'DVB %s development package', extra_depends='${PN}-dev')
|
||||
do_split_packages(d, dvb_libdir, '^lib(.*)\.so\.*', 'lib%s', 'DVB %s library', extra_depends='', allow_links=True)
|
||||
do_split_packages(d, dvb_libdir, r'^lib(.*)\.so$', 'lib%s', 'DVB %s package', extra_depends='', allow_links=True)
|
||||
do_split_packages(d, dvb_libdir, r'^lib(.*)\.la$', 'lib%s-dev', 'DVB %s development package', extra_depends='${PN}-dev')
|
||||
do_split_packages(d, dvb_libdir, r'^lib(.*)\.a$', 'lib%s-dev', 'DVB %s development package', extra_depends='${PN}-dev')
|
||||
do_split_packages(d, dvb_libdir, r'^lib(.*)\.so\.*', 'lib%s', 'DVB %s library', extra_depends='', allow_links=True)
|
||||
}
|
||||
|
||||
INSANE_SKIP:${PN} = "ldflags"
|
||||
|
|
|
|||
|
|
@ -23,8 +23,8 @@ do_install:append () {
|
|||
python populate_packages:prepend () {
|
||||
rootdir = bb.data.expand('${libdir}/ao/plugins-4', d)
|
||||
rootdir_dbg = bb.data.expand('${libdir}/ao/plugins-4/.debug', d)
|
||||
do_split_packages(d, rootdir, '^(.*)\.so$', output_pattern='${BPN}-plugin-%s', description='AO %s plugin')
|
||||
do_split_packages(d, rootdir_dbg, '^(.*)\.so$', output_pattern='${BPN}-plugin-%s-dbg', description='AO %s plugin debug data')
|
||||
do_split_packages(d, rootdir, r'^(.*)\.so$', output_pattern='${BPN}-plugin-%s', description='AO %s plugin')
|
||||
do_split_packages(d, rootdir_dbg, r'^(.*)\.so$', output_pattern='${BPN}-plugin-%s-dbg', description='AO %s plugin debug data')
|
||||
}
|
||||
|
||||
PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa pulseaudio', d)}"
|
||||
|
|
|
|||
|
|
@ -224,16 +224,16 @@ python samba_populate_packages() {
|
|||
mlprefix = d.getVar('MLPREFIX') or ''
|
||||
pam_libdir = d.expand('${base_libdir}/security')
|
||||
pam_pkgname = mlprefix + 'pam-plugin%s'
|
||||
do_split_packages(d, pam_libdir, '^pam_(.*)\.so$', pam_pkgname, 'PAM plugin for %s', extra_depends='', prepend=True)
|
||||
do_split_packages(d, pam_libdir, r'^pam_(.*)\.so$', pam_pkgname, 'PAM plugin for %s', extra_depends='', prepend=True)
|
||||
|
||||
libdir = d.getVar('libdir')
|
||||
do_split_packages(d, libdir, '^lib(.*)\.so\..*$', 'lib%s', 'Samba %s library', extra_depends='${PN}-common', prepend=True, allow_links=True)
|
||||
do_split_packages(d, libdir, r'^lib(.*)\.so\..*$', 'lib%s', 'Samba %s library', extra_depends='${PN}-common', prepend=True, allow_links=True)
|
||||
pkglibdir = '%s/samba' % libdir
|
||||
do_split_packages(d, pkglibdir, '^lib(.*)\.so$', 'lib%s', 'Samba %s library', extra_depends='${PN}-common', prepend=True)
|
||||
do_split_packages(d, pkglibdir, r'^lib(.*)\.so$', 'lib%s', 'Samba %s library', extra_depends='${PN}-common', prepend=True)
|
||||
moduledir = '%s/samba/auth' % libdir
|
||||
do_split_packages(d, moduledir, '^(.*)\.so$', 'samba-auth-%s', 'Samba %s authentication backend', hook=module_hook, extra_depends='', prepend=True)
|
||||
do_split_packages(d, moduledir, r'^(.*)\.so$', 'samba-auth-%s', 'Samba %s authentication backend', hook=module_hook, extra_depends='', prepend=True)
|
||||
moduledir = '%s/samba/pdb' % libdir
|
||||
do_split_packages(d, moduledir, '^(.*)\.so$', 'samba-pdb-%s', 'Samba %s password backend', hook=module_hook, extra_depends='', prepend=True)
|
||||
do_split_packages(d, moduledir, r'^(.*)\.so$', 'samba-pdb-%s', 'Samba %s password backend', hook=module_hook, extra_depends='', prepend=True)
|
||||
}
|
||||
|
||||
PACKAGESPLITFUNCS:prepend = "samba_populate_packages "
|
||||
|
|
|
|||
|
|
@ -122,12 +122,12 @@ python split_strongswan_plugins () {
|
|||
else:
|
||||
d.setVar('CONFFILES:' + pkg, oldfiles + " " + newfile)
|
||||
|
||||
split_packages = do_split_packages(d, libdir, 'libstrongswan-(.*)\.so', '${PN}-plugin-%s', 'strongSwan %s plugin', prepend=True)
|
||||
do_split_packages(d, sysconfdir, '(.*)\.conf', '${PN}-plugin-%s', 'strongSwan %s plugin', prepend=True, hook=add_plugin_conf)
|
||||
split_packages = do_split_packages(d, libdir, r'libstrongswan-(.*)\.so', '${PN}-plugin-%s', 'strongSwan %s plugin', prepend=True)
|
||||
do_split_packages(d, sysconfdir, r'(.*)\.conf', '${PN}-plugin-%s', 'strongSwan %s plugin', prepend=True, hook=add_plugin_conf)
|
||||
|
||||
split_dbg_packages = do_split_packages(d, dbglibdir, 'libstrongswan-(.*)\.so', '${PN}-plugin-%s-dbg', 'strongSwan %s plugin - Debugging files', prepend=True, extra_depends='${PN}-dbg')
|
||||
split_dev_packages = do_split_packages(d, libdir, 'libstrongswan-(.*)\.la', '${PN}-plugin-%s-dev', 'strongSwan %s plugin - Development files', prepend=True, extra_depends='${PN}-dev')
|
||||
split_staticdev_packages = do_split_packages(d, libdir, 'libstrongswan-(.*)\.a', '${PN}-plugin-%s-staticdev', 'strongSwan %s plugin - Development files (Static Libraries)', prepend=True, extra_depends='${PN}-staticdev')
|
||||
split_dbg_packages = do_split_packages(d, dbglibdir, r'libstrongswan-(.*)\.so', '${PN}-plugin-%s-dbg', 'strongSwan %s plugin - Debugging files', prepend=True, extra_depends='${PN}-dbg')
|
||||
split_dev_packages = do_split_packages(d, libdir, r'libstrongswan-(.*)\.la', '${PN}-plugin-%s-dev', 'strongSwan %s plugin - Development files', prepend=True, extra_depends='${PN}-dev')
|
||||
split_staticdev_packages = do_split_packages(d, libdir, r'libstrongswan-(.*)\.a', '${PN}-plugin-%s-staticdev', 'strongSwan %s plugin - Development files (Static Libraries)', prepend=True, extra_depends='${PN}-staticdev')
|
||||
|
||||
if split_packages:
|
||||
pn = d.getVar('PN')
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ INITSCRIPT_PARAMS:lcdproc = "defaults 71 20"
|
|||
|
||||
python populate_packages:prepend() {
|
||||
plugindir = d.expand('${libdir}/lcdproc')
|
||||
do_split_packages(d, plugindir, '(.*)\.so$', 'lcdd-driver-%s', 'LCDd driver for %s', prepend=True)
|
||||
do_split_packages(d, plugindir, r'(.*)\.so$', 'lcdd-driver-%s', 'LCDd driver for %s', prepend=True)
|
||||
}
|
||||
|
||||
PACKAGES_DYNAMIC += "^lcdd-driver-.*"
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ do_install() {
|
|||
|
||||
python populate_packages:prepend () {
|
||||
tessdata_dir= d.expand('${datadir}/tessdata')
|
||||
pkgs = do_split_packages(d, tessdata_dir, '^([a-z_]*)\.*', '${BPN}-%s', 'tesseract-ocr language files for %s', extra_depends='')
|
||||
pkgs = do_split_packages(d, tessdata_dir, r'^([a-z_]*)\.*', '${BPN}-%s', 'tesseract-ocr language files for %s', extra_depends='')
|
||||
pn = d.getVar('PN')
|
||||
d.appendVar('RDEPENDS:' + pn, ' '+' '.join(pkgs))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ PACKAGESPLITFUNCS:prepend = "split_ttf_mplus_packages "
|
|||
|
||||
python split_ttf_mplus_packages() {
|
||||
plugindir = d.expand('${datadir}/fonts/ttf-mplus/')
|
||||
packages = do_split_packages(d, plugindir, '^(.*)\.ttf$', 'ttf-%s', 'TTF Font %s')
|
||||
packages = do_split_packages(d, plugindir, r'^(.*)\.ttf$', 'ttf-%s', 'TTF Font %s')
|
||||
d.setVar('FONT_PACKAGES', ' '.join(packages))
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ FILES:${PN}-utils = "${bindir}/*"
|
|||
|
||||
python libcdio_split_packages() {
|
||||
libdir = d.expand('${libdir}')
|
||||
do_split_packages(d, libdir, '^lib(.*)\.so\..*', 'lib%s', 'libcdio %s library', extra_depends='', allow_links=True)
|
||||
do_split_packages(d, libdir, r'^lib(.*)\.so\..*', 'lib%s', 'libcdio %s library', extra_depends='', allow_links=True)
|
||||
}
|
||||
|
||||
PACKAGESPLITFUNCS =+ "libcdio_split_packages"
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ FILES:${PN}-utils = "${bindir}/*"
|
|||
|
||||
python libcdio_split_packages() {
|
||||
libdir = d.expand('${libdir}')
|
||||
do_split_packages(d, libdir, '^lib(.*)\.so\..*', 'lib%s', 'libcdio %s library', extra_depends='', allow_links=True)
|
||||
do_split_packages(d, libdir, r'^lib(.*)\.so\..*', 'lib%s', 'libcdio %s library', extra_depends='', allow_links=True)
|
||||
}
|
||||
|
||||
PACKAGESPLITFUNCS =+ "libcdio_split_packages"
|
||||
|
|
|
|||
|
|
@ -63,22 +63,22 @@ do_install:append () {
|
|||
python populate_packages:prepend () {
|
||||
freerdp_root = d.expand('${libdir}/freerdp')
|
||||
|
||||
do_split_packages(d, freerdp_root, '^(audin_.*)\.so$',
|
||||
do_split_packages(d, freerdp_root, r'^(audin_.*)\.so$',
|
||||
output_pattern='libfreerdp-plugin-%s',
|
||||
description='FreeRDP plugin %s',
|
||||
prepend=True, extra_depends='libfreerdp-plugin-audin')
|
||||
|
||||
do_split_packages(d, freerdp_root, '^(rdpsnd_.*)\.so$',
|
||||
do_split_packages(d, freerdp_root, r'^(rdpsnd_.*)\.so$',
|
||||
output_pattern='libfreerdp-plugin-%s',
|
||||
description='FreeRDP plugin %s',
|
||||
prepend=True, extra_depends='libfreerdp-plugin-rdpsnd')
|
||||
|
||||
do_split_packages(d, freerdp_root, '^(tsmf_.*)\.so$',
|
||||
do_split_packages(d, freerdp_root, r'^(tsmf_.*)\.so$',
|
||||
output_pattern='libfreerdp-plugin-%s',
|
||||
description='FreeRDP plugin %s',
|
||||
prepend=True, extra_depends='libfreerdp-plugin-tsmf')
|
||||
|
||||
do_split_packages(d, freerdp_root, '^([^-]*)\.so$',
|
||||
do_split_packages(d, freerdp_root, r'^([^-]*)\.so$',
|
||||
output_pattern='libfreerdp-plugin-%s',
|
||||
description='FreeRDP plugin %s',
|
||||
prepend=True, extra_depends='')
|
||||
|
|
|
|||
|
|
@ -34,8 +34,8 @@ PACKAGECONFIG[gtk3] = "--enable-gtk3, --disable-gtk3, gtk+3"
|
|||
|
||||
python populate_packages:prepend() {
|
||||
plugindir = d.expand('${libdir}/${BPN}-${PV}/')
|
||||
do_split_packages(d, plugindir, '^libcanberra-(.*)\.so$', 'libcanberra-%s', '%s support library', extra_depends='' )
|
||||
do_split_packages(d, plugindir, '^libcanberra-(.*)\.la$', 'libcanberra-%s', '%s support library', extra_depends='' )
|
||||
do_split_packages(d, plugindir, r'^libcanberra-(.*)\.so$', 'libcanberra-%s', '%s support library', extra_depends='' )
|
||||
do_split_packages(d, plugindir, r'^libcanberra-(.*)\.la$', 'libcanberra-%s', '%s support library', extra_depends='' )
|
||||
}
|
||||
|
||||
PACKAGES =+ "${PN}-gnome ${PN}-gtk2 ${PN}-gtk3 ${PN}-systemd"
|
||||
|
|
|
|||
|
|
@ -162,10 +162,10 @@ PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'samples', '${PN}-samples', '
|
|||
|
||||
python populate_packages:prepend () {
|
||||
cv_libdir = d.expand('${libdir}')
|
||||
do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True)
|
||||
do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev')
|
||||
do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev')
|
||||
do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True)
|
||||
do_split_packages(d, cv_libdir, r'^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True)
|
||||
do_split_packages(d, cv_libdir, r'^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev')
|
||||
do_split_packages(d, cv_libdir, r'^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev')
|
||||
do_split_packages(d, cv_libdir, r'^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True)
|
||||
|
||||
pn = d.getVar('PN')
|
||||
metapkg = pn + '-dev'
|
||||
|
|
|
|||
|
|
@ -219,8 +219,8 @@ INSANE_SKIP:${PN}-backend-passwd += "dev-so"
|
|||
|
||||
python populate_packages:prepend () {
|
||||
backend_dir = d.expand('${libexecdir}/openldap')
|
||||
do_split_packages(d, backend_dir, 'back_([a-z]*)\.so$', 'openldap-backend-%s', 'OpenLDAP %s backend', prepend=True, extra_depends='', allow_links=True)
|
||||
do_split_packages(d, backend_dir, 'back_([a-z]*)\-.*\.so\..*$', 'openldap-backend-%s', 'OpenLDAP %s backend', extra_depends='', allow_links=True)
|
||||
do_split_packages(d, backend_dir, r'back_([a-z]*)\.so$', 'openldap-backend-%s', 'OpenLDAP %s backend', prepend=True, extra_depends='', allow_links=True)
|
||||
do_split_packages(d, backend_dir, r'back_([a-z]*)\-.*\.so\..*$', 'openldap-backend-%s', 'OpenLDAP %s backend', extra_depends='', allow_links=True)
|
||||
|
||||
metapkg = "${PN}-backends"
|
||||
d.setVar('ALLOW_EMPTY:' + metapkg, "1")
|
||||
|
|
|
|||
|
|
@ -83,27 +83,27 @@ python populate_packages:prepend () {
|
|||
purple = d.expand('${libdir}/purple-2')
|
||||
finch = d.expand('${libdir}/finch')
|
||||
|
||||
do_split_packages(d, pidgroot, '^([^l][^i][^b].*)\.so$',
|
||||
do_split_packages(d, pidgroot, r'^([^l][^i][^b].*)\.so$',
|
||||
output_pattern='pidgin-plugin-%s',
|
||||
description='Pidgin plugin %s',
|
||||
prepend=True, extra_depends='')
|
||||
|
||||
do_split_packages(d, purple, '^lib(.*)\.so$',
|
||||
do_split_packages(d, purple, r'^lib(.*)\.so$',
|
||||
output_pattern='libpurple-protocol-%s',
|
||||
description='Libpurple protocol plugin for %s',
|
||||
prepend=True, extra_depends='')
|
||||
|
||||
do_split_packages(d, purple, '^(ssl-.*)\.so$',
|
||||
do_split_packages(d, purple, r'^(ssl-.*)\.so$',
|
||||
output_pattern='libpurple-plugin-%s',
|
||||
description='libpurple plugin %s',
|
||||
prepend=True, extra_depends='libpurple-plugin-ssl')
|
||||
|
||||
do_split_packages(d, purple, '^([^l][^i][^b].*)\.so$',
|
||||
do_split_packages(d, purple, r'^([^l][^i][^b].*)\.so$',
|
||||
output_pattern='libpurple-plugin-%s',
|
||||
description='libpurple plugin %s',
|
||||
prepend=True, extra_depends='')
|
||||
|
||||
do_split_packages(d, finch, '^([^l][^i][^b].*)\.so$',
|
||||
do_split_packages(d, finch, r'^([^l][^i][^b].*)\.so$',
|
||||
output_pattern='finch-plugin-%s',
|
||||
description='Finch plugin %s',
|
||||
prepend=True, extra_depends='')
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ python populate_packages:prepend () {
|
|||
packages.append(pkg)
|
||||
testrunners.append(modulename)
|
||||
|
||||
do_split_packages(d, poco_libdir, '^libPoco(.*)\.so\..*$',
|
||||
do_split_packages(d, poco_libdir, r'^libPoco(.*)\.so\..*$',
|
||||
'poco-%s', 'Poco %s component', extra_depends='', prepend=True, hook=hook)
|
||||
|
||||
d.setVar("RRECOMMENDS:%s" % pn, " ".join(packages))
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ SRC_URI += " \
|
|||
python populate_packages:prepend() {
|
||||
plugin_dir = d.expand('${libdir}/xfce4/panel/plugins/')
|
||||
plugin_name = d.expand('${PN}-plugin-%s')
|
||||
do_split_packages(d, plugin_dir, '^lib(.*).so$', plugin_name,
|
||||
do_split_packages(d, plugin_dir, r'^lib(.*)\.so$', plugin_name,
|
||||
'${PN} plugin for %s', extra_depends='', prepend=True,
|
||||
aux_files_pattern=['${datadir}/xfce4/panel/plugins/%s.desktop',
|
||||
'${sysconfdir}/xdg/xfce/panel/%s-*',
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user