diff options
| author | Paul Spooren <mail@aparcar.org> | 2020-02-11 17:27:24 -1000 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2020-02-13 17:45:46 +0100 |
| commit | 73f3ad1df2e1d33d3d5aae4fd2093aa80406cc4a (patch) | |
| tree | 9c62c9599a7d836a7f1740eda4c19578a0657311 | |
| parent | cd5dbba9056faf5224561a82e7dec11ce2dbc8cd (diff) | |
| download | upstream-73f3ad1df2e1d33d3d5aae4fd2093aa80406cc4a.tar.gz upstream-73f3ad1df2e1d33d3d5aae4fd2093aa80406cc4a.tar.bz2 upstream-73f3ad1df2e1d33d3d5aae4fd2093aa80406cc4a.zip | |
build: fix empty SUBTARGET in json files
Some targets like kirkwood or omap don't use a subtarget which results
in a malformed JSON info file.
Instead of having a valid value like `"target": "ath79/tiny"` for these
targets the value is `"target": "kirkwood/"`.
This patch uses the same if condition to use `generic` if the subtarget
is empty.
Tested for the kirkwood target.
Signed-off-by: Paul Spooren <mail@aparcar.org>
| -rw-r--r-- | include/image.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/image.mk b/include/image.mk index 46d592e8dc..fd04d4020b 100644 --- a/include/image.mk +++ b/include/image.mk @@ -588,7 +588,7 @@ define Device/Build/image DEVICE_ALT2_VARIANT="$(DEVICE_ALT2_VARIANT)" \ DEVICE_TITLE="$(DEVICE_TITLE)" \ TARGET="$(BOARD)" \ - SUBTARGET="$(SUBTARGET)" \ + SUBTARGET="$(if $(SUBTARGET),$(SUBTARGET),generic)" \ VERSION_NUMBER="$(VERSION_NUMBER)" \ VERSION_CODE="$(VERSION_CODE)" \ SUPPORTED_DEVICES="$(SUPPORTED_DEVICES)" \ |