From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Sat, 23 Jan 2021 21:09:27 +0000 (+0100)
Subject: x86: fix upgrade by emptying SUPPORTED_DEVICES
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=29167cbca3653de05a8b915bc21327dac7d05174;p=openwrt%2Fstaging%2Fzorun.git

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 <freifunk@adrianschmutzler.de>
---

diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile
index 85c850c128..81aab20666 100644
--- a/target/linux/x86/image/Makefile
+++ b/target/linux/x86/image/Makefile
@@ -144,6 +144,7 @@ define Device/Default
   endif
   IMAGES := $$(IMAGES-y)
   ARTIFACTS := $$(ARTIFACTS-y)
+  SUPPORTED_DEVICES :=
 endef
 
 include $(SUBTARGET).mk