summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-09-10 16:57:20 +0000
committerwbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-09-10 16:57:20 +0000
commit040ca7d5840d9753cfcc18ca13ce70e4731b41a7 (patch)
tree73b36e4b3117ba3ba575158f4694105c721e6ffb
parent2b297a5c1d43b0e4fc93af530e5ec76baa8d1d43 (diff)
fix the broken build for brcm 2.4, idea from nbd
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1887 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--openwrt/package/Makefile1
-rw-r--r--openwrt/package/nvram/Makefile4
2 files changed, 2 insertions, 3 deletions
diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile
index cdc592bdd..86a84a475 100644
--- a/openwrt/package/Makefile
+++ b/openwrt/package/Makefile
@@ -372,6 +372,7 @@ $(STAMP_DIR):
TARGET_DIR="$(TARGET_DIR)" \
IPKG_CONF="$(IPKG_CONF)" \
BOARD="$(BOARD)" \
+ KERNEL="$(KERNEL)" \
install
%-rebuild:
diff --git a/openwrt/package/nvram/Makefile b/openwrt/package/nvram/Makefile
index 337f722b5..f7312fe18 100644
--- a/openwrt/package/nvram/Makefile
+++ b/openwrt/package/nvram/Makefile
@@ -10,13 +10,11 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
include $(TOPDIR)/package/rules.mk
# does not depend on menuconfig
-ifneq ($(BOARD),brcm)
+ifneq ($(BOARD)-$(KERNEL),brcm-2.4)
BR2_PACKAGE_NVRAM:=m
else
-ifeq ($(LINUX_VERSION),2.4.30)
BR2_PACKAGE_NVRAM:=y
endif
-endif
$(eval $(call PKG_template,NVRAM,nvram,$(PKG_RELEASE),$(ARCH)))