From 5bf8ff55714ceb2f33ad85fec38aa45e6533d0e0 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Sat, 7 Nov 2015 17:17:06 +0100
Subject: [PATCH] OWHW: add 'sysmocom-owhw-image' and ensure usb2514 + bossa is
 included

---
 conf/machine/gsmk-owhw.conf                   |  4 +--
 recipes-apps/images/sysmocom-owhw-image.bb    | 28 +++++++++++++++++++
 .../files/gsmk-owhw/data.mount                |  7 +++++
 recipes-apps/tasks/task-owhw-image.bb         | 21 ++++++++++++++
 4 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 recipes-apps/images/sysmocom-owhw-image.bb
 create mode 100644 recipes-apps/sysmocom-backup-data/files/gsmk-owhw/data.mount
 create mode 100644 recipes-apps/tasks/task-owhw-image.bb

diff --git a/conf/machine/gsmk-owhw.conf b/conf/machine/gsmk-owhw.conf
index f99f88d..8b20f53 100644
--- a/conf/machine/gsmk-owhw.conf
+++ b/conf/machine/gsmk-owhw.conf
@@ -4,7 +4,7 @@
 
 require conf/machine/include/ti33x.inc
 
-IMAGE_FSTYPES += "ubi tar.gz"
+IMAGE_FSTYPES += "ubifs"
 
 SERIAL_CONSOLE = "115200 ttyO0"
 
@@ -37,5 +37,5 @@ PREFERRED_PROVIDER_virtual/bootloader = "barebox-gsmk-owhw"
 EXTRA_IMAGEDEPENDS += "barebox-gsmk-owhw"
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "\
-	kernel usb2514 \
+	kernel usb2514 mtd-utils-ubifs bossa \
 "
diff --git a/recipes-apps/images/sysmocom-owhw-image.bb b/recipes-apps/images/sysmocom-owhw-image.bb
new file mode 100644
index 0000000..4ab9a70
--- /dev/null
+++ b/recipes-apps/images/sysmocom-owhw-image.bb
@@ -0,0 +1,28 @@
+require recipes-apps/images/sysmocom-image.inc
+require recipes-apps/images/image-passwd.inc
+require recipes-apps/images/image-sshkey.inc
+
+# have enough space for log files and db
+IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE} \
+		 task-owhw-image task-sysmocom-debug \
+		 task-sysmocom-tools"
+
+# vim: tabstop=8 shiftwidth=8 noexpandtab
+
+# create what the rauc slots expect...
+link_kernel() {
+    echo "Linking the current uImage to /kernel"
+    OLD_PWD=$PWD
+
+    cd ${IMAGE_ROOTFS}/
+    ln -s ./boot/uImage-* ./kernel || true
+
+    echo "Copying devicetree to /devicetree"
+    cp "${DEPLOY_DIR_IMAGE}/uImage-am335x-gsmk-owhw.dtb" ./devicetree
+
+    touch ./initramfs
+
+    cd $OLD_PWD
+}
+
+IMAGE_PREPROCESS_COMMAND += "link_kernel; "
diff --git a/recipes-apps/sysmocom-backup-data/files/gsmk-owhw/data.mount b/recipes-apps/sysmocom-backup-data/files/gsmk-owhw/data.mount
new file mode 100644
index 0000000..f07f6b0
--- /dev/null
+++ b/recipes-apps/sysmocom-backup-data/files/gsmk-owhw/data.mount
@@ -0,0 +1,7 @@
+[Unit]
+Description=/data
+
+[Mount]
+What=ubi0:data
+Where=/data
+Type=ubifs
diff --git a/recipes-apps/tasks/task-owhw-image.bb b/recipes-apps/tasks/task-owhw-image.bb
new file mode 100644
index 0000000..dbf5b5f
--- /dev/null
+++ b/recipes-apps/tasks/task-owhw-image.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "Task for OWHW hardware"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = " \
+		    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+ALLOW_EMPTY_${PN} = "1"
+PR = "r1"
+
+RDEPENDS_${PN} = "usbutils openvpn gpsd gps-utils dropbear \
+	wget ntp ca-cacert-rootcert early-date i2c-tools \
+	wireless-tools gpsdate \
+	kernel-module-cfg80211 \
+	kernel-module-mac80211 \
+	kernel-module-rt2x00lib \
+	kernel-module-rt2x00usb \
+	kernel-module-rt2800lib \
+	kernel-module-rt2800usb \
+	linux-firmware-ralink \
+	procps iputils \
+"
+
+# vim: tabstop=8 shiftwidth=8 noexpandtab