tools/scons: update to 2.5.0

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

diff --git a/include/image.mk b/include/image.mk
index 415618d393dadd4227b6d046913a11b3e59d7ef5..c85a9d6505fae02d6713b79d24cc55b36fda8741 100644 (file)
--- a/include/image.mk
+++ b/include/image.mk
@@ -265,12 +265,6 @@ define Image/mkfs/prepare
 endef
 
 
-define Image/Checksum
-       ( cd ${BIN_DIR} ; \
-               $(FIND) -maxdepth 1 -type f \! -name 'md5sums'  -printf "%P\n" | sort | xargs $1 > $2 \
-       )
-endef
-
 ifdef CONFIG_TARGET_ROOTFS_TARGZ
   define Image/Build/targz
        $(TAR) -cp --numeric-owner --owner=0 --group=0 --sort=name \
@@ -300,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)))
@@ -361,6 +355,7 @@ define Device/Init
   DEVICE_DTS_DIR :=
 
   BOARD_NAME :=
+  UIMAGE_NAME :=
 
   FILESYSTEMS := $(TARGET_FILESYSTEMS)
 endef
@@ -370,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))
@@ -569,7 +564,5 @@ define BuildImage
        $(MAKE) legacy-images
 
   install: install-images
-       $(call Image/Checksum,md5sum --binary,md5sums)
-       $(call Image/Checksum,openssl dgst -sha256,sha256sums)
 
 endef