diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2018-03-06 09:38:29 +0100 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2018-03-07 09:59:08 +0100 |
| commit | 2fbf669730bfa7342b36711d275bfe4c7951ac1b (patch) | |
| tree | 62a27c9ecfb6bbd5568cd396fbe7ddd8fe75b404 /target/imagebuilder/files | |
| parent | cf1c7c0f17a45bba3e7ce1a3cd3f8f7efa7196c4 (diff) | |
| download | openwrt-2fbf669730bfa7342b36711d275bfe4c7951ac1b.tar.gz openwrt-2fbf669730bfa7342b36711d275bfe4c7951ac1b.tar.bz2 openwrt-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 'target/imagebuilder/files')
| -rw-r--r-- | target/imagebuilder/files/Makefile | 46 |
1 files changed, 9 insertions, 37 deletions
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 - |