X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Fimagebuilder%2Ffiles%2FMakefile;h=72cced84422c8c2ba96e1af46aa547603f4c4a12;hb=5dec71508bf834f332df120a70d096234d0eed21;hp=b52692517778fd16bb16af180922c50f1ed67418;hpb=22d9e562e6f66ba159d70dee0bd064379795732a;p=openwrt%2Fsvn-archive%2Farchive.git diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile index b526925177..72cced8442 100644 --- a/target/imagebuilder/files/Makefile +++ b/target/imagebuilder/files/Makefile @@ -1,6 +1,6 @@ # Makefile for OpenWrt # -# Copyright (C) 2007-2008 OpenWrt.org +# Copyright (C) 2007-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -23,6 +23,7 @@ endif include rules.mk include $(INCLUDE_DIR)/debug.mk include $(INCLUDE_DIR)/depends.mk +include $(INCLUDE_DIR)/version.mk define Helptext Available Commands: @@ -82,21 +83,12 @@ $(TOPDIR)/tmp/ipkg.conf: FORCE @echo 'src packages file:$(PACKAGE_DIR)' >> $@ BUILD_PACKAGES:=$(sort $(DEFAULT_PACKAGES) $(PACKAGES) $($(PROFILE)_PACKAGES) kernel) -ifeq ($(KERNEL),2.4) -BUILD_PACKAGES:=$(patsubst base-files,base-files-$(BOARD)-$(KERNEL),$(BUILD_PACKAGES)) -else BUILD_PACKAGES:=$(patsubst base-files,base-files-$(BOARD),$(BUILD_PACKAGES)) -endif # "-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 $(BOARD) - $($(PROFILE)_NAME)' + echo 'Building images for $(BOARD)$(if $($(PROFILE)_NAME), - $($(PROFILE)_NAME))' echo 'Packages: $(BUILD_PACKAGES)' echo rm -rf $(TARGET_DIR)