firmware: Add support to stick firmware images on the PXE

diff --git a/root_image/Makefile b/root_image/Makefile
index 0073ce682f2f8acc4c889a05135209a6e30cd586..165c846fdf72a1f39fdad91a6bac8f09e89f2524 100644 (file)
--- a/root_image/Makefile
+++ b/root_image/Makefile
@@ -866,16 +866,12 @@ modulespace-install: modulespace-prep linux-modules-install local-firmware-insta
                        INSTALL_MOD_PATH=$(CURDIR)/modulespace/ modules_install; \
        fi
 
-QLOGIC_PATH=$(RPM_DIR)/qlogic-firmware/
+QLOGIC_PATH=firmare/qlogic/
+RADEON_PATH=firmware/radeon/
 
 .PHONY: local-firmware-install
 local-firmware-install: modulespace-prep
-       if [ -d $(QLOGIC_PATH) ] ; then \
-               $(INSTALL_DATA) $(QLOGIC_PATH)*.bin            modulespace/$(LOCAL_FIRMWARE_PATH)/ ; \
-               $(INSTALL_DATA) $(QLOGIC_PATH)LICENSE          modulespace/$(LOCAL_FIRMWARE_PATH)/ ; \
-               $(INSTALL_DATA) $(QLOGIC_PATH)CURRENT_VERSIONS modulespace/$(LOCAL_FIRMWARE_PATH)/ ; \
-       fi
-       FIRMWARES="3com e100 radeon"; \
+       FIRMWARES="3com e100 radeon qlogic"; \
        for firmware in $$FIRMWARES; do \
                mkdir modulespace/$(LOCAL_FIRMWARE_PATH)/$$firmware; \
                for i in `find $(LINUX_DST)/modulespace/lib/firmware/$$firmware`; \
@@ -886,7 +882,15 @@ local-firmware-install: modulespace-prep
                        fi; \
                done; \
        done
-
+       if [ -d $(QLOGIC_PATH) ] ; then \
+               mkdir modulespace/$(LOCAL_FIRMWARE_PATH)/qlogic; \
+               $(INSTALL_DATA) $(QLOGIC_PATH)*.bin            modulespace/$(LOCAL_FIRMWARE_PATH)/qlogic/ ; \
+               $(INSTALL_DATA) $(QLOGIC_PATH)LICENSE          modulespace/$(LOCAL_FIRMWARE_PATH)/qlogic/ ; \
+               $(INSTALL_DATA) $(QLOGIC_PATH)CURRENT_VERSIONS modulespace/$(LOCAL_FIRMWARE_PATH)/qlogic/ ; \
+       fi
+       if [ -d $(RADEON_PATH) ] ; then \
+               $(INSTALL_DATA) $(RADEON_PATH)*.bin            modulespace/$(LOCAL_FIRMWARE_PATH)/radeon ; \
+       fi
 .PHONY:        syslinux-clean
 syslinux-clean:
        $(MAKE) -C syslinux/menu clean