diff --git a/meta-fso/recipes-freesmartphone/cornucopia/cornucopia-base.inc b/meta-fso/recipes-freesmartphone/cornucopia/cornucopia-base.inc index 7888c209d..a79b79d40 100644 --- a/meta-fso/recipes-freesmartphone/cornucopia/cornucopia-base.inc +++ b/meta-fso/recipes-freesmartphone/cornucopia/cornucopia-base.inc @@ -5,7 +5,7 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" SECTION = "devel" DEPENDS = "vala-native glib-2.0 libfso-glib libgee" -DEPENDS += "${@['libfsoframework', ''][(bb.data.getVar('PN', d, 1) in 'libfsoframework libfsobasics'.split())]}" +DEPENDS += "${@['libfsoframework', ''][(bb.data.getVar('PN', d, 1) in 'libfsoframework'.split())]}" PE = "2" INC_PR = "r2" diff --git a/meta-fso/recipes-freesmartphone/cornucopia/fsodeviced.inc b/meta-fso/recipes-freesmartphone/cornucopia/fsodeviced.inc index 9a6424692..b609b4245 100644 --- a/meta-fso/recipes-freesmartphone/cornucopia/fsodeviced.inc +++ b/meta-fso/recipes-freesmartphone/cornucopia/fsodeviced.inc @@ -2,7 +2,7 @@ require cornucopia-base.inc inherit fso-plugin -DEPENDS += "alsa-lib libfsoresource android-rpc libfsosystem libfsotransport" +DEPENDS += "alsa-lib android-rpc" RPROVIDES_${PN} = "openmoko-alsa-scenarios virtual/alsa-scenarios" EXTRA_OECONF = "\ diff --git a/meta-fso/recipes-freesmartphone/cornucopia/fsogsmd.inc b/meta-fso/recipes-freesmartphone/cornucopia/fsogsmd.inc index 5129f924b..b87f945f6 100644 --- a/meta-fso/recipes-freesmartphone/cornucopia/fsogsmd.inc +++ b/meta-fso/recipes-freesmartphone/cornucopia/fsogsmd.inc @@ -4,8 +4,7 @@ inherit fso-plugin LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS += "libfsosystem libfsotransport libfsoresource libgsm0710mux \ - libgisi ppp connman libsamsung-ipc" +DEPENDS += "libgisi ppp connman libsamsung-ipc" EXTRA_OECONF_append = "\ --enable-libgsm0710mux \ diff --git a/meta-fso/recipes-freesmartphone/cornucopia/fsogsmd_git.bb b/meta-fso/recipes-freesmartphone/cornucopia/fsogsmd_git.bb index 23f74adab..d1da7620d 100644 --- a/meta-fso/recipes-freesmartphone/cornucopia/fsogsmd_git.bb +++ b/meta-fso/recipes-freesmartphone/cornucopia/fsogsmd_git.bb @@ -3,8 +3,5 @@ require cornucopia-from-git.inc SRCREV = "${FSO_CORNUCOPIA_SRCREV}" -# Should be moved to fsogsmd.inc when switching to 0.12 -DEPENDS += "libfsotest" - PV = "0.11.99+gitr${SRCPV}" PR = "${INC_PR}.2" diff --git a/meta-fso/recipes-freesmartphone/cornucopia/fsotdld.inc b/meta-fso/recipes-freesmartphone/cornucopia/fsotdld.inc index fd5027c1f..26bee584a 100644 --- a/meta-fso/recipes-freesmartphone/cornucopia/fsotdld.inc +++ b/meta-fso/recipes-freesmartphone/cornucopia/fsotdld.inc @@ -2,7 +2,7 @@ require cornucopia-base.inc inherit fso-plugin -DEPENDS += "libfsotransport libfsoresource json-glib libsoup-2.4 gpsd" +DEPENDS += "json-glib libsoup-2.4 gpsd" EXTRA_OECONF = "--enable-provider-libgps" inherit update-rc.d diff --git a/meta-fso/recipes-freesmartphone/cornucopia/libfsobasics-0.11.0/0001-fsobasics-fix-threading-compilation-with-vala-0.16.0.patch b/meta-fso/recipes-freesmartphone/cornucopia/libfsobasics-0.11.0/0001-fsobasics-fix-threading-compilation-with-vala-0.16.0.patch deleted file mode 100644 index 8fd9bbc80..000000000 --- a/meta-fso/recipes-freesmartphone/cornucopia/libfsobasics-0.11.0/0001-fsobasics-fix-threading-compilation-with-vala-0.16.0.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a2fadf980add7cddb7195379931387aa8112a442 Mon Sep 17 00:00:00 2001 -From: Denis 'GNUtoo' Carikli -Date: Fri, 8 Jun 2012 23:11:09 +0200 -Subject: [PATCH] fsobasics: fix threading compilation with vala 0.16.0 - -Without that fix we have: - threading.vala:77.53-77.55: error: Cannot convert from `int' to `void*' - void* param = 0x0 ) - -Signed-off-by: Denis 'GNUtoo' Carikli ---- - fsobasics/threading.vala | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/fsobasics/threading.vala b/fsobasics/threading.vala -index a9e697c..dd2caaf 100644 ---- a/fsobasics/threading.vala -+++ b/fsobasics/threading.vala -@@ -74,7 +74,7 @@ public bool isMainThread() - - public void callDelegateOnMainThread( VoidFuncWithVoidStarParam func, - bool waitForCompletion = false, -- void* param = 0x0 ) -+ void* param = null ) - { - var mutex = new GLib.Mutex(); - var cond = new GLib.Cond(); --- -1.7.8.6 - diff --git a/meta-fso/recipes-freesmartphone/cornucopia/libfsobasics.inc b/meta-fso/recipes-freesmartphone/cornucopia/libfsobasics.inc deleted file mode 100644 index 76038371a..000000000 --- a/meta-fso/recipes-freesmartphone/cornucopia/libfsobasics.inc +++ /dev/null @@ -1,4 +0,0 @@ -require cornucopia-base.inc -DESCRIPTION = "freesmartphone.org support library" - -DEPENDS += "libnl" diff --git a/meta-fso/recipes-freesmartphone/cornucopia/libfsobasics_0.11.0.bb b/meta-fso/recipes-freesmartphone/cornucopia/libfsobasics_0.11.0.bb deleted file mode 100644 index 19c6a01de..000000000 --- a/meta-fso/recipes-freesmartphone/cornucopia/libfsobasics_0.11.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -require ${BPN}.inc - -PR = "${INC_PR}.1" - -EXTRA_OECONF += "--enable-vala" -SRC_URI += "file://0001-fsobasics-fix-threading-compilation-with-vala-0.16.0.patch" - -SRC_URI[md5sum] = "927435e1656640ebeac63b5f140da147" -SRC_URI[sha256sum] = "d0068178d309a3464ed4b739d14c36d5ca649f4cfd83fd58f21bd8883440797c" diff --git a/meta-fso/recipes-freesmartphone/cornucopia/libfsobasics_git.bb b/meta-fso/recipes-freesmartphone/cornucopia/libfsobasics_git.bb deleted file mode 100644 index 2175aa2f4..000000000 --- a/meta-fso/recipes-freesmartphone/cornucopia/libfsobasics_git.bb +++ /dev/null @@ -1,7 +0,0 @@ -require ${BPN}.inc -require cornucopia-from-git.inc - -SRCREV = "${FSO_CORNUCOPIA_SRCREV}" - -PV = "0.11.99+gitr${SRCPV}" -PR = "${INC_PR}.0" diff --git a/meta-fso/recipes-freesmartphone/cornucopia/libfsoframework.inc b/meta-fso/recipes-freesmartphone/cornucopia/libfsoframework.inc index 2f77372d4..9ca719cbc 100644 --- a/meta-fso/recipes-freesmartphone/cornucopia/libfsoframework.inc +++ b/meta-fso/recipes-freesmartphone/cornucopia/libfsoframework.inc @@ -1,4 +1,4 @@ require cornucopia-base.inc DESCRIPTION = "freesmartphone.org support library" -DEPENDS += "libfsobasics alsa-lib" +DEPENDS += "alsa-lib" diff --git a/meta-fso/recipes-freesmartphone/cornucopia/libfsoresource.inc b/meta-fso/recipes-freesmartphone/cornucopia/libfsoresource.inc deleted file mode 100644 index cb4efd0e7..000000000 --- a/meta-fso/recipes-freesmartphone/cornucopia/libfsoresource.inc +++ /dev/null @@ -1,4 +0,0 @@ -require cornucopia-base.inc -DESCRIPTION = "freesmartphone.org dbus resource library" - -DEPENDS += "libfso-glib" diff --git a/meta-fso/recipes-freesmartphone/cornucopia/libfsoresource_0.11.0.bb b/meta-fso/recipes-freesmartphone/cornucopia/libfsoresource_0.11.0.bb deleted file mode 100644 index 581b948d3..000000000 --- a/meta-fso/recipes-freesmartphone/cornucopia/libfsoresource_0.11.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require ${BPN}.inc - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "35cfc9aa57faf6678b2e3dbbb9e79a04" -SRC_URI[sha256sum] = "bc9efe02c989e9755d7cb918ccb4a12d27cad74acc46ed0013f0751557e464f7" diff --git a/meta-fso/recipes-freesmartphone/cornucopia/libfsoresource_git.bb b/meta-fso/recipes-freesmartphone/cornucopia/libfsoresource_git.bb deleted file mode 100644 index 2175aa2f4..000000000 --- a/meta-fso/recipes-freesmartphone/cornucopia/libfsoresource_git.bb +++ /dev/null @@ -1,7 +0,0 @@ -require ${BPN}.inc -require cornucopia-from-git.inc - -SRCREV = "${FSO_CORNUCOPIA_SRCREV}" - -PV = "0.11.99+gitr${SRCPV}" -PR = "${INC_PR}.0" diff --git a/meta-fso/recipes-freesmartphone/cornucopia/libfsosystem.inc b/meta-fso/recipes-freesmartphone/cornucopia/libfsosystem.inc deleted file mode 100644 index 1c3e89ebd..000000000 --- a/meta-fso/recipes-freesmartphone/cornucopia/libfsosystem.inc +++ /dev/null @@ -1,2 +0,0 @@ -require cornucopia-base.inc -DESCRIPTION = "freesmartphone.org system library" diff --git a/meta-fso/recipes-freesmartphone/cornucopia/libfsosystem_0.11.0.bb b/meta-fso/recipes-freesmartphone/cornucopia/libfsosystem_0.11.0.bb deleted file mode 100644 index 9f0b17908..000000000 --- a/meta-fso/recipes-freesmartphone/cornucopia/libfsosystem_0.11.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require ${BPN}.inc - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "ba551bdba4e75d2282fdcc5d0afcfb94" -SRC_URI[sha256sum] = "a77b0dc14e9e9203cb1b8e39bba328da79fb0c98d0ca7021abb8609450835f67" diff --git a/meta-fso/recipes-freesmartphone/cornucopia/libfsosystem_git.bb b/meta-fso/recipes-freesmartphone/cornucopia/libfsosystem_git.bb deleted file mode 100644 index 2175aa2f4..000000000 --- a/meta-fso/recipes-freesmartphone/cornucopia/libfsosystem_git.bb +++ /dev/null @@ -1,7 +0,0 @@ -require ${BPN}.inc -require cornucopia-from-git.inc - -SRCREV = "${FSO_CORNUCOPIA_SRCREV}" - -PV = "0.11.99+gitr${SRCPV}" -PR = "${INC_PR}.0" diff --git a/meta-fso/recipes-freesmartphone/cornucopia/libfsotest.inc b/meta-fso/recipes-freesmartphone/cornucopia/libfsotest.inc deleted file mode 100644 index 841f62ab1..000000000 --- a/meta-fso/recipes-freesmartphone/cornucopia/libfsotest.inc +++ /dev/null @@ -1,4 +0,0 @@ -require cornucopia-base.inc -DESCRIPTION = "freesmartphone.org test library" - -DEPENDS += "libfsobasics" diff --git a/meta-fso/recipes-freesmartphone/cornucopia/libfsotest_git.bb b/meta-fso/recipes-freesmartphone/cornucopia/libfsotest_git.bb deleted file mode 100644 index 2175aa2f4..000000000 --- a/meta-fso/recipes-freesmartphone/cornucopia/libfsotest_git.bb +++ /dev/null @@ -1,7 +0,0 @@ -require ${BPN}.inc -require cornucopia-from-git.inc - -SRCREV = "${FSO_CORNUCOPIA_SRCREV}" - -PV = "0.11.99+gitr${SRCPV}" -PR = "${INC_PR}.0" diff --git a/meta-fso/recipes-freesmartphone/cornucopia/libfsotransport.inc b/meta-fso/recipes-freesmartphone/cornucopia/libfsotransport.inc deleted file mode 100644 index 8f143cfad..000000000 --- a/meta-fso/recipes-freesmartphone/cornucopia/libfsotransport.inc +++ /dev/null @@ -1,3 +0,0 @@ -require cornucopia-base.inc - -DESCRIPTION = "freesmartphone.org transport library" diff --git a/meta-fso/recipes-freesmartphone/cornucopia/libfsotransport_0.11.1.bb b/meta-fso/recipes-freesmartphone/cornucopia/libfsotransport_0.11.1.bb deleted file mode 100644 index 2e788b56c..000000000 --- a/meta-fso/recipes-freesmartphone/cornucopia/libfsotransport_0.11.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -require ${BPN}.inc - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "a52a3133883596bbd283c1ace2f766d7" -SRC_URI[sha256sum] = "7eecc8bc9e55bd3343ffec826a93b2fdf5e78af346e762d6acab45b75c7d4106" - -EXTRA_OECONF = "--enable-palmpre-hsuart" diff --git a/meta-fso/recipes-freesmartphone/cornucopia/libfsotransport_git.bb b/meta-fso/recipes-freesmartphone/cornucopia/libfsotransport_git.bb deleted file mode 100644 index ee7610709..000000000 --- a/meta-fso/recipes-freesmartphone/cornucopia/libfsotransport_git.bb +++ /dev/null @@ -1,7 +0,0 @@ -require ${BPN}.inc -require cornucopia-from-git.inc - -SRCREV = "${FSO_CORNUCOPIA_SRCREV}" - -PV = "0.11.99+gitr${SRCPV}" -PR = "${INC_PR}.1" diff --git a/meta-fso/recipes-freesmartphone/cornucopia/libgsm0710mux.inc b/meta-fso/recipes-freesmartphone/cornucopia/libgsm0710mux.inc deleted file mode 100644 index 7e67eacd0..000000000 --- a/meta-fso/recipes-freesmartphone/cornucopia/libgsm0710mux.inc +++ /dev/null @@ -1,8 +0,0 @@ -require cornucopia-base.inc - -DESCRIPTION = "A GSM 07.10 Multiplexing Engine" -AUTHOR = "Michael 'Mickey' Lauer " -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -SECTION = "devel" -DEPENDS = "glib-2.0 libgsm0710 libfsotransport" diff --git a/meta-fso/recipes-freesmartphone/cornucopia/libgsm0710mux_0.11.2.bb b/meta-fso/recipes-freesmartphone/cornucopia/libgsm0710mux_0.11.2.bb deleted file mode 100644 index 2d6f1ad29..000000000 --- a/meta-fso/recipes-freesmartphone/cornucopia/libgsm0710mux_0.11.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require ${BPN}.inc - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "1d57f6a14af72715f6ee67e87716270f" -SRC_URI[sha256sum] = "ddd9e5adfc5c0b8ae6e06baf83f1ee18d5125f3e3f7d816d18190f25db1b8538" diff --git a/meta-fso/recipes-freesmartphone/cornucopia/libgsm0710mux_git.bb b/meta-fso/recipes-freesmartphone/cornucopia/libgsm0710mux_git.bb deleted file mode 100644 index 2175aa2f4..000000000 --- a/meta-fso/recipes-freesmartphone/cornucopia/libgsm0710mux_git.bb +++ /dev/null @@ -1,7 +0,0 @@ -require ${BPN}.inc -require cornucopia-from-git.inc - -SRCREV = "${FSO_CORNUCOPIA_SRCREV}" - -PV = "0.11.99+gitr${SRCPV}" -PR = "${INC_PR}.0" diff --git a/meta-fso/recipes-freesmartphone/cornucopia/mterm2_git.bb b/meta-fso/recipes-freesmartphone/cornucopia/mterm2_git.bb index 54096e9ee..753e16aae 100644 --- a/meta-fso/recipes-freesmartphone/cornucopia/mterm2_git.bb +++ b/meta-fso/recipes-freesmartphone/cornucopia/mterm2_git.bb @@ -5,7 +5,7 @@ DESCRIPTION = "mterm is a versatile muxer-aware terminal program" HOMEPAGE = "http://www.freesmartphone.org/index.php/Implementations/fso-term" AUTHOR = "Michael 'Mickey' Lauer " SECTION = "console/network" -DEPENDS = "dbus dbus-glib readline libfsoframework libfsotransport" +DEPENDS = "dbus dbus-glib readline libfsoframework" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" # we cannot use FSO_CORNUCOPIA_SRCREV without fso-autorev, because it needs newer