Skip to contentSkip to conversation

crda: bump to version 3.18

PATCH New Gustavo Zacarias 2 participants 3 messages Feb 18, 2015 – Feb 19, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 crda: bump to version 3.18

---
 ...d-DESTDIR-support-in-install-libreg-rules.patch | 41 ----------------------
 package/crda/0002-drop-ldconfig-call.patch         | 15 ++++++++
 package/crda/crda.hash                             |  2 +-
 package/crda/crda.mk                               |  2 +-
 4 files changed, 17 insertions(+), 43 deletions(-)
 delete mode 100644 package/crda/0002-Add-DESTDIR-support-in-install-libreg-rules.patch
 create mode 100644 package/crda/0002-drop-ldconfig-call.patch
package/crda/0002-Add-DESTDIR-support-in-install-libreg-rules.patch deleted +0 -41
deleted file mode 100644
index 617d05f..0000000
@@ -1,41 +0,0 @@
-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
-
-Also drop ldconfig call, as that causes problems when cross compiling /
-installing as non-root.
-
-Signed-off-by: John W. Linville <[email protected]>
-Signed-off-by: Luis R. Rodriguez <[email protected]>
-Signed-off-by: Peter Korsgaard <[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,12 @@ $(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)ldconfig
-+	$(Q)mkdir -p $(DESTDIR)/$(LIBDIR)
-+	$(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/
- 
- %.o: %.c regdb.h $(LIBREG)
--- 
-1.8.5.5
-
package/crda/0002-drop-ldconfig-call.patch new file +15 -0
new file mode 100644
index 0000000..f09e258
@@ -0,0 +1,15 @@
+Drop ldconfig call, it's useless for cross-compiling.
+
+Signed-off-by: Gustavo Zacarias <[email protected]>
+
+diff -Nura crda-3.18.orig/Makefile crda-3.18/Makefile
+--- crda-3.18.orig/Makefile	2015-02-18 10:34:23.841259401 -0300
++++ crda-3.18/Makefile	2015-02-18 10:35:10.524201452 -0300
+@@ -127,7 +127,6 @@
+ 	$(NQ) '  INSTALL  libreg'
+ 	$(Q)mkdir -p $(DESTDIR)/$(LIBDIR)
+ 	$(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/
+-	$(Q)ldconfig
+ 
+ %.o: %.c regdb.h $(LIBREG)
+ 	$(NQ) '  CC  ' $@
package/crda/crda.hash +1 -1
index 2fc04e6..45b9d20 100644
@@ -1,2 +1,2 @@
 # From https://www.kernel.org/pub/software/network/crda/sha256sums.asc
-sha256	2f85da7ab0170b140d6ed62596c8f268d4a7dedecf84cac7182ada979742ff59	crda-3.13.tar.xz
+sha256	43fcb9679f8b75ed87ad10944a506292def13e4afb194afa7aa921b01e8ecdbf	crda-3.18.tar.xz
package/crda/crda.mk +1 -1
index 3c06e07..abfbb8e 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CRDA_VERSION = 3.13
+CRDA_VERSION = 3.18
 CRDA_SOURCE = crda-$(CRDA_VERSION).tar.xz
 CRDA_SITE = $(BR2_KERNEL_MIRROR)/software/network/crda
 CRDA_DEPENDENCIES = host-pkgconf host-python-m2crypto \
Signature · 1 line
2.0.5
#1 lore raw

PATCH 2/2 wireless-regdb: bump to version 2015.01.30

---
 package/wireless-regdb/wireless-regdb.hash | 2 +-
 package/wireless-regdb/wireless-regdb.mk   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
package/wireless-regdb/wireless-regdb.hash +1 -1
index b9eabf1..c755efd 100644
@@ -1,2 +1,2 @@
 # From https://www.kernel.org/pub/software/network/wireless-regdb/sha256sums.asc
-sha256	eab6b50f30748a8b0065ba38cf3df05aac161a5861ae0a6c3cfd01d38a71c9dd	wireless-regdb-2014.11.18.tar.xz
+sha256	438d7f3d62686bc997098d17fe1aff95c6f6ec061aaab90ab7c2c17e8451ce85	wireless-regdb-2015.01.30.tar.xz
package/wireless-regdb/wireless-regdb.mk +3 -3
index 4322fb7..a4ca41b 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WIRELESS_REGDB_VERSION = 2014.11.18
+WIRELESS_REGDB_VERSION = 2015.01.30
 WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.xz
 WIRELESS_REGDB_SITE = http://kernel.org/pub/software/network/wireless-regdb
 WIRELESS_REGDB_LICENSE = ISC
@@ -13,8 +13,8 @@ WIRELESS_REGDB_LICENSE_FILES = LICENSE
 define WIRELESS_REGDB_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 644 -D -T $(@D)/regulatory.bin \
 		$(TARGET_DIR)/usr/lib/crda/regulatory.bin
-	$(INSTALL) -m 644 -D -T $(@D)/linville.key.pub.pem \
-		$(TARGET_DIR)/etc/wireless-regdb/pubkeys/linville.key.pub.pem
+	$(INSTALL) -m 644 -D -T $(@D)/sforshee.key.pub.pem \
+		$(TARGET_DIR)/etc/wireless-regdb/pubkeys/sforshee.key.pub.pem
 endef
 
 $(eval $(generic-package))
Signature · 1 line
2.0.5
#2 lore raw

PATCH 1/2 crda: bump to version 3.18

In reply to Gustavo Zacarias

Dear Gustavo Zacarias,

Quoted 9 lines · Gustavo Zacarias
---
 ...d-DESTDIR-support-in-install-libreg-rules.patch | 41 ----------------------
 package/crda/0002-drop-ldconfig-call.patch         | 15 ++++++++
 package/crda/crda.hash                             |  2 +-
 package/crda/crda.mk                               |  2 +-
 4 files changed, 17 insertions(+), 43 deletions(-)
 delete mode 100644 package/crda/0002-Add-DESTDIR-support-in-install-libreg-rules.patch
 create mode 100644 package/crda/0002-drop-ldconfig-call.patch

Both patches applied to next, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com