From 5724d72ffb2d6f4e44b65a92d5b69bcdf8551118 Mon Sep 17 00:00:00 2001
From: Patrick Murphy <Patrick.Murphy@multitech.com>
Date: Thu, 30 Apr 2020 13:04:00 -0500
Subject: moved 5.2.1 changes to master

---
 recipes-core/multitech/commissioning_1.0.0.bb | 33 ---------------------
 recipes-core/multitech/commissioning_1.0.1.bb | 42 +++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 33 deletions(-)
 delete mode 100644 recipes-core/multitech/commissioning_1.0.0.bb
 create mode 100644 recipes-core/multitech/commissioning_1.0.1.bb

(limited to 'recipes-core/multitech')

diff --git a/recipes-core/multitech/commissioning_1.0.0.bb b/recipes-core/multitech/commissioning_1.0.0.bb
deleted file mode 100644
index 22369dc..0000000
--- a/recipes-core/multitech/commissioning_1.0.0.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-inherit update-rc.d
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=593c81e8a2bd8b4c4e310d8792372b13"
-
-PACKAGE_ARCH = "all"
-
-RDEPENDS_${PN} += "lighttpd lighttpd-module-fastcgi lighttpd-module-redirect bash"
-RDEPENDS_${PN}-php-fpm += "php-fpm ${PN}"
-PACKAGES =+ "${PN}-php-fpm"
-INITSCRIPT_PACKAGES = "${PN} ${PN}-php-fpm"
-INITSCRIPT_NAME_${PN} = "commission"
-INITSCRIPT_PARAMS_${PN} = "start 9 2 3 4 5 ."
-INITSCRIPT_NAME_${PN}-php-fpm = "commission-php-fpm"
-INITSCRIPT_PARAMS_${PN}-php-fpm = "start 9 2 3 4 5 ."
-
-PR = "r1"
-SRCREV = "${PV}"
-
-FILES_${PN}-php-fpm = "/etc/init.d/commission-php-fpm"
-FILES_${PN} += "/www/"
-
-SRC_URI = "git://git@${MTS_INTERNAL_GIT}/mirrors/commissioning.git;protocol=ssh"
-
-S = "${WORKDIR}/git"
-do_install() {
-    cp -a ${S}/${sysconfdir}/ ${D}/
-    cp -a ${S}/www/ ${D}/
-    cp -a ${S}/${prefix} ${D}/
-    chmod 755 ${D}/etc/init.d/*
-    chmod 755 ${D}/${libexecdir}/commission/*
-    chown -R root:root ${D}/
-}
diff --git a/recipes-core/multitech/commissioning_1.0.1.bb b/recipes-core/multitech/commissioning_1.0.1.bb
new file mode 100644
index 0000000..cbe82d6
--- /dev/null
+++ b/recipes-core/multitech/commissioning_1.0.1.bb
@@ -0,0 +1,42 @@
+inherit update-rc.d
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=593c81e8a2bd8b4c4e310d8792372b13"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+DEPENDS = "fcgi jsoncpp shadow"
+RDEPENDS_${PN} += "jsoncpp lighttpd lighttpd-module-fastcgi lighttpd-module-openssl lighttpd-module-redirect bash"
+RDEPENDS_${PN}-php-fpm += "php-fpm ${PN}"
+PACKAGES =+ "${PN}-php-fpm"
+
+INITSCRIPT_PACKAGES = "${PN} ${PN}-php-fpm"
+INITSCRIPT_NAME_${PN} = "commission "
+INITSCRIPT_PARAMS_${PN} = "start 9 2 3 4 5 ."
+INITSCRIPT_NAME_${PN}-php-fpm = "commission-php-fpm"
+INITSCRIPT_PARAMS_${PN}-php-fpm = "start 9 2 3 4 5 ."
+
+PR = "r1"
+SRCREV = "${PV}"
+
+FILES_${PN}-php-fpm = "/etc/init.d/commission-php-fpm"
+FILES_${PN} += "/www/"
+
+SRC_URI = "git://git@gitlab.multitech.net/mirrors/commissioning.git;tag=1.0.1;protocol=ssh"
+
+S = "${WORKDIR}/git"
+do_compile() {
+    oe_runmake all
+}
+do_install() {
+
+    cp -a ${S}/${sysconfdir}/ ${D}/
+    cp -a ${S}/www/ ${D}/
+    cp -a ${S}/${prefix} ${D}/
+    chmod 755 ${D}/etc/init.d/*
+    chmod 755 ${D}/${libexecdir}/commission/*
+    chown -R root:root ${D}/
+
+    oe_runmake install DESTDIR=${D}
+    chmod 755 ${D}/usr/bin/commissioning.fcgi
+}
-- 
cgit v1.2.3