From 856902b8c0014fdbfd70b4c63cb353929dacbbf0 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 20 Feb 2022 09:48:12 +0100 Subject: 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 Signed-off-by: Khem Raj --- meta-multimedia/recipes-connectivity/rygel/rygel_0.38.3.bb | 4 ++-- meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.bb | 8 ++++---- meta-multimedia/recipes-multimedia/libao/libao_1.2.0.bb | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'meta-multimedia') diff --git a/meta-multimedia/recipes-connectivity/rygel/rygel_0.38.3.bb b/meta-multimedia/recipes-connectivity/rygel/rygel_0.38.3.bb index c08ab11b24..9633cab530 100644 --- a/meta-multimedia/recipes-connectivity/rygel/rygel_0.38.3.bb +++ b/meta-multimedia/recipes-connectivity/rygel/rygel_0.38.3.bb @@ -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)) diff --git a/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.bb b/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.bb index adaa552ed8..3cf0ca4eb8 100644 --- a/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.bb +++ b/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.bb @@ -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" diff --git a/meta-multimedia/recipes-multimedia/libao/libao_1.2.0.bb b/meta-multimedia/recipes-multimedia/libao/libao_1.2.0.bb index dc09d9413a..e6a9b7d250 100644 --- a/meta-multimedia/recipes-multimedia/libao/libao_1.2.0.bb +++ b/meta-multimedia/recipes-multimedia/libao/libao_1.2.0.bb @@ -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)}" -- cgit v1.2.3-54-g00ecf