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 --- include/rootfs.mk | 2 -- 1 file changed, 2 deletions(-) (limited to 'include/rootfs.mk') 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 -- cgit v1.2.3