aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2018-03-06 14:42:37 +0100
committerMatthias Schiffer <mschiffer@universe-factory.net>2018-03-07 09:59:08 +0100
commitf505fb07f3e5de20ec244fab0badacb9f77110ee (patch)
tree3562e19acbd849fddb6c75e2ded93ab298a6de87
parenta02a69d5f8a82aec2df7ad14018366d37b68ec11 (diff)
downloadupstream-f505fb07f3e5de20ec244fab0badacb9f77110ee.tar.gz
upstream-f505fb07f3e5de20ec244fab0badacb9f77110ee.tar.bz2
upstream-f505fb07f3e5de20ec244fab0badacb9f77110ee.zip
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@universe-factory.net>
-rw-r--r--include/image.mk10
1 files changed, 2 insertions, 8 deletions
diff --git a/include/image.mk b/include/image.mk
index 1cd8b75817..0711ebbdf3 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