kernel: update kernel 4.4 to version 4.4.19

[openwrt/openwrt.git] / include / image.mk

diff --git a/include/image.mk b/include/image.mk
index 91862c42a55c2b39369b53660e413bc1a1b65c88..c85a9d6505fae02d6713b79d24cc55b36fda8741 100644 (file)
--- a/include/image.mk
+++ b/include/image.mk
@@ -294,7 +294,7 @@ target-dir-%: FORCE
        $(CP) $(TARGET_DIR) $(mkfs_cur_target_dir)
        mv $(mkfs_cur_target_dir)/etc/opkg $(mkfs_cur_target_dir).opkg
        echo 'src default file://$(PACKAGE_DIR_ALL)' > $(mkfs_cur_target_dir).conf
-       $(if $(mkfs_packages_add), \
+       $(if $(call opkg_package_files,$(mkfs_packages_add)), \
                $(opkg_target) update && \
                $(opkg_target) install \
                        $(call opkg_package_files,$(mkfs_packages_add)))
@@ -355,6 +355,7 @@ define Device/Init
   DEVICE_DTS_DIR :=
 
   BOARD_NAME :=
+  UIMAGE_NAME :=
 
   FILESYSTEMS := $(TARGET_FILESYSTEMS)
 endef
@@ -364,7 +365,7 @@ DEFAULT_DEVICE_VARS := \
   DEVICE_DTS DEVICE_DTS_DIR BOARD_NAME CMDLINE \
   UBOOTENV_IN_UBI KERNEL_IN_UBI \
   BLOCKSIZE PAGESIZE SUBPAGESIZE VID_HDR_OFFSET \
-  UBINIZE_OPTS
+  UBINIZE_OPTS UIMAGE_NAME
 
 define Device/ExportVar
   $(1) : $(2):=$$($(2))