aboutsummaryrefslogtreecommitdiffstats
path: root/rules.mk
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2018-03-06 09:38:29 +0100
committerMatthias Schiffer <mschiffer@universe-factory.net>2018-03-07 09:59:08 +0100
commit2fbf669730bfa7342b36711d275bfe4c7951ac1b (patch)
tree62a27c9ecfb6bbd5568cd396fbe7ddd8fe75b404 /rules.mk
parentcf1c7c0f17a45bba3e7ce1a3cd3f8f7efa7196c4 (diff)
downloadupstream-2fbf669730bfa7342b36711d275bfe4c7951ac1b.tar.gz
upstream-2fbf669730bfa7342b36711d275bfe4c7951ac1b.tar.bz2
upstream-2fbf669730bfa7342b36711d275bfe4c7951ac1b.zip
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 <mschiffer@universe-factory.net>
Diffstat (limited to 'rules.mk')
-rw-r--r--rules.mk1
1 files changed, 1 insertions, 0 deletions
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)