fix the broken build for brcm 2.4, idea from nbd

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1887 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/Makefile b/package/Makefile
index cdc592bdde2be016865bcaf37381dac2a9699d7d..86a84a4755b8166ea5204d45d62f9cba94a6aa98 100644 (file)
--- a/package/Makefile
+++ b/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/package/nvram/Makefile b/package/nvram/Makefile
index 337f722b51992af91a4f0bbf3a45d9ab2279f314..f7312fe18b34656197253a39f95c048756a2650e 100644 (file)
--- a/package/nvram/Makefile
+++ b/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)))