diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-01-09 16:06:42 +0100 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-01-09 16:07:05 +0100 |
| commit | 3fd196635bcc6efe5c86fdcccc4849e1cb9fdd4f (patch) | |
| tree | 10e79e9bb3872f797350d619e075c98502621a3f | |
| parent | b0d747bda32e487140ad260db7f1ec5ef9b15997 (diff) | |
fso-gpsd: Do not RCONFLICTS with gpsd for now as it will not show up in the image with this
| -rw-r--r-- | packages/freesmartphone/fso-gpsd_git.bb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/packages/freesmartphone/fso-gpsd_git.bb b/packages/freesmartphone/fso-gpsd_git.bb index 73e59beb88..cde1bb65e3 100644 --- a/packages/freesmartphone/fso-gpsd_git.bb +++ b/packages/freesmartphone/fso-gpsd_git.bb @@ -3,7 +3,7 @@ LICENSE = "GPL" SECTION = "network" DEPENDS = "dbus-glib" PV = "0.8+gitr${SRCREV}" -PR = "r1" +PR = "r2" SRC_URI = "\ ${FREESMARTPHONE_GIT}/fso-gpsd.git;protocol=git;branch=master \ @@ -24,4 +24,6 @@ do_install_append() { FILES_${PN} += "${sysconfdir}" RDEPENDS_${PN} = "frameworkd" RPROVIDES_${PN} = "gpsd" -RCONFLICTS_${PN} = "gpsd" +# Disabled as we always got gpsd but not fso-gpsd in the fso-image. Needs +# fixing. +#RCONFLICTS_${PN} = "gpsd" |