include/image.mk: base package-list manifest on unprepared rootfs
authorMatthias Schiffer <mschiffer@universe-factory.net>
Tue, 6 Mar 2018 13:42:37 +0000 (14:42 +0100)
committerMatthias Schiffer <mschiffer@universe-factory.net>
Wed, 7 Mar 2018 08:59:08 +0000 (09:59 +0100)
With CONFIG_CLEAN_IPKG, the prepared rootfs does not have a full opkg
status file.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
include/image.mk

index 1cd8b75..0711ebb 100644 (file)
@@ -18,10 +18,7 @@ ifndef IB
 endif
 
 include $(INCLUDE_DIR)/image-legacy.mk
-
-ifdef TARGET_PER_DEVICE_ROOTFS
-  include $(INCLUDE_DIR)/rootfs.mk
-endif
+include $(INCLUDE_DIR)/rootfs.mk
 
 override MAKE:=$(_SINGLE)$(SUBMAKE)
 override NO_TRACE_MAKE:=$(_SINGLE)$(NO_TRACE_MAKE)
@@ -261,10 +258,7 @@ define Image/mkfs/ext4
 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 > \
+       $(call opkg,$(TARGET_DIR_ORIG)) list-installed > \
                $(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED)).manifest
 endef