Merge commit '7db8a7d66ee9f2919310ac5e7a5f9c10a290f021'

Author: liu-zilong

meta-linkx/README

@@ -1,3 +1,3 @@
 Welcome to AliOS Things Linux Edition !!!
 
-Linkx for Alios Things.
+LinkX for AliOS Things.

meta-linkx/recipes-linkkit/.gitkeep renamed to meta-linkx/classes/.gitkeep

@@ -0,0 +1,39 @@
+
+test -x /usr/bin/comboapp || (echo "Error: missing comboapp"; exit 0)
+test -x /usr/bin/rtk_hciattach || (echo "Error: missing rtk_hciattach"; exit 0)
+test -x /usr/bin/hciconfig || (echo "Error: missing hciconfig"; exit 0)
+
+function start_bluetooth()
+{
+    echo "Starting bluetooth..."
+    rm -f /etc/init.d/bluetooth
+    echo 0 > /sys/class/rfkill/rfkill0/state
+    sleep 1
+    echo 1 > /sys/class/rfkill/rfkill0/state
+    sleep 1
+    rtk_hciattach -n -s 115200 /dev/ttyS4 rtk_h5 &
+    sleep 3
+}
+
+case "$1" in
+    start)
+        start_bluetooth
+        echo "Starting comboapp..."
+        start-stop-daemon --start --exec /usr/bin/comboapp &
+        ;;
+    stop)
+        echo "Stopping comboapp..."
+        start-stop-daemon --stop --exec /usr/bin/comboapp
+        ;;
+    restart)
+        $0 stop
+        sleep 1
+        $0 start
+        ;;
+    *)
+        echo "Usage: /etc/init.d/linkkit {start|stop|restart}"
+        exit 1
+        ;;
+esac
+
+exit 0

meta-linkx/classes/base.bbclass

@@ -0,0 +1,36 @@
+#!/bin/sh
+
+### BEGIN INIT INFO
+# Provides:          linkkit
+# Required-Start:    $network
+# Required-Stop:     $network
+# Default-Start:     S 2 3 4 5
+# Default-Stop:      0 1 6
+# Description:       Living Link is platform service which provides customers with a
+#                    smart devices developerment management platform, especially for smart life area.
+#                    link to https://living.aliyun.com/
+### END INIT INFO
+
+test -x /usr/bin/linkkitapp || exit 0
+
+case "$1" in
+    start)
+        echo "Starting linkkitapp..."
+        start-stop-daemon --start --exec /usr/bin/linkkitapp > /var/log/linkkit.log 2>&1 &
+        ;;
+    stop)
+        echo "Stopping linkkitapp..."
+        start-stop-daemon --stop --exec /usr/bin/linkkitapp
+        ;;
+    restart)
+        $0 stop
+        sleep 1
+        $0 start
+        ;;
+    *)
+        echo "Usage: /etc/init.d/linkkit {start|stop|restart}"
+        exit 1
+        ;;
+esac
+
+exit 0

meta-linkx/conf/bitbake.conf

@@ -0,0 +1,25 @@
+#!/bin/sh
+
+test -x /usr/bin/ywssapp || exit 0
+
+case "$1" in
+    start)
+        echo "Starting ywssapp..."
+        start-stop-daemon --start --exec /usr/bin/ywssapp > /var/log/ywss.log 2>&1 &
+        ;;
+    stop)
+        echo "Stopping ywssapp..."
+        start-stop-daemon --stop --exec /usr/bin/ywssapp
+        ;;
+    restart)
+        $0 stop
+        sleep 1
+        $0 start
+        ;;
+    *)
+        echo "Usage: /etc/init.d/ywss {start|stop|restart}"
+        exit 1
+        ;;
+esac
+
+exit 0

meta-linkx/recipes-linkkit/Linkkit-0.6.tar.gz

@@ -1,29 +1,35 @@
-# FILESEXTRAPATHS_prepend := "${THISDIR}/patches:"
-# PATCH_FILE_X86_64 = " file://0001-Port-x86-64.patch;patch=1"
-# PATCH_FILE_RPI = " file://0002-Port-raspberrypi.patch;patch=1"
-
-# patching according to MACHINE
-# python() {
-#     bb.note("xiaxiaowen")
-#     getmachine = d.getVar("MACHINE", True)
-#     bb.note("%s" % getmachine)
-#     if getmachine == "qemux86-64":
-#         bb.note("patching %s" % d.getVar("PATCH_FILE_X86_64", True))
-#         d.setVar("SRC_URI_append", d.getVar("PATCH_FILE_X86_64", True))
-#     elif getmachine == "raspberrypi3-64":
-#         bb.note("patching %s" % d.getVar("PATCH_FILE_RPI", True))
-#         d.setVar("SRC_URI_append", d.getVar("PATCH_FILE_RPI", True))
-#     else:
-#         bb.note("do not need to patch")
-# }
-
-SRC_URI = "file://${THISDIR}/Linkkit-0.6.tar.gz \
-           file://${THISDIR}/linkkit.init"
-
-# source code dir
-S = "${WORKDIR}/Linkkit-0.6"
-
+DESCRIPTION = "AliOS Things Linux Edition comboapp"
+SUMMARY = "AliOS Things Linux Edition comboapp"
+LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
 
+#CFLAGS_prepend = " -g "
+
+#DEPENDS += "bluez5"
+#DEPENDS := "${@bb.utils.contains('DISTRO_FEATURES','bluez5','bluez5','bluez4',d)}"
+
+SRC_URI = "file://linkkit-0.6.tar.gz \
+           file://combo.init \
+           file://linkkit.kv"
+
+# only support sysvinit for now.
+inherit update-rc.d
+
+INITSCRIPT_NAME = "combo"
+INITSCRIPT_PARAMS = "defaults 87"
+
+TARGET_CC_ARCH += "${LDFLAGS}"
+
+do_compile() {
+    make ARCH=${TARGET_ARCH} -f Makefile.comboapp wifi_module=rtk ble_module=rtk
+}
 
-require linkkit.inc
+do_install() {
+    # create linkkit dir
+    install -d ${D}/${bindir}/
+    install -d ${D}/${datadir}/linkkit/
+    install -d ${D}/${INIT_D_DIR}
+    install -m 0644 ${WORKDIR}/linkkit.kv ${D}/${datadir}/linkkit/linkkit.kv
+    install -m 0755 ${WORKDIR}/combo.init ${D}/${INIT_D_DIR}/combo
+    install -m 0755 ${B}/comboapp ${D}/${bindir}/comboapp
+}