mirror of
https://github.com/home-assistant/operating-system.git
synced 2025-08-08 20:57:41 +00:00
Compare commits
10 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
0973ea8130 | ||
![]() |
7abbbbab22 | ||
![]() |
32d4b18c1f | ||
![]() |
8f8817cacd | ||
![]() |
abdf83c17d | ||
![]() |
69d1f39bc8 | ||
![]() |
88dd3d31aa | ||
![]() |
cb5343a6fa | ||
![]() |
b403b7a73e | ||
![]() |
8e56d8b8c8 |
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
| Board | Version |
|
| Board | Version |
|
||||||
|-------|---------|
|
|-------|---------|
|
||||||
| Open Virtual Applicance | 4.14.82 |
|
| Open Virtual Applicance | 4.19.18 |
|
||||||
| Raspberry Pi | 4.14.81 |
|
| Raspberry Pi | 4.14.81 |
|
||||||
| Tinker Board | 4.14.82 |
|
| Tinker Board | 4.14.82 |
|
||||||
| Odroid-C2 | 4.19.15 |
|
| Odroid-C2 | 4.19.15 |
|
||||||
|
@ -0,0 +1,50 @@
|
|||||||
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
|
||||||
|
index b160bd1084de..fffd55787981 100644
|
||||||
|
--- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
|
||||||
|
+++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
|
||||||
|
@@ -461,7 +461,7 @@
|
||||||
|
compatible = "amlogic,meson-gxbb-dwmac", "snps,dwmac";
|
||||||
|
reg = <0x0 0xff3f0000 0x0 0x10000
|
||||||
|
0x0 0xff634540 0x0 0x8>;
|
||||||
|
- interrupts = <GIC_SPI 8 IRQ_TYPE_EDGE_RISING>;
|
||||||
|
+ interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
|
interrupt-names = "macirq";
|
||||||
|
clocks = <&clkc CLKID_ETH>,
|
||||||
|
<&clkc CLKID_FCLK_DIV2>,
|
||||||
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
|
||||||
|
index ed336c7a98a7..44c5c51ff1fa 100644
|
||||||
|
--- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
|
||||||
|
+++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
|
||||||
|
@@ -467,7 +467,7 @@
|
||||||
|
compatible = "amlogic,meson-gx-dwmac", "amlogic,meson-gxbb-dwmac", "snps,dwmac";
|
||||||
|
reg = <0x0 0xc9410000 0x0 0x10000
|
||||||
|
0x0 0xc8834540 0x0 0x4>;
|
||||||
|
- interrupts = <GIC_SPI 8 IRQ_TYPE_EDGE_RISING>;
|
||||||
|
+ interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
|
interrupt-names = "macirq";
|
||||||
|
status = "disabled";
|
||||||
|
};
|
||||||
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
|
||||||
|
index 00f7be6d83f7..2e1cd5e3a246 100644
|
||||||
|
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
|
||||||
|
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
|
||||||
|
@@ -143,7 +143,6 @@
|
||||||
|
interrupt-parent = <&gpio_intc>;
|
||||||
|
/* MAC_INTR on GPIOZ_15 */
|
||||||
|
interrupts = <29 IRQ_TYPE_LEVEL_LOW>;
|
||||||
|
- eee-broken-1000t;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
|
||||||
|
index 70325b273bd2..ec09bb5792b7 100644
|
||||||
|
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
|
||||||
|
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
|
||||||
|
@@ -142,7 +142,6 @@
|
||||||
|
eth_phy0: ethernet-phy@0 {
|
||||||
|
/* Realtek RTL8211F (0x001cc916) */
|
||||||
|
reg = <0>;
|
||||||
|
- eee-broken-1000t;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
@ -680,13 +680,8 @@ CONFIG_CPU_FREQ=y
|
|||||||
CONFIG_CPU_FREQ_GOV_ATTR_SET=y
|
CONFIG_CPU_FREQ_GOV_ATTR_SET=y
|
||||||
CONFIG_CPU_FREQ_GOV_COMMON=y
|
CONFIG_CPU_FREQ_GOV_COMMON=y
|
||||||
CONFIG_CPU_FREQ_STAT=y
|
CONFIG_CPU_FREQ_STAT=y
|
||||||
CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
|
# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
|
||||||
# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
|
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
|
||||||
# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
|
|
||||||
# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
|
|
||||||
# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
|
|
||||||
# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
|
|
||||||
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
|
|
||||||
CONFIG_CPU_FREQ_GOV_POWERSAVE=m
|
CONFIG_CPU_FREQ_GOV_POWERSAVE=m
|
||||||
CONFIG_CPU_FREQ_GOV_USERSPACE=m
|
CONFIG_CPU_FREQ_GOV_USERSPACE=m
|
||||||
CONFIG_CPU_FREQ_GOV_ONDEMAND=y
|
CONFIG_CPU_FREQ_GOV_ONDEMAND=y
|
||||||
|
@ -2,7 +2,7 @@ BR2_aarch64=y
|
|||||||
BR2_DL_DIR="/cache/dl"
|
BR2_DL_DIR="/cache/dl"
|
||||||
BR2_CCACHE=y
|
BR2_CCACHE=y
|
||||||
BR2_CCACHE_DIR="/cache/cc"
|
BR2_CCACHE_DIR="/cache/cc"
|
||||||
BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches"
|
BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/patches"
|
||||||
BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
|
BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
|
||||||
BR2_GCC_VERSION_7_X=y
|
BR2_GCC_VERSION_7_X=y
|
||||||
BR2_TOOLCHAIN_BUILDROOT_CXX=y
|
BR2_TOOLCHAIN_BUILDROOT_CXX=y
|
||||||
|
@ -4,7 +4,6 @@ BR2_CCACHE=y
|
|||||||
BR2_CCACHE_DIR="/cache/cc"
|
BR2_CCACHE_DIR="/cache/cc"
|
||||||
BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/intel/patches"
|
BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/intel/patches"
|
||||||
BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
|
BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
|
||||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
|
|
||||||
BR2_GCC_VERSION_7_X=y
|
BR2_GCC_VERSION_7_X=y
|
||||||
BR2_TOOLCHAIN_BUILDROOT_CXX=y
|
BR2_TOOLCHAIN_BUILDROOT_CXX=y
|
||||||
BR2_BINUTILS_ENABLE_LTO=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_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=y
|
||||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=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_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_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
|
BR2_LINUX_KERNEL_LZ4=y
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
VERSION_MAJOR=2
|
VERSION_MAJOR=2
|
||||||
VERSION_BUILD=5
|
VERSION_BUILD=8
|
||||||
|
|
||||||
HASSOS_NAME="HassOS"
|
HASSOS_NAME="HassOS"
|
||||||
HASSOS_ID="hassos"
|
HASSOS_ID="hassos"
|
||||||
|
|
||||||
DEPLOYMENT="development"
|
DEPLOYMENT="production"
|
||||||
|
@ -0,0 +1 @@
|
|||||||
|
/usr/lib/systemd/system/hassos-user-rules-udev-trigger.service
|
@ -2,7 +2,7 @@
|
|||||||
Description=Udev persistent rules.d
|
Description=Udev persistent rules.d
|
||||||
Requires=mnt-overlay.mount
|
Requires=mnt-overlay.mount
|
||||||
After=mnt-overlay.mount
|
After=mnt-overlay.mount
|
||||||
Before=systemd-udevd.service hassos-config.service
|
Before=hassos-config.service
|
||||||
|
|
||||||
[Mount]
|
[Mount]
|
||||||
What=/mnt/overlay/etc/udev/rules.d
|
What=/mnt/overlay/etc/udev/rules.d
|
||||||
|
@ -4,6 +4,8 @@ DefaultDependencies=no
|
|||||||
Before=mnt-data.mount
|
Before=mnt-data.mount
|
||||||
RefuseManualStart=true
|
RefuseManualStart=true
|
||||||
RefuseManualStop=true
|
RefuseManualStop=true
|
||||||
|
Requires=dev-disk-by\x2dlabel-hassos\x2ddata.device
|
||||||
|
After=dev-disk-by\x2dlabel-hassos\x2ddata.device
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=oneshot
|
Type=oneshot
|
||||||
|
@ -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
|
@ -6,7 +6,7 @@ After=local-fs.target
|
|||||||
Conflicts=umount.target
|
Conflicts=umount.target
|
||||||
|
|
||||||
[Mount]
|
[Mount]
|
||||||
What=LABEL=hassos-boot
|
What=/dev/disk/by-label/hassos-boot
|
||||||
Where=/mnt/boot
|
Where=/mnt/boot
|
||||||
Type=auto
|
Type=auto
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
Description=HassOS config partition
|
Description=HassOS config partition
|
||||||
|
|
||||||
[Mount]
|
[Mount]
|
||||||
What=LABEL=CONFIG
|
What=/dev/disk/by-label/CONFIG
|
||||||
Where=/mnt/config
|
Where=/mnt/config
|
||||||
Type=auto
|
Type=auto
|
||||||
Options=ro
|
Options=ro
|
||||||
|
@ -7,7 +7,7 @@ Before=umount.target systemd-tmpfiles-setup.service
|
|||||||
Conflicts=umount.target
|
Conflicts=umount.target
|
||||||
|
|
||||||
[Mount]
|
[Mount]
|
||||||
What=LABEL=hassos-data
|
What=/dev/disk/by-label/hassos-data
|
||||||
Where=/mnt/data
|
Where=/mnt/data
|
||||||
Type=ext4
|
Type=ext4
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@ Before=umount.target systemd-tmpfiles-setup.service
|
|||||||
Conflicts=umount.target
|
Conflicts=umount.target
|
||||||
|
|
||||||
[Mount]
|
[Mount]
|
||||||
What=LABEL=hassos-overlay
|
What=/dev/disk/by-label/hassos-overlay
|
||||||
Where=/mnt/overlay
|
Where=/mnt/overlay
|
||||||
Type=ext4
|
Type=ext4
|
||||||
|
|
||||||
|
@ -47,7 +47,7 @@ if [ -d "${CONFIG_DIR}/modules" ]; then
|
|||||||
echo "[Info] Update Modules configuration!"
|
echo "[Info] Update Modules configuration!"
|
||||||
|
|
||||||
rm -rf /etc/modules-load.d/*
|
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
|
fi
|
||||||
|
|
||||||
##
|
##
|
||||||
|
@ -86,7 +86,7 @@ function create_kernel_image() {
|
|||||||
|
|
||||||
# Make image
|
# Make image
|
||||||
dd if=/dev/zero of="${kernel_img}" bs=${KERNEL_SIZE} count=1
|
dd if=/dev/zero of="${kernel_img}" bs=${KERNEL_SIZE} count=1
|
||||||
mkfs.ext4 -L "hassos-kernel" -E lazy_itable_init=0,lazy_journal_init=0 "${kernel_img}"
|
mkfs.ext4 -L "hassos-kernel" -E lazy_itable_init=0,lazy_journal_init=0 -O ^extent,^64bit "${kernel_img}"
|
||||||
|
|
||||||
# Mount / init file structs
|
# Mount / init file structs
|
||||||
mkdir -p /mnt/data/
|
mkdir -p /mnt/data/
|
||||||
|
@ -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
|
||||||
|
|
@ -1,6 +1,7 @@
|
|||||||
[Unit]
|
[Unit]
|
||||||
Description=vmtoolsd for openvmtools
|
Description=vmtoolsd for openvmtools
|
||||||
After=syslog.target network.target
|
After=syslog.target network.target
|
||||||
|
ConditionVirtualization=vmware
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=forking
|
Type=forking
|
||||||
|
Loading…
x
Reference in New Issue
Block a user