jeans/supervisor
jeans/supervisor
1
0
Fork 0
mirror of https://github.com/home-assistant/supervisor.git synced 2025-07-27 19:16:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change resinos version handling

Browse Source
This commit is contained in:
pvizeli 2017-03-28 18:09:20 +02:00
parent 6be2abab4f
commit 1410661b61
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build-scripts/resinos-build/create_resinos.sh
View File

@ -20,8 +20,8 @@ cleanup() {
trap 'cleanup fail' SIGINT SIGTERM trap 'cleanup fail' SIGINT SIGTERM
# Sanity checks # Sanity checks
if [ "$#" -ne 2 ]; then if [ "$#" -ne 3 ]; then
echo "Usage: create_resinos.sh <MACHINE> <HASSIO_VERSION>" echo "Usage: create_resinos.sh <MACHINE> <HASSIO_VERSION> <RESINOS_HASSIO_VERSION>"
echo "Optional environment: BUILD_DIR, PERSISTENT_WORKDIR, RESIN_BRANCH, HASSIO_ROOT" echo "Optional environment: BUILD_DIR, PERSISTENT_WORKDIR, RESIN_BRANCH, HASSIO_ROOT"
exit 1 exit 1
fi fi
@ -32,8 +32,8 @@ SCRIPTPATH=`pwd`
popd > /dev/null 2>&1 popd > /dev/null 2>&1
MACHINE=$1 MACHINE=$1
SUPERVISOR_TAG=$2
HASSIO_VERSION=$2 HASSIO_VERSION=$2
RESINOS_HASSIO_VERSION=$3
PERSISTENT_WORKDIR=${PERSISTENT_WORKDIR:=~/yocto} PERSISTENT_WORKDIR=${PERSISTENT_WORKDIR:=~/yocto}
BUILD_DIR=${BUILD_DIR:=$SCRIPTPATH} BUILD_DIR=${BUILD_DIR:=$SCRIPTPATH}
WORKSPACE=${BUILD_DIR:=$SCRIPTPATH}/resin-board WORKSPACE=${BUILD_DIR:=$SCRIPTPATH}/resin-board
@ -72,7 +72,7 @@ if [ ! -d $WORKSPACE/build/conf ]; then
fi fi
# Additional variables # 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 # Make sure shared directories are in place
mkdir -p $DOWNLOAD_DIR 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 cp $WORKSPACE/build/tmp/deploy/images/$MACHINE/kernel_modules_headers.tar.gz $BUILD_DEPLOY_DIR || true
echo "INFO: Pushing resinhup package to dockerhub" echo "INFO: Pushing resinhup package to dockerhub"
DOCKER_IMAGE="$DOCKER_REPO/resinos" DOCKER_IMAGE="$DOCKER_REPO/resinos-hassio"
DOCKER_TAG="$VERSION_HOSTOS-$MACHINE" DOCKER_TAG="$RESINOS_HASSIO_VERSION-$MACHINE"
if [ -f $BUILD_DEPLOY_DIR/resinhup-$VERSION_HOSTOS.tar ]; then if [ -f $BUILD_DEPLOY_DIR/resinhup-$VERSION_HOSTOS.tar ]; then
docker import $BUILD_DEPLOY_DIR/resinhup-$VERSION_HOSTOS.tar $DOCKER_IMAGE:$DOCKER_TAG docker import $BUILD_DEPLOY_DIR/resinhup-$VERSION_HOSTOS.tar $DOCKER_IMAGE:$DOCKER_TAG
docker push $DOCKER_IMAGE:$DOCKER_TAG docker push $DOCKER_IMAGE:$DOCKER_TAG

2
meta-hassio/recipes-containers/docker-disk/docker-resin-supervisor-disk.bbappend
View File

@ -19,5 +19,5 @@ do_install_append () {
install -d ${D}${sysconfdir}/resin-supervisor 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:@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:@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
} }

2
meta-hassio/recipes-containers/docker-disk/docker-resin-supervisor-disk/supervisor.conf
View File

@ -3,4 +3,4 @@ SUPERVISOR_TAG=@SUPERVISOR_TAG@
LED_FILE=@LED_FILE@ LED_FILE=@LED_FILE@
MACHINE=@MACHINE@ MACHINE=@MACHINE@
HOMEASSISTANT_REPOSITORY=@HOMEASSISTANT_REPOSITORY@ HOMEASSISTANT_REPOSITORY=@HOMEASSISTANT_REPOSITORY@
RESINOS_VERSION=@RESINOS_VERSION@ RESINOS_HASSIO_VERSION=@RESINOS_VERSION@

10
meta-hassio/recipes-support/resinhup/resinhup/resinhup
View File

@ -220,15 +220,15 @@ if [ "$LOG" == "yes" ]; then
fi fi
# Check if update is needed # Check if update is needed
log "Detected HassIO version: $RESINOS_VERSION ." log "Detected HassIO version: $RESINOS_HASSIO_VERSION ."
log "Update HassIO to version: $HOSTOS_VERSION ." log "Update HassIO to version: $HOSTOS_HASSIO_VERSION ."
if [ $RESINOS_VERSION == $HOSTOS_VERSION ]; then if [ $RESINOS_HASSIO_VERSION == $HOSTOS_VERSION ]; then
log "Version $HOSTOS_VERSION is already installed." log "Version $HOSTOS_VERSION is already installed."
exit 0 exit 0
fi fi
# protect downgrade # 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 if [ $downgrade == 1 ]; then
log ERROR "Downgrade are not supported" log ERROR "Downgrade are not supported"
exit 0 exit 0
@ -307,7 +307,7 @@ log "Running resinhup for version $HOSTOS_VERSION ..."
RESINHUP_STARTTIME=$(date +%s) RESINHUP_STARTTIME=$(date +%s)
# Set options # 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 \ docker run --privileged --rm --net=host $RESINHUP_ENV \
-v /:/host \ -v /:/host \