Bump version to 2.7 (RC)

Documentation/kernel.md

@@ -3,7 +3,7 @@
 
 | Board | Version |
 |-------|---------|
-| Open Virtual Applicance | 4.14.82 |
+| Open Virtual Applicance | 4.19.18 |
 | Raspberry Pi | 4.14.81 |
 | Tinker Board | 4.14.82 |
 | Odroid-C2 | 4.19.15 |

buildroot-external/configs/ova_defconfig

@@ -4,7 +4,6 @@ BR2_CCACHE=y
 BR2_CCACHE_DIR="/cache/cc"
 BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/intel/patches"
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
 BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_BINUTILS_ENABLE_LTO=y
@@ -20,7 +19,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/intel/ova $(BR2_EXTERNAL_HASSOS_PATH)/board/intel/ova/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.82"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.18"
 BR2_LINUX_KERNEL_DEFCONFIG="x86_64"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/intel/ova/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y

buildroot-external/meta

@@ -1,7 +1,7 @@
 VERSION_MAJOR=2
-VERSION_BUILD=5
+VERSION_BUILD=7
 
 HASSOS_NAME="HassOS"
 HASSOS_ID="hassos"
 
-DEPLOYMENT="development"
+DEPLOYMENT="staging"

buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/hassos-user-rules-udev-trigger.service

@@ -0,0 +1 @@
+/usr/lib/systemd/system/hassos-user-rules-udev-trigger.service

buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-udev-rules.d.mount

@@ -2,7 +2,7 @@
 Description=Udev persistent rules.d
 Requires=mnt-overlay.mount
 After=mnt-overlay.mount
-Before=systemd-udevd.service hassos-config.service
+Before=hassos-config.service
 
 [Mount]
 What=/mnt/overlay/etc/udev/rules.d

buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-expand.service

@@ -4,6 +4,8 @@ DefaultDependencies=no
 Before=mnt-data.mount
 RefuseManualStart=true
 RefuseManualStop=true
+Requires=dev-disk-by\x2dlabel-hassos\x2ddata.device
+After=dev-disk-by\x2dlabel-hassos\x2ddata.device
 
 [Service]
 Type=oneshot

buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-user-rules-udev-trigger.service

@@ -0,0 +1,17 @@
+[Unit]
+Description=Retrigger udev rules after user rules mounted
+DefaultDependencies=no
+Wants=systemd-udevd.service etc-udev-rules.d.mount
+After=systemd-udev-trigger.service etc-udev-rules.d.mount
+Before=hassos-bind.target
+ConditionPathIsReadWrite=/sys
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/bin/udevadm control --reload-rules
+ExecStart=/usr/bin/udevadm trigger --type=subsystems --action=add
+ExecStart=/usr/bin/udevadm trigger --type=devices --action=add
+
+[Install]
+WantedBy=hassos-bind.target

buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-boot.mount

@@ -6,7 +6,7 @@ After=local-fs.target
 Conflicts=umount.target
 
 [Mount]
-What=LABEL=hassos-boot
+What=/dev/disk/by-label/hassos-boot
 Where=/mnt/boot
 Type=auto
 

buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-config.mount

@@ -2,7 +2,7 @@
 Description=HassOS config partition
 
 [Mount]
-What=LABEL=CONFIG
+What=/dev/disk/by-label/CONFIG
 Where=/mnt/config
 Type=auto
 Options=ro

buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-data.mount

@@ -7,7 +7,7 @@ Before=umount.target systemd-tmpfiles-setup.service
 Conflicts=umount.target
 
 [Mount]
-What=LABEL=hassos-data
+What=/dev/disk/by-label/hassos-data
 Where=/mnt/data
 Type=ext4
 

buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-overlay.mount

@@ -5,7 +5,7 @@ Before=umount.target systemd-tmpfiles-setup.service
 Conflicts=umount.target
 
 [Mount]
-What=LABEL=hassos-overlay
+What=/dev/disk/by-label/hassos-overlay
 Where=/mnt/overlay
 Type=ext4
 

buildroot-external/rootfs-overlay/usr/sbin/hassos-config

@@ -47,7 +47,7 @@ if [ -d "${CONFIG_DIR}/modules" ]; then
     echo "[Info] Update Modules configuration!"
 
     rm -rf /etc/modules-load.d/*
-    cp -f ${CONFIG_DIR}/modules/* /etc/modules-load.d/*
+    cp -f ${CONFIG_DIR}/modules/* /etc/modules-load.d/
 fi
 
 ##

buildroot-patches/0016-openvmtools-start-only-inside-a-vmware-env.patch

@@ -0,0 +1,25 @@
+From ef9591dd61cfc79a0549954c71826ec1ac47757d Mon Sep 17 00:00:00 2001
+From: Pascal Vizeli <pvizeli@syshack.ch>
+Date: Mon, 28 Jan 2019 09:13:33 +0000
+Subject: [PATCH] openvmtools: start only inside a vmware env
+
+Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
+---
+ package/openvmtools/vmtoolsd.service | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/package/openvmtools/vmtoolsd.service b/package/openvmtools/vmtoolsd.service
+index 17a4df4..cb97357 100644
+--- a/package/openvmtools/vmtoolsd.service
++++ b/package/openvmtools/vmtoolsd.service
+@@ -1,6 +1,7 @@
+ [Unit]
+ Description=vmtoolsd for openvmtools
+ After=syslog.target network.target
++ConditionVirtualization=vmware
+ 
+ [Service]
+ Type=forking
+-- 
+2.17.1
+

buildroot/package/openvmtools/vmtoolsd.service

@@ -1,6 +1,7 @@
 [Unit]
 Description=vmtoolsd for openvmtools
 After=syslog.target network.target
+ConditionVirtualization=vmware
 
 [Service]
 Type=forking