diff options
Diffstat (limited to 'meta-oe')
27 files changed, 48 insertions, 48 deletions
diff --git a/meta-oe/classes/gitpkgv.bbclass b/meta-oe/classes/gitpkgv.bbclass index 238b0d2ea..165ba1e8d 100644 --- a/meta-oe/classes/gitpkgv.bbclass +++ b/meta-oe/classes/gitpkgv.bbclass | |||
@@ -51,14 +51,14 @@ def get_git_pkgv(d, use_tags): | |||
51 | import os | 51 | import os |
52 | import bb | 52 | import bb |
53 | 53 | ||
54 | src_uri = bb.data.getVar('SRC_URI', d, 1).split() | 54 | src_uri = d.getVar('SRC_URI', 1).split() |
55 | fetcher = bb.fetch2.Fetch(src_uri, d) | 55 | fetcher = bb.fetch2.Fetch(src_uri, d) |
56 | ud = fetcher.ud | 56 | ud = fetcher.ud |
57 | 57 | ||
58 | # | 58 | # |
59 | # If SRCREV_FORMAT is set respect it for tags | 59 | # If SRCREV_FORMAT is set respect it for tags |
60 | # | 60 | # |
61 | format = bb.data.getVar('SRCREV_FORMAT', d, True) | 61 | format = d.getVar('SRCREV_FORMAT', True) |
62 | if not format: | 62 | if not format: |
63 | format = 'default' | 63 | format = 'default' |
64 | 64 | ||
diff --git a/meta-oe/recipes-connectivity/dnsmasq/dnsmasq.inc b/meta-oe/recipes-connectivity/dnsmasq/dnsmasq.inc index e994852b1..d6f3a54c3 100644 --- a/meta-oe/recipes-connectivity/dnsmasq/dnsmasq.inc +++ b/meta-oe/recipes-connectivity/dnsmasq/dnsmasq.inc | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ | |||
7 | file://COPYING-v3;md5=d32239bcb673463ab874e80d47fae504" | 7 | file://COPYING-v3;md5=d32239bcb673463ab874e80d47fae504" |
8 | 8 | ||
9 | #at least versions 2.15 and prior are moved to the archive folder on the server | 9 | #at least versions 2.15 and prior are moved to the archive folder on the server |
10 | SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/${@['archive/', ''][float(bb.data.getVar('PV',d,1).split('.')[1]) > 15]}dnsmasq-${PV}.tar.gz;name=dnsmasq-${PV} \ | 10 | SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/${@['archive/', ''][float(d.getVar('PV',1).split('.')[1]) > 15]}dnsmasq-${PV}.tar.gz;name=dnsmasq-${PV} \ |
11 | file://init \ | 11 | file://init \ |
12 | file://dnsmasq.conf" | 12 | file://dnsmasq.conf" |
13 | 13 | ||
diff --git a/meta-oe/recipes-core/fakeroot/fakeroot-native_1.12.4.bb b/meta-oe/recipes-core/fakeroot/fakeroot-native_1.12.4.bb index 3bcebabf4..1e9f15a67 100644 --- a/meta-oe/recipes-core/fakeroot/fakeroot-native_1.12.4.bb +++ b/meta-oe/recipes-core/fakeroot/fakeroot-native_1.12.4.bb | |||
@@ -9,8 +9,8 @@ EXTRA_OECONF = "--program-prefix=" | |||
9 | 9 | ||
10 | # Compatability for the rare systems not using or having SYSV | 10 | # Compatability for the rare systems not using or having SYSV |
11 | python () { | 11 | python () { |
12 | if bb.data.getVar('HOST_NONSYSV', d, True) and bb.data.getVar('HOST_NONSYSV', d, True) != '0': | 12 | if d.getVar('HOST_NONSYSV', True) and d.getVar('HOST_NONSYSV', True) != '0': |
13 | bb.data.setVar('EXTRA_OECONF', ' --with-ipc=tcp --program-prefix= ', d) | 13 | d.setVar('EXTRA_OECONF', ' --with-ipc=tcp --program-prefix= ') |
14 | } | 14 | } |
15 | 15 | ||
16 | RDEPENDS_${PN} = "util-linux-native" | 16 | RDEPENDS_${PN} = "util-linux-native" |
diff --git a/meta-oe/recipes-core/glib-2.0/glibmm.inc b/meta-oe/recipes-core/glib-2.0/glibmm.inc index 60e9bceaa..15aeaac2c 100644 --- a/meta-oe/recipes-core/glib-2.0/glibmm.inc +++ b/meta-oe/recipes-core/glib-2.0/glibmm.inc | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499 \ | |||
7 | file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe" | 7 | file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe" |
8 | 8 | ||
9 | DEPENDS = "mm-common glib-2.0 libsigc++-2.0" | 9 | DEPENDS = "mm-common glib-2.0 libsigc++-2.0" |
10 | SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" | 10 | SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" |
11 | 11 | ||
12 | SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/${SHRT_VER}/glibmm-${PV}.tar.bz2;name=archive" | 12 | SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/${SHRT_VER}/glibmm-${PV}.tar.bz2;name=archive" |
13 | 13 | ||
diff --git a/meta-oe/recipes-core/meta/distro-feed-configs.bb b/meta-oe/recipes-core/meta/distro-feed-configs.bb index a25ef8f70..cff0946da 100644 --- a/meta-oe/recipes-core/meta/distro-feed-configs.bb +++ b/meta-oe/recipes-core/meta/distro-feed-configs.bb | |||
@@ -21,8 +21,8 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" | |||
21 | 21 | ||
22 | #def distro_feed_configs(d): | 22 | #def distro_feed_configs(d): |
23 | # import bb | 23 | # import bb |
24 | # parchs = bb.data.getVar( "PACKAGE_EXTRA_ARCHS", d, 1 ).split() | 24 | # parchs = d.getVar( "PACKAGE_EXTRA_ARCHS", 1 ).split() |
25 | # march = bb.data.getVar( "MACHINE_ARCH", d, 1 ).split() | 25 | # march = d.getVar( "MACHINE_ARCH", 1 ).split() |
26 | # archs = [ "all" ] + parchs + march | 26 | # archs = [ "all" ] + parchs + march |
27 | # confs = [ ( "${sysconfdir}/opkg/%s-feed.conf" % feed ) for feed in archs ] | 27 | # confs = [ ( "${sysconfdir}/opkg/%s-feed.conf" % feed ) for feed in archs ] |
28 | # return " ".join( confs ) | 28 | # return " ".join( confs ) |
diff --git a/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb b/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb index f125fb57f..451a3c697 100644 --- a/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb +++ b/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb | |||
@@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "291ac350cc5eb4a01b0d651ca99fae64cee8a1c06b2005277fab5a4356 | |||
16 | S = "${WORKDIR}" | 16 | S = "${WORKDIR}" |
17 | FILES_${PN}-dev = "${includedir}/libintl.h ${libdir}/libintl.a" | 17 | FILES_${PN}-dev = "${includedir}/libintl.h ${libdir}/libintl.a" |
18 | 18 | ||
19 | CFLAGS_append = " -fPIC -Wall -I ../../include ${@['-DSTUB_ONLY', ''][bb.data.getVar('USE_NLS', d, 1) != 'no']}" | 19 | CFLAGS_append = " -fPIC -Wall -I ../../include ${@['-DSTUB_ONLY', ''][d.getVar('USE_NLS', 1) != 'no']}" |
20 | TARGET_CC_ARCH += "${LDFLAGS}" | 20 | TARGET_CC_ARCH += "${LDFLAGS}" |
21 | 21 | ||
22 | do_compile() { | 22 | do_compile() { |
diff --git a/meta-oe/recipes-devtools/libcanberra/libcanberra_0.26.bb b/meta-oe/recipes-devtools/libcanberra/libcanberra_0.26.bb index c2f1cc82e..8b796ac67 100644 --- a/meta-oe/recipes-devtools/libcanberra/libcanberra_0.26.bb +++ b/meta-oe/recipes-devtools/libcanberra/libcanberra_0.26.bb | |||
@@ -29,7 +29,7 @@ EXTRA_OECONF = "\ | |||
29 | # enable pulse again when pulseaudio >= 0.9.11 is the default in OE | 29 | # enable pulse again when pulseaudio >= 0.9.11 is the default in OE |
30 | 30 | ||
31 | python populate_packages_prepend() { | 31 | python populate_packages_prepend() { |
32 | plugindir = bb.data.expand('${libdir}/${P}/', d) | 32 | plugindir = d.expand('${libdir}/${P}/') |
33 | do_split_packages(d, plugindir, '^libcanberra-(.*)\.so$', 'libcanberra-%s', '%s support library', extra_depends='' ) | 33 | do_split_packages(d, plugindir, '^libcanberra-(.*)\.so$', 'libcanberra-%s', '%s support library', extra_depends='' ) |
34 | } | 34 | } |
35 | 35 | ||
diff --git a/meta-oe/recipes-devtools/libgee/libgee_0.6.4.bb b/meta-oe/recipes-devtools/libgee/libgee_0.6.4.bb index a6044cdf3..fbd14662f 100644 --- a/meta-oe/recipes-devtools/libgee/libgee_0.6.4.bb +++ b/meta-oe/recipes-devtools/libgee/libgee_0.6.4.bb | |||
@@ -4,7 +4,7 @@ PR = "${INC_PR}.2" | |||
4 | DEPENDS += "gobject-introspection-stub" | 4 | DEPENDS += "gobject-introspection-stub" |
5 | DEPENDS_virtclass-native += "gobject-introspection-stub-native" | 5 | DEPENDS_virtclass-native += "gobject-introspection-stub-native" |
6 | 6 | ||
7 | SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" | 7 | SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" |
8 | SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libgee/${SHRT_VER}/${BP}.tar.xz" | 8 | SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libgee/${SHRT_VER}/${BP}.tar.xz" |
9 | SRC_URI[md5sum] = "a32bf498cf33d5e3417823a7b252ad22" | 9 | SRC_URI[md5sum] = "a32bf498cf33d5e3417823a7b252ad22" |
10 | SRC_URI[sha256sum] = "55f39f3b28e676f6cbd9377d83edd031084436a4da41280a9503c94faffb1665" | 10 | SRC_URI[sha256sum] = "55f39f3b28e676f6cbd9377d83edd031084436a4da41280a9503c94faffb1665" |
diff --git a/meta-oe/recipes-devtools/orc/orc.inc b/meta-oe/recipes-devtools/orc/orc.inc index 6efe02564..7a957f324 100644 --- a/meta-oe/recipes-devtools/orc/orc.inc +++ b/meta-oe/recipes-devtools/orc/orc.inc | |||
@@ -16,7 +16,7 @@ FILES_orc-examples = "${libdir}/orc/*" | |||
16 | FILES_${PN} = "${bindir}/*" | 16 | FILES_${PN} = "${bindir}/*" |
17 | 17 | ||
18 | python populate_packages_prepend () { | 18 | python populate_packages_prepend () { |
19 | libdir = bb.data.expand('${libdir}', d) | 19 | libdir = d.expand('${libdir}') |
20 | do_split_packages(d, libdir, '^lib(.*)\.so\.*', 'lib%s', 'ORC %s library', extra_depends='', allow_links=True) | 20 | do_split_packages(d, libdir, '^lib(.*)\.so\.*', 'lib%s', 'ORC %s library', extra_depends='', allow_links=True) |
21 | } | 21 | } |
22 | 22 | ||
diff --git a/meta-oe/recipes-devtools/vala/vala.inc b/meta-oe/recipes-devtools/vala/vala.inc index 3d33953b6..6cdc6053b 100644 --- a/meta-oe/recipes-devtools/vala/vala.inc +++ b/meta-oe/recipes-devtools/vala/vala.inc | |||
@@ -9,7 +9,7 @@ LICENSE = "LGPLv2.1" | |||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" | 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" |
10 | INC_PR = "r1" | 10 | INC_PR = "r1" |
11 | 11 | ||
12 | SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" | 12 | SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" |
13 | 13 | ||
14 | SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${BPN}/${SHRT_VER}/${BP}.tar.xz" | 14 | SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${BPN}/${SHRT_VER}/${BP}.tar.xz" |
15 | inherit autotools | 15 | inherit autotools |
diff --git a/meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb b/meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb index 8e842c48f..3f6d7673c 100644 --- a/meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb +++ b/meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb | |||
@@ -23,8 +23,8 @@ PACKAGES =+ "${PN}-core ${PN}-lxde ${PN}-gnome" | |||
23 | PACKAGES_DYNAMIC += "^${PN}-theme-.*" | 23 | PACKAGES_DYNAMIC += "^${PN}-theme-.*" |
24 | 24 | ||
25 | python populate_packages_prepend() { | 25 | python populate_packages_prepend() { |
26 | theme_dir = bb.data.expand('${datadir}/themes/', d) | 26 | theme_dir = d.expand('${datadir}/themes/') |
27 | theme_name = bb.data.expand('${PN}-theme-%s', d) | 27 | theme_name = d.expand('${PN}-theme-%s') |
28 | do_split_packages(d, theme_dir, '(.*)', theme_name, '${PN} theme for %s', extra_depends='', allow_dirs=True) | 28 | do_split_packages(d, theme_dir, '(.*)', theme_name, '${PN} theme for %s', extra_depends='', allow_dirs=True) |
29 | } | 29 | } |
30 | 30 | ||
diff --git a/meta-oe/recipes-graphics/pango/pangomm_2.28.2.bb b/meta-oe/recipes-graphics/pango/pangomm_2.28.2.bb index 2007e9c43..441911395 100644 --- a/meta-oe/recipes-graphics/pango/pangomm_2.28.2.bb +++ b/meta-oe/recipes-graphics/pango/pangomm_2.28.2.bb | |||
@@ -8,7 +8,7 @@ PR = "r2" | |||
8 | 8 | ||
9 | DEPENDS = "mm-common cairomm glibmm" | 9 | DEPENDS = "mm-common cairomm glibmm" |
10 | 10 | ||
11 | SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" | 11 | SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" |
12 | 12 | ||
13 | SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/pangomm/${SHRT_VER}/pangomm-${PV}.tar.bz2" | 13 | SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/pangomm/${SHRT_VER}/pangomm-${PV}.tar.bz2" |
14 | SRC_URI[md5sum] = "005a474863495d3c6267429a80da6cf2" | 14 | SRC_URI[md5sum] = "005a474863495d3c6267429a80da6cf2" |
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 731c490e1..9103dabfe 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb | |||
@@ -12,7 +12,7 @@ SRC_URI = "http://osdn.dl.sourceforge.jp/mplus-fonts/6650/mplus-TESTFLIGHT-${PV} | |||
12 | S = "${WORKDIR}/mplus-TESTFLIGHT-${PV}" | 12 | S = "${WORKDIR}/mplus-TESTFLIGHT-${PV}" |
13 | 13 | ||
14 | python populate_packages_prepend() { | 14 | python populate_packages_prepend() { |
15 | plugindir = bb.data.expand('${datadir}/fonts/ttf-mplus/', d) | 15 | plugindir = d.expand('${datadir}/fonts/ttf-mplus/') |
16 | do_split_packages(d, plugindir, '^(.*)\.ttf$', 'ttf-%s', 'TTF Font %s', extra_depends = "ttf-common") | 16 | do_split_packages(d, plugindir, '^(.*)\.ttf$', 'ttf-%s', 'TTF Font %s', extra_depends = "ttf-common") |
17 | } | 17 | } |
18 | 18 | ||
diff --git a/meta-oe/recipes-multimedia/libav/libav.inc b/meta-oe/recipes-multimedia/libav/libav.inc index 0e80430eb..32fcd6154 100644 --- a/meta-oe/recipes-multimedia/libav/libav.inc +++ b/meta-oe/recipes-multimedia/libav/libav.inc | |||
@@ -89,8 +89,8 @@ LEAD_SONAME = "libavcodec.so" | |||
89 | FILES_${PN}-dev = "${includedir}" | 89 | FILES_${PN}-dev = "${includedir}" |
90 | 90 | ||
91 | python populate_packages_prepend() { | 91 | python populate_packages_prepend() { |
92 | av_libdir = bb.data.expand('${libdir}', d) | 92 | av_libdir = d.expand('${libdir}') |
93 | av_pkgconfig = bb.data.expand('${libdir}/pkgconfig', d) | 93 | av_pkgconfig = d.expand('${libdir}/pkgconfig') |
94 | 94 | ||
95 | # Runtime package | 95 | # Runtime package |
96 | do_split_packages(d, av_libdir, '^lib(.*)\.so\..*', | 96 | do_split_packages(d, av_libdir, '^lib(.*)\.so\..*', |
diff --git a/meta-oe/recipes-multimedia/libcdio/libcdio_0.82.bb b/meta-oe/recipes-multimedia/libcdio/libcdio_0.82.bb index bff53124a..64f3e5d1f 100644 --- a/meta-oe/recipes-multimedia/libcdio/libcdio_0.82.bb +++ b/meta-oe/recipes-multimedia/libcdio/libcdio_0.82.bb | |||
@@ -22,7 +22,7 @@ FILES_${PN} = "${libdir}/${PN}${SOLIB}" | |||
22 | FILES_${PN}-utils = "${bindir}/*" | 22 | FILES_${PN}-utils = "${bindir}/*" |
23 | 23 | ||
24 | python populate_packages_prepend () { | 24 | python populate_packages_prepend () { |
25 | glibdir = bb.data.expand('${libdir}', d) | 25 | glibdir = d.expand('${libdir}') |
26 | do_split_packages(d, glibdir, '^lib(.*)\.so\..*', 'lib%s', 'gstreamer %s library', extra_depends='', allow_links=True) | 26 | do_split_packages(d, glibdir, '^lib(.*)\.so\..*', 'lib%s', 'gstreamer %s library', extra_depends='', allow_links=True) |
27 | } | 27 | } |
28 | 28 | ||
diff --git a/meta-oe/recipes-multimedia/live555/live555.inc b/meta-oe/recipes-multimedia/live555/live555.inc index e47bacf91..03016358c 100644 --- a/meta-oe/recipes-multimedia/live555/live555.inc +++ b/meta-oe/recipes-multimedia/live555/live555.inc | |||
@@ -9,7 +9,7 @@ SECTION = "devel" | |||
9 | 9 | ||
10 | INC_PR = "r0" | 10 | INC_PR = "r0" |
11 | 11 | ||
12 | URLV = "${@bb.data.getVar('PV',d,1)[0:4]}.${@bb.data.getVar('PV',d,1)[4:6]}.${@bb.data.getVar('PV',d,1)[6:8]}" | 12 | URLV = "${@d.getVar('PV',1)[0:4]}.${@d.getVar('PV',1)[4:6]}.${@d.getVar('PV',1)[6:8]}" |
13 | SRC_URI = "http://www.live555.com/liveMedia/public/live.${URLV}.tar.gz \ | 13 | SRC_URI = "http://www.live555.com/liveMedia/public/live.${URLV}.tar.gz \ |
14 | file://config.linux-cross" | 14 | file://config.linux-cross" |
15 | 15 | ||
diff --git a/meta-oe/recipes-navigation/navit/navit-fpu.inc b/meta-oe/recipes-navigation/navit/navit-fpu.inc index 08044adb8..d9637022f 100644 --- a/meta-oe/recipes-navigation/navit/navit-fpu.inc +++ b/meta-oe/recipes-navigation/navit/navit-fpu.inc | |||
@@ -1,6 +1,6 @@ | |||
1 | 1 | ||
2 | def get_navit_fpu_setting(bb, d): | 2 | def get_navit_fpu_setting(bb, d): |
3 | if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]: | 3 | if d.getVar('TARGET_FPU', 1) in [ 'soft' ]: |
4 | return "--enable-avoid-float" | 4 | return "--enable-avoid-float" |
5 | return "" | 5 | return "" |
6 | 6 | ||
diff --git a/meta-oe/recipes-support/fltk/fltk_1.1.10.bb b/meta-oe/recipes-support/fltk/fltk_1.1.10.bb index 2611b2065..ad8768db5 100644 --- a/meta-oe/recipes-support/fltk/fltk_1.1.10.bb +++ b/meta-oe/recipes-support/fltk/fltk_1.1.10.bb | |||
@@ -27,8 +27,8 @@ do_configure() { | |||
27 | } | 27 | } |
28 | 28 | ||
29 | python populate_packages_prepend () { | 29 | python populate_packages_prepend () { |
30 | if (bb.data.getVar('DEBIAN_NAMES', d, 1)): | 30 | if (d.getVar('DEBIAN_NAMES', 1)): |
31 | bb.data.setVar('PKG_${PN}', 'libfltk${PV}', d) | 31 | d.setVar('PKG_${PN}', 'libfltk${PV}') |
32 | } | 32 | } |
33 | 33 | ||
34 | LEAD_SONAME = "libfltk.so" | 34 | LEAD_SONAME = "libfltk.so" |
diff --git a/meta-oe/recipes-support/freerdp/freerdp.inc b/meta-oe/recipes-support/freerdp/freerdp.inc index 673b37240..d898f4683 100644 --- a/meta-oe/recipes-support/freerdp/freerdp.inc +++ b/meta-oe/recipes-support/freerdp/freerdp.inc | |||
@@ -26,7 +26,7 @@ FILES_libfreerdp = "${libdir}/lib*${SOLIBS}" | |||
26 | PACKAGES_DYNAMIC += "^libfreerdp-plugin-.*" | 26 | PACKAGES_DYNAMIC += "^libfreerdp-plugin-.*" |
27 | 27 | ||
28 | python populate_packages_prepend () { | 28 | python populate_packages_prepend () { |
29 | freerdp_root = bb.data.expand('${libdir}/freerdp', d) | 29 | freerdp_root = d.expand('${libdir}/freerdp') |
30 | 30 | ||
31 | do_split_packages(d, freerdp_root, '^(audin_.*)\.so$', | 31 | do_split_packages(d, freerdp_root, '^(audin_.*)\.so$', |
32 | output_pattern='libfreerdp-plugin-%s', | 32 | output_pattern='libfreerdp-plugin-%s', |
diff --git a/meta-oe/recipes-support/links/links.inc b/meta-oe/recipes-support/links/links.inc index 9001d2a3b..abd10f2ac 100644 --- a/meta-oe/recipes-support/links/links.inc +++ b/meta-oe/recipes-support/links/links.inc | |||
@@ -6,7 +6,7 @@ LICENSE = "GPLv2" | |||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=b0c80473f97008e42e29a9f80fcc55ff" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=b0c80473f97008e42e29a9f80fcc55ff" |
7 | DEPENDS = "jpeg libpng flex openssl zlib" | 7 | DEPENDS = "jpeg libpng flex openssl zlib" |
8 | 8 | ||
9 | LPV = "${@bb.data.getVar("PV",d,1).split("+")[1]}" | 9 | LPV = "${@d.getVar("PV",1).split("+")[1]}" |
10 | 10 | ||
11 | SRC_URI = "http://links.twibright.com/download/links-${LPV}.tar.bz2 \ | 11 | SRC_URI = "http://links.twibright.com/download/links-${LPV}.tar.bz2 \ |
12 | file://ac-prog-cxx.patch \ | 12 | file://ac-prog-cxx.patch \ |
diff --git a/meta-oe/recipes-support/lzma/lzma.inc b/meta-oe/recipes-support/lzma/lzma.inc index 457d7f493..75e6d6780 100644 --- a/meta-oe/recipes-support/lzma/lzma.inc +++ b/meta-oe/recipes-support/lzma/lzma.inc | |||
@@ -4,7 +4,7 @@ LICENSE = "LGPL" | |||
4 | LIC_FILES_CHKSUM = "file://lzma.txt;md5=20251cdc2e3793cceab11878d0aa11b1" | 4 | LIC_FILES_CHKSUM = "file://lzma.txt;md5=20251cdc2e3793cceab11878d0aa11b1" |
5 | INC_PR = "r7" | 5 | INC_PR = "r7" |
6 | 6 | ||
7 | SRC_URI = "http://downloads.sourceforge.net/sevenzip/lzma${@bb.data.getVar('PV',d,1).replace('.','')}.tar.bz2;subdir=${BPN}-${PV} \ | 7 | SRC_URI = "http://downloads.sourceforge.net/sevenzip/lzma${@d.getVar('PV',1).replace('.','')}.tar.bz2;subdir=${BPN}-${PV} \ |
8 | file://001-large_files.patch \ | 8 | file://001-large_files.patch \ |
9 | file://002-lzmp.patch \ | 9 | file://002-lzmp.patch \ |
10 | file://003-compile_fixes.patch \ | 10 | file://003-compile_fixes.patch \ |
diff --git a/meta-oe/recipes-support/nano/nano.inc b/meta-oe/recipes-support/nano/nano.inc index 68bcb2efb..b73aae00f 100644 --- a/meta-oe/recipes-support/nano/nano.inc +++ b/meta-oe/recipes-support/nano/nano.inc | |||
@@ -10,7 +10,7 @@ RDEPENDS_${PN} = "ncurses-terminfo" | |||
10 | 10 | ||
11 | INC_PR = "r3" | 11 | INC_PR = "r3" |
12 | 12 | ||
13 | PV_MAJOR = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" | 13 | PV_MAJOR = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" |
14 | 14 | ||
15 | SRC_URI = "http://www.nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.gz" | 15 | SRC_URI = "http://www.nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.gz" |
16 | 16 | ||
diff --git a/meta-oe/recipes-support/opencv/opencv_2.4.bb b/meta-oe/recipes-support/opencv/opencv_2.4.bb index 6d0121c76..28770932a 100644 --- a/meta-oe/recipes-support/opencv/opencv_2.4.bb +++ b/meta-oe/recipes-support/opencv/opencv_2.4.bb | |||
@@ -40,23 +40,23 @@ TARGET_CC_ARCH += "-I${S}/include " | |||
40 | PACKAGES += "${PN}-apps python-opencv" | 40 | PACKAGES += "${PN}-apps python-opencv" |
41 | 41 | ||
42 | python populate_packages_prepend () { | 42 | python populate_packages_prepend () { |
43 | cv_libdir = bb.data.expand('${libdir}', d) | 43 | cv_libdir = d.expand('${libdir}') |
44 | cv_libdir_dbg = bb.data.expand('${libdir}/.debug', d) | 44 | cv_libdir_dbg = d.expand('${libdir}/.debug') |
45 | do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True) | 45 | do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True) |
46 | do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') | 46 | do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') |
47 | do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') | 47 | do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') |
48 | do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True) | 48 | do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True) |
49 | 49 | ||
50 | pn = bb.data.getVar('PN', d, 1) | 50 | pn = d.getVar('PN', 1) |
51 | metapkg = pn + '-dev' | 51 | metapkg = pn + '-dev' |
52 | bb.data.setVar('ALLOW_EMPTY_' + metapkg, "1", d) | 52 | d.setVar('ALLOW_EMPTY_' + metapkg, "1") |
53 | blacklist = [ metapkg ] | 53 | blacklist = [ metapkg ] |
54 | metapkg_rdepends = [ ] | 54 | metapkg_rdepends = [ ] |
55 | packages = bb.data.getVar('PACKAGES', d, 1).split() | 55 | packages = d.getVar('PACKAGES', 1).split() |
56 | for pkg in packages[1:]: | 56 | for pkg in packages[1:]: |
57 | if not pkg in blacklist and not pkg in metapkg_rdepends and pkg.endswith('-dev'): | 57 | if not pkg in blacklist and not pkg in metapkg_rdepends and pkg.endswith('-dev'): |
58 | metapkg_rdepends.append(pkg) | 58 | metapkg_rdepends.append(pkg) |
59 | bb.data.setVar('RRECOMMENDS_' + metapkg, ' '.join(metapkg_rdepends), d) | 59 | d.setVar('RRECOMMENDS_' + metapkg, ' '.join(metapkg_rdepends)) |
60 | } | 60 | } |
61 | 61 | ||
62 | FILES_${PN} = "" | 62 | FILES_${PN} = "" |
diff --git a/meta-oe/recipes-support/openldap/openldap_2.4.23.bb b/meta-oe/recipes-support/openldap/openldap_2.4.23.bb index 8d9bd6c6b..b9441efc5 100644 --- a/meta-oe/recipes-support/openldap/openldap_2.4.23.bb +++ b/meta-oe/recipes-support/openldap/openldap_2.4.23.bb | |||
@@ -11,7 +11,7 @@ LICENSE = "OpenLDAP" | |||
11 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=3d82d3085f228af211a6502c7ea7c3c7" | 11 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=3d82d3085f228af211a6502c7ea7c3c7" |
12 | SECTION = "libs" | 12 | SECTION = "libs" |
13 | 13 | ||
14 | LDAP_VER = "${@'.'.join(bb.data.getVar('PV',d,1).split('.')[0:2])}" | 14 | LDAP_VER = "${@'.'.join(d.getVar('PV',1).split('.')[0:2])}" |
15 | 15 | ||
16 | SRC_URI = "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${P}.tgz" | 16 | SRC_URI = "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${P}.tgz" |
17 | SRC_URI += "file://openldap-m4-pthread.patch" | 17 | SRC_URI += "file://openldap-m4-pthread.patch" |
@@ -252,19 +252,19 @@ pkg_prerm_${PN}-slapd () { | |||
252 | PACKAGES_DYNAMIC += "^openldap-backends.* ^openldap-backend-.*" | 252 | PACKAGES_DYNAMIC += "^openldap-backends.* ^openldap-backend-.*" |
253 | 253 | ||
254 | python populate_packages_prepend () { | 254 | python populate_packages_prepend () { |
255 | backend_dir = bb.data.expand('${libexecdir}/openldap', d) | 255 | backend_dir = d.expand('${libexecdir}/openldap') |
256 | do_split_packages(d, backend_dir, 'back_([a-z]*)\-.*\.so\..*$', 'openldap-backend-%s', 'OpenLDAP %s backend', extra_depends='', allow_links=True) | 256 | do_split_packages(d, backend_dir, 'back_([a-z]*)\-.*\.so\..*$', 'openldap-backend-%s', 'OpenLDAP %s backend', extra_depends='', allow_links=True) |
257 | 257 | ||
258 | metapkg = "openldap-backends" | 258 | metapkg = "openldap-backends" |
259 | bb.data.setVar('ALLOW_EMPTY_' + metapkg, "1", d) | 259 | d.setVar('ALLOW_EMPTY_' + metapkg, "1") |
260 | bb.data.setVar('FILES_' + metapkg, "", d) | 260 | d.setVar('FILES_' + metapkg, "") |
261 | metapkg_rdepends = [] | 261 | metapkg_rdepends = [] |
262 | packages = bb.data.getVar('PACKAGES', d, 1).split() | 262 | packages = d.getVar('PACKAGES', 1).split() |
263 | for pkg in packages[1:]: | 263 | for pkg in packages[1:]: |
264 | if pkg.count("openldap-backend-") and not pkg in metapkg_rdepends and not pkg.count("-dev") and not pkg.count("-dbg") and not pkg.count("static") and not pkg.count("locale"): | 264 | if pkg.count("openldap-backend-") and not pkg in metapkg_rdepends and not pkg.count("-dev") and not pkg.count("-dbg") and not pkg.count("static") and not pkg.count("locale"): |
265 | metapkg_rdepends.append(pkg) | 265 | metapkg_rdepends.append(pkg) |
266 | bb.data.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends), d) | 266 | d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends)) |
267 | bb.data.setVar('DESCRIPTION_' + metapkg, 'OpenLDAP backends meta package', d) | 267 | d.setVar('DESCRIPTION_' + metapkg, 'OpenLDAP backends meta package') |
268 | packages.append(metapkg) | 268 | packages.append(metapkg) |
269 | bb.data.setVar('PACKAGES', ' '.join(packages), d) | 269 | d.setVar('PACKAGES', ' '.join(packages)) |
270 | } | 270 | } |
diff --git a/meta-oe/recipes-support/pidgin/pidgin.inc b/meta-oe/recipes-support/pidgin/pidgin.inc index cb2a59799..340e7f2b0 100644 --- a/meta-oe/recipes-support/pidgin/pidgin.inc +++ b/meta-oe/recipes-support/pidgin/pidgin.inc | |||
@@ -59,9 +59,9 @@ FILES_${PN}-dev += "${libdir}/${PN}/*.la" | |||
59 | PACKAGES_DYNAMIC += "^libpurple-protocol-.* ^libpurple-plugin-.* ^pidgin-plugin-.* ^finch-plugin-.*" | 59 | PACKAGES_DYNAMIC += "^libpurple-protocol-.* ^libpurple-plugin-.* ^pidgin-plugin-.* ^finch-plugin-.*" |
60 | 60 | ||
61 | python populate_packages_prepend () { | 61 | python populate_packages_prepend () { |
62 | pidgroot = bb.data.expand('${libdir}/pidgin', d) | 62 | pidgroot = d.expand('${libdir}/pidgin') |
63 | purple = bb.data.expand('${libdir}/purple-2', d) | 63 | purple = d.expand('${libdir}/purple-2') |
64 | finch = bb.data.expand('${libdir}/finch', d) | 64 | finch = d.expand('${libdir}/finch') |
65 | 65 | ||
66 | do_split_packages(d, pidgroot, '^([^l][^i][^b].*)\.so$', | 66 | do_split_packages(d, pidgroot, '^([^l][^i][^b].*)\.so$', |
67 | output_pattern='pidgin-plugin-%s', | 67 | output_pattern='pidgin-plugin-%s', |
diff --git a/meta-oe/recipes-support/poppler/poppler-fpu.inc b/meta-oe/recipes-support/poppler/poppler-fpu.inc index 11df85280..67d97ca8e 100644 --- a/meta-oe/recipes-support/poppler/poppler-fpu.inc +++ b/meta-oe/recipes-support/poppler/poppler-fpu.inc | |||
@@ -1,6 +1,6 @@ | |||
1 | 1 | ||
2 | def get_poppler_fpu_setting(bb, d): | 2 | def get_poppler_fpu_setting(bb, d): |
3 | if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]: | 3 | if d.getVar('TARGET_FPU', 1) in [ 'soft' ]: |
4 | return "--enable-fixedpoint" | 4 | return "--enable-fixedpoint" |
5 | return "" | 5 | return "" |
6 | 6 | ||
diff --git a/meta-oe/recipes-support/vim/vim.inc b/meta-oe/recipes-support/vim/vim.inc index 7b036a7c8..16ca58d4e 100644 --- a/meta-oe/recipes-support/vim/vim.inc +++ b/meta-oe/recipes-support/vim/vim.inc | |||
@@ -6,8 +6,8 @@ RSUGGESTS_${PN} = "diffutils" | |||
6 | LICENSE = "vim" | 6 | LICENSE = "vim" |
7 | LIC_FILES_CHKSUM = "file://README.txt;md5=72c4840d07b65659b60b3fa405c7da36" | 7 | LIC_FILES_CHKSUM = "file://README.txt;md5=72c4840d07b65659b60b3fa405c7da36" |
8 | 8 | ||
9 | PV_MAJOR = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" | 9 | PV_MAJOR = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" |
10 | VIMDIR = "${@bb.data.getVar('PV',d,1).split('.')[0]}${@bb.data.getVar('PV',d,1).split('.')[1]}" | 10 | VIMDIR = "${@d.getVar('PV',1).split('.')[0]}${@d.getVar('PV',1).split('.')[1]}" |
11 | 11 | ||
12 | INC_PR = "r11" | 12 | INC_PR = "r11" |
13 | 13 | ||