diff options
17 files changed, 42 insertions, 42 deletions
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 c08ab11b2..9633cab53 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 () { | |||
64 | postinst = d.getVar('plugin_postinst') | 64 | postinst = d.getVar('plugin_postinst') |
65 | pkgs = [] | 65 | pkgs = [] |
66 | 66 | ||
67 | 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}')) | 67 | 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}')) |
68 | 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}')) | 68 | 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}')) |
69 | 69 | ||
70 | metapkg = d.getVar('PN') + '-meta' | 70 | metapkg = d.getVar('PN') + '-meta' |
71 | d.setVar('RDEPENDS:' + metapkg, ' '.join(pkgs)) | 71 | 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 adaa552ed..3cf0ca4eb 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" | |||
91 | 91 | ||
92 | python populate_packages:prepend () { | 92 | python populate_packages:prepend () { |
93 | dvb_libdir = bb.data.expand('${libdir}', d) | 93 | dvb_libdir = bb.data.expand('${libdir}', d) |
94 | do_split_packages(d, dvb_libdir, '^lib(.*)\.so$', 'lib%s', 'DVB %s package', extra_depends='', allow_links=True) | 94 | do_split_packages(d, dvb_libdir, r'^lib(.*)\.so$', 'lib%s', 'DVB %s package', extra_depends='', allow_links=True) |
95 | do_split_packages(d, dvb_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'DVB %s development package', extra_depends='${PN}-dev') | 95 | do_split_packages(d, dvb_libdir, r'^lib(.*)\.la$', 'lib%s-dev', 'DVB %s development package', extra_depends='${PN}-dev') |
96 | do_split_packages(d, dvb_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'DVB %s development package', extra_depends='${PN}-dev') | 96 | do_split_packages(d, dvb_libdir, r'^lib(.*)\.a$', 'lib%s-dev', 'DVB %s development package', extra_depends='${PN}-dev') |
97 | do_split_packages(d, dvb_libdir, '^lib(.*)\.so\.*', 'lib%s', 'DVB %s library', extra_depends='', allow_links=True) | 97 | do_split_packages(d, dvb_libdir, r'^lib(.*)\.so\.*', 'lib%s', 'DVB %s library', extra_depends='', allow_links=True) |
98 | } | 98 | } |
99 | 99 | ||
100 | INSANE_SKIP:${PN} = "ldflags" | 100 | 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 dc09d9413..e6a9b7d25 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 () { | |||
23 | python populate_packages:prepend () { | 23 | python populate_packages:prepend () { |
24 | rootdir = bb.data.expand('${libdir}/ao/plugins-4', d) | 24 | rootdir = bb.data.expand('${libdir}/ao/plugins-4', d) |
25 | rootdir_dbg = bb.data.expand('${libdir}/ao/plugins-4/.debug', d) | 25 | rootdir_dbg = bb.data.expand('${libdir}/ao/plugins-4/.debug', d) |
26 | do_split_packages(d, rootdir, '^(.*)\.so$', output_pattern='${BPN}-plugin-%s', description='AO %s plugin') | 26 | do_split_packages(d, rootdir, r'^(.*)\.so$', output_pattern='${BPN}-plugin-%s', description='AO %s plugin') |
27 | do_split_packages(d, rootdir_dbg, '^(.*)\.so$', output_pattern='${BPN}-plugin-%s-dbg', description='AO %s plugin debug data') | 27 | do_split_packages(d, rootdir_dbg, r'^(.*)\.so$', output_pattern='${BPN}-plugin-%s-dbg', description='AO %s plugin debug data') |
28 | } | 28 | } |
29 | 29 | ||
30 | PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa pulseaudio', d)}" | 30 | PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa pulseaudio', d)}" |
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.14.12.bb b/meta-networking/recipes-connectivity/samba/samba_4.14.12.bb index 1fd30ad8a..84eee4419 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.14.12.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.14.12.bb | |||
@@ -224,16 +224,16 @@ python samba_populate_packages() { | |||
224 | mlprefix = d.getVar('MLPREFIX') or '' | 224 | mlprefix = d.getVar('MLPREFIX') or '' |
225 | pam_libdir = d.expand('${base_libdir}/security') | 225 | pam_libdir = d.expand('${base_libdir}/security') |
226 | pam_pkgname = mlprefix + 'pam-plugin%s' | 226 | pam_pkgname = mlprefix + 'pam-plugin%s' |
227 | do_split_packages(d, pam_libdir, '^pam_(.*)\.so$', pam_pkgname, 'PAM plugin for %s', extra_depends='', prepend=True) | 227 | do_split_packages(d, pam_libdir, r'^pam_(.*)\.so$', pam_pkgname, 'PAM plugin for %s', extra_depends='', prepend=True) |
228 | 228 | ||
229 | libdir = d.getVar('libdir') | 229 | libdir = d.getVar('libdir') |
230 | do_split_packages(d, libdir, '^lib(.*)\.so\..*$', 'lib%s', 'Samba %s library', extra_depends='${PN}-common', prepend=True, allow_links=True) | 230 | do_split_packages(d, libdir, r'^lib(.*)\.so\..*$', 'lib%s', 'Samba %s library', extra_depends='${PN}-common', prepend=True, allow_links=True) |
231 | pkglibdir = '%s/samba' % libdir | 231 | pkglibdir = '%s/samba' % libdir |
232 | do_split_packages(d, pkglibdir, '^lib(.*)\.so$', 'lib%s', 'Samba %s library', extra_depends='${PN}-common', prepend=True) | 232 | do_split_packages(d, pkglibdir, r'^lib(.*)\.so$', 'lib%s', 'Samba %s library', extra_depends='${PN}-common', prepend=True) |
233 | moduledir = '%s/samba/auth' % libdir | 233 | moduledir = '%s/samba/auth' % libdir |
234 | do_split_packages(d, moduledir, '^(.*)\.so$', 'samba-auth-%s', 'Samba %s authentication backend', hook=module_hook, extra_depends='', prepend=True) | 234 | do_split_packages(d, moduledir, r'^(.*)\.so$', 'samba-auth-%s', 'Samba %s authentication backend', hook=module_hook, extra_depends='', prepend=True) |
235 | moduledir = '%s/samba/pdb' % libdir | 235 | moduledir = '%s/samba/pdb' % libdir |
236 | do_split_packages(d, moduledir, '^(.*)\.so$', 'samba-pdb-%s', 'Samba %s password backend', hook=module_hook, extra_depends='', prepend=True) | 236 | do_split_packages(d, moduledir, r'^(.*)\.so$', 'samba-pdb-%s', 'Samba %s password backend', hook=module_hook, extra_depends='', prepend=True) |
237 | } | 237 | } |
238 | 238 | ||
239 | PACKAGESPLITFUNCS:prepend = "samba_populate_packages " | 239 | PACKAGESPLITFUNCS:prepend = "samba_populate_packages " |
diff --git a/meta-networking/recipes-support/strongswan/strongswan_5.9.4.bb b/meta-networking/recipes-support/strongswan/strongswan_5.9.4.bb index 2b7a7a241..686cdb677 100644 --- a/meta-networking/recipes-support/strongswan/strongswan_5.9.4.bb +++ b/meta-networking/recipes-support/strongswan/strongswan_5.9.4.bb | |||
@@ -122,12 +122,12 @@ python split_strongswan_plugins () { | |||
122 | else: | 122 | else: |
123 | d.setVar('CONFFILES:' + pkg, oldfiles + " " + newfile) | 123 | d.setVar('CONFFILES:' + pkg, oldfiles + " " + newfile) |
124 | 124 | ||
125 | split_packages = do_split_packages(d, libdir, 'libstrongswan-(.*)\.so', '${PN}-plugin-%s', 'strongSwan %s plugin', prepend=True) | 125 | split_packages = do_split_packages(d, libdir, r'libstrongswan-(.*)\.so', '${PN}-plugin-%s', 'strongSwan %s plugin', prepend=True) |
126 | do_split_packages(d, sysconfdir, '(.*)\.conf', '${PN}-plugin-%s', 'strongSwan %s plugin', prepend=True, hook=add_plugin_conf) | 126 | do_split_packages(d, sysconfdir, r'(.*)\.conf', '${PN}-plugin-%s', 'strongSwan %s plugin', prepend=True, hook=add_plugin_conf) |
127 | 127 | ||
128 | 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') | 128 | 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') |
129 | 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') | 129 | 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') |
130 | 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') | 130 | 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') |
131 | 131 | ||
132 | if split_packages: | 132 | if split_packages: |
133 | pn = d.getVar('PN') | 133 | pn = d.getVar('PN') |
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 5257ee347..46ca77f20 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" | |||
100 | 100 | ||
101 | python populate_packages:prepend() { | 101 | python populate_packages:prepend() { |
102 | plugindir = d.expand('${libdir}/lcdproc') | 102 | plugindir = d.expand('${libdir}/lcdproc') |
103 | do_split_packages(d, plugindir, '(.*)\.so$', 'lcdd-driver-%s', 'LCDd driver for %s', prepend=True) | 103 | do_split_packages(d, plugindir, r'(.*)\.so$', 'lcdd-driver-%s', 'LCDd driver for %s', prepend=True) |
104 | } | 104 | } |
105 | 105 | ||
106 | PACKAGES_DYNAMIC += "^lcdd-driver-.*" | 106 | 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 3a3068f73..2f7fcac78 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() { | |||
17 | 17 | ||
18 | python populate_packages:prepend () { | 18 | python populate_packages:prepend () { |
19 | tessdata_dir= d.expand('${datadir}/tessdata') | 19 | tessdata_dir= d.expand('${datadir}/tessdata') |
20 | pkgs = do_split_packages(d, tessdata_dir, '^([a-z_]*)\.*', '${BPN}-%s', 'tesseract-ocr language files for %s', extra_depends='') | 20 | pkgs = do_split_packages(d, tessdata_dir, r'^([a-z_]*)\.*', '${BPN}-%s', 'tesseract-ocr language files for %s', extra_depends='') |
21 | pn = d.getVar('PN') | 21 | pn = d.getVar('PN') |
22 | d.appendVar('RDEPENDS:' + pn, ' '+' '.join(pkgs)) | 22 | d.appendVar('RDEPENDS:' + pn, ' '+' '.join(pkgs)) |
23 | } | 23 | } |
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 31e710a95..d8236ce43 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 " | |||
15 | 15 | ||
16 | python split_ttf_mplus_packages() { | 16 | python split_ttf_mplus_packages() { |
17 | plugindir = d.expand('${datadir}/fonts/ttf-mplus/') | 17 | plugindir = d.expand('${datadir}/fonts/ttf-mplus/') |
18 | packages = do_split_packages(d, plugindir, '^(.*)\.ttf$', 'ttf-%s', 'TTF Font %s') | 18 | packages = do_split_packages(d, plugindir, r'^(.*)\.ttf$', 'ttf-%s', 'TTF Font %s') |
19 | d.setVar('FONT_PACKAGES', ' '.join(packages)) | 19 | d.setVar('FONT_PACKAGES', ' '.join(packages)) |
20 | } | 20 | } |
21 | 21 | ||
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 441defea4..3ca91f64a 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}/*" | |||
18 | 18 | ||
19 | python libcdio_split_packages() { | 19 | python libcdio_split_packages() { |
20 | libdir = d.expand('${libdir}') | 20 | libdir = d.expand('${libdir}') |
21 | do_split_packages(d, libdir, '^lib(.*)\.so\..*', 'lib%s', 'libcdio %s library', extra_depends='', allow_links=True) | 21 | do_split_packages(d, libdir, r'^lib(.*)\.so\..*', 'lib%s', 'libcdio %s library', extra_depends='', allow_links=True) |
22 | } | 22 | } |
23 | 23 | ||
24 | PACKAGESPLITFUNCS =+ "libcdio_split_packages" | 24 | 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 2becafb2a..170a555b9 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}/*" | |||
25 | 25 | ||
26 | python libcdio_split_packages() { | 26 | python libcdio_split_packages() { |
27 | libdir = d.expand('${libdir}') | 27 | libdir = d.expand('${libdir}') |
28 | do_split_packages(d, libdir, '^lib(.*)\.so\..*', 'lib%s', 'libcdio %s library', extra_depends='', allow_links=True) | 28 | do_split_packages(d, libdir, r'^lib(.*)\.so\..*', 'lib%s', 'libcdio %s library', extra_depends='', allow_links=True) |
29 | } | 29 | } |
30 | 30 | ||
31 | PACKAGESPLITFUNCS =+ "libcdio_split_packages" | 31 | 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 3dbc87686..a272cb099 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 () { | |||
63 | python populate_packages:prepend () { | 63 | python populate_packages:prepend () { |
64 | freerdp_root = d.expand('${libdir}/freerdp') | 64 | freerdp_root = d.expand('${libdir}/freerdp') |
65 | 65 | ||
66 | do_split_packages(d, freerdp_root, '^(audin_.*)\.so$', | 66 | do_split_packages(d, freerdp_root, r'^(audin_.*)\.so$', |
67 | output_pattern='libfreerdp-plugin-%s', | 67 | output_pattern='libfreerdp-plugin-%s', |
68 | description='FreeRDP plugin %s', | 68 | description='FreeRDP plugin %s', |
69 | prepend=True, extra_depends='libfreerdp-plugin-audin') | 69 | prepend=True, extra_depends='libfreerdp-plugin-audin') |
70 | 70 | ||
71 | do_split_packages(d, freerdp_root, '^(rdpsnd_.*)\.so$', | 71 | do_split_packages(d, freerdp_root, r'^(rdpsnd_.*)\.so$', |
72 | output_pattern='libfreerdp-plugin-%s', | 72 | output_pattern='libfreerdp-plugin-%s', |
73 | description='FreeRDP plugin %s', | 73 | description='FreeRDP plugin %s', |
74 | prepend=True, extra_depends='libfreerdp-plugin-rdpsnd') | 74 | prepend=True, extra_depends='libfreerdp-plugin-rdpsnd') |
75 | 75 | ||
76 | do_split_packages(d, freerdp_root, '^(tsmf_.*)\.so$', | 76 | do_split_packages(d, freerdp_root, r'^(tsmf_.*)\.so$', |
77 | output_pattern='libfreerdp-plugin-%s', | 77 | output_pattern='libfreerdp-plugin-%s', |
78 | description='FreeRDP plugin %s', | 78 | description='FreeRDP plugin %s', |
79 | prepend=True, extra_depends='libfreerdp-plugin-tsmf') | 79 | prepend=True, extra_depends='libfreerdp-plugin-tsmf') |
80 | 80 | ||
81 | do_split_packages(d, freerdp_root, '^([^-]*)\.so$', | 81 | do_split_packages(d, freerdp_root, r'^([^-]*)\.so$', |
82 | output_pattern='libfreerdp-plugin-%s', | 82 | output_pattern='libfreerdp-plugin-%s', |
83 | description='FreeRDP plugin %s', | 83 | description='FreeRDP plugin %s', |
84 | prepend=True, extra_depends='') | 84 | 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 0b85862bb..37e2376b1 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" | |||
34 | 34 | ||
35 | python populate_packages:prepend() { | 35 | python populate_packages:prepend() { |
36 | plugindir = d.expand('${libdir}/${BPN}-${PV}/') | 36 | plugindir = d.expand('${libdir}/${BPN}-${PV}/') |
37 | do_split_packages(d, plugindir, '^libcanberra-(.*)\.so$', 'libcanberra-%s', '%s support library', extra_depends='' ) | 37 | do_split_packages(d, plugindir, r'^libcanberra-(.*)\.so$', 'libcanberra-%s', '%s support library', extra_depends='' ) |
38 | do_split_packages(d, plugindir, '^libcanberra-(.*)\.la$', 'libcanberra-%s', '%s support library', extra_depends='' ) | 38 | do_split_packages(d, plugindir, r'^libcanberra-(.*)\.la$', 'libcanberra-%s', '%s support library', extra_depends='' ) |
39 | } | 39 | } |
40 | 40 | ||
41 | PACKAGES =+ "${PN}-gnome ${PN}-gtk2 ${PN}-gtk3 ${PN}-systemd" | 41 | 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 a3affa701..4449596da 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', ' | |||
162 | 162 | ||
163 | python populate_packages:prepend () { | 163 | python populate_packages:prepend () { |
164 | cv_libdir = d.expand('${libdir}') | 164 | cv_libdir = d.expand('${libdir}') |
165 | do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True) | 165 | do_split_packages(d, cv_libdir, r'^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True) |
166 | do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') | 166 | do_split_packages(d, cv_libdir, r'^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') |
167 | do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') | 167 | do_split_packages(d, cv_libdir, r'^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') |
168 | do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True) | 168 | do_split_packages(d, cv_libdir, r'^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True) |
169 | 169 | ||
170 | pn = d.getVar('PN') | 170 | pn = d.getVar('PN') |
171 | metapkg = pn + '-dev' | 171 | 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 b80bde849..e5e9e5a6d 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" | |||
219 | 219 | ||
220 | python populate_packages:prepend () { | 220 | python populate_packages:prepend () { |
221 | backend_dir = d.expand('${libexecdir}/openldap') | 221 | backend_dir = d.expand('${libexecdir}/openldap') |
222 | do_split_packages(d, backend_dir, 'back_([a-z]*)\.so$', 'openldap-backend-%s', 'OpenLDAP %s backend', prepend=True, extra_depends='', allow_links=True) | 222 | do_split_packages(d, backend_dir, r'back_([a-z]*)\.so$', 'openldap-backend-%s', 'OpenLDAP %s backend', prepend=True, extra_depends='', allow_links=True) |
223 | do_split_packages(d, backend_dir, 'back_([a-z]*)\-.*\.so\..*$', 'openldap-backend-%s', 'OpenLDAP %s backend', extra_depends='', allow_links=True) | 223 | do_split_packages(d, backend_dir, r'back_([a-z]*)\-.*\.so\..*$', 'openldap-backend-%s', 'OpenLDAP %s backend', extra_depends='', allow_links=True) |
224 | 224 | ||
225 | metapkg = "${PN}-backends" | 225 | metapkg = "${PN}-backends" |
226 | d.setVar('ALLOW_EMPTY:' + metapkg, "1") | 226 | 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 b2e6d9ac1..17a2adfc1 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 () { | |||
83 | purple = d.expand('${libdir}/purple-2') | 83 | purple = d.expand('${libdir}/purple-2') |
84 | finch = d.expand('${libdir}/finch') | 84 | finch = d.expand('${libdir}/finch') |
85 | 85 | ||
86 | do_split_packages(d, pidgroot, '^([^l][^i][^b].*)\.so$', | 86 | do_split_packages(d, pidgroot, r'^([^l][^i][^b].*)\.so$', |
87 | output_pattern='pidgin-plugin-%s', | 87 | output_pattern='pidgin-plugin-%s', |
88 | description='Pidgin plugin %s', | 88 | description='Pidgin plugin %s', |
89 | prepend=True, extra_depends='') | 89 | prepend=True, extra_depends='') |
90 | 90 | ||
91 | do_split_packages(d, purple, '^lib(.*)\.so$', | 91 | do_split_packages(d, purple, r'^lib(.*)\.so$', |
92 | output_pattern='libpurple-protocol-%s', | 92 | output_pattern='libpurple-protocol-%s', |
93 | description='Libpurple protocol plugin for %s', | 93 | description='Libpurple protocol plugin for %s', |
94 | prepend=True, extra_depends='') | 94 | prepend=True, extra_depends='') |
95 | 95 | ||
96 | do_split_packages(d, purple, '^(ssl-.*)\.so$', | 96 | do_split_packages(d, purple, r'^(ssl-.*)\.so$', |
97 | output_pattern='libpurple-plugin-%s', | 97 | output_pattern='libpurple-plugin-%s', |
98 | description='libpurple plugin %s', | 98 | description='libpurple plugin %s', |
99 | prepend=True, extra_depends='libpurple-plugin-ssl') | 99 | prepend=True, extra_depends='libpurple-plugin-ssl') |
100 | 100 | ||
101 | do_split_packages(d, purple, '^([^l][^i][^b].*)\.so$', | 101 | do_split_packages(d, purple, r'^([^l][^i][^b].*)\.so$', |
102 | output_pattern='libpurple-plugin-%s', | 102 | output_pattern='libpurple-plugin-%s', |
103 | description='libpurple plugin %s', | 103 | description='libpurple plugin %s', |
104 | prepend=True, extra_depends='') | 104 | prepend=True, extra_depends='') |
105 | 105 | ||
106 | do_split_packages(d, finch, '^([^l][^i][^b].*)\.so$', | 106 | do_split_packages(d, finch, r'^([^l][^i][^b].*)\.so$', |
107 | output_pattern='finch-plugin-%s', | 107 | output_pattern='finch-plugin-%s', |
108 | description='Finch plugin %s', | 108 | description='Finch plugin %s', |
109 | prepend=True, extra_depends='') | 109 | 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 c364f7220..027ff6469 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 () { | |||
72 | packages.append(pkg) | 72 | packages.append(pkg) |
73 | testrunners.append(modulename) | 73 | testrunners.append(modulename) |
74 | 74 | ||
75 | do_split_packages(d, poco_libdir, '^libPoco(.*)\.so\..*$', | 75 | do_split_packages(d, poco_libdir, r'^libPoco(.*)\.so\..*$', |
76 | 'poco-%s', 'Poco %s component', extra_depends='', prepend=True, hook=hook) | 76 | 'poco-%s', 'Poco %s component', extra_depends='', prepend=True, hook=hook) |
77 | 77 | ||
78 | d.setVar("RRECOMMENDS:%s" % pn, " ".join(packages)) | 78 | d.setVar("RRECOMMENDS:%s" % pn, " ".join(packages)) |
diff --git a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.3.bb b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.3.bb index c9e65400d..3c1864a80 100644 --- a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.3.bb +++ b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.3.bb | |||
@@ -17,7 +17,7 @@ SRC_URI += " \ | |||
17 | python populate_packages:prepend() { | 17 | python populate_packages:prepend() { |
18 | plugin_dir = d.expand('${libdir}/xfce4/panel/plugins/') | 18 | plugin_dir = d.expand('${libdir}/xfce4/panel/plugins/') |
19 | plugin_name = d.expand('${PN}-plugin-%s') | 19 | plugin_name = d.expand('${PN}-plugin-%s') |
20 | do_split_packages(d, plugin_dir, '^lib(.*).so$', plugin_name, | 20 | do_split_packages(d, plugin_dir, r'^lib(.*)\.so$', plugin_name, |
21 | '${PN} plugin for %s', extra_depends='', prepend=True, | 21 | '${PN} plugin for %s', extra_depends='', prepend=True, |
22 | aux_files_pattern=['${datadir}/xfce4/panel/plugins/%s.desktop', | 22 | aux_files_pattern=['${datadir}/xfce4/panel/plugins/%s.desktop', |
23 | '${sysconfdir}/xdg/xfce/panel/%s-*', | 23 | '${sysconfdir}/xdg/xfce/panel/%s-*', |