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/feeds.mk | 2 -- 1 file changed, 2 deletions(-) (limited to 'include/feeds.mk') diff --git a/include/feeds.mk b/include/feeds.mk index b85438301c..cecd30424f 100644 --- a/include/feeds.mk +++ b/include/feeds.mk @@ -23,8 +23,6 @@ ifneq ($(CONFIG_PER_FEED_REPO),) endif endif -PACKAGE_DIR_ALL := $(TOPDIR)/staging_dir/packages/$(BOARD) - opkg_package_files = $(wildcard \ $(foreach dir,$(PACKAGE_SUBDIRS), \ $(foreach pkg,$(1), $(dir)/$(pkg)_*.ipk))) -- cgit v1.2.3