aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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