aboutsummaryrefslogtreecommitdiffstats
path: root/target/imagebuilder
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2008-01-03 22:17:51 +0000
committerFlorian Fainelli <florian@openwrt.org>2008-01-03 22:17:51 +0000
commit932c5c28a000b4f3c9abb6099bf22e3a19079123 (patch)
treeef591bf382d98db2729dc994bea2d8e758c5e3c7 /target/imagebuilder
parentcde143278f22e78250fd35546a106c0b1b00a4d8 (diff)
downloadmaster-187ad058-932c5c28a000b4f3c9abb6099bf22e3a19079123.tar.gz
master-187ad058-932c5c28a000b4f3c9abb6099bf22e3a19079123.tar.bz2
master-187ad058-932c5c28a000b4f3c9abb6099bf22e3a19079123.zip
Fix imagebuilder for 2.6 kernels (#2900)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10099 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/imagebuilder')
-rw-r--r--target/imagebuilder/files/Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile
index 6429437395..aa5b97150d 100644
--- a/target/imagebuilder/files/Makefile
+++ b/target/imagebuilder/files/Makefile
@@ -82,7 +82,11 @@ $(TOPDIR)/tmp/ipkg.conf: FORCE
@echo 'src packages file:$(TOPDIR)/packages' >> $@
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))