aboutsummaryrefslogtreecommitdiffstats
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
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>
-rw-r--r--include/feeds.mk2
-rw-r--r--include/rootfs.mk2
-rw-r--r--package/Makefile1
-rw-r--r--rules.mk1
-rw-r--r--target/imagebuilder/files/Makefile46
5 files changed, 11 insertions, 41 deletions
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)))
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
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
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)
diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile
index 95f405b8fd..95df8bf113 100644
--- a/target/imagebuilder/files/Makefile
+++ b/target/imagebuilder/files/Makefile
@@ -23,6 +23,7 @@ endif
include rules.mk
include $(INCLUDE_DIR)/debug.mk
include $(INCLUDE_DIR)/depends.mk
+include $(INCLUDE_DIR)/rootfs.mk
include $(INCLUDE_DIR)/version.mk
export REVISION
@@ -54,20 +55,10 @@ help: FORCE
# override variables from rules.mk
PACKAGE_DIR:=$(TOPDIR)/packages
LISTS_DIR:=$(subst $(space),/,$(patsubst %,..,$(subst /,$(space),$(TARGET_DIR))))$(DL_DIR)
-OPKG:= \
- IPKG_NO_SCRIPT=1 \
- IPKG_INSTROOT="$(TARGET_DIR)" \
- $(STAGING_DIR_HOST)/bin/opkg \
+OPKG:=$(call opkg,$(TARGET_DIR)) \
-f $(TOPDIR)/repositories.conf \
- --force-depends \
- --force-overwrite \
- --force-postinstall \
--cache $(DL_DIR) \
- --lists-dir $(LISTS_DIR) \
- --offline-root $(TARGET_DIR) \
- --add-dest root:/ \
- --add-arch all:100 \
- --add-arch $(ARCH_PACKAGES):200
+ --lists-dir $(LISTS_DIR)
include $(INCLUDE_DIR)/target.mk
-include .profiles.mk
@@ -109,14 +100,11 @@ _call_image: staging_dir/host/.prereq-build
echo 'Building images for $(BOARD)$(if $($(USER_PROFILE)_NAME), - $($(USER_PROFILE)_NAME))'
echo 'Packages: $(BUILD_PACKAGES)'
echo
- rm -rf $(TARGET_DIR)
+ rm -rf $(TARGET_DIR) $(TARGET_DIR_ORIG)
mkdir -p $(TARGET_DIR) $(BIN_DIR) $(TMP_DIR) $(DL_DIR)
$(MAKE) package_reload
$(MAKE) package_install
-ifneq ($(USER_FILES),)
- $(MAKE) copy_files
-endif
- $(MAKE) -s package_postinst
+ $(MAKE) -s prepare_rootfs
$(MAKE) -s build_image
$(MAKE) -s checksum
@@ -148,28 +136,13 @@ package_install: FORCE
$(OPKG) install $(firstword $(wildcard $(PACKAGE_DIR)/libc_*.ipk $(PACKAGE_DIR)/base/libc_*.ipk))
$(OPKG) install $(firstword $(wildcard $(PACKAGE_DIR)/kernel_*.ipk $(PACKAGE_DIR)/base/kernel_*.ipk))
$(OPKG) install $(BUILD_PACKAGES)
- rm -f $(TARGET_DIR)/usr/lib/opkg/lists/*
-copy_files: FORCE
+prepare_rootfs: FORCE
@echo
- @echo Copying extra files
- @$(call file_copy,$(USER_FILES)/*,$(TARGET_DIR)/)
+ @echo Finalizing root filesystem...
-package_postinst: FORCE
- @echo
- @echo Cleaning up
- @rm -f $(TARGET_DIR)/tmp/opkg.lock
- @echo
- @echo Activating init scripts
- @mkdir -p $(TARGET_DIR)/etc/rc.d
- @( \
- cd $(TARGET_DIR); \
- for script in ./usr/lib/opkg/info/*.postinst; do \
- IPKG_INSTROOT=$(TARGET_DIR) $$(which bash) $$script; \
- done || true \
- )
- rm -f $(TARGET_DIR)/usr/lib/opkg/info/*.postinst
- $(if $(CONFIG_CLEAN_IPKG),rm -rf $(TARGET_DIR)/usr/lib/opkg)
+ $(CP) $(TARGET_DIR) $(TARGET_DIR_ORIG)
+ $(call prepare_rootfs,$(TARGET_DIR),$(USER_FILES))
build_image: FORCE
@echo
@@ -207,4 +180,3 @@ endif
$(if $(BIN_DIR),BIN_DIR="$(BIN_DIR)"))
.SILENT: help info image
-