include: remove 34k distinction

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

diff --git a/include/image.mk b/include/image.mk
index b5e45ec155ae7d766d7a3984e461a9f5066b554b..c85a9d6505fae02d6713b79d24cc55b36fda8741 100644 (file)
--- a/include/image.mk
+++ b/include/image.mk
@@ -29,6 +29,7 @@ override NO_TRACE_MAKE:=$(_SINGLE)$(NO_TRACE_MAKE)
 
 target_params = $(subst +,$(space),$*)
 param_get = $(patsubst $(1)=%,%,$(filter $(1)=%,$(2)))
+param_get_default = $(firstword $(call param_get,$(1),$(2)) $(3))
 param_mangle = $(subst $(space),_,$(strip $(1)))
 param_unmangle = $(subst _,$(space),$(1))
 
@@ -264,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 \
@@ -289,17 +284,29 @@ mkfs_packages_add = $(filter-out -%,$(mkfs_packages))
 mkfs_packages_remove = $(patsubst -%,%,$(filter -%,$(mkfs_packages)))
 mkfs_cur_target_dir = $(call mkfs_target_dir,pkg=$(target_params))
 
+opkg_target = \
+       $(call opkg,$(mkfs_cur_target_dir)) \
+               -f $(mkfs_cur_target_dir).conf \
+               -l $(mkfs_cur_target_dir).tmp
+
 target-dir-%: FORCE
-       rm -rf $(mkfs_cur_target_dir)
+       rm -rf $(mkfs_cur_target_dir) $(mkfs_cur_target_dir).opkg
        $(CP) $(TARGET_DIR) $(mkfs_cur_target_dir)
-       $(if $(mkfs_packages_add), \
-               $(call opkg,$(mkfs_cur_target_dir)) install \
+       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 $(call opkg_package_files,$(mkfs_packages_add)), \
+               $(opkg_target) update && \
+               $(opkg_target) install \
                        $(call opkg_package_files,$(mkfs_packages_add)))
        $(if $(mkfs_packages_remove), \
                $(call opkg,$(mkfs_cur_target_dir)) remove \
                        $(mkfs_packages_remove))
        $(call Image/mkfs/prepare,$(mkfs_cur_target_dir))
        $(call prepare_rootfs,$(mkfs_cur_target_dir))
+       mv $(mkfs_cur_target_dir).opkg $(mkfs_cur_target_dir)/etc/opkg
+       rm -rf \
+               $(mkfs_cur_target_dir).conf \
+               $(mkfs_cur_target_dir).tmp
 
 $(KDIR)/root.%: kernel_prepare
        $(call Image/mkfs/$(word 1,$(target_params)),$(target_params))
@@ -348,16 +355,17 @@ define Device/Init
   DEVICE_DTS_DIR :=
 
   BOARD_NAME :=
+  UIMAGE_NAME :=
 
   FILESYSTEMS := $(TARGET_FILESYSTEMS)
 endef
 
 DEFAULT_DEVICE_VARS := \
   DEVICE_NAME KERNEL KERNEL_INITRAMFS KERNEL_INITRAMFS_IMAGE \
-  DEVICE_DTS DEVICE_DTS_DIR BOARD_NAME \
+  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))
@@ -556,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