Merge branch 'multitech-corecdp-dev' of git@git.multitech.net:multitech-oe into multitech-corecdp-dev

11 files changed, 88 insertions, 76 deletions

diff --git a/conf/distro/corecdp.conf b/conf/distro/corecdp.conf
index ef650e8836..b5682fa74f 100644
--- a/conf/distro/corecdp.conf
+++ b/conf/distro/corecdp.conf
@@ -11,7 +11,7 @@ require conf/amend-recipes.inc
 
 DISTRO_NAME = "CoreCDP"
 DISTRO = "corecdp"
-DISTRO_VERSION = "1.0.0"
+DISTRO_VERSION = "1.0.2"
 DISTRO_TYPE = "release"
 TARGET_VENDOR = "-corecdp"
 BUILDNAME = "${DISTRO_NAME} ${DISTRO_VERSION}"
diff --git a/recipes/base-files/base-files_3.0.14.bb b/recipes/base-files/base-files_3.0.14.bb
index f2d02b0fa0..a3dd567e92 100644
--- a/recipes/base-files/base-files_3.0.14.bb
+++ b/recipes/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r89"
+PR = "r91"
 LICENSE = "GPL"
 
 SRC_URI = " \
diff --git a/recipes/images/corecdp-full-image.bb b/recipes/images/corecdp-full-image.bb
index 036ee3c6dd..ab2f2499e9 100644
--- a/recipes/images/corecdp-full-image.bb
+++ b/recipes/images/corecdp-full-image.bb
@@ -33,5 +33,8 @@ IMAGE_INSTALL += "jamvm"
 
 IMAGE_INSTALL += "php php-cli php-cgi"
 
+# Multi-Tech SMS Utility (see http://git.multitech.net)
+IMAGE_INSTALL += "sms-utils"
+
 export IMAGE_BASENAME = "corecdp-full-image"
 
diff --git a/recipes/multitech/config/ppp/options b/recipes/multitech/config/ppp/options
index 1126510694..24fed19991 100644
--- a/recipes/multitech/config/ppp/options
+++ b/recipes/multitech/config/ppp/options
@@ -1,10 +1,10 @@
 # Select tty device
 #
-# MTSMC-E
+# MTCDP-E1, MTCDP-G2
 /dev/ttyS1
-# MTSMC-H
-#/dev/ttyACM0
-# USB device
+# MTCDP-H4
+#/dev/ttyUSB3
+# MTCDP-EV2
 #/dev/ttyUSB0
 
 # Uncomment below to run in foreground
diff --git a/recipes/multitech/config_1.0.bb b/recipes/multitech/config_1.0.bb
index e07bb7d7f9..b1e2aadf41 100644
--- a/recipes/multitech/config_1.0.bb
+++ b/recipes/multitech/config_1.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Provides default system config files and /var/config fs"
 SECTION = "base"
 LICENSE = "GPL"
-PR = "r11"
+PR = "r12"
 
 inherit update-rc.d
 
diff --git a/recipes/multitech/mts-io.inc b/recipes/multitech/mts-io.inc
new file mode 100644
index 0000000000..b6f6abe3ae
--- /dev/null
+++ b/recipes/multitech/mts-io.inc
@@ -0,0 +1,56 @@
+DESCRIPTION = "mts-io controller and sysfs wrapper"
+HOMEPAGE = "http://www.multitech.net/"
+SECTION = "base"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "virtual/kernel"
+RDEPENDS = "kernel (${KERNEL_VERSION})"
+
+SRC_URI = " \
+    file://mts-io.init \
+    git://git.multitech.net/cdp-io-controller.git;protocol=git;tag=v${PV} \
+"
+S = "${WORKDIR}/git/io-module"
+
+inherit module-base
+inherit update-rc.d
+
+EXTRA_OEMAKE = " -C ${STAGING_KERNEL_DIR} \
+                M=${S} \
+                modules \
+                "
+
+do_configure () {
+   echo "Nothing to configure for mts-io"
+}
+
+do_compile () {
+    unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+    oe_runmake
+}
+
+PACKAGES = "${PN}"
+
+FILES_${PN} = "${base_libdir}/modules/${KERNEL_VERSION}/extra/mts_io.ko"
+FILES_${PN} += "${sysconfdir}/init.d/mts-io"
+FILES_${PN} += "${libdir}/mts-io-sysfs*"
+FILES_${PN} += "${sbindir}/mts-io-sysfs"
+
+INITSCRIPT_NAME = "mts-io"
+INITSCRIPT_PARAMS = "start 90 S ."
+
+PARALLEL_MAKE = ""
+
+fakeroot do_install () {
+    install -m 0755 -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra
+    # use cp instead of install so the driver doesn't get stripped
+    cp ${S}/mts_io.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra
+
+    install -d ${D}${sysconfdir}/init.d
+    install -m 0755 ${WORKDIR}/mts-io.init ${D}${sysconfdir}/init.d/mts-io
+
+    install -m 0755 -d ${D}${sbindir}
+    install -d ${D}${libdir}/mts-io-sysfs
+    install -m 0755 ${WORKDIR}/git/io-tool/mts-io-sysfs-inc.sh ${D}${libdir}/mts-io-sysfs
+    install -m 0755 ${WORKDIR}/git/io-tool/mts-io-sysfs ${D}${sbindir}/mts-io-sysfs
+}
diff --git a/recipes/multitech/mts-io_0.2.0.bb b/recipes/multitech/mts-io_0.2.0.bb
index 57bec161a1..bda1ebd15b 100644
--- a/recipes/multitech/mts-io_0.2.0.bb
+++ b/recipes/multitech/mts-io_0.2.0.bb
@@ -1,58 +1,3 @@
-DESCRIPTION = "mts-io controller and sysfs wrapper"
-HOMEPAGE = "http://www.multitech.net/"
-SECTION = "base"
-PRIORITY = "optional"
-LICENSE = "GPL"
-DEPENDS = "virtual/kernel"
-RDEPENDS = "kernel (${KERNEL_VERSION})"
-
-SRC_URI = " \
-    file://mts-io.init \
-    git://git.multitech.net/cdp-io-controller.git;protocol=git;tag=v0.2.0 \
-"
-S = "${WORKDIR}/git/io-module"
-
-inherit module-base
-inherit update-rc.d
+require mts-io.inc
 
 PR = "r0"
-
-EXTRA_OEMAKE = " -C ${STAGING_KERNEL_DIR} \
-                M=${S} \
-                modules \
-                "
-
-do_configure () {
-   echo "Nothing to configure for mts-io"
-}
-
-do_compile () {
-    unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
-    oe_runmake
-}
-
-PACKAGES = "${PN}"
-
-FILES_${PN} = "${base_libdir}/modules/${KERNEL_VERSION}/extra/mts_io.ko"
-FILES_${PN} += "${sysconfdir}/init.d/mts-io"
-FILES_${PN} += "${libdir}/mts-io-sysfs*"
-FILES_${PN} += "${sbindir}/mts-io-sysfs"
-
-INITSCRIPT_NAME = "mts-io"
-INITSCRIPT_PARAMS = "start 90 S ."
-
-PARALLEL_MAKE = ""
-
-fakeroot do_install () {
-    install -m 0755 -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra
-    # use cp instead of install so the driver doesn't get stripped
-    cp ${S}/mts_io.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra
-
-    install -d ${D}${sysconfdir}/init.d
-    install -m 0755 ${WORKDIR}/mts-io.init ${D}${sysconfdir}/init.d/mts-io
-
-    install -m 0755 -d ${D}${sbindir}
-    install -d ${D}${libdir}/mts-io-sysfs
-    install -m 0755 ${WORKDIR}/git/io-tool/mts-io-sysfs-inc.sh ${D}${libdir}/mts-io-sysfs
-    install -m 0755 ${WORKDIR}/git/io-tool/mts-io-sysfs ${D}${sbindir}/mts-io-sysfs
-}
diff --git a/recipes/multitech/mts-io_0.3.0.bb b/recipes/multitech/mts-io_0.3.0.bb
new file mode 100644
index 0000000000..bda1ebd15b
--- /dev/null
+++ b/recipes/multitech/mts-io_0.3.0.bb
@@ -0,0 +1,3 @@
+require mts-io.inc
+
+PR = "r0"
diff --git a/recipes/multitech/sms-utils.inc b/recipes/multitech/sms-utils.inc
new file mode 100644
index 0000000000..b0b15a3f97
--- /dev/null
+++ b/recipes/multitech/sms-utils.inc
@@ -0,0 +1,13 @@
+DESCRIPTION = "SMS Utilities"
+HOMEPAGE = "http://www.multitech.net/"
+SECTION = "console/utils"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "libesmtp libyaml"
+
+SRC_URI = "git://git.multitech.net/sms-utils.git;protocol=git;tag=${PV}"
+S = "${WORKDIR}/git"
+
+inherit autotools
+
+PARALLEL_MAKE = ""
diff --git a/recipes/multitech/sms-utils_0.0.3.bb b/recipes/multitech/sms-utils_0.0.3.bb
index 71ef21c3fd..f796b2482a 100644
--- a/recipes/multitech/sms-utils_0.0.3.bb
+++ b/recipes/multitech/sms-utils_0.0.3.bb
@@ -1,14 +1,3 @@
-DESCRIPTION = "SMS Utilities"
-HOMEPAGE = "http://www.multitech.net/"
-SECTION = "console/utils"
-PRIORITY = "optional"
-LICENSE = "GPL"
-DEPENDS = "libesmtp libyaml"
-PR = "r0"
-
-SRC_URI = "git://git.multitech.net/sms-utils.git;protocol=git;tag=0.0.3"
-S = "${WORKDIR}/git"
+require sms-utils.inc
 
-inherit autotools
-
-PARALLEL_MAKE = ""
+PR = "r0"
diff --git a/recipes/multitech/sms-utils_0.0.4.bb b/recipes/multitech/sms-utils_0.0.4.bb
new file mode 100644
index 0000000000..f796b2482a
--- /dev/null
+++ b/recipes/multitech/sms-utils_0.0.4.bb
@@ -0,0 +1,3 @@
+require sms-utils.inc
+
+PR = "r0"