diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2022-02-20 09:48:12 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2022-02-21 18:12:04 -0800 |
commit | 856902b8c0014fdbfd70b4c63cb353929dacbbf0 (patch) | |
tree | 78ff3c35f5d7c2891b56b5d0082866fe6fc12640 /meta-oe | |
parent | bfd22261ef554575dee9a857e518b7b6c603af2a (diff) | |
download | meta-openembedded-contrib-856902b8c0014fdbfd70b4c63cb353929dacbbf0.tar.gz |
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>
Diffstat (limited to 'meta-oe')
11 files changed, 23 insertions, 23 deletions
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb b/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb index 5257ee3477..46ca77f208 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb @@ -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-.*" diff --git a/meta-oe/recipes-graphics/tesseract/tesseract-lang_4.1.0.bb b/meta-oe/recipes-graphics/tesseract/tesseract-lang_4.1.0.bb index 3a3068f73a..2f7fcac784 100644 --- a/meta-oe/recipes-graphics/tesseract/tesseract-lang_4.1.0.bb +++ b/meta-oe/recipes-graphics/tesseract/tesseract-lang_4.1.0.bb @@ -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)) } diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb index 31e710a95e..d8236ce434 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb @@ -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)) } diff --git a/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+2.0.1.bb b/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+2.0.1.bb index 441defea43..3ca91f64a3 100644 --- a/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+2.0.1.bb +++ b/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+2.0.1.bb @@ -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" diff --git a/meta-oe/recipes-multimedia/libcdio/libcdio_2.1.0.bb b/meta-oe/recipes-multimedia/libcdio/libcdio_2.1.0.bb index 2becafb2a4..170a555b9e 100644 --- a/meta-oe/recipes-multimedia/libcdio/libcdio_2.1.0.bb +++ b/meta-oe/recipes-multimedia/libcdio/libcdio_2.1.0.bb @@ -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" diff --git a/meta-oe/recipes-support/freerdp/freerdp_2.5.0.bb b/meta-oe/recipes-support/freerdp/freerdp_2.5.0.bb index 3dbc87686a..a272cb0991 100644 --- a/meta-oe/recipes-support/freerdp/freerdp_2.5.0.bb +++ b/meta-oe/recipes-support/freerdp/freerdp_2.5.0.bb @@ -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='') diff --git a/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb b/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb index 0b85862bb5..37e2376b16 100644 --- a/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb +++ b/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb @@ -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" diff --git a/meta-oe/recipes-support/opencv/opencv_4.5.5.bb b/meta-oe/recipes-support/opencv/opencv_4.5.5.bb index a3affa701d..4449596dae 100644 --- a/meta-oe/recipes-support/opencv/opencv_4.5.5.bb +++ b/meta-oe/recipes-support/opencv/opencv_4.5.5.bb @@ -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' diff --git a/meta-oe/recipes-support/openldap/openldap_2.5.9.bb b/meta-oe/recipes-support/openldap/openldap_2.5.9.bb index b80bde8490..e5e9e5a6de 100644 --- a/meta-oe/recipes-support/openldap/openldap_2.5.9.bb +++ b/meta-oe/recipes-support/openldap/openldap_2.5.9.bb @@ -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") diff --git a/meta-oe/recipes-support/pidgin/pidgin_2.14.2.bb b/meta-oe/recipes-support/pidgin/pidgin_2.14.2.bb index b2e6d9ac10..17a2adfc14 100644 --- a/meta-oe/recipes-support/pidgin/pidgin_2.14.2.bb +++ b/meta-oe/recipes-support/pidgin/pidgin_2.14.2.bb @@ -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='') diff --git a/meta-oe/recipes-support/poco/poco_1.11.0.bb b/meta-oe/recipes-support/poco/poco_1.11.0.bb index c364f7220b..027ff64692 100644 --- a/meta-oe/recipes-support/poco/poco_1.11.0.bb +++ b/meta-oe/recipes-support/poco/poco_1.11.0.bb @@ -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)) |