Merge pull request 'fix for HA' (#1) from ha-osbuilder into dev

Reviewed-on: #1

buildroot-external/kernel/hassos.config

@@ -60,6 +60,8 @@ CONFIG_BT_HIDP=m
 CONFIG_BT_LEDS=y
 
 CONFIG_IPV6=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_REACHABILITY_PROBE=y
 CONFIG_IPV6_SIT=m
 
 CONFIG_IP_MROUTE=y

buildroot-external/meta

@@ -1,4 +1,4 @@
-VERSION_MAJOR=10
+VERSION_MAJOR=11
 VERSION_BUILD=0
 
 HASSOS_NAME="Home Assistant OS"

buildroot-external/package/generic_raw_uart/generic_raw_uart.hash

@@ -1,3 +1,3 @@
 # Locally computed
 sha256  b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1  LICENSE
-sha256  07a0de82e6bf25d35df3520beaea886644160bac4077c3ccb9bb615f5d266972  generic_raw_uart-b787f3d84b311bd3e07b0ca8f2aa63330030746e.tar.gz
+sha256  bea4b61fb1ca9f85ed080344709f48c0fd8ab8950cd370506d822b14d287744e  generic_raw_uart-610c9cf1e6b84720b638e12ffc192dbc150aed84.tar.gz

buildroot-external/package/generic_raw_uart/generic_raw_uart.mk

@@ -13,15 +13,11 @@
 #
 ################################################################################
 
-GENERIC_RAW_UART_VERSION = b787f3d84b311bd3e07b0ca8f2aa63330030746e
+GENERIC_RAW_UART_VERSION = 610c9cf1e6b84720b638e12ffc192dbc150aed84
 GENERIC_RAW_UART_SITE = $(call github,alexreinert,piVCCU,$(GENERIC_RAW_UART_VERSION))
 GENERIC_RAW_UART_LICENSE = GPL2
 GENERIC_RAW_UART_LICENSE_FILES = LICENSE
 GENERIC_RAW_UART_MODULE_SUBDIRS = kernel
 
-define GENERIC_RAW_UART_LINUX_CONFIG_FIXUPS
-	$(call KCONFIG_DISABLE_OPT,CONFIG_WERROR)
-endef
-
 $(eval $(kernel-module))
 $(eval $(generic-package))

buildroot-external/package/rpi-rf-mod/rpi-rf-mod.hash

@@ -1,2 +1,2 @@
 sha256  b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1  LICENSE
-sha256  df22bcebb72f1ce7dc01504e2a1d097dd09fed20a461b36c2dd273f6ba7f8c96  rpi-rf-mod-de15b40fe87116c14c810b25d3b5107091e8946b.tar.gz
+sha256  92e90678e7305486625777322c576a0a5a124a9199b5515e65ae72cbdb1ca534  rpi-rf-mod-b472ab34508e8de6ad152ba81b0059fab3e77d38.tar.gz

buildroot-external/package/rpi-rf-mod/rpi-rf-mod.mk

@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-RPI_RF_MOD_VERSION = de15b40fe87116c14c810b25d3b5107091e8946b
+RPI_RF_MOD_VERSION = b472ab34508e8de6ad152ba81b0059fab3e77d38
 RPI_RF_MOD_SITE = $(call github,jens-maus,RaspberryMatic,$(RPI_RF_MOD_VERSION))
 RPI_RF_MOD_LICENSE = Apache-2.0
 RPI_RF_MOD_DEPENDENCIES = host-dtc

buildroot-external/patches/linux/0001-ipv6-add-option-to-explicitly-enable-reachability-te.patch

@@ -0,0 +1,56 @@
+From b9182b02829b158d55acc53a0bcec1ed667b2668 Mon Sep 17 00:00:00 2001
+Message-Id: <b9182b02829b158d55acc53a0bcec1ed667b2668.1680000784.git.stefan@agner.ch>
+From: Stefan Agner <stefan@agner.ch>
+Date: Tue, 28 Mar 2023 12:02:10 +0200
+Subject: [PATCH] ipv6: add option to explicitly enable reachability test
+
+Systems which act as host as well as router might prefer the host
+behavior. Currently the kernel does not allow to use IPv6 forwarding
+globally and at the same time use route reachability probing.
+
+Add a compile time flag to enable route reachability probe in any
+case.
+
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ net/ipv6/Kconfig | 9 +++++++++
+ net/ipv6/route.c | 3 ++-
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
+index 658bfed1df8b..5147fd4c93ff 100644
+--- a/net/ipv6/Kconfig
++++ b/net/ipv6/Kconfig
+@@ -48,6 +48,15 @@ config IPV6_OPTIMISTIC_DAD
+ 
+ 	  If unsure, say N.
+ 
++config IPV6_REACHABILITY_PROBE
++	bool "IPv6: Always use reachability probing (RFC 4191)"
++	help
++	  By default reachability probing is disabled on router devices (when
++	  IPv6 forwarding is enabled). This option explicitly enables
++	  reachability probing always.
++
++	  If unsure, say N.
++
+ config INET6_AH
+ 	tristate "IPv6: AH transformation"
+ 	select XFRM_AH
+diff --git a/net/ipv6/route.c b/net/ipv6/route.c
+index 0fdb03df2287..5e1e1f02f400 100644
+--- a/net/ipv6/route.c
++++ b/net/ipv6/route.c
+@@ -2210,7 +2210,8 @@ struct rt6_info *ip6_pol_route(struct net *net, struct fib6_table *table,
+ 
+ 	strict |= flags & RT6_LOOKUP_F_IFACE;
+ 	strict |= flags & RT6_LOOKUP_F_IGNORE_LINKSTATE;
+-	if (net->ipv6.devconf_all->forwarding == 0)
++	if (net->ipv6.devconf_all->forwarding == 0 ||
++	    IS_ENABLED(IPV6_REACHABILITY_PROBE))
+ 		strict |= RT6_LOOKUP_F_REACHABLE;
+ 
+ 	rcu_read_lock();
+-- 
+2.40.0
+

buildroot-external/patches/network-manager/0001-ndisc-support-multiple-gateways-for-a-single-network.patch

@@ -0,0 +1,27 @@
+From a053500cf43a31ee82a6e0f3d644ea36f5c77ffb Mon Sep 17 00:00:00 2001
+Message-Id: <a053500cf43a31ee82a6e0f3d644ea36f5c77ffb.1679932288.git.stefan@agner.ch>
+From: Stefan Agner <stefan@agner.ch>
+Date: Mon, 27 Mar 2023 17:48:34 +0200
+Subject: [PATCH] ndisc: support multiple gateways for a single network
+
+---
+ src/core/ndisc/nm-ndisc.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/core/ndisc/nm-ndisc.c b/src/core/ndisc/nm-ndisc.c
+index 9a6038d406..67cdf5d99a 100644
+--- a/src/core/ndisc/nm-ndisc.c
++++ b/src/core/ndisc/nm-ndisc.c
+@@ -654,7 +654,8 @@ nm_ndisc_add_route(NMNDisc *ndisc, const NMNDiscRoute *new_item, gint64 now_msec
+         NMNDiscRoute *item = &g_array_index(rdata->routes, NMNDiscRoute, i);
+ 
+         if (IN6_ARE_ADDR_EQUAL(&item->network, &new_item->network)
+-            && item->plen == new_item->plen) {
++            && item->plen == new_item->plen
++            && IN6_ARE_ADDR_EQUAL(&item->gateway, &new_item->gateway)) {
+             if (new_item->expiry_msec <= now_msec) {
+                 g_array_remove_index(rdata->routes, i);
+                 return TRUE;
+-- 
+2.40.0
+

buildroot-external/rootfs-overlay/etc/systemd/journald.conf

@@ -1,3 +1,4 @@
 [Journal]
 Storage=auto
 Compress=yes
+SystemMaxUse=500M

buildroot-external/rootfs-overlay/usr/libexec/haos-swapfile

@@ -2,17 +2,20 @@
 set -e
 
 swapfile="/mnt/data/swapfile"
-swapsize="$(awk '/MemTotal/{ print $2 * 0.33 }' /proc/meminfo)"
+# Swap space in 4k blocks
+swapsize="$(awk '/MemTotal/{ print int($2 * 0.33 / 4) }' /proc/meminfo)"
 
 
-if [ ! -s "${swapfile}" ] || [ "$(stat "${swapfile}" -c '%s')" -lt $((swapsize * 1024)) ]; then
+if [ ! -s "${swapfile}" ] || [ "$(stat "${swapfile}" -c '%s')" -lt $((swapsize * 4096)) ]; then
 	# Check free space (in 4k blocks)
-	if [ "$(stat -f /mnt/data -c '%f')" -lt $((swapsize / 4)) ]; then
+	if [ "$(stat -f /mnt/data -c '%f')" -lt "${swapsize}" ]; then
 		echo "[WARNING] Not enough space to allocate swapfile"
 		exit 1
 	fi
 
-	dd if=/dev/zero of="${swapfile}" bs=1k count="${swapsize}"
+	echo "[INFO] Creating swapfile of size $((swapsize *4))k"
+	umask 0077
+	dd if=/dev/zero of="${swapfile}" bs=4k count="${swapsize}"
 fi
 
 if ! swaplabel "${swapfile}" > /dev/null 2>&1; then

scripts/enter.sh

@@ -3,7 +3,7 @@ set -e
 
 BUILDER_UID="$(id -u)"
 BUILDER_GID="$(id -g)"
-CACHE_DIR="${CACHE_DIR:-$HOME/hassos-cache}"
+CACHE_DIR="/mnt/data/supervisor/$(pwd)/hassos-cache}"
 ARGS="$*"
 COMMAND="${ARGS:-bash}"
 
@@ -21,6 +21,6 @@ sudo losetup -f > /dev/null
 
 # shellcheck disable=SC2086
 sudo docker run -it --rm --privileged \
-  -v "$(pwd):/build" -v "${CACHE_DIR}:/cache" \
+  -v "/mnt/data/supervisor/$(pwd):/build" -v "${CACHE_DIR}:/cache" \
   -e BUILDER_UID="${BUILDER_UID}" -e BUILDER_GID="${BUILDER_GID}" \
   hassos:local ${COMMAND}