Change resinhup handling

This commit is contained in:
Pascal Vizeli 2017-03-24 01:22:14 +01:00
parent 67ff696d6b
commit 60b840df67
3 changed files with 9 additions and 3 deletions

View File

@ -1,7 +1,8 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
SRC_URI += " \ SRC_URI = " \
file://resinhup \
file://hassio.conf \ file://hassio.conf \
file://resinhup.timer \ file://resinhup.timer \
file://resinhup.service \ file://resinhup.service \
@ -27,6 +28,9 @@ do_install_append() {
install -m 0755 ${WORKDIR}/hassio.conf ${D}${sysconfdir} install -m 0755 ${WORKDIR}/hassio.conf ${D}${sysconfdir}
sed -i -e 's:@HASSIO_VERSION@:${HASSIO_VERSION}:g' ${D}${sysconfdir}/hassio.conf sed -i -e 's:@HASSIO_VERSION@:${HASSIO_VERSION}:g' ${D}${sysconfdir}/hassio.conf
install -d ${D}${bindir}
install -m 0755 ${WORKDIR}/resinhup ${D}${bindir}
if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
install -d ${D}${systemd_unitdir}/system install -d ${D}${systemd_unitdir}/system
install -c -m 0644 ${WORKDIR}/resinhup.service ${D}${systemd_unitdir}/system install -c -m 0644 ${WORKDIR}/resinhup.service ${D}${systemd_unitdir}/system

View File

@ -1,5 +1,7 @@
#!/bin/bash #!/bin/bash
set -e
# Default values # Default values
LOGFILE=/tmp/`basename "$0"`.log LOGFILE=/tmp/`basename "$0"`.log
LOG=yes LOG=yes
@ -299,7 +301,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 -e REMOTE=$DOCKER_REPO/hassio" RESINHUP_ENV="-e VERSION=$HOSTOS_VERSION-$MACHINE -e REMOTE=$DOCKER_REPO/hassio"
docker run --privileged --rm --net=host $RESINHUP_ENV \ docker run --privileged --rm --net=host $RESINHUP_ENV \
-v /:/host \ -v /:/host \

View File

@ -16,4 +16,4 @@ After=\
[Service] [Service]
Type=simple Type=simple
ExecStart=@BASE_BINDIR@/bash @BINDIR@/run-resinhub.sh ExecStart=@BASE_BINDIR@/bash @BINDIR@/resinhub