Merge branch 'master' into fido

recipes-bsp/u-boot/files/0001-Allow-fw-env-tools-to-be-available-as-library.patch

@@ -0,0 +1,31 @@
+From e6850fcf6273b2068c5ae659bbacd8c7f664fd26 Mon Sep 17 00:00:00 2001
+From: Stefano Babic <sbabic@denx.de>
+Date: Mon, 22 Jun 2015 14:58:24 +0200
+Subject: [PATCH] Allow fw env tools to be available as library
+
+Signed-off-by: Stefano Babic <sbabic@denx.de>
+---
+ tools/env/Makefile | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/tools/env/Makefile b/tools/env/Makefile
+index 40164f7..38ad118 100644
+--- a/tools/env/Makefile
++++ b/tools/env/Makefile
+@@ -23,10 +23,12 @@ endif
+ always := fw_printenv
+ hostprogs-y := fw_printenv
+ 
+-fw_printenv-objs := fw_env.o fw_env_main.o \
++lib-y += fw_env.o \
+ 	crc32.o ctype.o linux_string.o \
+ 	env_attr.o env_flags.o aes.o
+ 
++fw_printenv-objs := fw_env_main.o $(lib-y)
++
+ quiet_cmd_crosstools_strip = STRIP   $^
+       cmd_crosstools_strip = $(STRIP) $^; touch $@
+ 
+-- 
+1.9.1
+

recipes-bsp/u-boot/u-boot-fw-utils%.bbappend

@@ -0,0 +1,8 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+SRC_URI += "file://0001-Allow-fw-env-tools-to-be-available-as-library.patch"
+
+do_install_append() {
+    install -d ${D}${libdir}
+    install -m 644  ${S}/tools/env/lib.a ${D}${libdir}/libubootenv.a
+}

recipes-extended/images/bbb-swu-image.bb

@@ -0,0 +1,30 @@
+# Copyright (C) 2015 Unknown User <unknow@user.org>
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+DESCRIPTION = "Example Compound image for beaglebone "
+SECTION = ""
+
+# Note: sw-description is mandatory
+SRC_URI = "file://sw-description \
+           "
+inherit swupdate
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+# IMAGE_DEPENDS: list of Yocto images that contains a root filesystem
+# it will be ensured they are built before creating swupdate image
+IMAGE_DEPENDS = ""
+
+# SWUPDATE_IMAGES: list of images that will be part of the compound image
+# the list can have any binaries - images must be in the DEPLOY directory
+SWUPDATE_IMAGES = " \
+                core-image-full-cmdline \
+                "
+
+# Images can have multiple formats - define which image must be
+# taken to be put in the compound image
+SWUPDATE_IMAGES_FSTYPES[core-image-full-cmdline] = ".ext3"
+
+COMPATIBLE = "beaglebone"

recipes-extended/images/bbb-swu-image/beaglebone/sw-description

@@ -0,0 +1,15 @@
+software =
+{
+	version = "0.1.0";
+
+	hardware-compatibility: [ "revC"];
+
+	images: (
+		{
+			filename = "core-image-full-cmdline-beaglebone.ext3";
+			device = "/dev/mmcblk1p2";
+			type = "raw";
+		}
+	);
+}
+

recipes-support/swupdate/swupdate.inc

@@ -1,7 +1,7 @@
 SUMMARY="Image updater for Yocto projects"
 DESCRIPTION = "Application for automatic software update from USB Pen"
 SECTION="swupdate"
-DEPENDS = "mtd-utils libconfig openssl lua curl"
+DEPENDS = "mtd-utils libconfig libarchive openssl lua curl json-c u-boot-fw-utils gnutls"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
 

recipes-support/swupdate/swupdate/beaglebone/defconfig

@@ -0,0 +1,76 @@
+#
+# 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_MTD=y
+CONFIG_LUA=y
+# 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_WEBSERVER=y
+
+#
+# Webserver Features
+#
+CONFIG_MONGOOSE=y
+
+#
+# Mongoose Feature
+#
+CONFIG_MONGOOSELUA=y
+# CONFIG_MONGOOSEIPV6 is not set
+CONFIG_MONGOOSESSL=y
+
+#
+# Archival Features
+#
+CONFIG_CPIO=y
+CONFIG_GUNZIP=y
+
+#
+# Parser Features
+#
+CONFIG_LIBCONFIG=y
+CONFIG_LIBCONFIGROOT=""
+# CONFIG_JSON is not set
+# CONFIG_LUAEXTERNAL is not set
+# CONFIG_SETSWDESCRIPTION is not set
+
+#
+# Image Handlers
+#
+# CONFIG_UBIVOL is not set
+CONFIG_CFI=y
+CONFIG_RAW=y
+CONFIG_LUASCRIPTHANDLER=y
+CONFIG_SHELLSCRIPTHANDLER=y
+CONFIG_HANDLER_IN_LUA=y
+CONFIG_UBOOT=y
+CONFIG_UBOOT_FWENV="/etc/fw_env.config"

recipes-support/swupdate/swupdate/swupdate

@@ -57,7 +57,7 @@ do_start() {
 	*)
 		echo "Starting $DESC ..."
 		cd /home/root
-		exec $DAEMON -v -w "-document_root /www" &
+		exec $DAEMON -v -w "-document_root /www" $SWUPDATE_EXTRA_ARGS &
 		exit 0
 		;;
 	esac