Commit 23dfff36 authored by Samuel Martin's avatar Samuel Martin Committed by Thomas Petazzoni
Browse files

crda: override python interperter 

During its build, crda calls a python script importing m2crypto module
which requires python2 interpreter.

So, we have a build dependency against host-python.

Also, we make sure this python script is interpreted using the right
python interpreter; we add a patch allowing to enforce this and
explicitly set it.

Fixes:
  http://autobuild.buildroot.net/results/a1e/a1e53d66d3962fd5431e7601937b071a0a3c2084/



[Thomas: fix typos in comments, some of them noticed by Yann.]

Signed-off-by: default avatarSamuel Martin <s.martin49@gmail.com>
Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 09e8b6cd

package/crda/crda-0001-Makefile-allow-to-override-python-interpreter.patch

0 → 100644
+34 −0
Original line number Diff line number Diff line 
From 6831024a247fd89c7f7adcbee8a0be991b3caaf4 Mon Sep 17 00:00:00 2001

From: Samuel Martin <s.martin49@gmail.com>

Date: Sun, 2 Mar 2014 23:45:44 +0100

Subject: [PATCH] Makefile: allow to override python interpreter



Signed-off-by: Samuel Martin <s.martin49@gmail.com>

---

 Makefile | 3 ++-

 1 file changed, 2 insertions(+), 1 deletion(-)



diff --git a/Makefile b/Makefile

index 1d34bde..d7134ff 100644

--- a/Makefile

+++ b/Makefile

@@ -42,6 +42,7 @@ LDLIBS += -lgcrypt

 reglib.o: keys-gcrypt.c

 

 endif

+PYTHON ?= python2

 MKDIR ?= mkdir -p

 INSTALL ?= install

 

@@ -103,7 +104,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)$(PYTHON) ./utils/key2pub.py --$* $(wildcard $(PUBKEY_DIR)/*.pem) $@

 

 %.o: %.c regdb.h reglib.h

 	$(NQ) '  CC  ' $@

-- 

1.9.0

package/crda/crda.mk

+7 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ CRDA_VERSION = 1.1.3 
CRDA_SOURCE = crda-$(CRDA_VERSION).tar.bz2

CRDA_SITE = http://wireless.kernel.org/download/crda

CRDA_DEPENDENCIES = host-pkgconf host-python-m2crypto \

	libnl libgcrypt

	libnl libgcrypt host-python

CRDA_LICENSE = ISC

CRDA_LICENSE_FILES = LICENSE
@@ -23,10 +23,16 @@ CRDA_NLLIBS += -lnl-3 -lm -lpthread 
CRDA_LDLIBS += `$(STAGING_DIR)/usr/bin/libgcrypt-config --libs`

endif



# * key2pub.py currently is not python3 compliant (though python2/python3

#   compliance could rather easily be achieved.

# * key2pub.py uses M2Crypto python module, which is only available for

#   python2, so we have to make sure this script is run using the python2

#   interpreter, hence the host-python dependency and the PYTHON variable.

define CRDA_BUILD_CMDS

	$(TARGET_CONFIGURE_OPTS) \

		LDLIBS="$(CRDA_LDLIBS)" \

		NLLIBS="$(CRDA_NLLIBS)" \

		PYTHON=$(HOST_DIR)/usr/bin/python2 \

		$(MAKE) all_noverify -C $(@D)

endef