From 17cad30c07e24e4ccf5f807603ff4e1096365480 Mon Sep 17 00:00:00 2001 From: Florin Sarbu Date: Wed, 18 Jul 2018 16:33:58 +0200 Subject: [PATCH 1/3] resin-supervisor: Rename docker-resin-supervisor-disk.bbappend to resin-supervisor.bbappend This was done in meta-resin 2.14.0 so we follow suit here Signed-off-by: Florin Sarbu --- ...r-resin-supervisor-disk.bbappend => resin-supervisor.bbappend} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename layers/meta-resin-allwinner/recipes-containers/docker-disk/{docker-resin-supervisor-disk.bbappend => resin-supervisor.bbappend} (100%) diff --git a/layers/meta-resin-allwinner/recipes-containers/docker-disk/docker-resin-supervisor-disk.bbappend b/layers/meta-resin-allwinner/recipes-containers/docker-disk/resin-supervisor.bbappend similarity index 100% rename from layers/meta-resin-allwinner/recipes-containers/docker-disk/docker-resin-supervisor-disk.bbappend rename to layers/meta-resin-allwinner/recipes-containers/docker-disk/resin-supervisor.bbappend From 210ac501818b9fea4d9e5f7a97d24f94ff195de1 Mon Sep 17 00:00:00 2001 From: Florin Sarbu Date: Wed, 18 Jul 2018 17:15:43 +0200 Subject: [PATCH 2/3] local.conf.sample: Delete references to RESIN_CONNECTABLE* variables meta-resin 2.14.0 will allow building of one image which by default is unmanaged. The conversion between managed and unmanaged will be done through the os-config tool at boot time, based on the existence of resinio configuration parameters in config.json, so we remove the references to these obsolete variables from here. Signed-off-by: Florin Sarbu --- layers/meta-resin-allwinner/conf/samples/local.conf.sample | 2 -- 1 file changed, 2 deletions(-) diff --git a/layers/meta-resin-allwinner/conf/samples/local.conf.sample b/layers/meta-resin-allwinner/conf/samples/local.conf.sample index 2477e2d..4263fb0 100644 --- a/layers/meta-resin-allwinner/conf/samples/local.conf.sample +++ b/layers/meta-resin-allwinner/conf/samples/local.conf.sample @@ -3,8 +3,6 @@ #MACHINE ?= "nanopi-neo-air" # More info meta-resin/README.md -#RESIN_CONNECTABLE ?= "1" -#RESIN_CONNECTABLE_ENABLE_SERVICES ?= "0" #TARGET_REPOSITORY ?= "" #TARGET_TAG ?= "" BALENA_STORAGE = "overlay2" From 941d457e31fd9899ec506fd39fdabe34a1c62cd2 Mon Sep 17 00:00:00 2001 From: Florin Sarbu Date: Wed, 18 Jul 2018 11:07:49 +0200 Subject: [PATCH 3/3] Release v2.14.0+rev1 Signed-off-by: Florin Sarbu --- CHANGELOG.md | 5 +++++ VERSION | 2 +- layers/meta-resin | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3377b7f..53f28fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ Change log ----------- +# v2.14.0+rev1 +## (2018-07-18) + +* Update the meta-resin submodule to version v2.14.0 [Florin] + # v2.13.6+rev1 ## (2018-07-13) diff --git a/VERSION b/VERSION index 6224ccf..5b7ab5b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.13.6+rev1 +2.14.0+rev1 diff --git a/layers/meta-resin b/layers/meta-resin index e167839..2c4ac61 160000 --- a/layers/meta-resin +++ b/layers/meta-resin @@ -1 +1 @@ -Subproject commit e167839b84b4e93313942a47078a896a6e32b6a2 +Subproject commit 2c4ac61bc17188b35d98263378ed961c2a30519a