aboutsummaryrefslogtreecommitdiffstats
path: root/package/Makefile
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 /package/Makefile
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 'package/Makefile')
-rw-r--r--package/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/package/Makefile b/package/Makefile
index a83b350b06..610d09d6fe 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -7,6 +7,7 @@
curdir:=package
+include $(INCLUDE_DIR)/feeds.mk
include $(INCLUDE_DIR)/rootfs.mk
-include $(TMP_DIR)/.packagedeps