| Message ID | 20210602200958.792410-1-mail@aparcar.org |
|---|---|
| State | Accepted |
| Delegated to: | Paul Spooren |
| Headers | show |
| Series | build/json: fix DEVICE_PACKAGES | expand |
LGTM. Reviewed-by: Philip Prindeville <philipp@redfish-solutions.com> We were chatting in IRC and it seems to me that there's other cleanup that needs to happen in include/image.mk but we can discuss that out-of-band. > On Jun 2, 2021, at 2:09 PM, Paul Spooren <mail@aparcar.org> wrote: > > The variable was missing in the definition of DEFAULT_DEVICE_VARS which > caused it to contain wrong values, messing up the resulting JSON files. > > This patch adds the variable DEVICE_PACKAGES to DEFAULT_DEVICE_VARS. > > Suggested-by: Baptiste Jonglez <git@bitsofnetworks.org> > Signed-off-by: Paul Spooren <mail@aparcar.org> > --- > include/image.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/image.mk b/include/image.mk > index afefc2bb0b..c8b33a40bb 100644 > --- a/include/image.mk > +++ b/include/image.mk > @@ -431,7 +431,7 @@ DEFAULT_DEVICE_VARS := \ > DEVICE_IMG_PREFIX SOC BOARD_NAME UIMAGE_MAGIC UIMAGE_NAME \ > SUPPORTED_DEVICES IMAGE_METADATA KERNEL_ENTRY KERNEL_LOADADDR \ > UBOOT_PATH IMAGE_SIZE \ > - DEVICE_COMPAT_VERSION DEVICE_COMPAT_MESSAGE \ > + DEVICE_PACKAGES DEVICE_COMPAT_VERSION DEVICE_COMPAT_MESSAGE \ > DEVICE_VENDOR DEVICE_MODEL DEVICE_VARIANT \ > DEVICE_ALT0_VENDOR DEVICE_ALT0_MODEL DEVICE_ALT0_VARIANT \ > DEVICE_ALT1_VENDOR DEVICE_ALT1_MODEL DEVICE_ALT1_VARIANT \ > -- > 2.30.2 > > > _______________________________________________ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/mailman/listinfo/openwrt-devel
diff --git a/include/image.mk b/include/image.mk index afefc2bb0b..c8b33a40bb 100644 --- a/include/image.mk +++ b/include/image.mk @@ -431,7 +431,7 @@ DEFAULT_DEVICE_VARS := \ DEVICE_IMG_PREFIX SOC BOARD_NAME UIMAGE_MAGIC UIMAGE_NAME \ SUPPORTED_DEVICES IMAGE_METADATA KERNEL_ENTRY KERNEL_LOADADDR \ UBOOT_PATH IMAGE_SIZE \ - DEVICE_COMPAT_VERSION DEVICE_COMPAT_MESSAGE \ + DEVICE_PACKAGES DEVICE_COMPAT_VERSION DEVICE_COMPAT_MESSAGE \ DEVICE_VENDOR DEVICE_MODEL DEVICE_VARIANT \ DEVICE_ALT0_VENDOR DEVICE_ALT0_MODEL DEVICE_ALT0_VARIANT \ DEVICE_ALT1_VENDOR DEVICE_ALT1_MODEL DEVICE_ALT1_VARIANT \
The variable was missing in the definition of DEFAULT_DEVICE_VARS which caused it to contain wrong values, messing up the resulting JSON files. This patch adds the variable DEVICE_PACKAGES to DEFAULT_DEVICE_VARS. Suggested-by: Baptiste Jonglez <git@bitsofnetworks.org> Signed-off-by: Paul Spooren <mail@aparcar.org> --- include/image.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)