Commit 03e61317 authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Thomas Petazzoni
Browse files

crda: bump to version 3.18

parent 28355558
Loading
Loading
Loading
Loading
+0 −41
Original line number Diff line number Diff line
From 2cabb2588da56735369131b709f191453c080be0 Mon Sep 17 00:00:00 2001
From: "John W. Linville" <linville@tuxdriver.com>
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 <linville@tuxdriver.com>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 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
+15 −0
Original line number Diff line number Diff line
Drop ldconfig call, it's useless for cross-compiling.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

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  ' $@
+1 −1
Original line number Diff line number Diff line
# 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
+1 −1
Original line number Diff line number Diff line
@@ -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 \