balena-os · alexgg · Jun 25, 2024 · Jun 27, 2024 · Jun 27, 2024 · Jun 6, 2024
diff --git a/layers/meta-balena b/layers/meta-balena
diff --git a/layers/meta-balena-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend b/layers/meta-balena-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend
@@ -40,6 +40,14 @@ do_deploy:append:revpi-connect-4() {
 	echo "dtoverlay=dwc2,dr_mode=host" >> ${DEPLOYDIR}/bootfiles/config.txt
 }
 
+do_deploy:append:raspberrypicm4-ioboard() {
+    echo "otg_mode=1" >> ${DEPLOYDIR}/bootfiles/config.txt
+}
+
+do_deploy:append:raspberrypicm4-ioboard-sb() {
+    echo "otg_mode=1" >> ${DEPLOYDIR}/bootfiles/config.txt
+}
+
 do_deploy:append:raspberrypi3-unipi-neuron() {
 	# Use the dt overlays required by the UniPi Neuron family of boards
 	echo "dtoverlay=neuronee" >> ${DEPLOYDIR}/bootfiles/config.txt

diff --git a/...ena-raspberrypi/recipes-bsp/rpi-eeprom/files/raspberrypicm4-ioboard-sb/default-config.txt b/...ena-raspberrypi/recipes-bsp/rpi-eeprom/files/raspberrypicm4-ioboard-sb/default-config.txt
@@ -0,0 +1,7 @@
+[all]
+BOOT_UART=0
+WAKE_ON_GPIO=0
+POWER_OFF_ON_HALT=1
+FREEZE_VERSION=0
+HDMI_DELAY=0
+BOOT_ORDER=0xf2165
diff --git a/layers/meta-balena-raspberrypi/recipes-core/initrdscripts/initramfs-framework_%.bbappend b/layers/meta-balena-raspberrypi/recipes-core/initrdscripts/initramfs-framework_%.bbappend
@@ -20,8 +20,10 @@ do_install:append() {
 
 	install -m 0755 ${WORKDIR}/cryptsetup-rpi ${D}/init.d/72-cryptsetup
 	sed -i -e "s/@@BALENA_NONENC_BOOT_LABEL@@/${BALENA_NONENC_BOOT_LABEL}/g" ${D}/init.d/72-cryptsetup
-
 	install -m 0755 ${WORKDIR}/kexec_pi4_fwgpio ${D}/init.d/73-kexec_pi4_fwgpio
+  if ${@bb.utils.contains('DISTRO_FEATURES','osdev-image','true','false',d)}; then
+	  sed -i -e "s/fail/warn/g" ${D}/init.d/72-cryptsetup
+  fi
 }
 
 RDEPENDS:initramfs-module-cryptsetup:append = " os-helpers-otp gnupg"
diff --git a/layers/meta-balena-raspberrypi/recipes-support/os-helpers/os-helpers/os-helpers-sb b/layers/meta-balena-raspberrypi/recipes-support/os-helpers/os-helpers/os-helpers-sb
@@ -37,15 +37,7 @@ BALENA_NONENCRYPTED_BOOT_PARTITION_FILES="\
 is_secured() {
 	# Check the private key has been programmed
 	if [ -n "$(otp_read_key | sed s/0//g)" ]; then
-		# Check that the RSA digest has been programmed
-		# Skip on balena bootloader that has no VHCI access
-		if grep -q "balena_stage2" < /proc/cmdline; then
 			return 0
-		else
-			if otp_has_rsa_digest; then
-				return 0
-			fi
-		fi
 	fi
 	return 1
 }
+596 −0		.versionbot/CHANGELOG.yml
+156 −0		CHANGELOG.md
+9 −0		meta-balena-common/classes/balena-bootloader.bbclass
+4 −0		meta-balena-common/classes/kernel-balena.bbclass
+1 −1		meta-balena-common/conf/distro/include/balena-os.inc
+34 −13		meta-balena-common/recipes-connectivity/networkmanager/balena-files/90shared
+1 −1		meta-balena-common/recipes-containers/balena-supervisor/balena-supervisor.inc
+30 −8		meta-balena-common/recipes-containers/balena/balena/balena-healthcheck
+7 −0		meta-balena-common/recipes-core/balena-rollback/files/rollback-health
+1 −1		meta-balena-common/recipes-core/initrdscripts/files/kexec
+22 −9		meta-balena-common/recipes-core/initrdscripts/files/migrate
+0 −14		meta-balena-common/recipes-kernel/rtl8192cu/rtl8192cu_4.0.2_9000.bb
+5 −0		meta-balena-common/recipes-support/hostapp-update-hooks/files/0-signed-update
+37 −12		meta-balena-common/recipes-support/os-helpers/os-helpers/os-helpers-tpm2
+14 −6		meta-balena-common/recipes-support/resin-init/resin-init-flasher/resin-init-flasher
+33 −0		tests/suites/cloud/config.js
+8 −0		tests/suites/cloud/suite.js
+12 −0		tests/suites/config.js
+34 −0		tests/suites/hup/config.js
+8 −0		tests/suites/hup/suite.js
+33 −0		tests/suites/os/config.js
+9 −0		tests/suites/os/suite.js
+10 −16		tests/suites/os/tests/safe-reboot/index.js
+315 −133		tests/suites/os/tests/secureboot/index.js