FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

firmware: Honor DESTDIR when installing firmware.

Browse Source 
This fixes a regression introduced first in release 2.9.1 with commit
(7ce8498465 "firmware: Refactor by using build_tools/install_firmware.")
which prevents from installing the firmware in a location other than the system
root.

Bug: https://issues.asterisk.org/jira/browse/DAHLIN-337
Reported-by: Anthony Messina <amessina@messinet.com>
Signed-off-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
[edited the commit message]
Signed-off-by: Shaun Ruffell <sruffell@digium.com>
This commit is contained in:
Tzafrir Cohen 2014-03-30 19:55:17 +03:00 committed by Shaun Ruffell
parent 6593097586
commit 22f034a307
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/dahdi/firmware/Makefile
View File

@ -83,6 +83,7 @@ OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-VPMOCT032=dahdi-fw-vpmoct032.o)
DOWNLOAD=wget DOWNLOAD=wget
WGET=wget WGET=wget
INSTALL_FIRMWARE=../../../build_tools/install_firmware INSTALL_FIRMWARE=../../../build_tools/install_firmware
RUN_INST=$(INSTALL_FIRMWARE) $(1) $(2) $(DESTDIR)
# If "fetch" is used, --continue is not a valid option. # If "fetch" is used, --continue is not a valid option.
ifeq ($(WGET),wget) ifeq ($(WGET),wget)
@ -126,21 +127,21 @@ $(DESTDIR)/usr/lib/hotplug/firmware $(DESTDIR)/lib/firmware:
# Install all downloaded firmware images for hotplug usage # Install all downloaded firmware images for hotplug usage
hotplug-install: $(DESTDIR)/usr/lib/hotplug/firmware $(DESTDIR)/lib/firmware $(FIRMWARE) hotplug-install: $(DESTDIR)/usr/lib/hotplug/firmware $(DESTDIR)/lib/firmware $(FIRMWARE)
@$(INSTALL_FIRMWARE) dahdi-fw-oct6114-032 $(OCT6114_032_VERSION) @$(call RUN_INST,dahdi-fw-oct6114-032,$(OCT6114_032_VERSION))
@$(INSTALL_FIRMWARE) dahdi-fw-oct6114-064 $(OCT6114_064_VERSION) @$(call RUN_INST,dahdi-fw-oct6114-064,$(OCT6114_064_VERSION))
@$(INSTALL_FIRMWARE) dahdi-fw-oct6114-128 $(OCT6114_128_VERSION) @$(call RUN_INST,dahdi-fw-oct6114-128,$(OCT6114_128_VERSION))
@$(INSTALL_FIRMWARE) dahdi-fw-oct6114-256 $(OCT6114_256_VERSION) @$(call RUN_INST,dahdi-fw-oct6114-256,$(OCT6114_256_VERSION))
@$(INSTALL_FIRMWARE) dahdi-fw-tc400m $(TC400M_VERSION) @$(call RUN_INST,dahdi-fw-tc400m,$(TC400M_VERSION))
@$(INSTALL_FIRMWARE) dahdi-fw-hx8 $(HX8_VERSION) @$(call RUN_INST,dahdi-fw-hx8,$(HX8_VERSION))
@$(INSTALL_FIRMWARE) dahdi-fw-vpmoct032 $(VPMOCT032_VERSION) @$(call RUN_INST,dahdi-fw-vpmoct032,$(VPMOCT032_VERSION))
@$(INSTALL_FIRMWARE) dahdi-fw-te820 $(WCT820_VERSION) @$(call RUN_INST,dahdi-fw-te820,$(WCT820_VERSION))
@$(INSTALL_FIRMWARE) dahdi-fw-te133 $(TE133_VERSION) @$(call RUN_INST,dahdi-fw-te133,$(TE133_VERSION))
@$(INSTALL_FIRMWARE) dahdi-fw-te134 $(TE134_VERSION) @$(call RUN_INST,dahdi-fw-te134,$(TE134_VERSION))
@$(INSTALL_FIRMWARE) dahdi-fw-te435 $(TE435_VERSION) @$(call RUN_INST,dahdi-fw-te435,$(TE435_VERSION))
@$(INSTALL_FIRMWARE) dahdi-fw-a8a $(A8A_VERSION) @$(call RUN_INST,dahdi-fw-a8a,$(A8A_VERSION))
@$(INSTALL_FIRMWARE) dahdi-fw-a8b $(A8B_VERSION) @$(call RUN_INST,dahdi-fw-a8b,$(A8B_VERSION))
@$(INSTALL_FIRMWARE) dahdi-fw-a4a $(A4A_VERSION) @$(call RUN_INST,dahdi-fw-a4a,$(A4A_VERSION))
@$(INSTALL_FIRMWARE) dahdi-fw-a4b $(A4B_VERSION) @$(call RUN_INST,dahdi-fw-a4b,$(A4B_VERSION))
# Uninstall any installed dahdi firmware images from hotplug firmware directories # Uninstall any installed dahdi firmware images from hotplug firmware directories
hotplug-uninstall: hotplug-uninstall: