meta-fso: drop all libfso* recipes, now all provided by libfsoframework

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
shr-distribution · Jul 27, 2012 · 0298bef · 0298bef
1 parent 424dc30
commit 0298bef
Show file tree

Hide file tree

Showing 25 changed files with 6 additions and 142 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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/...copia/libfsobasics-0.11.0/0001-fsobasics-fix-threading-compilation-with-vala-0.16.0.patch b/...copia/libfsobasics-0.11.0/0001-fsobasics-fix-threading-compilation-with-vala-0.16.0.patch
diff --git a/meta-fso/recipes-freesmartphone/cornucopia/libfsobasics.inc b/meta-fso/recipes-freesmartphone/cornucopia/libfsobasics.inc
diff --git a/meta-fso/recipes-freesmartphone/cornucopia/libfsobasics_0.11.0.bb b/meta-fso/recipes-freesmartphone/cornucopia/libfsobasics_0.11.0.bb
diff --git a/meta-fso/recipes-freesmartphone/cornucopia/libfsobasics_git.bb b/meta-fso/recipes-freesmartphone/cornucopia/libfsobasics_git.bb
diff --git 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
diff --git a/meta-fso/recipes-freesmartphone/cornucopia/libfsoresource_0.11.0.bb b/meta-fso/recipes-freesmartphone/cornucopia/libfsoresource_0.11.0.bb
diff --git a/meta-fso/recipes-freesmartphone/cornucopia/libfsoresource_git.bb b/meta-fso/recipes-freesmartphone/cornucopia/libfsoresource_git.bb
diff --git a/meta-fso/recipes-freesmartphone/cornucopia/libfsosystem.inc b/meta-fso/recipes-freesmartphone/cornucopia/libfsosystem.inc
diff --git a/meta-fso/recipes-freesmartphone/cornucopia/libfsosystem_0.11.0.bb b/meta-fso/recipes-freesmartphone/cornucopia/libfsosystem_0.11.0.bb
diff --git a/meta-fso/recipes-freesmartphone/cornucopia/libfsosystem_git.bb b/meta-fso/recipes-freesmartphone/cornucopia/libfsosystem_git.bb
diff --git a/meta-fso/recipes-freesmartphone/cornucopia/libfsotest.inc b/meta-fso/recipes-freesmartphone/cornucopia/libfsotest.inc
diff --git a/meta-fso/recipes-freesmartphone/cornucopia/libfsotest_git.bb b/meta-fso/recipes-freesmartphone/cornucopia/libfsotest_git.bb
diff --git a/meta-fso/recipes-freesmartphone/cornucopia/libfsotransport.inc b/meta-fso/recipes-freesmartphone/cornucopia/libfsotransport.inc
diff --git a/meta-fso/recipes-freesmartphone/cornucopia/libfsotransport_0.11.1.bb b/meta-fso/recipes-freesmartphone/cornucopia/libfsotransport_0.11.1.bb
diff --git a/meta-fso/recipes-freesmartphone/cornucopia/libfsotransport_git.bb b/meta-fso/recipes-freesmartphone/cornucopia/libfsotransport_git.bb
diff --git a/meta-fso/recipes-freesmartphone/cornucopia/libgsm0710mux.inc b/meta-fso/recipes-freesmartphone/cornucopia/libgsm0710mux.inc
diff --git a/meta-fso/recipes-freesmartphone/cornucopia/libgsm0710mux_0.11.2.bb b/meta-fso/recipes-freesmartphone/cornucopia/libgsm0710mux_0.11.2.bb
diff --git a/meta-fso/recipes-freesmartphone/cornucopia/libgsm0710mux_git.bb b/meta-fso/recipes-freesmartphone/cornucopia/libgsm0710mux_git.bb
diff --git 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 <mlauer@vanille-media.de>"
 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