X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/0738089ffd1d43806662fe81b088f4ccc75aecb3..f7c2a3fc303114ddf861e20d7bd53789655a302b:/target/imagebuilder/files/Makefile diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile index b52692517..fe503118b 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. @@ -81,22 +81,12 @@ $(TOPDIR)/tmp/ipkg.conf: FORCE @echo 'dest root /' > $@ @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 +BUILD_PACKAGES:=$(sort $(DEFAULT_PACKAGES) $($(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 $(BOARD) - $($(PROFILE)_NAME)' + echo 'Building images for $(BOARD)$(if $($(PROFILE)_NAME), - $($(PROFILE)_NAME))' echo 'Packages: $(BUILD_PACKAGES)' echo rm -rf $(TARGET_DIR)