[openwrt/openwrt] include/image.mk: base package-list manifest on unprepared rootfs

[LEDE Commits]

neoraider pushed a commit to openwrt/openwrt.git, branch master:
https://git.lede-project.org/f505fb07f3e5de20ec244fab0badacb9f77110ee

commit f505fb07f3e5de20ec244fab0badacb9f77110ee
Author: Matthias Schiffer <mschiffer at universe-factory.net>
AuthorDate: Tue Mar 6 14:42:37 2018 +0100

    include/image.mk: base package-list manifest on unprepared rootfs
    
    With CONFIG_CLEAN_IPKG, the prepared rootfs does not have a full opkg
    status file.
    
    Signed-off-by: Matthias Schiffer <mschiffer at universe-factory.net>
---
 include/image.mk | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/include/image.mk b/include/image.mk
index 1cd8b75..0711ebb 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -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