From c9fbceb7c35e6572c04deb0babda1ff8cf4c3457 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Fri, 12 Feb 2010 21:12:44 +0100 Subject: freesmartphone: rename mickeydbus(2) to mdbus(2), fso-term is now called mterm2 --- conf/distro/include/fso-autorev.inc | 5 +++-- conf/distro/include/sane-srcrevs-fso.inc | 4 ++-- recipes/freesmartphone/fso-term_git.bb | 21 --------------------- recipes/freesmartphone/mdbus2_git.bb | 17 +++++++++++++++++ recipes/freesmartphone/mdbus_git.bb | 25 +++++++++++++++++++++++++ recipes/freesmartphone/mickeydbus2_git.bb | 17 ----------------- recipes/freesmartphone/mickeydbus_git.bb | 25 ------------------------- recipes/freesmartphone/mterm2_git.bb | 21 +++++++++++++++++++++ 8 files changed, 68 insertions(+), 67 deletions(-) delete mode 100644 recipes/freesmartphone/fso-term_git.bb create mode 100644 recipes/freesmartphone/mdbus2_git.bb create mode 100644 recipes/freesmartphone/mdbus_git.bb delete mode 100644 recipes/freesmartphone/mickeydbus2_git.bb delete mode 100644 recipes/freesmartphone/mickeydbus_git.bb create mode 100644 recipes/freesmartphone/mterm2_git.bb diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc index fda3cd4729..d73d4732dc 100644 --- a/conf/distro/include/fso-autorev.inc +++ b/conf/distro/include/fso-autorev.inc @@ -13,13 +13,11 @@ SRCREV_pn-fsousaged = "${AUTOREV}" SRCREV_pn-fso-abyss = "${AUTOREV}" SRCREV_pn-fso-boot = "${AUTOREV}" SRCREV_pn-fso-apm = "${AUTOREV}" -SRCREV_pn-fso-term = "${AUTOREV}" SRCREV_pn-fso-gsm0710muxd = "${AUTOREV}" SRCREV_pn-fso-gpsd = "${AUTOREV}" SRCREV_pn-fso-monitord = "${AUTOREV}" SRCREV_pn-fso-sounds = "${AUTOREV}" SRCREV_pn-fso-specs = "${AUTOREV}" -SRCREV_pn-fso-term = "${AUTOREV}" SRCREV_pn-gsmd2 = "${AUTOREV}" SRCREV_pn-illume-theme-freesmartphone = "${AUTOREV}" SRCREV_pn-libascenario = "${AUTOREV}" @@ -34,9 +32,12 @@ SRCREV_pn-libgee-native = "${AUTOREV}" SRCREV_pn-libgee = "${AUTOREV}" SRCREV_pn-libgsm0710 = "${AUTOREV}" SRCREV_pn-libgsm0710mux = "${AUTOREV}" +SRCREV_pn-libmsmcomm = "${AUTOREV}" SRCREV_pn-libpersistence = "${AUTOREV}" SRCREV_pn-mickeydbus = "${AUTOREV}" +SRCREV_pn-mdbus2 = "${AUTOREV}" SRCREV_pn-mickeyterm = "${AUTOREV}" +SRCREV_pn-mterm2 = "${AUTOREV}" SRCREV_pn-misc-vapi = "${AUTOREV}" SRCREV_pn-msmcommd = "${AUTOREV}" SRCREV_pn-python-pytrc = "${AUTOREV}" diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc index 2178ab3c3e..5d1192e05a 100644 --- a/conf/distro/include/sane-srcrevs-fso.inc +++ b/conf/distro/include/sane-srcrevs-fso.inc @@ -17,14 +17,14 @@ SRCREV_pn-libfsobasics ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-libfsoframework ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-libfsotransport ?= "0c1e8c057b4110b1d8d2c24fd93744c03c304cc8" SRCREV_pn-libfsoresource ?= "${FSO_CORNUCOPIA_SRCREV}" -SRCREV_pn-mickeydbus2 ?= "3e75d0ab3e334e303fa1f64b5d87465150c0b58c" +SRCREV_pn-mdbus2 ?= "a8b99e5b7e2805adc494296dfdda478f0d2fb46c" +SRCREV_pn-mterm2 ?= "a8b99e5b7e2805adc494296dfdda478f0d2fb46c" # FSO Projects -- Misc SRCREV_pn-dbus-hlid ?= "5df7f49fe8881804aaab544a569fd164c3e93afb" SRCREV_pn-frameworkd ?= "e3d6339c5d69e0791c4633f86363159e56126075" SRCREV_pn-frameworkd-config-shr_FSO_REV ?= ${SRCREV_pn-frameworkd} SRCREV_pn-fso-abyss ?= "aaa3c48296c8589d845f2b6e4314b794750d91cc" -SRCREV_pn-fso-term ?= "aa0b9c26dee3918a5e9d2809bb36335bda276a0d" SRCREV_pn-fso-gpsd ?= "39e810899110a9bb302cf2064e1c0f73541fb4e6" SRCREV_pn-fso-gsm0710muxd ?= "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4" SRCREV_pn-fso-monitord ?= "b4ae1e9b10e710042624c2cf1a15b91a7d5b1d44" diff --git a/recipes/freesmartphone/fso-term_git.bb b/recipes/freesmartphone/fso-term_git.bb deleted file mode 100644 index acb20cdb05..0000000000 --- a/recipes/freesmartphone/fso-term_git.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "Term 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" -LICENSE = "GPL" -PV = "0.0.0.0+gitr${SRCREV}" -PR = "r0" - -SRC_URI = "\ - ${FREESMARTPHONE_GIT}/fso-term.git;protocol=git;branch=master \ -" -S = "${WORKDIR}/git" - -do_stage() { - : -} - -inherit autotools vala - -FILES_${PN} += "${datadir}" diff --git a/recipes/freesmartphone/mdbus2_git.bb b/recipes/freesmartphone/mdbus2_git.bb new file mode 100644 index 0000000000..0b72f4cea3 --- /dev/null +++ b/recipes/freesmartphone/mdbus2_git.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Mickey's DBus introspection and calling Program V2" +AUTHOR = "Michael 'Mickey' Lauer " +HOMEPAGE = "http://www.freesmartphone.org" +SECTION = "console/network" +LICENSE = "GPLv2" +DEPENDS = "glib-2.0 dbus dbus-glib" +PV = "2.0.0+gitr${SRCREV}" +PR = "r0" + +SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git;branch=master" +S = "${WORKDIR}/git/tools/mdbus2" + +do_stage() { + : +} + +inherit autotools_stage vala diff --git a/recipes/freesmartphone/mdbus_git.bb b/recipes/freesmartphone/mdbus_git.bb new file mode 100644 index 0000000000..229ff7f1fd --- /dev/null +++ b/recipes/freesmartphone/mdbus_git.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Mickey's DBus introspection and calling Program" +AUTHOR = "Michael 'Mickey' Lauer " +HOMEPAGE = "http://www.freesmartphone.org" +SECTION = "console/network" +LICENSE = "GPLv2" +PV = "0.9.2+gitr${SRCREV}" +PR = "r2" + +SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master" +S = "${WORKDIR}/git" + +do_install() { + install -d ${D}${bindir} + install -m 0755 mickeydbus/mdbus ${D}${bindir} +} + +RDEPENDS_${PN} = "\ + python-dbus \ + python-pygobject \ + python-pprint \ + python-xml \ +" + +PACKAGE_ARCH_${PN} = "all" + diff --git a/recipes/freesmartphone/mickeydbus2_git.bb b/recipes/freesmartphone/mickeydbus2_git.bb deleted file mode 100644 index 799cbe72c1..0000000000 --- a/recipes/freesmartphone/mickeydbus2_git.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "Mickey's DBus introspection and calling Program rewritten in vala" -AUTHOR = "Michael 'Mickey' Lauer " -HOMEPAGE = "http://www.freesmartphone.org" -SECTION = "console/network" -LICENSE = "GPLv2" - -DEPENDS = "vala-native glib-2.0 dbus dbus-glib" - -PV = "2.0.0+gitr${SRCREV}" -PR = "r0" - -SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git;branch=master" -S = "${WORKDIR}/git/tools/mdbus2" - -inherit autotools - - diff --git a/recipes/freesmartphone/mickeydbus_git.bb b/recipes/freesmartphone/mickeydbus_git.bb deleted file mode 100644 index 229ff7f1fd..0000000000 --- a/recipes/freesmartphone/mickeydbus_git.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "Mickey's DBus introspection and calling Program" -AUTHOR = "Michael 'Mickey' Lauer " -HOMEPAGE = "http://www.freesmartphone.org" -SECTION = "console/network" -LICENSE = "GPLv2" -PV = "0.9.2+gitr${SRCREV}" -PR = "r2" - -SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master" -S = "${WORKDIR}/git" - -do_install() { - install -d ${D}${bindir} - install -m 0755 mickeydbus/mdbus ${D}${bindir} -} - -RDEPENDS_${PN} = "\ - python-dbus \ - python-pygobject \ - python-pprint \ - python-xml \ -" - -PACKAGE_ARCH_${PN} = "all" - diff --git a/recipes/freesmartphone/mterm2_git.bb b/recipes/freesmartphone/mterm2_git.bb new file mode 100644 index 0000000000..6e10f9456f --- /dev/null +++ b/recipes/freesmartphone/mterm2_git.bb @@ -0,0 +1,21 @@ +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" +LICENSE = "GPL" +PV = "0.1.0+gitr${SRCREV}" +PR = "r0" + +SRC_URI = "\ + ${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git;branch=master \ +" +S = "${WORKDIR}/git/tools/mterm2" + +do_stage() { + : +} + +inherit autotools vala + +FILES_${PN} += "${datadir}" -- cgit v1.2.3