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 cdc592b..86a84a4 100644 (file)
--- a/openwrt/package/Makefile
+++ b/openwrt/package/Makefile
@@ -372,6 +372,7 @@ $(STAMP_DIR):
                TARGET_DIR="$(TARGET_DIR)" \
                IPKG_CONF="$(IPKG_CONF)" \
                BOARD="$(BOARD)" \
                TARGET_DIR="$(TARGET_DIR)" \
                IPKG_CONF="$(IPKG_CONF)" \
                BOARD="$(BOARD)" \

+               KERNEL="$(KERNEL)" \

                install
 
 %-rebuild: 
                install
 
 %-rebuild: 

diff --git a/openwrt/package/nvram/Makefile b/openwrt/package/nvram/Makefile
index 337f722..f7312fe 100644 (file)
--- 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
 include $(TOPDIR)/package/rules.mk
 
 # does not depend on menuconfig

-ifneq ($(BOARD),brcm)
+ifneq ($(BOARD)-$(KERNEL),brcm-2.4)

 BR2_PACKAGE_NVRAM:=m
 else
 BR2_PACKAGE_NVRAM:=m
 else

-ifeq ($(LINUX_VERSION),2.4.30)

 BR2_PACKAGE_NVRAM:=y
 endif
 BR2_PACKAGE_NVRAM:=y
 endif

-endif

 
 $(eval $(call PKG_template,NVRAM,nvram,$(PKG_RELEASE),$(ARCH)))
 
 
 $(eval $(call PKG_template,NVRAM,nvram,$(PKG_RELEASE),$(ARCH)))