diff options
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 2 | ||||
| -rw-r--r-- | packages/freesmartphone/frameworkd_git.bb | 6 | ||||
| -rw-r--r-- | packages/freesmartphone/fso-gsm0710muxd_git.bb | 19 | ||||
| -rw-r--r-- | packages/freesmartphone/gsmd2_git.bb | 8 | ||||
| -rw-r--r-- | packages/freesmartphone/mickeyterm_git.bb | 5 |
5 files changed, 29 insertions, 11 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 3e796a31aa..cc367f8b26 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -54,6 +54,7 @@ SRCREV_pn-frameworkd-devel ?= "${SRCREV_pn-frameworkd}" SRCREV_pn-fsod ?= "3fa5eb6f2edcf7c9f0fc2027fda47b91d9f0f136" SRCREV_pn-fso-apm ?= "eb39ce7fb81bfa64e1a9eb5f142ca3d1065be3fa" SRCREV_pn-fso-gpsd ?= "15f75f335efb52dd50a22a05f47a0f63eb07378b" +SRCREV_pn-fso-gsm0710muxd ?= "95151f9e2fe37e0989b981027deefa3821a3b4e5" SRCREV_pn-fso-monitord ?= "31b4d3d1a40b1cc2cbe186e5ea80490a0c80b55f" SRCREV_pn-fso-sounds ?= "b24d3c2e66fee10a5e288101cd1b6f5bbd3da7e2" SRCREV_pn-fstests ?= "204" @@ -62,7 +63,6 @@ SRCREV_pn-gnuradio ?= "9809" SRCREV_pn-gpe-contacts ?= "9312" SRCREV_pn-gpe-sketchbook ?= "9547" SRCREV_pn-gpe-conf ?= "9798" -SRCREV_pn-gsm0710muxd ?= "95151f9e2fe37e0989b981027deefa3821a3b4e5" SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f" SRCREV_pn-gtkhtml2 ?= "1158" SRCREV_pn-gypsy ?= "134" diff --git a/packages/freesmartphone/frameworkd_git.bb b/packages/freesmartphone/frameworkd_git.bb index 186de8990d..3c9075904e 100644 --- a/packages/freesmartphone/frameworkd_git.bb +++ b/packages/freesmartphone/frameworkd_git.bb @@ -5,7 +5,7 @@ SECTION = "console/network" DEPENDS = "python-cython-native python-pyrex-native" LICENSE = "GPL" PV = "0.8.4.9+gitr${SRCREV}" -PR = "r1" +PR = "r2" inherit distutils update-rc.d @@ -53,8 +53,8 @@ RRECOMMENDS_${PN} += "\ # machine specific stuff, should ideally be elsewhere # - recommend MUXer on platforms that require one -RDEPENDS_${PN}_append_om-gta01 = " gsm0710muxd" -RDEPENDS_${PN}_append_om-gta02 = " gsm0710muxd" +RDEPENDS_${PN}_append_om-gta01 = " fso-gsm0710muxd" +RDEPENDS_${PN}_append_om-gta02 = " fso-gsm0710muxd" # - add wmiconfig for wireless configuration RDEPENDS_${PN}_append_om-gta02 = " wmiconfig" diff --git a/packages/freesmartphone/fso-gsm0710muxd_git.bb b/packages/freesmartphone/fso-gsm0710muxd_git.bb new file mode 100644 index 0000000000..d7566ae3aa --- /dev/null +++ b/packages/freesmartphone/fso-gsm0710muxd_git.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "GSM 07.10 muxer userspace daemon; fso-version" +HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/gsm0710muxd" +AUTHOR = "M. Dietrich" +SECTION = "console/network" +DEPENDS = "dbus dbus-glib" +LICENSE = "GPL" +PV = "0.9.2.2+gitr${SRCREV}" +PR = "r1" + +SRC_URI = "${FREESMARTPHONE_GIT}/gsm0710muxd.git;protocol=git;branch=master" +S = "${WORKDIR}/git" + +inherit autotools + +RDEPENDS = "dbus dbus-glib" +RCONFLICTS = "gsm0710muxd" +RREPLACES = "gsm0710muxd" + +FILES_${PN} += "${datadir} ${sysconfdir}" diff --git a/packages/freesmartphone/gsmd2_git.bb b/packages/freesmartphone/gsmd2_git.bb index 0432927d16..4d25aa94e9 100644 --- a/packages/freesmartphone/gsmd2_git.bb +++ b/packages/freesmartphone/gsmd2_git.bb @@ -1,12 +1,11 @@ DESCRIPTION = "GSM 07.07 phone server" -HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/gsm0710muxd" +HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/gsmd2" AUTHOR = "Ixonos Team" SECTION = "console/network" DEPENDS = "dbus dbus-glib" -RDEPENDS = "gsm0710muxd" LICENSE = "GPL" -PV = "0.1.0+${PR}-gitr${SRCREV}" -PR = "r0" +PV = "0.1.0+gitr${SRCREV}" +PR = "r1" SRC_URI = "${FREESMARTPHONE_GIT}/gsmd2.git;protocol=git;branch=master" S = "${WORKDIR}/git" @@ -15,3 +14,4 @@ inherit autotools EXTRA_OECONF = "--disable-tests" +RDEPENDS = "fso-gsm0710muxd" diff --git a/packages/freesmartphone/mickeyterm_git.bb b/packages/freesmartphone/mickeyterm_git.bb index be17e05ea5..acef04ce2b 100644 --- a/packages/freesmartphone/mickeyterm_git.bb +++ b/packages/freesmartphone/mickeyterm_git.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.freesmartphone.org" SECTION = "console/network" LICENSE = "GPLv2" PV = "2.9.1+gitr${SRCREV}" -PR = "r1" +PR = "r2" SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master" S = "${WORKDIR}/git" @@ -21,9 +21,8 @@ RDEPENDS_${PN} = "\ python-threading \ " RRECOMMENDS_${PN} += "\ - gsm0710muxd \ + fso-gsm0710muxd \ python-dbus \ " PACKAGE_ARCH_${PN} = "all" - |