[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2585-gb3cca51
Brought to you by:
sszy
|
From: Fabien M <fa...@us...> - 2011-11-23 09:14:43
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via b3cca51fbc18bc99236ac854ce0137ddb5c7b834 (commit)
via e8735b3563edc366fdb3ceccabd2a784e7071830 (commit)
from fb252159aa567d7830a21a14d657770ddead5ccd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b3cca51fbc18bc99236ac854ce0137ddb5c7b834
Author: Fabien Marteau <fab...@ar...>
Date: Wed Nov 23 10:12:33 2011 +0100
[buildroot][as_devices] buildroot use python2.7 now
commit e8735b3563edc366fdb3ceccabd2a784e7071830
Author: Fabien Marteau <fab...@ar...>
Date: Wed Nov 23 09:51:12 2011 +0100
[buildroot] cleanup nanocom directory for quiltify
-----------------------------------------------------------------------
Summary of changes:
.../package/armadeus/as_devices/as_devices.mk | 2 +-
patches/buildroot/2011.05/cleanup_buildroot.sh | 1 +
target/packages/as_devices/python/Makefile | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/buildroot/package/armadeus/as_devices/as_devices.mk b/buildroot/package/armadeus/as_devices/as_devices.mk
index 08c4c6d..f18fe06 100644
--- a/buildroot/package/armadeus/as_devices/as_devices.mk
+++ b/buildroot/package/armadeus/as_devices/as_devices.mk
@@ -4,7 +4,7 @@
#
#############################################################
-PYTHON:=python2.4
+PYTHON:=python2.7
AS_DEVICES_VER:=0.16
AS_DEVICES_SOURCE:=$(TOPDIR)/../target/packages/as_devices
diff --git a/patches/buildroot/2011.05/cleanup_buildroot.sh b/patches/buildroot/2011.05/cleanup_buildroot.sh
index dffb68a..e14b991 100755
--- a/patches/buildroot/2011.05/cleanup_buildroot.sh
+++ b/patches/buildroot/2011.05/cleanup_buildroot.sh
@@ -58,3 +58,4 @@ rm -f buildroot/package/ntp/ntp-nano.patch
rm -f buildroot/package/busybox/busybox-1.16.2/*.patch
rm -f buildroot/target/generic/Config.in
rm -rf buildroot/package/libmodbus
+rm -rf buildroot/package/nanocom
diff --git a/target/packages/as_devices/python/Makefile b/target/packages/as_devices/python/Makefile
index cb2af95..b3fa2a3 100644
--- a/target/packages/as_devices/python/Makefile
+++ b/target/packages/as_devices/python/Makefile
@@ -21,9 +21,9 @@ WRAPPER_LIBS+= AsDac_wrap.so
WRAPPER_LIBS+= AsI2c_wrap.so
WRAPPER_DIR=src
-PYTHON_VERS=2.4
+PYTHON_VERS=2.7
PYTHON_SUBVERS=5
-PYINC=$(STAGING_DIR)/usr/include/python2.4/
+PYINC=$(STAGING_DIR)/usr/include/python$(PYTHON_VERS)/
PYLIB=$(ARMADEUS_TARGET_DIR)/usr/lib/python$(PYTHON_VERS)
.PHONY: all
hooks/post-receive
--
armadeus
|