X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=target%2Fimagebuilder%2Ffiles%2FMakefile;h=baa0e1f271993d1d063c55f045cf7eaf413559f7;hp=2e1e82f866ad071f6eda2ad0b966d1e898fad207;hb=1d0f7e3136c7f72852fe91c1ec95863b1f4ace15;hpb=8c1d9afc409fa26245256b91eb045a2f50f54c92 diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile index 2e1e82f866..baa0e1f271 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. @@ -10,7 +10,7 @@ TOPDIR:=${CURDIR} LC_ALL:=C LANG:=C export TOPDIR LC_ALL LANG -export KBUILD_VERBOSE=99 +export OPENWRT_VERBOSE=s all: help include $(TOPDIR)/include/host.mk @@ -38,11 +38,12 @@ Building images: By default 'make image' will create an image with the default target profile and package set. You can use the following parameters to change that: - + make image PROFILE="" # override the default target profile 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)) @@ -52,29 +53,47 @@ 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_INSTROOT="$(TARGET_DIR)" \ - IPKG_CONF_DIR="$(TOPDIR)/tmp" \ - IPKG_OFFLINE_ROOT="$(TARGET_DIR)" \ $(STAGING_DIR_HOST)/bin/opkg \ - -f $(TOPDIR)/tmp/opkg.conf \ - --force-depends \ - --force-overwrite - -define Profile - $(eval $(call Profile/Default)) - $(eval $(call Profile/$(1))) - ifeq ($(USER_PROFILE),) - USER_PROFILE:=$(1) - endif - $(1)_NAME:=$(NAME) - $(1)_PACKAGES:=$(PACKAGES) - PROFILE_LIST += \ - echo '$(1):'; [ -z '$(NAME)' ] || echo ' $(NAME)'; echo ' Packages: $(PACKAGES)'; -endef + -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 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)'; \ +) + +.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 + 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)))"' @@ -82,54 +101,53 @@ _call_info: FORCE echo 'Available Profiles:' echo; $(PROFILE_LIST) -$(TOPDIR)/tmp/opkg.conf: FORCE - @mkdir -p $(TOPDIR)/tmp - @mkdir -p $(TARGET_DIR)/tmp - @echo 'dest root /' > $@ - @echo 'src packages file:$(PACKAGE_DIR)' >> $@ - @echo 'arch all 100' >> $@ - ifneq ($(CONFIG_TARGET_adm5120),y) - @echo 'arch $(BOARD) 200' >> $@ - else - @echo 'arch $(BOARD)_$(ARCH) 200' >> $@ - endif - @echo 'option offline_root $(TARGET_DIR)' >> $@ - -BUILD_PACKAGES:=$(sort $(DEFAULT_PACKAGES) $(USER_PACKAGES) $($(USER_PROFILE)_PACKAGES) kernel) +BUILD_PACKAGES:=$(USER_PACKAGES) $(sort $(DEFAULT_PACKAGES) $($(USER_PROFILE)_PACKAGES) kernel) # "-pkgname" in the package list means remove "pkgname" from the package list 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) - $(MAKE) package_index + 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 || true; \ + fi $(MAKE) package_install ifneq ($(USER_FILES),) $(MAKE) copy_files endif - $(MAKE) package_postinst - $(MAKE) build_image - -package_index: $(TOPDIR)/tmp/opkg.conf FORCE + $(MAKE) -s package_postinst + $(MAKE) -s build_image + $(MAKE) -s checksum + +package_index: FORCE @echo @echo Building package index... + @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 @@ -137,32 +155,50 @@ 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)") + +checksum: FORCE + @echo + @echo Calculating checksums... + @$(call sha256sums,$(BIN_DIR)) + clean: - rm -rf tmp $(TARGET_DIR) $(BIN_DIR) + rm -rf $(TMP_DIR) $(DL_DIR) $(TARGET_DIR) $(BIN_DIR) info: (unset PROFILE FILES PACKAGES MAKEFLAGS; $(MAKE) -s _call_info) +PROFILE_FILTER = $(filter DEVICE_$(PROFILE) $(PROFILE),$(PROFILE_NAMES)) + image: +ifneq ($(PROFILE),) + ifeq ($(PROFILE_FILTER),) + @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)") \ + $(MAKE) -s _call_image \ + $(if $(PROFILE),USER_PROFILE="$(PROFILE_FILTER)") \ $(if $(FILES),USER_FILES="$(FILES)") \ - $(if $(PACKAGES),USER_PACKAGES="$(PACKAGES)")) + $(if $(PACKAGES),USER_PACKAGES="$(PACKAGES)") \ + $(if $(BIN_DIR),BIN_DIR="$(BIN_DIR)")) .SILENT: help info image