summaryrefslogtreecommitdiff
path: root/include/rootfs.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 /include/rootfs.mk
parentcf1c7c0f17a45bba3e7ce1a3cd3f8f7efa7196c4 (diff)
downloadopenwrt-2fbf669730bfa7342b36711d275bfe4c7951ac1b.tar.gz
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 'include/rootfs.mk')
-rw-r--r--include/rootfs.mk2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/rootfs.mk b/include/rootfs.mk
index bf26dd2415..76425c017a 100644
--- a/include/rootfs.mk
+++ b/include/rootfs.mk
@@ -1,5 +1,3 @@
-include $(INCLUDE_DIR)/feeds.mk
-
ifdef CONFIG_USE_MKLIBS
define mklibs
rm -rf $(TMP_DIR)/mklibs-progs $(TMP_DIR)/mklibs-out