apex: Revert back to 1.4.7 - what I thought I tested wasn't what I actually tested...

[openwrt.git] / target / linux / ixp4xx-2.6 / image / npe-ucode / Makefile

diff --git a/target/linux/ixp4xx-2.6/image/npe-ucode/Makefile b/target/linux/ixp4xx-2.6/image/npe-ucode/Makefile
index 7dc476b..b5181e8 100644 (file)
--- a/target/linux/ixp4xx-2.6/image/npe-ucode/Makefile
+++ b/target/linux/ixp4xx-2.6/image/npe-ucode/Makefile
@@ -9,43 +9,32 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=npe-ucode
-PKG_VERSION:=2.3
+PKG_VERSION:=2.4
 PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE:=IPL_ixp400NpeLibrary-2_3.zip
-PKG_SOURCE_URL:=http://www.intel.com/design/network/products/npfamily/ixp400_current.htm
-PKG_UNPACK:=unzip -d $(PKG_BUILD_DIR)/ $(DL_DIR)/$(PKG_SOURCE)
+PKG_SOURCE:=IPL_ixp400NpeLibrary-2_4.zip
 
-include $(INCLUDE_DIR)/unpack.mk
+include $(INCLUDE_DIR)/package.mk
 
-$(PKG_BUILD_DIR)/.prepared:
-       mkdir $(PKG_BUILD_DIR)
-       $(PKG_UNPACK)
+define Build/Prepare
+       rm -rf $(PKG_BUILD_DIR)
+       mkdir -p $(PKG_BUILD_DIR)
+       unzip -d $(PKG_BUILD_DIR)/ $(DL_DIR)/$(PKG_SOURCE)
        mv $(PKG_BUILD_DIR)/ixp400_xscale_sw/src/npeDl/IxNpeMicrocode.c $(PKG_BUILD_DIR)/
        rm -rf $(PKG_BUILD_DIR)/ixp400_xscale_sw
        $(CP) ./src/* $(PKG_BUILD_DIR)/
-       touch $@
-
-$(PKG_BUILD_DIR)/NPE-B: $(PKG_BUILD_DIR)/.prepared
-       ( cd $(PKG_BUILD_DIR) ; \
-         $(HOSTCC) -Wall IxNpeMicrocode.c -o IxNpeMicrocode ; \
-         ./IxNpeMicrocode -be )
+endef
 
-$(DL_DIR)/$(PKG_SOURCE):
-       mkdir -p $(DL_DIR)
-       echo "You must manually download $(PKG_SOURCE) from $(PKG_SOURCE_URL) and put it in $(DL_DIR)."
-       echo "You will need to agree to the Intel Public License to do so - please do read it!"
-       false
+define Build/Compile
+       (cd $(PKG_BUILD_DIR); \
+               $(HOSTCC) -Wall IxNpeMicrocode.c -o IxNpeMicrocode; \
+               ./IxNpeMicrocode -be \
+       )
+endef
 
-download: $(DL_DIR)/$(PKG_SOURCE)
-prepare: $(PKG_BUILD_DIR)/.prepared
-compile: $(PKG_BUILD_DIR)/NPE-B
-
-ifneq ($(TARGET),)
-install: compile
+define Build/InstallDev
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/NPE-B $(TARGET)/
-endif
+endef
 
-clean:
-       rm -rf $(PKG_BUILD_DIR)
+$(eval $(call Build/DefaultTargets))