X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=target%2Fimagebuilder%2Ffiles%2FMakefile;h=1056a42ca31a8407f306e01b5b92ca1fbfca3fc6;hp=c1177f1ba3bb478c25162a6096f3c7966d20961f;hb=HEAD;hpb=7470f0e2b32b351a9b60e51bd0aa279fbc18755f diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile index c1177f1ba3..1056a42ca3 100644 --- a/target/imagebuilder/files/Makefile +++ b/target/imagebuilder/files/Makefile @@ -1,6 +1,6 @@ # Makefile for OpenWrt # -# Copyright (C) 2007-2010 OpenWrt.org +# Copyright (C) 2007-2015 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -43,7 +43,7 @@ Building images: make image PACKAGES=" [ [ ...]]" # include extra packages 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) endef $(eval $(call shexport,Helptext)) @@ -53,17 +53,20 @@ help: FORCE # override variables from rules.mk PACKAGE_DIR:=$(TOPDIR)/packages +LISTS_DIR:=$(subst $(space),/,$(patsubst %,..,$(subst /,$(space),$(TARGET_DIR))))$(DL_DIR) OPKG:= \ - IPKG_TMP="$(TOPDIR)/tmp/ipkgtmp" \ + IPKG_NO_SCRIPT=1 \ + IPKG_TMP="$(TMP_DIR)/ipkgtmp" \ IPKG_INSTROOT="$(TARGET_DIR)" \ - IPKG_CONF_DIR="$(TOPDIR)/tmp" \ + IPKG_CONF_DIR="$(TMP_DIR)" \ IPKG_OFFLINE_ROOT="$(TARGET_DIR)" \ $(STAGING_DIR_HOST)/bin/opkg \ -f $(TOPDIR)/repositories.conf \ --force-depends \ --force-overwrite \ --force-postinstall \ - --cache $(TOPDIR)/dl \ + --cache $(DL_DIR) \ + --lists-dir $(LISTS_DIR) \ --offline-root $(TARGET_DIR) \ --add-dest root:/ \ --add-arch all:100 \ @@ -77,12 +80,28 @@ define Profile endif $(1)_NAME:=$(NAME) $(1)_PACKAGES:=$(PACKAGES) + PROFILE_NAMES += $(1) PROFILE_LIST += \ echo '$(1):'; [ -z '$(NAME)' ] || echo ' $(NAME)'; echo ' Packages: $(PACKAGES)'; endef include $(INCLUDE_DIR)/target.mk +staging_dir/host/.prereq-build: include/prereq-build.mk + mkdir -p tmp + rm -f tmp/.host.mk + @$(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f $(TOPDIR)/include/prereq-build.mk prereq 2>/dev/null || { \ + echo "Prerequisite check failed. Use FORCE=1 to override."; \ + false; \ + } + ifneq ($(realpath $(TOPDIR)/include/prepare.mk),) + @$(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f $(TOPDIR)/include/prepare.mk prepare 2>/dev/null || { \ + echo "Preparation failed."; \ + false; \ + } + endif + touch $@ + _call_info: FORCE echo 'Current Target: "$(BOARD)$(if $(SUBTARGET), ($(BOARDNAME)))"' echo 'Default Packages: $(DEFAULT_PACKAGES)' @@ -94,18 +113,18 @@ BUILD_PACKAGES:=$(sort $(DEFAULT_PACKAGES) $(USER_PACKAGES) $($(USER_PROFILE)_PA BUILD_PACKAGES:=$(filter-out $(filter -%,$(BUILD_PACKAGES)) $(patsubst -%,%,$(filter -%,$(BUILD_PACKAGES))),$(BUILD_PACKAGES)) PACKAGES:= -_call_image: +_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) - mkdir -p $(TARGET_DIR) $(BIN_DIR) $(TMP_DIR) + mkdir -p $(TARGET_DIR) $(BIN_DIR) $(TMP_DIR) $(DL_DIR) if [ ! -f "$(PACKAGE_DIR)/Packages" ] || [ ! -f "$(PACKAGE_DIR)/Packages.gz" ] || [ "`find $(PACKAGE_DIR) -cnewer $(PACKAGE_DIR)/Packages.gz`" ]; then \ echo "Package list missing or not up-to-date, generating it.";\ $(MAKE) package_index; \ else \ mkdir -p $(TARGET_DIR)/tmp; \ - $(OPKG) update; \ + $(OPKG) update || true; \ fi $(MAKE) package_install ifneq ($(USER_FILES),) @@ -117,22 +136,24 @@ endif package_index: FORCE @echo @echo Building package index... - @mkdir -p $(TOPDIR)/tmp $(TOPDIR)/dl $(TARGET_DIR)/tmp + @mkdir -p $(TMP_DIR) $(TARGET_DIR)/tmp (cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages && \ - gzip -9c Packages > Packages.gz \ + gzip -9nc Packages > Packages.gz \ ) >/dev/null 2>/dev/null - $(OPKG) update + $(OPKG) update || true 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 $(BUILD_PACKAGES) rm -f $(TARGET_DIR)/usr/lib/opkg/lists/* copy_files: FORCE @echo @echo Copying extra files - $(CP) $(USER_FILES)/* $(TARGET_DIR)/ + @$(call file_copy,$(USER_FILES)/*,$(TARGET_DIR)/) package_postinst: FORCE @echo @@ -140,29 +161,37 @@ package_postinst: FORCE @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 ./etc/init.d/*; do \ - grep '#!/bin/sh /etc/rc.common' $$script >/dev/null || continue; \ - IPKG_INSTROOT=$(TARGET_DIR) $(which bash) ./etc/rc.common $$script enable; \ - done || true; \ + 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... - $(NO_TRACE_MAKE) -C target/linux/$(BOARD)/image install TARGET_BUILD=1 IB=1 \ + $(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)") clean: - rm -rf $(TOPDIR)/tmp $(TOPDIR)/dl $(TARGET_DIR) $(BIN_DIR) + rm -rf $(TMP_DIR) $(DL_DIR) $(TARGET_DIR) $(BIN_DIR) info: (unset PROFILE FILES PACKAGES MAKEFLAGS; $(MAKE) -s _call_info) image: +ifneq ($(PROFILE),) + ifeq ($(filter $(PROFILE),$(PROFILE_NAMES)),) + @echo 'Profile "$(PROFILE)" does not exist!' + @echo 'Use "make info" to get a list of available profile names.' + @exit 1 + endif +endif (unset PROFILE FILES PACKAGES MAKEFLAGS; \ $(MAKE) _call_image \ $(if $(PROFILE),USER_PROFILE="$(PROFILE)") \