diff options
| author | Nicolas Dechesne <nicolas.dechesne@linaro.org> | 2016-09-07 16:32:02 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-09-15 10:22:46 +0200 |
| commit | 5641b252766a59497c4d32b70103bb1b96c8d9c0 (patch) | |
| tree | 41a57789df02763c6001aad37f09f96225f37077 /meta-oe/recipes-navigation | |
| parent | c7137fd871bbc6a2e0c65a3e823d5abdc1feb9e6 (diff) | |
| download | meta-openembedded-5641b252766a59497c4d32b70103bb1b96c8d9c0.tar.gz | |
Revert "gpsd, foxtrotgps: blacklist, fails to build with new binutils-2.27"
This reverts commit 8c29023f1fe5881f3e001704eb9e5d398777d4a6.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-navigation')
| -rw-r--r-- | meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.1.1.bb | 3 | ||||
| -rw-r--r-- | meta-oe/recipes-navigation/gpsd/gpsd_3.14.bb | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.1.1.bb b/meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.1.1.bb index 32b20c387..d91cbcbbb 100644 --- a/meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.1.1.bb +++ b/meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.1.1.bb | |||
| @@ -6,8 +6,7 @@ LICENSE = "GPLv2" | |||
| 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" |
| 7 | DEPENDS = "curl gtk+ libglade sqlite3 libexif gpsd bluez4 intltool-native" | 7 | DEPENDS = "curl gtk+ libglade sqlite3 libexif gpsd bluez4 intltool-native" |
| 8 | 8 | ||
| 9 | PNBLACKLIST[foxtrotgps] ?= "Depends on broken gpsd" | 9 | PNBLACKLIST[foxtrotgps] ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5 conflicts with bluez4 and bluez5 is selected in DISTRO_FEATURES', '', d)}" |
| 10 | #PNBLACKLIST[foxtrotgps] ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5 conflicts with bluez4 and bluez5 is selected in DISTRO_FEATURES', '', d)}" | ||
| 11 | 10 | ||
| 12 | SRC_URI = "http://www.foxtrotgps.org/releases/${BP}.tar.gz" | 11 | SRC_URI = "http://www.foxtrotgps.org/releases/${BP}.tar.gz" |
| 13 | SRC_URI[md5sum] = "6777d448ee9d3ba195f9d26ea90e3163" | 12 | SRC_URI[md5sum] = "6777d448ee9d3ba195f9d26ea90e3163" |
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.14.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.14.bb index 537facc0e..6158e970a 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd_3.14.bb +++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.14.bb | |||
| @@ -139,6 +139,3 @@ RPROVIDES_${PN} += "${PN}-systemd" | |||
| 139 | RREPLACES_${PN} += "${PN}-systemd" | 139 | RREPLACES_${PN} += "${PN}-systemd" |
| 140 | RCONFLICTS_${PN} += "${PN}-systemd" | 140 | RCONFLICTS_${PN} += "${PN}-systemd" |
| 141 | SYSTEMD_SERVICE_${PN} = "${PN}.socket" | 141 | SYSTEMD_SERVICE_${PN} = "${PN}.socket" |
| 142 | |||
| 143 | # http://errors.yoctoproject.org/Errors/Details/81000/ | ||
| 144 | PNBLACKLIST[gpsd] ?= "BROKEN: fails to build with new binutils 2.27" | ||