Sfoglia il codice sorgente

crda: enable and fix compile. python2-m2crypto must be installed on the host. we need to add a check to scripts/scan-pkgs.sh later

Waldemar Brodkorb 9 anni fa
parent
commit
8873db04da
2 ha cambiato i file con 12 aggiunte e 3 eliminazioni
  1. 1 3
      package/crda/Makefile
  2. 11 0
      package/crda/patches/patch-Makefile

+ 1 - 3
package/crda/Makefile

@@ -14,8 +14,6 @@ PKG_BUILDDEP:=		libnl
 PKG_URL:=		http://wireless.kernel.org/en/developers/Regulatory
 PKG_SITES:=		http://linuxwireless.org/download/crda/
 
-PKG_CFLINE_CRDA:=	depends on ADK_BROKEN
-
 DISTFILES:=             $(PKG_NAME)-$(PKG_VERSION).tar.bz2
 
 PKG_FLAVOURS_CRDA:=	WITH_UDEV
@@ -41,7 +39,7 @@ $(eval $(call PKG_template,CRDA,crda,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS
 CONFIG_STYLE:=		manual
 ALL_TARGET:=		all_noverify
 
-ifneq ($(ADK_PACKAGE_CRDA_WITH_OPENSSL),)
+ifneq ($(ADK_PACKAGE_CRDA_WITH_OPENSSL)$(ADK_PACKAGE_CRDA_WITH_LIBRESSL),)
 XAKE_FLAGS+=		USE_OPENSSL=1
 endif
 

+ 11 - 0
package/crda/patches/patch-Makefile

@@ -0,0 +1,11 @@
+--- crda-1.1.3.orig/Makefile	2012-01-19 03:19:09.000000000 +0100
++++ crda-1.1.3/Makefile	2015-11-14 09:17:04.000000000 +0100
+@@ -103,7 +103,7 @@ $(REG_BIN):
+ keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem)
+ 	$(NQ) '  GEN ' $@
+ 	$(NQ) '  Trusted pubkeys:' $(wildcard $(PUBKEY_DIR)/*.pem)
+-	$(Q)./utils/key2pub.py --$* $(wildcard $(PUBKEY_DIR)/*.pem) $@
++	$(Q)PATH="/usr/bin:/usr/local/bin" ./utils/key2pub.py --$* $(wildcard $(PUBKEY_DIR)/*.pem) $@
+ 
+ %.o: %.c regdb.h reglib.h
+ 	$(NQ) '  CC  ' $@