From 42ff53003cfc94c4d2a6ad3c542233f1e3f8b613 Mon Sep 17 00:00:00 2001 From: Yong Li Date: Tue, 22 Mar 2016 13:06:22 +0800 Subject: [PATCH] spi-minnowmax-board: remove systemd related service files Will use the ostro-6lowpan package for this systemd service Signed-off-by: Yong Li --- .../files/ostro-6lowpan-start.sh | 31 ------------------- .../files/ostro-6lowpan-stop.sh | 4 --- .../files/ostro-6lowpan.service | 14 --------- .../spi-minnowmax-board.bb | 11 ------- 4 files changed, 60 deletions(-) delete mode 100755 recipes-extended/spi-minnowmax-board/files/ostro-6lowpan-start.sh delete mode 100755 recipes-extended/spi-minnowmax-board/files/ostro-6lowpan-stop.sh delete mode 100644 recipes-extended/spi-minnowmax-board/files/ostro-6lowpan.service diff --git a/recipes-extended/spi-minnowmax-board/files/ostro-6lowpan-start.sh b/recipes-extended/spi-minnowmax-board/files/ostro-6lowpan-start.sh deleted file mode 100755 index f7f5ab6..0000000 --- a/recipes-extended/spi-minnowmax-board/files/ostro-6lowpan-start.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh - -if [ -z "$HWADDR" ]; then - HWADDR=`ip link show wpan0 | grep -e link/ieee802.15.4 | sed -e 's#^.*link/ieee802.15.4 \([0-9a-fA-F:]\+\) .*$#\1#g'` - if [ -z "$HWADDR" ]; then - HWADDR=`sed /etc/machine-id -e 's#\([0-9a-fA-F]\{2\}\)#\1:#g' | cut -d: -f1-8` - fi -fi - -if [ -z "$PAN" ]; then - PAN=777 -fi - -if [ -z "$ADDR" ]; then - ADDR=`echo $HWADDR | cut -d: -f7-8 | tr -d :` -fi - -if [ -z "$CHANNEL" ]; then - CHANNEL=`iz listphy | grep -e "channels on page 0:" | sed -e 's#^.*channels on page 0: \([0-9a-fA-F:]\+\) .*$#\1#g'` -fi - -if [ -z "$CHANNEL" ]; then - CHANNEL=11 -fi - -ip link set wpan0 address ${HWADDR} -iz set wpan0 ${PAN} ${ADDR} ${CHANNEL} -ifconfig wpan0 up -ip link add link wpan0 name lowpan0 type lowpan -ifconfig lowpan0 up - diff --git a/recipes-extended/spi-minnowmax-board/files/ostro-6lowpan-stop.sh b/recipes-extended/spi-minnowmax-board/files/ostro-6lowpan-stop.sh deleted file mode 100755 index 85271a6..0000000 --- a/recipes-extended/spi-minnowmax-board/files/ostro-6lowpan-stop.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -ifconfig lowpan0 down -ifconfig wpan0 down -ip link del lowpan0 diff --git a/recipes-extended/spi-minnowmax-board/files/ostro-6lowpan.service b/recipes-extended/spi-minnowmax-board/files/ostro-6lowpan.service deleted file mode 100644 index 20ee906..0000000 --- a/recipes-extended/spi-minnowmax-board/files/ostro-6lowpan.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=6loWPAN network setup -Before=connman.service - -[Service] -Type=oneshot -RemainAfterExit=yes -EnvironmentFile=-/etc/ostro-6lowpan.conf -ExecStart=/usr/lib/ostro-scripts/ostro-6lowpan-start.sh -ExecStop=/usr/lib/ostro-scripts/ostro-6lowpan-stop.sh - -[Install] -WantedBy=multi-user.target - diff --git a/recipes-extended/spi-minnowmax-board/spi-minnowmax-board.bb b/recipes-extended/spi-minnowmax-board/spi-minnowmax-board.bb index 6e7609f..3df63c4 100644 --- a/recipes-extended/spi-minnowmax-board/spi-minnowmax-board.bb +++ b/recipes-extended/spi-minnowmax-board/spi-minnowmax-board.bb @@ -17,18 +17,12 @@ SRC_URI = "file://spi-minnow-cc2520.c \ file://modprobe.d/spi-minnow-cc2520.conf.sample \ file://modules-load.d/at86rf230.conf.sample \ file://modprobe.d/spi-minnow-at86rf230.conf.sample \ - file://ostro-6lowpan.service \ - file://ostro-6lowpan-start.sh \ - file://ostro-6lowpan-stop.sh \ " FILES_${PN} += " /usr/lib/modules-load.d/cc2520.conf.sample \ /usr/lib/modules-load.d/at86rf230.conf.sample \ /lib/modprobe.d/spi-minnow-cc2520.conf.sample \ /lib/modprobe.d/spi-minnow-at86rf230.conf.sample \ - ${systemd_unitdir}/system/ostro-6lowpan.service \ - ${libdir}/ostro-scripts/ostro-6lowpan-start.sh \ - ${libdir}/ostro-scripts/ostro-6lowpan-stop.sh \ " # Sample configuring file @@ -39,11 +33,6 @@ do_install_append () { install -m 0644 modprobe.d/spi-minnow-cc2520.conf.sample ${D}${base_libdir}/modprobe.d/ install -m 0644 modules-load.d/at86rf230.conf.sample ${D}${libdir}/modules-load.d/ install -m 0644 modprobe.d/spi-minnow-at86rf230.conf.sample ${D}${base_libdir}/modprobe.d/ - install -d -m 755 ${D}${systemd_unitdir}/system/ - install -m 0644 ostro-6lowpan.service ${D}${systemd_unitdir}/system/ - install -d -m 755 ${D}${libdir}/ostro-scripts/ - install -m 0755 ostro-6lowpan-start.sh ${D}${libdir}/ostro-scripts/ - install -m 0755 ostro-6lowpan-stop.sh ${D}${libdir}/ostro-scripts/ } S = "${WORKDIR}"