From 2fbf669730bfa7342b36711d275bfe4c7951ac1b Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 6 Mar 2018 09:38:29 +0100 Subject: imagebuilder: reuse rootfs preparation from rootfs.mk In addition to removing redundant code, this fixes various issues in IB-generated images that have been fixed in prepare_rootfs before, including better handling of CONFIG_CLEAN_IPKG and enabling of initscripts from FILES. We also reuse the opkg macro and remove --force-... flags that have been removed from rootfs.mk as well. Signed-off-by: Matthias Schiffer --- rules.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'rules.mk') diff --git a/rules.mk b/rules.mk index 84e0aaadc6..a97b2d2155 100644 --- a/rules.mk +++ b/rules.mk @@ -144,6 +144,7 @@ ifeq ($(or $(CONFIG_EXTERNAL_TOOLCHAIN),$(CONFIG_GCC_VERSION_4_8),$(CONFIG_TARGE endif PACKAGE_DIR:=$(BIN_DIR)/packages +PACKAGE_DIR_ALL:=$(TOPDIR)/staging_dir/packages/$(BOARD) BUILD_DIR:=$(BUILD_DIR_BASE)/$(TARGET_DIR_NAME) STAGING_DIR:=$(TOPDIR)/staging_dir/$(TARGET_DIR_NAME) BUILD_DIR_TOOLCHAIN:=$(BUILD_DIR_BASE)/$(TOOLCHAIN_DIR_NAME) -- cgit v1.2.3