From: wbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 10 Sep 2005 16:57:20 +0000 (+0000)
Subject: fix the broken build for brcm 2.4, idea from nbd
X-Git-Tag: fast2504n-3.10.28-merged~24286
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=040ca7d5840d9753cfcc18ca13ce70e4731b41a7;p=openwrt.git

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
---

diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile
index cdc592bdde..86a84a4755 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 337f722b51..f7312fe18b 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)))