[svn-commits] kpfleming: linux/trunk r4383 - in /linux/trunk: ./ drivers/dahdi/firmware/
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Tue Jun 17 17:09:23 CDT 2008
Author: kpfleming
Date: Tue Jun 17 17:09:22 2008
New Revision: 4383
URL: http://svn.digium.com/view/dahdi?view=rev&rev=4383
Log:
some more minor fixes... the equivalent of zaptel r4356 is now included here
Modified:
linux/trunk/Makefile
linux/trunk/drivers/dahdi/firmware/Makefile
linux/trunk/drivers/dahdi/firmware/make_firmware_object.in (props changed)
Modified: linux/trunk/Makefile
URL: http://svn.digium.com/view/dahdi/linux/trunk/Makefile?view=diff&rev=4383&r1=4382&r2=4383
==============================================================================
--- linux/trunk/Makefile (original)
+++ linux/trunk/Makefile Tue Jun 17 17:09:22 2008
@@ -204,7 +204,7 @@
endif
ifdef RCCONF_DIR
ifeq (,$(wildcard $(DESTDIR)$(RCCONF_DIR)/dahdi))
- $(INSTALL) -D -m 644 dahdi.sysconfig $(DESTDIR)$(RCCONF_DIR)/dahdi
+ install -D -m 644 dahdi.sysconfig $(DESTDIR)$(RCCONF_DIR)/dahdi
endif
endif
ifdef COPY_NETSCR
Modified: linux/trunk/drivers/dahdi/firmware/Makefile
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/firmware/Makefile?view=diff&rev=4383&r1=4382&r2=4383
==============================================================================
--- linux/trunk/drivers/dahdi/firmware/Makefile (original)
+++ linux/trunk/drivers/dahdi/firmware/Makefile Tue Jun 17 17:09:22 2008
@@ -22,7 +22,7 @@
FIRMWARE_URL:=http://downloads.digium.com/pub/telephony/firmware/releases
-ALL_FIRMWARE="FIRMWARE-OCT6114-064 FIRMWARE-OCT6114-128 FIRMWARE-TC400M FIRMWARE-VPMADT032"
+ALL_FIRMWARE=FIRMWARE-OCT6114-064 FIRMWARE-OCT6114-128 FIRMWARE-TC400M FIRMWARE-VPMADT032
# Firmware files should use the naming convention: dahdi-fw-<base name>-<sub name>-<version> or dahdi-fw-<base name>-<version>
# First example: dahdi-fw-oct6114-064-1.05.01
@@ -63,7 +63,6 @@
# Download and extract firmware tarballs
dahdi-fw-oct6114-064-%.tar.gz: have_download
- echo "FOO"
ifeq ($(shell if ( [ "$(HOTPLUG_FIRMWARE)" = "no" ] ) || ( [ -d $(DESTDIR)/usr/lib/hotplug/firmware ] && ! [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-oct6114-064-$(OCT6114_064_VERSION) ] ) || ( [ -d $(DESTDIR)/lib/firmware ] && ! [ -f $(DESTDIR)/lib/firmware/.dahdi-fw-oct6114-064-$(OCT6114_064_VERSION) ] ); then echo "yes"; else echo "no"; fi),yes)
@echo "Attempting to download $@"
@if test ! -f $@; then $(DOWNLOAD) $(WGET_ARGS) $(FIRMWARE_URL)/$@; fi;
@@ -114,12 +113,12 @@
ifeq ($(shell if ( [ -d $(DESTDIR)/usr/lib/hotplug/firmware ] && ! [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-oct6114-064-$(OCT6114_064_VERSION) ] ) || ( [ -d $(DESTDIR)/lib/firmware ] && ! [ -f $(DESTDIR)/lib/firmware/.dahdi-fw-oct6114-064-$(OCT6114_064_VERSION) ] ); then echo "yes"; else echo "no"; fi),yes)
@echo "Installing dahdi-fw-oct6114-064.bin to hotplug firmware directories"
if [ -d $(DESTDIR)/usr/lib/hotplug/firmware ]; then \
- $(INSTALL) -m 644 dahdi-fw-oct6114-064.bin $(DESTDIR)/usr/lib/hotplug/firmware && \
+ install -m 644 dahdi-fw-oct6114-064.bin $(DESTDIR)/usr/lib/hotplug/firmware && \
(rm -rf $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-oct6114-064-*; \
touch $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-oct6114-064-$(OCT6114_064_VERSION)); \
fi
if [ -d $(DESTDIR)/lib/firmware ]; then \
- $(INSTALL) -m 644 dahdi-fw-oct6114-064.bin $(DESTDIR)/lib/firmware && \
+ install -m 644 dahdi-fw-oct6114-064.bin $(DESTDIR)/lib/firmware && \
(rm -rf $(DESTDIR)/lib/firmware/.dahdi-fw-oct6114-064-*; \
touch $(DESTDIR)/lib/firmware/.dahdi-fw-oct6114-064-$(OCT6114_064_VERSION)); \
fi
@@ -129,12 +128,12 @@
ifeq ($(shell if ( [ -d $(DESTDIR)/usr/lib/hotplug/firmware ] && ! [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-oct6114-128-$(OCT6114_128_VERSION) ] ) || ( [ -d $(DESTDIR)/lib/firmware ] && ! [ -f $(DESTDIR)/lib/firmware/.dahdi-fw-oct6114-128-$(OCT6114_128_VERSION) ] ); then echo "yes"; else echo "no"; fi),yes)
@echo "Installing dahdi-fw-oct6114-128.bin to hotplug firmware directories"
if [ -d $(DESTDIR)/usr/lib/hotplug/firmware ]; then \
- $(INSTALL) -m 644 dahdi-fw-oct6114-128.bin $(DESTDIR)/usr/lib/hotplug/firmware && \
+ install -m 644 dahdi-fw-oct6114-128.bin $(DESTDIR)/usr/lib/hotplug/firmware && \
(rm -rf $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-oct6114-128-*; \
touch $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-oct6114-128-$(OCT6114_128_VERSION)); \
fi
if [ -d $(DESTDIR)/lib/firmware ]; then \
- $(INSTALL) -m 644 dahdi-fw-oct6114-128.bin $(DESTDIR)/lib/firmware && \
+ install -m 644 dahdi-fw-oct6114-128.bin $(DESTDIR)/lib/firmware && \
(rm -rf $(DESTDIR)/lib/firmware/.dahdi-fw-oct6114-128-*; \
touch $(DESTDIR)/lib/firmware/.dahdi-fw-oct6114-128-$(OCT6114_128_VERSION)); \
fi
@@ -144,12 +143,12 @@
ifeq ($(shell if ( [ -d $(DESTDIR)/usr/lib/hotplug/firmware ] && ! [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-tc400m-$(TC400M_VERSION) ] ) || ( [ -d $(DESTDIR)/lib/firmware ] && ! [ -f $(DESTDIR)/lib/firmware/.dahdi-fw-tc400m-$(TC400M_VERSION) ] ); then echo "yes"; else echo "no"; fi),yes)
@echo "Installing dahdi-fw-tc400m.bin to hotplug firmware directories"
if [ -d $(DESTDIR)/usr/lib/hotplug/firmware ]; then \
- $(INSTALL) -m 644 dahdi-fw-tc400m.bin $(DESTDIR)/usr/lib/hotplug/firmware && \
+ install -m 644 dahdi-fw-tc400m.bin $(DESTDIR)/usr/lib/hotplug/firmware && \
(rm -rf $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-tc400m-*; \
touch $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-tc400m-$(TC400M_VERSION)); \
fi
if [ -d $(DESTDIR)/lib/firmware ]; then \
- $(INSTALL) -m 644 dahdi-fw-tc400m.bin $(DESTDIR)/lib/firmware && \
+ install -m 644 dahdi-fw-tc400m.bin $(DESTDIR)/lib/firmware && \
(rm -rf $(DESTDIR)/lib/firmware/.dahdi-fw-tc400m-*; \
touch $(DESTDIR)/lib/firmware/.dahdi-fw-tc400m-$(TC400M_VERSION)); \
fi
@@ -159,12 +158,12 @@
ifeq ($(shell if ( [ -d $(DESTDIR)/usr/lib/hotplug/firmware ] && ! [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-vpmadt032-$(VPMADT032_VERSION) ] ) || ( [ -d $(DESTDIR)/lib/firmware ] && ! [ -f $(DESTDIR)/lib/firmware/.dahdi-fw-vpmadt032-$(VPMADT032_VERSION) ] ); then echo "yes"; else echo "no"; fi),yes)
@echo "Installing dahdi-fw-vpmadt032.bin to hotplug firmware directories"
if [ -d $(DESTDIR)/usr/lib/hotplug/firmware ]; then \
- $(INSTALL) -m 644 dahdi-fw-vpmadt032.bin $(DESTDIR)/usr/lib/hotplug/firmware && \
+ install -m 644 dahdi-fw-vpmadt032.bin $(DESTDIR)/usr/lib/hotplug/firmware && \
(rm -rf $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-vpmadt032-*; \
touch $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-vpmadt032-$(VPMADT032_VERSION)); \
fi
if [ -d $(DESTDIR)/lib/firmware ]; then \
- $(INSTALL) -m 644 dahdi-fw-vpmadt032.bin $(DESTDIR)/lib/firmware && \
+ install -m 644 dahdi-fw-vpmadt032.bin $(DESTDIR)/lib/firmware && \
(rm -rf $(DESTDIR)/lib/firmware/.dahdi-fw-vpmadt032-*; \
touch $(DESTDIR)/lib/firmware/.dahdi-fw-vpmadt032-$(VPMADT032_VERSION)); \
fi
Propchange: linux/trunk/drivers/dahdi/firmware/make_firmware_object.in
('svn:executable' removed)
More information about the svn-commits
mailing list