Merge pull request #402 from home-assistant/dev

Version 3.1

.github/release-drafter.yml

@@ -0,0 +1,15 @@
+categories:
+  - title: 'HassOS Core'
+    label: 'os'
+  - title: 'Build'
+    label: 'build'
+  - title: 'Raspberry Pi'
+    label: 'board/raspberry'
+  - title: 'Open Virtual Appliance'
+    label: 'board/ova'
+  - title: 'Intel-Nuc'
+    label: 'board/intel-nuc'
+template: |
+  ## Changes
+
+  $CHANGES

.github/stale.yml

@@ -0,0 +1,17 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - security
+# Label to use when marking an issue as stale
+staleLabel: wontfix
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

.hadolint.yaml

@@ -0,0 +1,2 @@
+ignored:
+  - DL3008

.travis.yml

@@ -1,25 +0,0 @@
-language: bash
-
-sudo: required
-service: docker
-
-addons:
-  apt:
-    packages:
-     - docker-ce
-
-before_install:
-  - shopt -s globstar
-  - docker pull koalaman/shellcheck
-
-script:
- - docker run -v $(pwd):/mnt koalaman/shellcheck scripts/*.sh
- - docker run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/scripts/*.sh
- - docker run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/scripts/*.sh
- - docker run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/board/**/*.sh
- - docker run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/rootfs-overlay/usr/sbin/*
- - docker run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/rootfs-overlay/usr/libexec/*
- - docker run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/rootfs-overlay/usr/lib/rauc/*
-
-matrix:
-  fast_finish: true

Dockerfile

@@ -1,19 +1,24 @@
 FROM ubuntu:18.04
 
+# Set shell
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
 # Docker
-RUN apt-get update && apt-get install -y \
+RUN apt-get update && apt-get install -y --no-install-recommends \
         apt-transport-https \
         ca-certificates \
         curl \
+        gpg-agent \
         software-properties-common \
     && rm -rf /var/lib/apt/lists/* \
     && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \
     && add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
-    && apt-get update && apt-get install -y docker-ce \
+    && apt-get update && apt-get install -y --no-install-recommends \
+        docker-ce \
     && rm -rf /var/lib/apt/lists/*
 
 # Build Tools
-RUN apt-get update && apt-get install -y \
+RUN apt-get update && apt-get install -y --no-install-recommends \
         wget patch vim cpio python unzip rsync bc bzip2 ncurses-dev \
         git make g++ file perl bash binutils locales qemu-utils bison flex \
     && rm -rf /var/lib/apt/lists/*

Documentation/boards/odroid-xu4.md

@@ -0,0 +1,27 @@
+# Odroid-XU4
+
+## eMMC
+
+The Odroid XU4 has a hidden boot sector that is only visible on the Odroid itself (can't be written by a card reader). There are a couple possibilities:
+1) If the eMMC already had a working image before flashing HassOS:
+* It will be booting to uBoot (but no further). 
+    * If you have the serial adapter, you should be able to enter `distro_bootcmd` at the uboot prompt to continue booting.
+    * If not, flash the HassOS image to an SD card and boot off that temporarily (while the eMMC is also plugged in).
+* Once booted, login at the prompts and then enter `dd if=/dev/mmcblk0 of=/dev/mmcblk0boot0 bs=512 skip=63 seek=62 count=1440` at the linux prompt.
+* Reboot with eMMC (don't forget to flip the boot switch to eMMC)
+2) Clean/wiped/corruped boot sector:
+* You'll need to follow [Hardkernel's instructions](https://forum.odroid.com/viewtopic.php?f=53&t=6173) to get a working boot sector. Then flash HassOS and follow instructions above.
+* Alternatively, you can try flash HassOS to both an SD and eMMC, then boot off the SD with the eMMC also plugged in, then run `dd if=/dev/mmcblk1 of=/dev/mmcblk0boot0 bs=512 skip=1 seek=0 count=16381` at the Linux prompt. Note that this is untested, but in theory should work..
+
+If you are getting permissions issues when using the dd command, try disabling RO:
+`echo 0 > /sys/block/mmcblk0boot0/force_ro`
+to re-enable after running dd:
+`echo 1 > /sys/block/mmcblk0boot0/force_ro`
+## Console
+
+By default, console access is granted over the serial header and over HDMI. Certain startup messages will only appear on the serial console by default. To show the messages on the HDMI console instead, swap the order of the two consoles in the `cmdline.txt` file on the boot partition. You can also delete the SAC2 console if you don't plan on using the serial adapter.
+eg. `console=tty1 console=ttySAC2,115200`
+
+## GPIO
+
+Refer to [the odroid wiki](https://wiki.odroid.com/odroid-xu4/hardware/expansion_connectors).

Documentation/boards/tinker.md

@@ -7,11 +7,11 @@ Supported Hardware:
 | Tinker RK3288 | tinker |
 | Tinker S RK3288 | tinker |
 
-## EMMC
+## eMMC
 
-Actual we support only SD cards. The support for EMMC will follow.
+eMMC support is provided transparently. Just flash the image to the eMMC by connecting your Tinker Board S to your PC via Micro-USB.
 
 ## Serial console
 
-For access to terminal over serial console, add `console=ttyS2,115200` to `cmdline.txt`. GPIO pins are: 34 = GND / 32 = UART TXD / 33 = UART RXD.
+To access the terminal over serial console, add `console=ttyS2,115200` to `cmdline.txt`. GPIO pins are: 34 = GND / 32 = UART TXD / 33 = UART RXD.
 

azure-pipelines.yml

@@ -0,0 +1,52 @@
+# https://dev.azure.com/home-assistant
+
+trigger:
+  batch: true
+  branches:
+    include:
+    - dev
+  tags:
+    include:
+    - '*'
+    exclude:
+    - untagged*
+pr:
+- dev
+
+variables:
+  - name: versionHadolint
+    value: 'v1.16.3'
+  - name: versionShellCheck
+    value: 'v0.6.0'
+
+jobs:
+
+- job: 'Hadolint'
+  pool:
+    vmImage: 'ubuntu-16.04'
+  steps:
+  - script: sudo docker pull hadolint/hadolint:$(versionHadolint)
+    displayName: 'Install Hadolint'
+  - script: |
+      sudo docker run --rm -i \
+        -v $(pwd)/.hadolint.yaml:/.hadolint.yaml:ro \
+        hadolint/hadolint:$(versionHadolint) < Dockerfile
+    displayName: 'Run Hadolint'
+
+
+- job: 'ShellCheck'
+  pool:
+    vmImage: 'ubuntu-16.04'
+  steps:
+  - script: sudo docker pull koalaman/shellcheck:$(versionShellCheck)
+    displayName: 'Install ShellCheck'
+  - script: |
+      sudo docker run --rm -i \
+        -v $(pwd):/mnt:ro koalaman/shellcheck:$(versionShellCheck) \
+          scripts/*.sh \
+          buildroot-external/scripts/*.sh \
+          buildroot-external/board/**/*.sh \
+          buildroot-external/rootfs-overlay/usr/sbin/* \
+          buildroot-external/rootfs-overlay/usr/libexec/* \
+          buildroot-external/rootfs-overlay/usr/lib/rauc/*
+    displayName: 'Run ShellCheck'

buildroot-external/meta

@@ -1,7 +1,7 @@
-VERSION_MAJOR=2
-VERSION_BUILD=12
+VERSION_MAJOR=3
+VERSION_BUILD=1
 
 HASSOS_NAME="HassOS"
 HASSOS_ID="hassos"
 
-DEPLOYMENT="production"
+DEPLOYMENT="development"

buildroot-external/rootfs-overlay/usr/libexec/hassos-zram

@@ -51,9 +51,9 @@ else
     exit 1
 fi
 
-# Calc 20% of memory for ZRAM swap partition
+# Calc 25% of memory for ZRAM swap partition
 if [ "$TYPE" = "swap" ] && [ "$SIZE" -eq "0" ]; then
-    SIZE="$(awk '/MemTotal/{ print $2 * 0.20 }' /proc/meminfo)K"
+    SIZE="$(awk '/MemTotal/{ print $2 * 0.25 }' /proc/meminfo)K"
 fi
 
 # Init device

buildroot-external/scripts/rauc.sh

@@ -78,6 +78,7 @@ function install_rauc_certs() {
 
 function install_bootloader_config() {
     if [ "${BOOTLOADER}" == "uboot" ]; then
+    	# shellcheck disable=SC1117
         echo -e "/dev/disk/by-partlabel/hassos-bootstate\t0x0000\t${BOOT_ENV_SIZE}" > "${TARGET_DIR}/etc/fw_env.config"
     else
         cp -f "${BR2_EXTERNAL_HASSOS_PATH}/misc/barebox-state-efi.dtb" "${TARGET_DIR}/etc/barebox-state.dtb"

buildroot-external/scripts/rootfs-layer.sh

@@ -29,6 +29,7 @@ function fix_rootfs() {
 
 function install_hassos_cli() {
 
+    # shellcheck disable=SC1117
     sed -i "s|\(root.*\)/bin/sh|\1/usr/sbin/hassos-cli|" "${TARGET_DIR}/etc/passwd"
     
     if ! grep "hassos-cli" "${TARGET_DIR}/etc/shells"; then