[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-288-g9ad2bf8
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-288-g9ad2bf8
|
From: Julien B a. A. <ar...@us...> - 2014-06-17 05:51:11
|
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 9ad2bf81e004b8a4f50e5343e1279cbdbf8433da (commit)
via b5303ed94c6a802c969b020d2badab887bf386f3 (commit)
from e234251cf5233367e4b7fb8ed0482a324d6c853c (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 9ad2bf81e004b8a4f50e5343e1279cbdbf8433da
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jun 17 07:49:12 2014 +0200
[BUILDROOT] 2013.11: Add Tk package
commit b5303ed94c6a802c969b020d2badab887bf386f3
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jun 16 20:19:17 2014 +0200
[AS_DEVICES] python/Makefile: indent
-----------------------------------------------------------------------
Summary of changes:
.../2013.11/011-armadeus-add-tk-package.patch | 71 ++++++++++++++++++++
patches/buildroot/2013.11/cleanup_buildroot.sh | 1 +
target/packages/as_devices/python/Makefile | 38 +++++-----
3 files changed, 91 insertions(+), 19 deletions(-)
create mode 100644 patches/buildroot/2013.11/011-armadeus-add-tk-package.patch
diff --git a/patches/buildroot/2013.11/011-armadeus-add-tk-package.patch b/patches/buildroot/2013.11/011-armadeus-add-tk-package.patch
new file mode 100644
index 0000000..3bb3ef5
--- /dev/null
+++ b/patches/buildroot/2013.11/011-armadeus-add-tk-package.patch
@@ -0,0 +1,71 @@
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2014-06-16 21:14:28.273941318 +0200
++++ buildroot/package/Config.in 2014-06-16 21:19:46.000000000 +0200
+@@ -441,6 +441,7 @@
+ if BR2_PACKAGE_TCL
+ menu "tcl libraries/modules"
+ source "package/tcllib/Config.in"
++source "package/tk/Config.in"
+ endmenu
+ endif
+ endmenu
+Index: buildroot/package/tk/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/tk/Config.in 2014-06-16 21:20:18.935680166 +0200
+@@ -0,0 +1,18 @@
++config BR2_PACKAGE_TK
++ bool "tk"
++ depends on BR2_PACKAGE_TCL
++ depends on BR2_PACKAGE_XORG7
++ help
++ Tk is a GUI toolkit for Tcl
++
++ http://www.tcl.tk/
++
++config BR2_PACKAGE_TK_NO_DEMOS
++ bool "remove demos"
++ default y
++ depends on BR2_PACKAGE_TK
++ help
++ Remove Tk demo files from target rootfs
++
++comment "Tk needs X.org, Tcl"
++ depends on !BR2_PACKAGE_TCL || !BR2_PACKAGE_XORG7
+Index: buildroot/package/tk/tk.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/tk/tk.mk 2014-06-16 21:20:26.187716126 +0200
+@@ -0,0 +1,29 @@
++################################################################################
++#
++# tk
++#
++################################################################################
++
++TK_VERSION_MAJOR = 8.4
++TK_VERSION = $(TK_VERSION_MAJOR).20
++TK_SOURCE = tk$(TK_VERSION)-src.tar.gz
++TK_SITE = http://downloads.sourceforge.net/project/tcl/Tcl/$(TK_VERSION)
++TK_LICENSE = tcl license
++TK_LICENSE_FILES = license.terms
++TK_INSTALL_STAGING = YES
++TK_DEPENDENCIES = tcl xlib_libX11
++
++# shouldn't be $(STAGING_DIR) ?
++TK_CONF_OPT = \
++ --with-tcl=$(TARGET_DIR)/usr/lib \
++ --with-x \
++ --x-includes=$(STAGING_DIR)/usr/include/X11
++
++ifeq ($(BR2_PACKAGE_TK_NO_DEMOS),y)
++define TCL_REMOVE_DEMOS
++ rm -rf $(TARGET_DIR)/usr/lib/tk$(TK_VERSION_MAJOR)/demos
++endef
++TK_POST_INSTALL_TARGET_HOOKS += TK_REMOVE_DEMOS
++endif
++
++$(eval $(autotools-package))
diff --git a/patches/buildroot/2013.11/cleanup_buildroot.sh b/patches/buildroot/2013.11/cleanup_buildroot.sh
index 859670a..553ee57 100755
--- a/patches/buildroot/2013.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2013.11/cleanup_buildroot.sh
@@ -87,3 +87,4 @@ rm -rf buildroot/package/agg/
rm -rf buildroot/package/gnash/
rm -rf buildroot/package/xc3sprog/
rm -rf buildroot/package/sam7-pgm-ng/
+rm -rf buildroot/package/tk/
diff --git a/target/packages/as_devices/python/Makefile b/target/packages/as_devices/python/Makefile
index 7a6a3bd..ced0a44 100644
--- a/target/packages/as_devices/python/Makefile
+++ b/target/packages/as_devices/python/Makefile
@@ -1,31 +1,31 @@
# Default values for local compiling:
-ARMADEUS_BASE_DIR=../../../../
+ARMADEUS_BASE_DIR = ../../../../
-include $(ARMADEUS_BASE_DIR)/Makefile.in
-CFLAGS=-Wall -g -O0
+CFLAGS = -Wall -g -O0
-LDFLAGS=
-CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
-CXX:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-g++
-STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)arm-linux-sstrip
+LDFLAGS =
+CC = $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
+CXX = $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-g++
+STRIP = $(ARMADEUS_TOOLCHAIN_PATH)arm-linux-sstrip
-INCLUDE_LIB=../c/
+INCLUDE_LIB = ../c/
-AS_LIB=../c/libas_devices.so
+AS_LIB = ../c/libas_devices.so
-LIBNAME=AsDevices
+LIBNAME = AsDevices
-WRAPPER_LIBS=AsGpio_wrap.so
-WRAPPER_LIBS+= AsAdc_wrap.so
-WRAPPER_LIBS+= AsDac_wrap.so
-WRAPPER_LIBS+= AsI2c_wrap.so
-WRAPPER_LIBS+= AsSpi_wrap.so
-WRAPPER_DIR=src
+WRAPPER_LIBS = AsGpio_wrap.so
+WRAPPER_LIBS += AsAdc_wrap.so
+WRAPPER_LIBS += AsDac_wrap.so
+WRAPPER_LIBS += AsI2c_wrap.so
+WRAPPER_LIBS += AsSpi_wrap.so
+WRAPPER_DIR = src
-PYTHON_VERS=2.7
-PYTHON_SUBVERS=5
-PYINC=$(STAGING_DIR)/usr/include/python$(PYTHON_VERS)/
-PYLIB=$(ARMADEUS_TARGET_DIR)/usr/lib/python$(PYTHON_VERS)
+PYTHON_VERS = 2.7
+PYTHON_SUBVERS = 5
+PYINC = $(STAGING_DIR)/usr/include/python$(PYTHON_VERS)/
+PYLIB = $(ARMADEUS_TARGET_DIR)/usr/lib/python$(PYTHON_VERS)
.PHONY: all
hooks/post-receive
--
armadeus
|
