diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2017-01-25 15:31:59 -0800 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-02-13 18:43:23 +0100 |
commit | ebef44963866d3231ccfe79d66d21c96ca0b4113 (patch) | |
tree | 3eae06de942ade83dfaac41f506f32d77b5a13e7 /meta-oe/recipes-core | |
parent | e79566f51dde46145cfdc3732a6e1464ff27f4f3 (diff) | |
download | meta-openembedded-ebef44963866d3231ccfe79d66d21c96ca0b4113.tar.gz |
remove some more True options to getVar calls
getVar() now defaults to expanding by default, thus remove the True
option from getVar() calls. Fix a small number of cases not addressed
by the original patch:
http://git.openembedded.org/meta-openembedded/commit/?id=efd3696e70a6603f1a45faa4a172433514f0a487
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-core')
-rw-r--r-- | meta-oe/recipes-core/glib-2.0/glibmm_2.50.0.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-core/libxml/libxml++_2.38.1.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-core/meta/distro-feed-configs.bb | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/meta-oe/recipes-core/glib-2.0/glibmm_2.50.0.bb b/meta-oe/recipes-core/glib-2.0/glibmm_2.50.0.bb index ebe7747ae..9479de980 100644 --- a/meta-oe/recipes-core/glib-2.0/glibmm_2.50.0.bb +++ b/meta-oe/recipes-core/glib-2.0/glibmm_2.50.0.bb | |||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499 \ | |||
8 | DEPENDS = "mm-common glib-2.0 libsigc++-2.0" | 8 | DEPENDS = "mm-common glib-2.0 libsigc++-2.0" |
9 | inherit autotools pkgconfig | 9 | inherit autotools pkgconfig |
10 | 10 | ||
11 | SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" | 11 | SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" |
12 | 12 | ||
13 | SRC_URI = " \ | 13 | SRC_URI = " \ |
14 | ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/${SHRT_VER}/glibmm-${PV}.tar.xz \ | 14 | ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/${SHRT_VER}/glibmm-${PV}.tar.xz \ |
diff --git a/meta-oe/recipes-core/libxml/libxml++_2.38.1.bb b/meta-oe/recipes-core/libxml/libxml++_2.38.1.bb index 70965f313..2cb954835 100644 --- a/meta-oe/recipes-core/libxml/libxml++_2.38.1.bb +++ b/meta-oe/recipes-core/libxml/libxml++_2.38.1.bb | |||
@@ -6,7 +6,7 @@ SECTION = "libs" | |||
6 | LICENSE = "LGPL-2.1+" | 6 | LICENSE = "LGPL-2.1+" |
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 " | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 " |
8 | 8 | ||
9 | SHRT_VER = "${@d.getVar('PV',True).split('.')[0]}.${@d.getVar('PV',True).split('.')[1]}" | 9 | SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" |
10 | SRC_URI = "${GNOME_MIRROR}/${BPN}/${SHRT_VER}/${BP}.tar.xz \ | 10 | SRC_URI = "${GNOME_MIRROR}/${BPN}/${SHRT_VER}/${BP}.tar.xz \ |
11 | file://libxml++_ptest.patch \ | 11 | file://libxml++_ptest.patch \ |
12 | file://run-ptest \ | 12 | file://run-ptest \ |
diff --git a/meta-oe/recipes-core/meta/distro-feed-configs.bb b/meta-oe/recipes-core/meta/distro-feed-configs.bb index ea5ca3848..2a8de54d2 100644 --- a/meta-oe/recipes-core/meta/distro-feed-configs.bb +++ b/meta-oe/recipes-core/meta/distro-feed-configs.bb | |||
@@ -22,8 +22,8 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" | |||
22 | 22 | ||
23 | #def distro_feed_configs(d): | 23 | #def distro_feed_configs(d): |
24 | # import bb | 24 | # import bb |
25 | # parchs = d.getVar( "PACKAGE_EXTRA_ARCHS", 1 ).split() | 25 | # parchs = d.getVar("PACKAGE_EXTRA_ARCHS").split() |
26 | # march = d.getVar( "MACHINE_ARCH", 1 ).split() | 26 | # march = d.getVar("MACHINE_ARCH").split() |
27 | # archs = [ "all" ] + parchs + march | 27 | # archs = [ "all" ] + parchs + march |
28 | # confs = [ ( "${sysconfdir}/opkg/%s-feed.conf" % feed ) for feed in archs ] | 28 | # confs = [ ( "${sysconfdir}/opkg/%s-feed.conf" % feed ) for feed in archs ] |
29 | # return " ".join( confs ) | 29 | # return " ".join( confs ) |