From b44889b7bbaf9f2b88322b6989833712a17dcc6a Mon Sep 17 00:00:00 2001
From: Marcus Folkesson <marcus.folkesson@gmail.com>
Date: Fri, 27 May 2022 09:14:36 +0200
Subject: Adapt to Honister

Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
---
 conf/layer.conf                                                |  2 +-
 recipes-core/images/core-image-rorootfs-overlay-initramfs.bb   |  2 +-
 .../initrdscripts/files/init-readonly-rootfs-overlay-boot.sh   | 10 +++++-----
 .../initrdscripts/initramfs-readonly-rootfs-overlay_1.0.bb     |  4 ++--
 .../initrdscripts/readonly-rootfs-overlay-init-script.inc      |  2 +-
 recipes-kernel/linux/linux-yocto-tiny_%.bbappend               |  2 +-
 recipes-kernel/linux/linux-yocto_%.bbappend                    |  2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/conf/layer.conf b/conf/layer.conf
index 37c2a90..de377f2 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "readonly-rootfs-overlay"
 BBFILE_PATTERN_readonly-rootfs-overlay = "^${LAYERDIR}/"
 BBFILE_PRIORITY_readonly-rootfs-overlay = "6"
 
-LAYERSERIES_COMPAT_readonly-rootfs-overlay = "sumo"
+LAYERSERIES_COMPAT_readonly-rootfs-overlay = "honister"
diff --git a/recipes-core/images/core-image-rorootfs-overlay-initramfs.bb b/recipes-core/images/core-image-rorootfs-overlay-initramfs.bb
index 4c21555..497e9d4 100644
--- a/recipes-core/images/core-image-rorootfs-overlay-initramfs.bb
+++ b/recipes-core/images/core-image-rorootfs-overlay-initramfs.bb
@@ -13,7 +13,7 @@ IMAGE_LINGUAS = ""
 
 LICENSE = "MIT"
 
-IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}"
+IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}.u-boot"
 inherit core-image
 
 IMAGE_ROOTFS_SIZE = "8192"
diff --git a/recipes-core/initrdscripts/files/init-readonly-rootfs-overlay-boot.sh b/recipes-core/initrdscripts/files/init-readonly-rootfs-overlay-boot.sh
index be62db0..66f0cdc 100644
--- a/recipes-core/initrdscripts/files/init-readonly-rootfs-overlay-boot.sh
+++ b/recipes-core/initrdscripts/files/init-readonly-rootfs-overlay-boot.sh
@@ -101,11 +101,11 @@ mount_and_boot() {
 
 	# Mount root file system to new mount-point, if unsuccessful, try bind
 	# mounting current root file system.
-	if ! $MOUNT $ROOT_ROMOUNTPARAMS "$ROOT_ROMOUNT" 2>/dev/null && \
-		[ "x$ROOT_ROMOUNTPARAMS_BIND" == "x$ROOT_ROMOUNTPARAMS" ] || \
-		log "Could not mount $ROOT_RODEVICE, bind mounting..." && \
-		! $MOUNT $ROOT_ROMOUNTPARAMS_BIND "$ROOT_ROMOUNT"; then
-		fatal "Could not mount read-only rootfs"
+	if ! $MOUNT $ROOT_ROMOUNTPARAMS "$ROOT_ROMOUNT" 2>/dev/null ; then
+		log "Could not mount $ROOT_RODEVICE, bind mounting..."
+		if ! $MOUNT $ROOT_ROMOUNTPARAMS_BIND "$ROOT_ROMOUNT"; then
+            fatal "Could not mount read-only rootfs"
+        fi
 	fi
 
 	# Remounting root file system as read only.
diff --git a/recipes-core/initrdscripts/initramfs-readonly-rootfs-overlay_1.0.bb b/recipes-core/initrdscripts/initramfs-readonly-rootfs-overlay_1.0.bb
index 164d394..8f12a29 100644
--- a/recipes-core/initrdscripts/initramfs-readonly-rootfs-overlay_1.0.bb
+++ b/recipes-core/initrdscripts/initramfs-readonly-rootfs-overlay_1.0.bb
@@ -1,8 +1,8 @@
 require readonly-rootfs-overlay-init-script.inc
 
-do_install_append() {
+do_install:append() {
         install -d ${D}/dev
         mknod -m 622 ${D}/dev/console c 5 1
 }
 
-FILES_${PN} += "/dev"
+FILES:${PN} += "/dev"
diff --git a/recipes-core/initrdscripts/readonly-rootfs-overlay-init-script.inc b/recipes-core/initrdscripts/readonly-rootfs-overlay-init-script.inc
index 947246b..fcfefcf 100644
--- a/recipes-core/initrdscripts/readonly-rootfs-overlay-init-script.inc
+++ b/recipes-core/initrdscripts/readonly-rootfs-overlay-init-script.inc
@@ -12,7 +12,7 @@ do_install() {
         install -d "${D}/media/rfs/rw"
 }
 
-FILES_${PN} += " /init /media/rfs"
+FILES:${PN} += " /init /media/rfs"
 
 # Due to kernel dependency
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-kernel/linux/linux-yocto-tiny_%.bbappend b/recipes-kernel/linux/linux-yocto-tiny_%.bbappend
index cc2bfe6..cae6b66 100644
--- a/recipes-kernel/linux/linux-yocto-tiny_%.bbappend
+++ b/recipes-kernel/linux/linux-yocto-tiny_%.bbappend
@@ -1 +1 @@
-KERNEL_FEATURES_append = " features/overlayfs/overlayfs.scc"
+KERNEL_FEATURES:append = " features/overlayfs/overlayfs.scc"
diff --git a/recipes-kernel/linux/linux-yocto_%.bbappend b/recipes-kernel/linux/linux-yocto_%.bbappend
index cc2bfe6..cae6b66 100644
--- a/recipes-kernel/linux/linux-yocto_%.bbappend
+++ b/recipes-kernel/linux/linux-yocto_%.bbappend
@@ -1 +1 @@
-KERNEL_FEATURES_append = " features/overlayfs/overlayfs.scc"
+KERNEL_FEATURES:append = " features/overlayfs/overlayfs.scc"
-- 
cgit v1.2.3-54-g00ecf