X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=target%2Fimagebuilder%2Ffiles%2FMakefile;h=03a95dbf6ef14fdddb2fb9ca1752e31661984dee;hp=d2afd0e8448aa8b425ea5816c3e11a4bff9e0461;hb=2999f810ff2c968e6bbe5b2fd32cfbd80f83570a;hpb=1b555e1d2b1cb2ae3dd1832225e6c9d2c5df0a37 diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile index d2afd0e844..03a95dbf6e 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 @@ -44,6 +45,15 @@ Building images: make image FILES="" # include extra files from make image BIN_DIR="" # alternative output directory for the images make image EXTRA_IMAGE_NAME="" # Add this to the output image filename (sanitized) + make image DISABLED_SERVICES=" [ [ ..]]" # Which services in /etc/init.d/ should be disabled + +Print manifest: + List "all" packages which get installed into the image. + You can use the following parameters: + + make manifest PROFILE="" # override the default target profile + make manifest PACKAGES=" [ [ ...]]" # include extra packages + endef $(eval $(call shexport,Helptext)) @@ -54,35 +64,27 @@ 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 USER_PROFILE ?= $(firstword $(PROFILE_NAMES)) PROFILE_LIST = $(foreach p,$(PROFILE_NAMES), \ - echo '$(patsubst DEVICE_%,%,$(p)):'; $(if $($(p)_NAME),echo ' $(subst ','"'"',$($(p)_NAME))'; ) echo ' Packages: $($(p)_PACKAGES)'; \ -) + echo '$(patsubst DEVICE_%,%,$(p)):'; $(if $($(p)_NAME),echo ' $(subst ','"'"',$($(p)_NAME))'; ) \ + echo ' Packages: $($(p)_PACKAGES)'; echo ' hasImageMetadata: $($(p)_HAS_IMAGE_METADATA)'; \ + $(if $($(p)_SUPPORTED_DEVICES),echo ' SupportedDevices: $($(p)_SUPPORTED_DEVICES)';) ) + .profiles.mk: .targetinfo @$(SCRIPT_DIR)/target-metadata.pl profile_mk $< '$(BOARD)$(if $(SUBTARGET),/$(SUBTARGET))' > $@ staging_dir/host/.prereq-build: include/prereq-build.mk mkdir -p tmp - @$(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f $(TOPDIR)/include/prereq-build.mk prereq 2>/dev/null || { \ + @$(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f $(TOPDIR)/include/prereq-build.mk prereq IB=1 2>/dev/null || { \ echo "Prerequisite check failed. Use FORCE=1 to override."; \ false; \ } @@ -95,7 +97,8 @@ staging_dir/host/.prereq-build: include/prereq-build.mk touch $@ _call_info: FORCE - echo 'Current Target: "$(BOARD)$(if $(SUBTARGET), ($(BOARDNAME)))"' + echo 'Current Target: "$(TARGETID)"' + echo 'Current Revision: "$(REVISION)"' echo 'Default Packages: $(DEFAULT_PACKAGES)' echo 'Available Profiles:' echo; $(PROFILE_LIST) @@ -109,17 +112,22 @@ _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 json_overview_image_info $(MAKE) -s checksum +_call_manifest: FORCE + rm -rf $(TARGET_DIR) + mkdir -p $(TARGET_DIR) $(BIN_DIR) $(TMP_DIR) $(DL_DIR) + $(MAKE) package_reload >/dev/null + $(MAKE) package_install >/dev/null + $(OPKG) list-installed + package_index: FORCE @echo >&2 @echo Building package index... >&2 @@ -140,43 +148,38 @@ package_reload: package_list: FORCE @$(MAKE) -s package_reload - @$(OPKG) list --size 2>/dev/null | awk -F" - " '{printf "%s %s %s\n", $$1, $$2, $$3}' + @$(OPKG) list --size 2>/dev/null package_install: FORCE @echo @echo Installing packages... - $(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 $(firstword $(wildcard $(LINUX_DIR)/libc_*.ipk $(PACKAGE_DIR)/libc_*.ipk)) + $(OPKG) install $(firstword $(wildcard $(LINUX_DIR)/kernel_*.ipk $(PACKAGE_DIR)/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... + + $(CP) $(TARGET_DIR) $(TARGET_DIR_ORIG) + $(call prepare_rootfs,$(TARGET_DIR),$(USER_FILES),$(DISABLED_SERVICES)) -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) build_image: FORCE @echo @echo Building images... + rm -rf $(BUILD_DIR)/json_info_files/ $(NO_TRACE_MAKE) -C target/linux/$(BOARD)/image install TARGET_BUILD=1 IB=1 EXTRA_IMAGE_NAME="$(EXTRA_IMAGE_NAME)" \ $(if $(USER_PROFILE),PROFILE="$(USER_PROFILE)") +$(BIN_DIR)/profiles.json: FORCE + $(if $(CONFIG_JSON_OVERVIEW_IMAGE_INFO), \ + WORK_DIR=$(BUILD_DIR)/json_info_files \ + $(SCRIPT_DIR)/json_overview_image_info.py $@ \ + ) + +json_overview_image_info: $(BIN_DIR)/profiles.json + checksum: FORCE @echo @echo Calculating checksums... @@ -191,7 +194,7 @@ info: PROFILE_FILTER = $(filter DEVICE_$(PROFILE) $(PROFILE),$(PROFILE_NAMES)) -image: +_check_profile: FORCE ifneq ($(PROFILE),) ifeq ($(PROFILE_FILTER),) @echo 'Profile "$(PROFILE)" does not exist!' @@ -199,12 +202,30 @@ ifneq ($(PROFILE),) @exit 1 endif endif + +image: + $(MAKE) -s _check_profile (unset PROFILE FILES PACKAGES MAKEFLAGS; \ $(MAKE) -s _call_image \ $(if $(PROFILE),USER_PROFILE="$(PROFILE_FILTER)") \ $(if $(FILES),USER_FILES="$(FILES)") \ $(if $(PACKAGES),USER_PACKAGES="$(PACKAGES)") \ - $(if $(BIN_DIR),BIN_DIR="$(BIN_DIR)")) + $(if $(BIN_DIR),BIN_DIR="$(BIN_DIR)") \ + $(if $(DISABLED_SERVICES),DISABLED_SERVICES="$(DISABLED_SERVICES)")) -.SILENT: help info image +manifest: FORCE + $(MAKE) -s _check_profile + (unset PROFILE FILES PACKAGES MAKEFLAGS; \ + $(MAKE) -s _call_manifest \ + $(if $(PROFILE),USER_PROFILE="$(PROFILE_FILTER)") \ + $(if $(PACKAGES),USER_PACKAGES="$(PACKAGES)")) + +whatdepends: FORCE +ifeq ($(PACKAGE),) + @echo 'Variable `PACKAGE` is not set but required by `whatdepends`' + @exit 1 +endif + @$(MAKE) -s package_reload + @$(OPKG) whatdepends -A $(PACKAGE) +.SILENT: help info image manifest whatdepends