summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/distro/mlinux.conf4
-rw-r--r--recipes-core/images/mlinux-basetest-image.bb9
-rw-r--r--recipes-core/images/mlinux-minimal-image.bb3
-rw-r--r--recipes-core/multitech/commissioning_1.0.0.bb33
-rw-r--r--recipes-core/sysvinit/files/start_getty_open6
-rw-r--r--recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend23
6 files changed, 76 insertions, 2 deletions
diff --git a/conf/distro/mlinux.conf b/conf/distro/mlinux.conf
index dce4a35..b3155f0 100644
--- a/conf/distro/mlinux.conf
+++ b/conf/distro/mlinux.conf
@@ -1,7 +1,7 @@
DISTRO = "mlinux"
DISTRO_NAME = "mLinux"
-DISTRO_BASE_VERSION = "5.1"
-DISTRO_VERSION = "${DISTRO_BASE_VERSION}.8"
+DISTRO_BASE_VERSION = "5.2"
+DISTRO_VERSION = "${DISTRO_BASE_VERSION}.0"
DISTRO_CODENAME = ""
SDK_VENDOR = "-mlinux"
SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
diff --git a/recipes-core/images/mlinux-basetest-image.bb b/recipes-core/images/mlinux-basetest-image.bb
new file mode 100644
index 0000000..807b16e
--- /dev/null
+++ b/recipes-core/images/mlinux-basetest-image.bb
@@ -0,0 +1,9 @@
+# Conduit 0.0 or 0.1 without RS9113
+DESCRIPTION = "mLinux base test image"
+LICENSE = "MIT"
+
+require mlinux-base-image.bb
+
+# Open console for test image
+CONSOLE = "sysvinit-inittab-start-open"
+
diff --git a/recipes-core/images/mlinux-minimal-image.bb b/recipes-core/images/mlinux-minimal-image.bb
index 8090f57..0e1d4a3 100644
--- a/recipes-core/images/mlinux-minimal-image.bb
+++ b/recipes-core/images/mlinux-minimal-image.bb
@@ -57,10 +57,13 @@ MULTITECH_MTAC = "kernel-module-mtac \
UPGRADE_FEATURES = "upgrade-reboot mtd-utils-static"
+CONSOLE = "sysvinit-inittab-start"
+
IMAGE_INSTALL = "${CORE_FEATURES} \
${NETWORKING_FEATURES} \
${UPGRADE_FEATURES} \
${MULTITECH_FEATURES} \
${MULTITECH_MTAC} \
+ ${CONSOLE} \
"
diff --git a/recipes-core/multitech/commissioning_1.0.0.bb b/recipes-core/multitech/commissioning_1.0.0.bb
new file mode 100644
index 0000000..22369dc
--- /dev/null
+++ b/recipes-core/multitech/commissioning_1.0.0.bb
@@ -0,0 +1,33 @@
+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/sysvinit/files/start_getty_open b/recipes-core/sysvinit/files/start_getty_open
new file mode 100644
index 0000000..3afce00
--- /dev/null
+++ b/recipes-core/sysvinit/files/start_getty_open
@@ -0,0 +1,6 @@
+#!/bin/sh
+# Open console for testing
+if [ -c /dev/$2 ]
+then
+ /sbin/getty -L $1 $2 xterm -n -l /bin/bash
+fi
diff --git a/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend b/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend
index 6c79846..be33f10 100644
--- a/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend
+++ b/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend
@@ -1,2 +1,25 @@
# enable gadget serial console for supported hardware
+SUMMARY_${PN}-start-open = "Open debug console for development only"
+SUMMARY_${PN}-start = "Production console"
SERIAL_CONSOLES_append_mtcdt = " 115200;ttyGS0"
+PACKAGES =+ "${PN}-start ${PN}-start-open"
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+SRC_URI += "file://start_getty_open"
+
+FILES_${PN} = "${sysconfdir}/inittab"
+FILES_${PN}-start = "${base_bindir}/start_getty"
+FILES_${PN}-start-open = "${base_bindir}/start_getty_open"
+RCONFLICTS_${PN}-start = "${PN}-start-open"
+RCONFLICTS_${PN}-start-open = "${PN}-start"
+RDEPENDS_${PN}-start-open = "${PN}"
+
+do_install_append() {
+ install -m 0755 ${WORKDIR}/start_getty_open ${D}${base_bindir}/start_getty_open
+}
+pkg_postinst_${PN}-start-open() {
+ sed -i 's?^S0:.*?S0:12345:respawn:/bin/start_getty_open 115200 ttyS0?' $D/etc/inittab
+}
+
+pkg_prerm_${PN}-start-open() {
+ sed -i 's?^S0:.*?S0:12345:respawn:/bin/start_getty 115200 ttyS0?' $D/etc/inittab
+}