Skip to contentSkip to conversation

crda: bump to version 3.13

PATCH New Gustavo Zacarias 2 participants 2 messages Jun 24, 2014 – Jun 25, 2014

lore
Share & tools
lore

Gustavo Zacarias

author
#0 lore raw

PATCH 1/1 crda: bump to version 3.13

Signed-off-by Gustavo Zacarias <[email protected]>
---
 ...d-DESTDIR-support-in-install-libreg-rules.patch | 37 ++++++++++++++++++++++
 package/crda/crda.mk                               |  6 ++--
 2 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 package/crda/crda-0002-Add-DESTDIR-support-in-install-libreg-rules.patch
package/crda/crda-0002-Add-DESTDIR-support-in-install-libreg-rules.patch new file +37 -0
new file mode 100644
index 0000000..ab25b38
@@ -0,0 +1,37 @@
+From 2cabb2588da56735369131b709f191453c080be0 Mon Sep 17 00:00:00 2001
+From: "John W. Linville" <[email protected]>
+Date: Fri, 14 Feb 2014 13:58:44 -0500
+Subject: [PATCH 1/4] crda: Add DESTDIR support in install-libreg* rules in
+ Makefile
+
+Signed-off-by: John W. Linville <[email protected]>
+Signed-off-by: Luis R. Rodriguez <[email protected]>
+---
+ Makefile | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 0b2f0d7..1f25509 100644
+--- a/Makefile
++++ b/Makefile
+@@ -120,13 +120,13 @@ $(LIBREG): regdb.h reglib.h reglib.c
+ 
+ install-libreg-headers:
+ 	$(NQ) '  INSTALL  libreg-headers'
+-	$(Q)mkdir -p $(INCLUDE_DIR)
+-	$(Q)cp *.h $(INCLUDE_DIR)/
++	$(Q)mkdir -p $(DESTDIR)/$(INCLUDE_DIR)
++	$(Q)cp *.h $(DESTDIR)/$(INCLUDE_DIR)/
+ 
+ install-libreg:
+ 	$(NQ) '  INSTALL  libreg'
+-	$(Q)mkdir -p $(LIBDIR)
+-	$(Q)cp $(LIBREG) $(LIBDIR)/
++	$(Q)mkdir -p $(DESTDIR)/$(LIBDIR)
++	$(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/
+ 	$(Q)ldconfig
+ 
+ %.o: %.c regdb.h $(LIBREG)
+-- 
+1.8.5.5
+
package/crda/crda.mk +3 -3
index 01e8684..f3d3e80 100644
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-CRDA_VERSION = 1.1.3
-CRDA_SOURCE = crda-$(CRDA_VERSION).tar.bz2
-CRDA_SITE = http://wireless.kernel.org/download/crda
+CRDA_VERSION = 3.13
+CRDA_SOURCE = crda-$(CRDA_VERSION).tar.xz
+CRDA_SITE = $(BR2_KERNEL_MIRROR)/software/network/crda
 CRDA_DEPENDENCIES = host-pkgconf host-python-m2crypto \
 	libnl libgcrypt host-python
 CRDA_LICENSE = ISC
Signature · 1 line
1.8.5.5
#1 lore raw

PATCH 1/1 crda: bump to version 3.13

Quoted 37 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Signed-off-by Gustavo Zacarias <[email protected]>
---
 ...d-DESTDIR-support-in-install-libreg-rules.patch | 37 ++++++++++++++++++++++
 package/crda/crda.mk                               |  6 ++--
 2 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 package/crda/crda-0002-Add-DESTDIR-support-in-install-libreg-rules.patch
package/crda/crda-0002-Add-DESTDIR-support-in-install-libreg-rules.patch new file +22 -0
new file mode 100644
index 0000000..ab25b38
@@ -0,0 +1,37 @@
+From 2cabb2588da56735369131b709f191453c080be0 Mon Sep 17 00:00:00 2001
+From: "John W. Linville" <[email protected]>
+Date: Fri, 14 Feb 2014 13:58:44 -0500
+Subject: [PATCH 1/4] crda: Add DESTDIR support in install-libreg* rules in
+ Makefile
+
+Signed-off-by: John W. Linville <[email protected]>
+Signed-off-by: Luis R. Rodriguez <[email protected]>
+---
+ Makefile | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 0b2f0d7..1f25509 100644
+--- a/Makefile
++++ b/Makefile
+@@ -120,13 +120,13 @@ $(LIBREG): regdb.h reglib.h reglib.c
+ 
+ install-libreg-headers:
+ 	$(NQ) '  INSTALL  libreg-headers'
+-	$(Q)mkdir -p $(INCLUDE_DIR)
+-	$(Q)cp *.h $(INCLUDE_DIR)/

package/crda/crda-0002-Add-DESTDIR-support-in-install-libreg-rules.patch line 32

Quoted 10 lines
package/crda/crda-0002-Add-DESTDIR-support-in-install-libreg-rules.patch new file +10 -0
++	$(Q)mkdir -p $(DESTDIR)/$(INCLUDE_DIR)
++	$(Q)cp *.h $(DESTDIR)/$(INCLUDE_DIR)/
+ 
+ install-libreg:
+ 	$(NQ) '  INSTALL  libreg'
+-	$(Q)mkdir -p $(LIBDIR)
+-	$(Q)cp $(LIBREG) $(LIBDIR)/
++	$(Q)mkdir -p $(DESTDIR)/$(LIBDIR)
++	$(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/
+ 	$(Q)ldconfig

I also dropped the ldconfig call as it otherwise fails here:

GZIP regdbdump.8
make[1]: ldconfig: Command not found
Makefile:127: recipe for target 'install-libreg' failed
make[1]: *** [install-libreg] Error 127
make[1]: *** Waiting for unfinished jobs....
make[1]: Leaving directory '/home/peko/source/buildroot/output/build/crda-3.13'

Perhaps a better fix for upstream is to do ldconfig || true or something?

Committed with that fixed, thanks.

Signature · 1 line
Bye, Peter Korsgaard