turn the IXP4xx microcode check into a prereq check so that the error message is displayed before the compile starts
SVN-Revision: 6148
This commit is contained in:
		@@ -51,3 +51,17 @@ define Image/Build/jffs2-128k
 | 
				
			|||||||
endef
 | 
					endef
 | 
				
			||||||
 | 
					
 | 
				
			||||||
$(eval $(call BuildImage))
 | 
					$(eval $(call BuildImage))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					UCODEFILE:=IPL_ixp400NpeLibrary-2_3.zip
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					define Require/npe-ucode
 | 
				
			||||||
 | 
						[ -f $(DL_DIR)/$(UCODEFILE) ]
 | 
				
			||||||
 | 
					endef
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					$(eval $(call Require,npe-ucode, \
 | 
				
			||||||
 | 
						You must manually download $(UCODEFILE) from \\\
 | 
				
			||||||
 | 
						http://www.intel.com/design/network/products/npfamily/ixp400_current.htm \\\
 | 
				
			||||||
 | 
						and put it in $(DL_DIR). \\\
 | 
				
			||||||
 | 
						You will need to agree to the Intel Public License to do so - please do read it! \
 | 
				
			||||||
 | 
					))
 | 
				
			||||||
 | 
						
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -14,7 +14,6 @@ PKG_RELEASE:=1
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 | 
					PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 | 
				
			||||||
PKG_SOURCE:=IPL_ixp400NpeLibrary-2_3.zip
 | 
					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_UNPACK:=unzip -d $(PKG_BUILD_DIR)/ $(DL_DIR)/$(PKG_SOURCE)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
include $(INCLUDE_DIR)/unpack.mk
 | 
					include $(INCLUDE_DIR)/unpack.mk
 | 
				
			||||||
@@ -32,12 +31,6 @@ $(PKG_BUILD_DIR)/NPE-B: $(PKG_BUILD_DIR)/.prepared
 | 
				
			|||||||
	  $(HOSTCC) -Wall IxNpeMicrocode.c -o IxNpeMicrocode ; \
 | 
						  $(HOSTCC) -Wall IxNpeMicrocode.c -o IxNpeMicrocode ; \
 | 
				
			||||||
	  ./IxNpeMicrocode -be )
 | 
						  ./IxNpeMicrocode -be )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
$(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
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
download: $(DL_DIR)/$(PKG_SOURCE)
 | 
					download: $(DL_DIR)/$(PKG_SOURCE)
 | 
				
			||||||
prepare: $(PKG_BUILD_DIR)/.prepared
 | 
					prepare: $(PKG_BUILD_DIR)/.prepared
 | 
				
			||||||
compile: $(PKG_BUILD_DIR)/NPE-B
 | 
					compile: $(PKG_BUILD_DIR)/NPE-B
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user