rauc: Fix board-specific properties
The botloader and the compatibility strings were not being properly
applied, and an overlay file specific to Clearfog successfully masked
that error.
Change-Id: I7958b674b20616b594acc5f48a55cfcdd9809a75
Co-authored-by: Miroslav Mareš <mmares@cesnet.cz>
diff --git a/board/czechlight/clearfog/overlay/etc/rauc/system.conf b/board/czechlight/clearfog/overlay/etc/rauc/system.conf
deleted file mode 100644
index eac1494..0000000
--- a/board/czechlight/clearfog/overlay/etc/rauc/system.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-[system]
-compatible=czechlight-clearfog
-bootloader=uboot
-
-[keyring]
-path=/etc/rauc/keyring.pem
-
-[slot.rootfs.0]
-device=/dev/mmcblk0p1
-type=ext4
-bootname=A
-
-[slot.cfg.0]
-device=/dev/mmcblk0p2
-type=ext4
-parent=rootfs.0
-ignore-checksum=true
-
-[slot.rootfs.1]
-device=/dev/mmcblk0p3
-type=ext4
-bootname=B
-
-[slot.cfg.1]
-device=/dev/mmcblk0p4
-type=ext4
-parent=rootfs.1
-ignore-checksum=true
diff --git a/package/czechlight-rauc/czechlight-rauc.mk b/package/czechlight-rauc/czechlight-rauc.mk
index f0ac674..300379f 100644
--- a/package/czechlight-rauc/czechlight-rauc.mk
+++ b/package/czechlight-rauc/czechlight-rauc.mk
@@ -62,7 +62,7 @@
define CZECHLIGHT_RAUC_INSTALL_TARGET_CMDS
$(INSTALL) -D -m 0644 $(BR2_EXTERNAL_CZECHLIGHT_PATH)/crypto/rauc-cert.pem $(TARGET_DIR)/etc/rauc/keyring.pem
$(INSTALL) -D -m 0644 $(BR2_EXTERNAL_CZECHLIGHT_PATH)/package/czechlight-rauc/system.conf.in $(TARGET_DIR)/etc/rauc/system.conf
- sed -i -E -e "s|CZECHLIGHT_RAUC_BOOTLOADER|$(CZECHLIGHT_RAUC_BOOTLOADER)|" \
+ sed -i -E -e "s|CZECHLIGHT_RAUC_BOOTLOADER|$(call qstrip, $(CZECHLIGHT_RAUC_BOOTLOADER))|" \
-e 's|CZECHLIGHT_RAUC_COMPATIBLE|$(call qstrip,$(CZECHLIGHT_RAUC_COMPATIBLE))|' \
-e "s|CZECHLIGHT_RAUC_SLOT_A_ROOTFS_DEV|$(call qstrip,$(CZECHLIGHT_RAUC_SLOT_A_ROOTFS_DEV))|" \
-e "s|CZECHLIGHT_RAUC_SLOT_A_CFG_DEV|$(call qstrip,$(CZECHLIGHT_RAUC_SLOT_A_CFG_DEV))|" \
diff --git a/package/czechlight-rauc/system.conf.in b/package/czechlight-rauc/system.conf.in
index b2476eb..918f018 100644
--- a/package/czechlight-rauc/system.conf.in
+++ b/package/czechlight-rauc/system.conf.in
@@ -1,6 +1,6 @@
[system]
-compatible=czechlight-epia-geode
-bootloader=CZECHLIGHT_RAUC_BOOTLOADER_NAME
+compatible=CZECHLIGHT_RAUC_COMPATIBLE
+bootloader=CZECHLIGHT_RAUC_BOOTLOADER
[keyring]
path=/etc/rauc/keyring.pem