From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from dude.hi.pengutronix.de ([2001:6f8:1178:2:21e:67ff:fe11:9c5c]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1W1XPw-00026s-CH for ptxdist@pengutronix.de; Fri, 10 Jan 2014 09:26:12 +0100 Received: from jbe by dude.hi.pengutronix.de with local (Exim 4.82) (envelope-from ) id 1W1XPw-0000df-BB for ptxdist@pengutronix.de; Fri, 10 Jan 2014 09:26:12 +0100 From: Juergen Beisert Date: Fri, 10 Jan 2014 09:26:09 +0100 Message-Id: <1389342370-28936-2-git-send-email-jbe@pengutronix.de> In-Reply-To: <1389342370-28936-1-git-send-email-jbe@pengutronix.de> References: <1389342370-28936-1-git-send-email-jbe@pengutronix.de> Subject: [ptxdist] [PATCH 1/2] lowpan-tools: ensure proper Python handling Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de A dependency (build and run time) to Python only exists if the serial test program gets installed. If all tests programs are disabled, we can omit Python at all. Signed-off-by: Juergen Beisert --- ...hon-is-required-only-for-the-serial-tests.patch | 63 ++++++++++++++++++++++ patches/lowpan-tools-0.3/series | 4 ++ rules/lowpan-tools.make | 1 + 3 files changed, 68 insertions(+) create mode 100644 patches/lowpan-tools-0.3/0008-Python-is-required-only-for-the-serial-tests.patch diff --git a/patches/lowpan-tools-0.3/0008-Python-is-required-only-for-the-serial-tests.patch b/patches/lowpan-tools-0.3/0008-Python-is-required-only-for-the-serial-tests.patch new file mode 100644 index 0000000..93121df --- /dev/null +++ b/patches/lowpan-tools-0.3/0008-Python-is-required-only-for-the-serial-tests.patch @@ -0,0 +1,63 @@ +From: Juergen Beisert +Date: Tue, 7 Jan 2014 10:25:05 +0100 +Subject: [PATCH] Python is required only for the serial tests + +Only the serial tests require host and target python. + +Signed-off-by: Juergen Beisert +--- + configure.ac | 20 +++++++++++++++----- + test-serial/Makefile.am | 2 ++ + 2 files changed, 17 insertions(+), 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 89c2651..755b39a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -19,6 +19,11 @@ AC_CONFIG_HEADER([config.h]) + # Test for new silent rules and enable only if they are available + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + ++AC_ARG_ENABLE([tests], ++ [AC_HELP_STRING([--disable-tests], [do not install the tests @<:@default=yes@:>@])], ++ [], ++ [enable_tests=yes]) ++ + AC_ARG_WITH(zbtestdir, [AC_HELP_STRING([--with-zbtestdir], + [directory where all test programs will be installed])], + [zbtestdir=$withval], +@@ -77,11 +82,16 @@ AC_PROG_LIBTOOL + AM_PROG_LEX + AC_PROG_YACC + AC_SUBST(LIBTOOL_DEPS) +-# Currently the scripts works with python2.x only +-# Check for this at first +-AC_PATH_PROG(PYTHON, python2 python2.7 python2.6 python2.5 python) +-AM_PATH_PYTHON(,, [:]) +-py_CHECK_MAJOR_VERSION([PYTHON_VERSION], [2]) ++ ++if test "x$enable_tests" == "xyes" ; then ++ # Currently the scripts works with python2.x only ++ # Check for this at first ++ AC_PATH_PROG(PYTHON, python2 python2.7 python2.6 python2.5 python) ++ AM_PATH_PYTHON(,, [:]) ++ py_CHECK_MAJOR_VERSION([PYTHON_VERSION], [2]) ++fi ++AM_CONDITIONAL([PYTHON_AVAILABLE], [test "x$enable_tests" == "xyes"]) ++ + AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir) + + # Checks for libraries. +diff --git a/test-serial/Makefile.am b/test-serial/Makefile.am +index 5553ded..733d472 100644 +--- a/test-serial/Makefile.am ++++ b/test-serial/Makefile.am +@@ -1,6 +1,8 @@ ++if PYTHON_AVAILABLE + include $(top_srcdir)/Makefile.common + + python_PYTHON = test_DQ.py + tests = test_packets.py test_edscan.py test_recv.py test_trx.py + zbtest_SCRIPTS = $(tests) + EXTRA_DIST = $(tests) ++endif diff --git a/patches/lowpan-tools-0.3/series b/patches/lowpan-tools-0.3/series index 1652508..4139c7a 100644 --- a/patches/lowpan-tools-0.3/series +++ b/patches/lowpan-tools-0.3/series @@ -1,3 +1,5 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 0001-izoordinator-Fixes-to-error-handling.patch 0002-addrdb-fix-include-dependency-and-remove-redefined.patch 0003-configure.ac-check-for-python2.x.patch @@ -5,3 +7,5 @@ 0005-configure.ac-Check-that-the-python-version-is-indeed.patch 0006-Allow-to-set-PAN-ID-short-address-and-channel-manual.patch 0007-iz-mac-Handle-return-code-from-set-command.patch +0008-Python-is-required-only-for-the-serial-tests.patch +# 7c25727779db5bbadf89312809d9fd8c - git-ptx-patches magic diff --git a/rules/lowpan-tools.make b/rules/lowpan-tools.make index a4919bd..5bed2a4 100644 --- a/rules/lowpan-tools.make +++ b/rules/lowpan-tools.make @@ -44,6 +44,7 @@ endif LOWPAN_TOOLS_CONF_TOOL := autoconf LOWPAN_TOOLS_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ + --$(call ptx/endis, PTXCONF_LOWPAN_TOOLS_TESTS)-tests \ --disable-manpages \ --enable-shared \ --disable-static \ -- 1.8.5.2 -- ptxdist mailing list ptxdist@pengutronix.de