X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fnvram%2FMakefile;h=ff9359beab5d12b2226d25573d5a8061439b9d22;hb=95f4b6bdd07d833e83265b9ca39de0223ff969e3;hp=7fdf6b9ad92d643a59f9f46ff2a36cb579dec714;hpb=796a9d1091884a07817e5c140d0ff6a0b8c76235;p=openwrt-10.03%2F.git

diff --git a/package/nvram/Makefile b/package/nvram/Makefile
index 7fdf6b9ad..ff9359bea 100644
--- a/package/nvram/Makefile
+++ b/package/nvram/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,40 +8,46 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nvram
-PKG_RELEASE:=1
+PKG_RELEASE:=4
+
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/nvram
   SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=@TARGET_brcm_2_4
-  TITLE:=Broadcom config utility
+  CATEGORY:=Base system
+  TITLE:=Userspace port of the Broadcom NVRAM manipulation tool
+  DEPENDS:=@TARGET_brcm_2_4||@TARGET_brcm47xx
 endef
 
 define Package/nvram/description
- This package contains an utility to control broadcom's 'nvram' config area.
+ This package contains an utility to manipulate NVRAM on Broadcom based devices.
+ It works on both brcm-2.4 and bcm47xx (Linux 2.6) without using the kernel api.
 endef
 
 define Build/Prepare
 	mkdir -p $(PKG_BUILD_DIR)
-	$(CP) ./src/* $(PKG_BUILD_DIR)
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
 endef
 
-TARGET_CFLAGS += $(FPIC)
+define Build/Configure
+endef
 
-define Build/InstallDev
-	mkdir -p $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libnvram*.so $(1)/usr/lib/
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CC="$(TARGET_CC)" \
+		CFLAGS="$(TARGET_CFLAGS) -Wall" \
+		LDFLAGS="$(TARGET_LDFLAGS)"
 endef
 
 define Package/nvram/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/nvram.init $(1)/etc/init.d/nvram
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libnvram*.so $(1)/usr/lib/
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/nvram $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libnvram.so.0.1 $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,nvram))