From 1410661b6109bc44eba847b7d3ad9f991aa13186 Mon Sep 17 00:00:00 2001
From: pvizeli <pvizeli@syshack.ch>
Date: Tue, 28 Mar 2017 18:09:20 +0200
Subject: [PATCH] Change resinos version handling

---
 build-scripts/resinos-build/create_resinos.sh        | 12 ++++++------
 .../docker-resin-supervisor-disk.bbappend            |  2 +-
 .../docker-resin-supervisor-disk/supervisor.conf     |  2 +-
 .../recipes-support/resinhup/resinhup/resinhup       | 10 +++++-----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/build-scripts/resinos-build/create_resinos.sh b/build-scripts/resinos-build/create_resinos.sh
index 219bd3bf4..a90b148fe 100755
--- a/build-scripts/resinos-build/create_resinos.sh
+++ b/build-scripts/resinos-build/create_resinos.sh
@@ -20,8 +20,8 @@ cleanup() {
 trap 'cleanup fail' SIGINT SIGTERM
 
 # Sanity checks
-if [ "$#" -ne 2 ]; then
-    echo "Usage: create_resinos.sh <MACHINE> <HASSIO_VERSION>"
+if [ "$#" -ne 3 ]; then
+    echo "Usage: create_resinos.sh <MACHINE> <HASSIO_VERSION> <RESINOS_HASSIO_VERSION>"
     echo "Optional environment: BUILD_DIR, PERSISTENT_WORKDIR, RESIN_BRANCH, HASSIO_ROOT"
     exit 1
 fi
@@ -32,8 +32,8 @@ SCRIPTPATH=`pwd`
 popd > /dev/null 2>&1
 
 MACHINE=$1
-SUPERVISOR_TAG=$2
 HASSIO_VERSION=$2
+RESINOS_HASSIO_VERSION=$3
 PERSISTENT_WORKDIR=${PERSISTENT_WORKDIR:=~/yocto}
 BUILD_DIR=${BUILD_DIR:=$SCRIPTPATH}
 WORKSPACE=${BUILD_DIR:=$SCRIPTPATH}/resin-board
@@ -72,7 +72,7 @@ if [ ! -d $WORKSPACE/build/conf ]; then
 fi
 
 # Additional variables
-BARYS_ARGUMENTS_VAR="-a HASSIO_SUPERVISOR_TAG=$SUPERVISOR_TAG -a HOMEASSISTANT_REPOSITORY=$HOMEASSISTANT_REPOSITORY"
+BARYS_ARGUMENTS_VAR="-a HASSIO_SUPERVISOR_TAG=$HASSIO_VERSION -a HOMEASSISTANT_REPOSITORY=$HOMEASSISTANT_REPOSITORY -a RESINOS_HASSIO_VERSION=$RESINOS_HASSIO_VERSION"
 
 # Make sure shared directories are in place
 mkdir -p $DOWNLOAD_DIR
@@ -131,8 +131,8 @@ cp $DEVICE_TYPE_JSON $BUILD_DEPLOY_DIR/device-type.json
 cp $WORKSPACE/build/tmp/deploy/images/$MACHINE/kernel_modules_headers.tar.gz $BUILD_DEPLOY_DIR || true
 
 echo "INFO: Pushing resinhup package to dockerhub"
-DOCKER_IMAGE="$DOCKER_REPO/resinos"
-DOCKER_TAG="$VERSION_HOSTOS-$MACHINE"
+DOCKER_IMAGE="$DOCKER_REPO/resinos-hassio"
+DOCKER_TAG="$RESINOS_HASSIO_VERSION-$MACHINE"
 if [ -f $BUILD_DEPLOY_DIR/resinhup-$VERSION_HOSTOS.tar ]; then
     docker import $BUILD_DEPLOY_DIR/resinhup-$VERSION_HOSTOS.tar $DOCKER_IMAGE:$DOCKER_TAG
     docker push $DOCKER_IMAGE:$DOCKER_TAG
diff --git a/meta-hassio/recipes-containers/docker-disk/docker-resin-supervisor-disk.bbappend b/meta-hassio/recipes-containers/docker-disk/docker-resin-supervisor-disk.bbappend
index f673283b9..84d52e334 100644
--- a/meta-hassio/recipes-containers/docker-disk/docker-resin-supervisor-disk.bbappend
+++ b/meta-hassio/recipes-containers/docker-disk/docker-resin-supervisor-disk.bbappend
@@ -19,5 +19,5 @@ do_install_append () {
     install -d ${D}${sysconfdir}/resin-supervisor
     sed -i -e 's:@HOMEASSISTANT_REPOSITORY@:${HOMEASSISTANT_REPOSITORY}:g' ${D}${sysconfdir}/resin-supervisor/supervisor.conf
     sed -i -e 's:@MACHINE@:${MACHINE}:g' ${D}${sysconfdir}/resin-supervisor/supervisor.conf
-    sed -i -e 's:@RESINOS_VERSION@:${HOSTOS_VERSION}:g' ${D}${sysconfdir}/resin-supervisor/supervisor.conf
+    sed -i -e 's:@RESINOS_HASSIO_VERSION@:${RESINOS_HASSIO_VERSION}:g' ${D}${sysconfdir}/resin-supervisor/supervisor.conf
 }
diff --git a/meta-hassio/recipes-containers/docker-disk/docker-resin-supervisor-disk/supervisor.conf b/meta-hassio/recipes-containers/docker-disk/docker-resin-supervisor-disk/supervisor.conf
index eedc1b417..1a449a8de 100644
--- a/meta-hassio/recipes-containers/docker-disk/docker-resin-supervisor-disk/supervisor.conf
+++ b/meta-hassio/recipes-containers/docker-disk/docker-resin-supervisor-disk/supervisor.conf
@@ -3,4 +3,4 @@ SUPERVISOR_TAG=@SUPERVISOR_TAG@
 LED_FILE=@LED_FILE@
 MACHINE=@MACHINE@
 HOMEASSISTANT_REPOSITORY=@HOMEASSISTANT_REPOSITORY@
-RESINOS_VERSION=@RESINOS_VERSION@
+RESINOS_HASSIO_VERSION=@RESINOS_VERSION@
diff --git a/meta-hassio/recipes-support/resinhup/resinhup/resinhup b/meta-hassio/recipes-support/resinhup/resinhup/resinhup
index 31a90b4ab..f6bdb4fcd 100644
--- a/meta-hassio/recipes-support/resinhup/resinhup/resinhup
+++ b/meta-hassio/recipes-support/resinhup/resinhup/resinhup
@@ -220,15 +220,15 @@ if [ "$LOG" == "yes" ]; then
 fi
 
 # Check if update is needed
-log "Detected HassIO version: $RESINOS_VERSION ."
-log "Update HassIO to version: $HOSTOS_VERSION ."
-if [ $RESINOS_VERSION == $HOSTOS_VERSION ]; then
+log "Detected HassIO version: $RESINOS_HASSIO_VERSION ."
+log "Update HassIO to version: $HOSTOS_HASSIO_VERSION ."
+if [ $RESINOS_HASSIO_VERSION == $HOSTOS_VERSION ]; then
     log "Version $HOSTOS_VERSION is already installed."
     exit 0
 fi
 
 # protect downgrade
-downgrade=$(awk -vn1=$RESINOS_VERSION -vn2=$HOSTOS_VERSION 'BEGIN{print (n1<n2) ? 0:1}')
+downgrade=$(awk -vn1=$RESINOS_HASSIO_VERSION -vn2=$HOSTOS_VERSION 'BEGIN{print (n1<n2) ? 0:1}')
 if [ $downgrade == 1 ]; then
     log ERROR "Downgrade are not supported"
     exit 0
@@ -307,7 +307,7 @@ log "Running resinhup for version $HOSTOS_VERSION ..."
 RESINHUP_STARTTIME=$(date +%s)
 
 # Set options
-RESINHUP_ENV="-e VERSION=$HOSTOS_VERSION-$MACHINE -e REMOTE=$DOCKER_REPO/hassio"
+RESINHUP_ENV="-e VERSION=$HOSTOS_VERSION-$MACHINE -e REMOTE=$DOCKER_REPO/resinos-hassio"
 
 docker run --privileged --rm --net=host $RESINHUP_ENV \
     -v /:/host \