From 347960c61ca1431a6b0bf68f3b8e2757c24fd39a Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Fri, 16 Dec 2016 19:43:35 +0100
Subject: [PATCH] swupdate: use version 2016.10

There is new functionality in that version that we need for our firmware
update solution, so append the git-based recipe and set the revision to
the 2016.10 version.

Also provide a customized build configuration file. Notice that the
defconfig file is actually a full '.config'. It needs to be a full
config file because otherwise the anonymous python function in the
recipe is not able to gather all the build time dependences.

https://jira.digi.com/browse/DEL-3355

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 meta-digi-dey/conf/distro/dey.conf            |  3 +
 .../swupdate/swupdate/defconfig               | 83 +++++++++++++++++++
 .../swupdate/swupdate_git.bbappend            | 15 ++++
 3 files changed, 101 insertions(+)
 create mode 100644 meta-digi-dey/recipes-support/swupdate/swupdate/defconfig
 create mode 100644 meta-digi-dey/recipes-support/swupdate/swupdate_git.bbappend

diff --git a/meta-digi-dey/conf/distro/dey.conf b/meta-digi-dey/conf/distro/dey.conf
index 1eabe420c..897753c07 100644
--- a/meta-digi-dey/conf/distro/dey.conf
+++ b/meta-digi-dey/conf/distro/dey.conf
@@ -50,6 +50,9 @@ PREFERRED_VERSION_linux-yocto_qemumips ?= "4.1%"
 PREFERRED_VERSION_linux-yocto_qemumips64 ?= "4.1%"
 PREFERRED_VERSION_linux-yocto_qemuppc ?= "4.1%"
 
+# Use swupdate version 2016.10
+PREFERRED_VERSION_swupdate = "2016.10+git%"
+
 SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${IMAGE_BASENAME}-${TUNE_PKGARCH}"
 SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"
 
diff --git a/meta-digi-dey/recipes-support/swupdate/swupdate/defconfig b/meta-digi-dey/recipes-support/swupdate/swupdate/defconfig
new file mode 100644
index 000000000..009cfaf4c
--- /dev/null
+++ b/meta-digi-dey/recipes-support/swupdate/swupdate/defconfig
@@ -0,0 +1,83 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Swupdate Configuration
+#
+CONFIG_HAVE_DOT_CONFIG=y
+
+#
+# Swupdate Settings
+#
+
+#
+# General Configuration
+#
+CONFIG_SCRIPTS=y
+# CONFIG_HW_COMPATIBILITY is not set
+CONFIG_SW_VERSIONS_FILE="/etc/sw-versions"
+CONFIG_MTD=y
+# CONFIG_LUA is not set
+# CONFIG_FEATURE_SYSLOG is not set
+
+#
+# Build Options
+#
+# CONFIG_STATIC is not set
+CONFIG_CROSS_COMPILE=""
+CONFIG_SYSROOT=""
+CONFIG_EXTRA_CFLAGS=""
+CONFIG_EXTRA_LDFLAGS=""
+CONFIG_EXTRA_LDLIBS=""
+
+#
+# Debugging Options
+#
+# CONFIG_DEBUG is not set
+# CONFIG_WERROR is not set
+# CONFIG_NOCLEANUP is not set
+# CONFIG_DOWNLOAD is not set
+# CONFIG_HASH_VERIFY is not set
+# CONFIG_SIGNED_IMAGES is not set
+# CONFIG_ENCRYPTED_IMAGES is not set
+# CONFIG_SURICATTA is not set
+
+#
+# Suricatta
+#
+
+#
+# Server
+#
+CONFIG_SURICATTA_SERVER_NONE=y
+
+#
+# hawkBit support needs libcurl and CONFIG_JSON=y
+#
+# CONFIG_WEBSERVER is not set
+
+#
+# Archival Features
+#
+CONFIG_GUNZIP=y
+
+#
+# Parser Features
+#
+CONFIG_LIBCONFIG=y
+CONFIG_LIBCONFIGROOT=""
+# CONFIG_JSON is not set
+# CONFIG_SETSWDESCRIPTION is not set
+
+#
+# Image Handlers
+#
+CONFIG_UBIVOL=y
+CONFIG_UBIBLACKLIST=""
+CONFIG_UBIVIDOFFSET=0
+# CONFIG_CFI is not set
+# CONFIG_CFIHAMMING1 is not set
+CONFIG_RAW=y
+CONFIG_SHELLSCRIPTHANDLER=y
+# CONFIG_ARCHIVE is not set
+# CONFIG_REMOTE_HANDLER is not set
+CONFIG_UBOOT=y
+CONFIG_UBOOT_FWENV="/etc/fw_env.config"
diff --git a/meta-digi-dey/recipes-support/swupdate/swupdate_git.bbappend b/meta-digi-dey/recipes-support/swupdate/swupdate_git.bbappend
new file mode 100644
index 000000000..cc0d47745
--- /dev/null
+++ b/meta-digi-dey/recipes-support/swupdate/swupdate_git.bbappend
@@ -0,0 +1,15 @@
+# Copyright (C) 2016 Digi International
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+
+# Version 2016.10
+SRCREV = "edd6559728d2e234ebdc03ba1d5444449ae2b92b"
+PV = "2016.10+git${SRCPV}"
+
+do_install_append() {
+	# The 'progress' command is new starting in version '2016.10', but we
+	# don't need to do a version check here because the bbappend is version
+	# specific (PV hardcoded above)
+	install -d ${D}${bindir}/
+	install -m 0755 progress ${D}${bindir}/
+}