X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Fimagebuilder%2Ffiles%2FMakefile;h=2e1e82f866ad071f6eda2ad0b966d1e898fad207;hb=8c1d9afc409fa26245256b91eb045a2f50f54c92;hp=fbcfa0d49aa5a2a795f733483891ddb802fb8dbf;hpb=7cb45c3be851b1f8e8c97c4e39794371e5913b63;p=openwrt%2Fstaging%2Fmkresin.git diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile index fbcfa0d49a..2e1e82f866 100644 --- a/target/imagebuilder/files/Makefile +++ b/target/imagebuilder/files/Makefile @@ -1,57 +1,31 @@ -# Makefile for the OpenWrt Image Builder +# Makefile for OpenWrt # -# Copyright (C) 2006-2007 OpenWrt.org +# Copyright (C) 2007-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -export TOPDIR=${CURDIR} - +TOPDIR:=${CURDIR} +LC_ALL:=C +LANG:=C +export TOPDIR LC_ALL LANG +export KBUILD_VERBOSE=99 all: help -include rules.mk -include .config +include $(TOPDIR)/include/host.mk -SHELL:=/usr/bin/env bash -export LC_ALL=C -export LANG=C -ifeq ($(KBUILD_VERBOSE),99) - MAKE:=3>/dev/null $(MAKE) +ifneq ($(OPENWRT_BUILD),1) + override OPENWRT_BUILD=1 + export OPENWRT_BUILD endif -export IS_TTY=$(shell tty -s && echo 1 || echo 0) -# override variables from rules.mk -PACKAGE_DIR:=$(TOPDIR)/packages -IPKG:= \ - IPKG_TMP="$(TOPDIR)/tmp/ipkgtmp" \ - IPKG_INSTROOT="$(TARGET_DIR)" \ - IPKG_CONF_DIR="$(TOPDIR)/tmp" \ - IPKG_OFFLINE_ROOT="$(TARGET_DIR)" \ - $(SCRIPT_DIR)/ipkg -force-defaults - - -define Profile/Default - ID:= - NAME:= - PACKAGES:= -endef - -define Profile - $(eval $(call Profile/Default)) - $(eval $(call Profile/$(1))) - ifneq ($(ID),) - ifeq ($(PROFILE),) - PROFILE:=$(ID) - endif - $(ID)_NAME:=$(NAME) - $(ID)_PACKAGES:=$(PACKAGES) - PROFILE_LIST += \ - echo '$(ID):'; [ -z '$(NAME)' ] || echo ' $(NAME)'; echo ' Packages: $(PACKAGES)'; - endif -endef +include rules.mk +include $(INCLUDE_DIR)/debug.mk +include $(INCLUDE_DIR)/depends.mk -include .target.mk +include $(INCLUDE_DIR)/version.mk +export REVISION define Helptext Available Commands: @@ -75,73 +49,120 @@ $(eval $(call shexport,Helptext)) help: FORCE echo "$$$(call shvar,Helptext)" -info: FORCE - echo 'Current Target: "$(BOARDNAME)"' + +# override variables from rules.mk +PACKAGE_DIR:=$(TOPDIR)/packages +OPKG:= \ + IPKG_TMP="$(TOPDIR)/tmp/ipkgtmp" \ + 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 + +include $(INCLUDE_DIR)/target.mk + +_call_info: FORCE + echo 'Current Target: "$(BOARD)$(if $(SUBTARGET), ($(BOARDNAME)))"' + echo 'Default Packages: $(DEFAULT_PACKAGES)' echo 'Available Profiles:' echo; $(PROFILE_LIST) -$(TOPDIR)/tmp/ipkg.conf: FORCE +$(TOPDIR)/tmp/opkg.conf: FORCE @mkdir -p $(TOPDIR)/tmp + @mkdir -p $(TARGET_DIR)/tmp @echo 'dest root /' > $@ - @echo 'src packages file:$(TOPDIR)/packages' >> $@ + @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) $(PACKAGES) $($(PROFILE)_PACKAGES) kernel) -BUILD_PACKAGES:=$(patsubst base-files,base-files-$(BOARD)-$(KERNEL),$(BUILD_PACKAGES)) +BUILD_PACKAGES:=$(sort $(DEFAULT_PACKAGES) $(USER_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)) -image: - if [ -z "$($(PROFILE)_NAME)" ]; then \ - echo Profile $(PROFILE) not found.; \ - echo 'Use "make info" to get a list of available target profiles'; \ - false; \ - fi - echo 'Building images for $(BOARDNAME) - $($(PROFILE)_NAME)' +_call_image: + 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 $(MAKE) package_install -ifneq ($(FILES),) +ifneq ($(USER_FILES),) $(MAKE) copy_files endif $(MAKE) package_postinst $(MAKE) build_image -package_index: $(TOPDIR)/tmp/ipkg.conf FORCE +package_index: $(TOPDIR)/tmp/opkg.conf FORCE @echo @echo Building package index... - (cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages) >/dev/null 2>/dev/null - $(IPKG) update + (cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages && \ + gzip -9c Packages > Packages.gz \ + ) >/dev/null 2>/dev/null + $(OPKG) update package_install: FORCE @echo @echo Installing packages... - $(IPKG) install $(BUILD_PACKAGES) + $(OPKG) install $(BUILD_PACKAGES) copy_files: FORCE @echo @echo Copying extra files - $(CP) $(FILES)/* $(TARGET_DIR)/ + $(CP) $(USER_FILES)/* $(TARGET_DIR)/ package_postinst: FORCE + @echo + @echo Cleaning up + @rm -f $(TARGET_DIR)/tmp/opkg.lock @echo @echo Activating init scripts - ( \ - cd $(BUILD_DIR)/root; \ + @( \ + cd $(TARGET_DIR); \ for script in ./etc/init.d/*; do \ grep '#!/bin/sh /etc/rc.common' $$script >/dev/null || continue; \ - IPKG_INSTROOT=$(BUILD_DIR)/root $(which bash) ./etc/rc.common $$script enable; \ - done; \ + IPKG_INSTROOT=$(TARGET_DIR) $(which bash) ./etc/rc.common $$script enable; \ + done || true; \ ) build_image: FORCE @echo @echo Building images... - $(NO_TRACE_MAKE) -C target/linux/$(BOARD)-$(KERNEL)/image install IB=1 + $(NO_TRACE_MAKE) -C target/linux/$(BOARD)/image install TARGET_BUILD=1 IB=1 clean: rm -rf tmp $(TARGET_DIR) $(BIN_DIR) -.PHONY: FORCE + +info: + (unset PROFILE FILES PACKAGES MAKEFLAGS; $(MAKE) -s _call_info) + +image: + (unset PROFILE FILES PACKAGES MAKEFLAGS; \ + $(MAKE) _call_image \ + $(if $(PROFILE),USER_PROFILE="$(PROFILE)") \ + $(if $(FILES),USER_FILES="$(FILES)") \ + $(if $(PACKAGES),USER_PACKAGES="$(PACKAGES)")) + .SILENT: help info image -%: ; +