From f505fb07f3e5de20ec244fab0badacb9f77110ee Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 6 Mar 2018 14:42:37 +0100 Subject: [PATCH] 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 --- include/image.mk | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/include/image.mk b/include/image.mk index 1cd8b758171a..0711ebbdf304 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 -- 2.30.2