From 2911e0db62c8aa720cac98f70b82b6d411115cbb Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sat, 23 Jan 2021 22:09:27 +0100 Subject: [PATCH] x86: fix upgrade by emptying SUPPORTED_DEVICES x86 uses append-metadata, but only for signing and not for the metadata itself. Since recently SUPPORTED_DEVICES was assigned with a global value and is not empty anymore, append-metadata will now actually put metadata into x86 images. This breaks sysupgrade on x86. To fix it for the moment, let's just empty SUPPORTED_DEVICES for this target again. In the long term, one should either not add metadata to the images if it is not desired, and/or remove the unintended fwtool check. Fixes: f52081bcf938 ("treewide: provide global default for SUPPORTED_DEVICES") Signed-off-by: Adrian Schmutzler Signed-off-by: CN_SZTL --- target/linux/x86/image/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile index 964671a478..efad9782b3 100644 --- a/target/linux/x86/image/Makefile +++ b/target/linux/x86/image/Makefile @@ -9,6 +9,8 @@ include $(INCLUDE_DIR)/image.mk export PATH=$(TARGET_PATH):/sbin +SUPPORTED_DEVICES := + GRUB2_MODULES = biosdisk boot chain configfile ext2 linux ls part_msdos reboot serial vga GRUB2_MODULES_LEGACY = $(GRUB2_MODULES) GRUB2_MODULES_LEGACY += part_gpt search fat exfat