X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=target%2Fimagebuilder%2Ffiles%2FMakefile;h=0f0fe42b595d8addcbc4df031f0e8f2a28f738e1;hp=fe503118b015a14839f1ef0fb8c519cd0379b314;hb=6c21bcaa65d0b9c38f60a9735de59cf441c3be52;hpb=991a35c6a621a3b03a0a6de6aa3045b951a7b627 diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile index fe503118b0..0f0fe42b59 100644 --- a/target/imagebuilder/files/Makefile +++ b/target/imagebuilder/files/Makefile @@ -1,6 +1,6 @@ # Makefile for OpenWrt # -# Copyright (C) 2007-2009 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. @@ -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 @@ -24,6 +24,9 @@ include rules.mk include $(INCLUDE_DIR)/debug.mk include $(INCLUDE_DIR)/depends.mk +include $(INCLUDE_DIR)/version.mk +export REVISION + define Helptext Available Commands: help: This help text @@ -35,10 +38,11 @@ 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 endef $(eval $(call shexport,Helptext)) @@ -49,93 +53,134 @@ help: FORCE # override variables from rules.mk PACKAGE_DIR:=$(TOPDIR)/packages -IPKG:= \ +OPKG:= \ + IPKG_NO_SCRIPT=1 \ IPKG_TMP="$(TOPDIR)/tmp/ipkgtmp" \ IPKG_INSTROOT="$(TARGET_DIR)" \ IPKG_CONF_DIR="$(TOPDIR)/tmp" \ IPKG_OFFLINE_ROOT="$(TARGET_DIR)" \ - $(SCRIPT_DIR)/ipkg -force-defaults + $(STAGING_DIR_HOST)/bin/opkg \ + -f $(TOPDIR)/repositories.conf \ + --force-depends \ + --force-overwrite \ + --force-postinstall \ + --cache $(TOPDIR)/dl \ + --offline-root $(TARGET_DIR) \ + --add-dest root:/ \ + --add-arch all:100 \ + --add-arch $(ARCH_PACKAGES):200 define Profile $(eval $(call Profile/Default)) $(eval $(call Profile/$(1))) - ifeq ($(PROFILE),) - PROFILE:=$(1) + ifeq ($(USER_PROFILE),) + USER_PROFILE:=$(1) 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 -info: FORCE +_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 - @mkdir -p $(TOPDIR)/tmp - @echo 'dest root /' > $@ - @echo 'src packages file:$(PACKAGE_DIR)' >> $@ - -BUILD_PACKAGES:=$(sort $(DEFAULT_PACKAGES) $($(PROFILE)_PACKAGES) kernel) +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)) +PACKAGES:= -image: - echo 'Building images for $(BOARD)$(if $($(PROFILE)_NAME), - $($(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 + 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 ($(FILES),) +ifneq ($(USER_FILES),) $(MAKE) copy_files endif $(MAKE) package_postinst $(MAKE) build_image - -package_index: $(TOPDIR)/tmp/ipkg.conf FORCE + +package_index: FORCE @echo @echo Building package index... + @mkdir -p $(TOPDIR)/tmp $(TOPDIR)/dl $(TARGET_DIR)/tmp (cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages && \ gzip -9c Packages > Packages.gz \ ) >/dev/null 2>/dev/null - $(IPKG) update + $(OPKG) update || true package_install: FORCE @echo @echo Installing packages... - $(IPKG) install $(BUILD_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) $(FILES)/* $(TARGET_DIR)/ + @$(call file_copy,$(USER_FILES)/*,$(TARGET_DIR)/) 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 ./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 \ + $(if $(USER_PROFILE),PROFILE="$(USER_PROFILE)") + clean: - rm -rf tmp $(TARGET_DIR) $(BIN_DIR) + rm -rf $(TOPDIR)/tmp $(TOPDIR)/dl $(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)") \ + $(if $(FILES),USER_FILES="$(FILES)") \ + $(if $(PACKAGES),USER_PACKAGES="$(PACKAGES)") \ + $(if $(BIN_DIR),BIN_DIR="$(BIN_DIR)")) .SILENT: help info image