Merge branch 'multitech-corecdp-1.x' into multitech-corecdp-dev

8 files changed, 28 insertions, 20 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/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"