build: drop UBI EOF marker from images by default

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

diff --git a/include/image.mk b/include/image.mk
index 91862c42a55c2b39369b53660e413bc1a1b65c88..8cc6e38cad672fb6fadff018c38cfaf2e1ddcfa8 100644 (file)
--- a/include/image.mk
+++ b/include/image.mk
@@ -264,6 +264,13 @@ define Image/mkfs/prepare
        $(call Image/mkfs/prepare/default,$(1))
 endef
 
+define Image/Manifest
+       $(STAGING_DIR_HOST)/bin/opkg \
+               --offline-root $(TARGET_DIR) \
+               --add-arch all:100 \
+               --add-arch $(if $(ARCH_PACKAGES),$(ARCH_PACKAGES),$(BOARD)):200 list-installed > \
+               $(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED)).manifest
+endef
 
 ifdef CONFIG_TARGET_ROOTFS_TARGZ
   define Image/Build/targz
@@ -294,7 +301,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)))
@@ -346,7 +353,8 @@ define Device/Init
   PAGESIZE :=
   SUBPAGESIZE :=
   VID_HDR_OFFSET :=
-  UBINIZE_OPTS := -E 5
+  UBINIZE_OPTS :=
+  UBINIZE_PARTS :=
   MKUBIFS_OPTS :=
 
   FS_OPTIONS/ubifs = $$(MKUBIFS_OPTS)
@@ -355,6 +363,7 @@ define Device/Init
   DEVICE_DTS_DIR :=
 
   BOARD_NAME :=
+  UIMAGE_NAME :=
 
   FILESYSTEMS := $(TARGET_FILESYSTEMS)
 endef
@@ -364,7 +373,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 UBINIZE_PARTS
 
 define Device/ExportVar
   $(1) : $(2):=$$($(2))
@@ -563,5 +572,6 @@ define BuildImage
        $(MAKE) legacy-images
 
   install: install-images
+       $(call Image/Manifest)
 
 endef