Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard
commit
5aedb8be68
|
|
@ -0,0 +1,7 @@
|
|||
Run the emulation with:
|
||||
|
||||
qemu-system-ppc64 -M pseries -cpu POWER7 -m 256 -kernel output/images/vmlinux -append 'console=hvc0 root=/dev/sda' -drive file=output/images/rootfs.ext2,if=scsi,index=0 -serial stdio -display curses
|
||||
|
||||
The login prompt will appear in the terminal that started Qemu.
|
||||
|
||||
Tested with QEMU 2.1.0
|
||||
|
|
@ -12,7 +12,7 @@ choice
|
|||
Select the specific Barebox version you want to use
|
||||
|
||||
config BR2_TARGET_BAREBOX_LATEST_VERSION
|
||||
bool "2014.07.0"
|
||||
bool "2014.08.0"
|
||||
|
||||
config BR2_TARGET_BAREBOX_CUSTOM_VERSION
|
||||
bool "Custom version"
|
||||
|
|
@ -40,7 +40,7 @@ endif
|
|||
|
||||
config BR2_TARGET_BAREBOX_VERSION
|
||||
string
|
||||
default "2014.07.0" if BR2_TARGET_BAREBOX_LATEST_VERSION
|
||||
default "2014.08.0" if BR2_TARGET_BAREBOX_LATEST_VERSION
|
||||
default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION
|
||||
default "custom" if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
|
||||
default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ BR2_TARGET_UBOOT=y
|
|||
BR2_TARGET_UBOOT_BOARDNAME="nitrogen6q"
|
||||
BR2_TARGET_UBOOT_FORMAT_IMX=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="http://github.com/boundarydevices/u-boot-imx6/tarball/4034391/u-boot-4034391.tar.gz"
|
||||
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="http://github.com/boundarydevices/u-boot-imx6/tarball/63ae4a5/u-boot-63ae4a5.tar.gz"
|
||||
|
||||
# kernel
|
||||
BR2_LINUX_KERNEL=y
|
||||
|
|
|
|||
|
|
@ -0,0 +1,23 @@
|
|||
# Architecture
|
||||
BR2_powerpc64=y
|
||||
BR2_powerpc_power7=y
|
||||
|
||||
# System
|
||||
BR2_TARGET_GENERIC_GETTY=y
|
||||
BR2_TARGET_GENERIC_GETTY_PORT="hvc0"
|
||||
|
||||
# Filesystem
|
||||
BR2_TARGET_ROOTFS_EXT2=y
|
||||
# BR2_TARGET_ROOTFS_TAR is not set
|
||||
|
||||
# Lock to 3.16 headers to avoid breaking with newer kernels
|
||||
BR2_KERNEL_HEADERS_VERSION=y
|
||||
BR2_DEFAULT_KERNEL_VERSION="3.16.1"
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_16=y
|
||||
|
||||
# Kernel
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.16.1"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="pseries"
|
||||
BR2_LINUX_KERNEL_VMLINUX=y
|
||||
|
|
@ -669,6 +669,7 @@ menu "Hardware handling"
|
|||
source "package/libllcp/Config.in"
|
||||
source "package/libmbim/Config.in"
|
||||
source "package/libnfc/Config.in"
|
||||
source "package/libphidget/Config.in"
|
||||
source "package/libqmi/Config.in"
|
||||
source "package/libraw1394/Config.in"
|
||||
source "package/librtlsdr/Config.in"
|
||||
|
|
@ -1031,6 +1032,7 @@ endif
|
|||
source "package/noip/Config.in"
|
||||
source "package/ntp/Config.in"
|
||||
source "package/nuttcp/Config.in"
|
||||
source "package/odhcploc/Config.in"
|
||||
source "package/olsr/Config.in"
|
||||
source "package/openntpd/Config.in"
|
||||
source "package/openobex/Config.in"
|
||||
|
|
@ -1038,6 +1040,7 @@ endif
|
|||
source "package/openswan/Config.in"
|
||||
source "package/openvpn/Config.in"
|
||||
source "package/p910nd/Config.in"
|
||||
source "package/phidgetwebservice/Config.in"
|
||||
source "package/portmap/Config.in"
|
||||
source "package/pppd/Config.in"
|
||||
source "package/pptp-linux/Config.in"
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@ AGENTPP_DEPENDENCIES = host-pkgconf snmppp
|
|||
AGENTPP_CONF_OPT += \
|
||||
--disable-proxy \
|
||||
--disable-forwarder \
|
||||
--disable-rpath \
|
||||
--disable-dependency-tracking
|
||||
--disable-rpath
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
BOOST_VERSION = 1.55.0
|
||||
BOOST_VERSION = 1.56.0
|
||||
BOOST_SOURCE = boost_$(subst .,_,$(BOOST_VERSION)).tar.bz2
|
||||
BOOST_SITE = http://downloads.sourceforge.net/project/boost/boost/$(BOOST_VERSION)
|
||||
BOOST_INSTALL_STAGING = YES
|
||||
|
|
|
|||
|
|
@ -0,0 +1,26 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Start chrony
|
||||
|
||||
[ -f /etc/chrony.conf ] || exit 0
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
echo "Starting chrony: "
|
||||
chronyd && echo "OK" || echo "FAIL"
|
||||
;;
|
||||
stop)
|
||||
echo -n "Stopping chrony: "
|
||||
killall chronyd && echo "OK" || echo "FAIL"
|
||||
;;
|
||||
restart|reload)
|
||||
"$0" stop
|
||||
sleep 1
|
||||
"$0" start
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $0 {start|stop|restart}"
|
||||
exit 1
|
||||
esac
|
||||
|
||||
exit $?
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
CHRONY_VERSION = 1.29.1
|
||||
CHRONY_VERSION = 1.30
|
||||
CHRONY_SITE = http://download.tuxfamily.org/chrony
|
||||
CHRONY_LICENSE = GPLv2
|
||||
CHRONY_LICENSE_FILES = COPYING
|
||||
|
|
@ -39,4 +39,8 @@ define CHRONY_INSTALL_TARGET_CMDS
|
|||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install
|
||||
endef
|
||||
|
||||
define CHRONY_INSTALL_INIT_SYSV
|
||||
$(INSTALL) -D -m 755 package/chrony/S49chrony $(TARGET_DIR)/etc/init.d/S49chrony
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
|
|
|
|||
|
|
@ -61,7 +61,6 @@ COREUTILS_CONF_ENV = ac_cv_c_restrict=no \
|
|||
PERL=missing
|
||||
|
||||
COREUTILS_CONF_OPT = --disable-rpath \
|
||||
--disable-dependency-tracking \
|
||||
--enable-install-program=hostname
|
||||
|
||||
define COREUTILS_POST_INSTALL
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
ERLANG_VERSION = 17.0
|
||||
ERLANG_VERSION = 17.1
|
||||
ERLANG_SITE = http://www.erlang.org/download
|
||||
ERLANG_SOURCE = otp_src_$(ERLANG_VERSION).tar.gz
|
||||
ERLANG_DEPENDENCIES = host-erlang
|
||||
|
|
|
|||
|
|
@ -6,20 +6,20 @@ defined, otherwise the build breaks.
|
|||
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
src/make-event-names.py | 2 ++
|
||||
src/make-event-names.py | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
Index: evemu-1.2.0/src/make-event-names.py
|
||||
===================================================================
|
||||
--- evemu-1.2.0.orig/src/make-event-names.py
|
||||
+++ evemu-1.2.0/src/make-event-names.py
|
||||
@@ -91,7 +91,9 @@
|
||||
print "#ifndef EVENT_NAMES_H"
|
||||
print "#define EVENT_NAMES_H"
|
||||
print ""
|
||||
+ print "#ifndef SYN_MAX"
|
||||
print "#define SYN_MAX 3 /* linux/input.h doesn't define that */"
|
||||
+ print "#endif"
|
||||
print ""
|
||||
diff --git a/src/make-event-names.py b/src/make-event-names.py
|
||||
index bc77f2c..2d0924d 100755
|
||||
--- a/src/make-event-names.py
|
||||
+++ b/src/make-event-names.py
|
||||
@@ -92,7 +92,9 @@ def print_mapping_table(bits):
|
||||
print("#ifndef EVENT_NAMES_H")
|
||||
print("#define EVENT_NAMES_H")
|
||||
print("")
|
||||
+ print("#ifndef SYN_MAX")
|
||||
print("#define SYN_MAX 3 /* linux/input.h doesn't define that */")
|
||||
+ print("#endif")
|
||||
print("")
|
||||
|
||||
for prefix in prefixes:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 077722193e4e59e76591abbaddac9d22068be4e6 Mon Sep 17 00:00:00 2001
|
||||
From 628835a5addbe3dbf49fbd221b3785518c7b26ac Mon Sep 17 00:00:00 2001
|
||||
From: Peter Seiderer <ps.report@gmx.net>
|
||||
Date: Sun, 27 Apr 2014 13:14:51 +0200
|
||||
Subject: [PATCH] configure.ac: add '--disable-tests' option
|
||||
|
|
@ -20,10 +20,10 @@ index 7b68f3d..a83b35f 100644
|
|||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = evemu.pc
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index ec21a6e..4e0c3b8 100644
|
||||
index 239811c..c7e16b3 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -43,6 +43,15 @@ if test "x$XMLTO" = "x" || test "x$ASCIIDOC" = "x"; then
|
||||
@@ -45,6 +45,15 @@ if test "x$XMLTO" = "x" || test "x$ASCIIDOC" = "x"; then
|
||||
AC_MSG_WARN([xmlto or asciidoc not found - cannot create man pages without it])
|
||||
fi
|
||||
|
||||
|
|
@ -37,7 +37,7 @@ index ec21a6e..4e0c3b8 100644
|
|||
+AC_SUBST([SUBDIR_TESTS])
|
||||
+
|
||||
AC_SUBST(AM_CFLAGS,
|
||||
"-Wall -Wextra -pedantic")
|
||||
"-Wall -Wextra")
|
||||
|
||||
--
|
||||
1.8.1.4
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From d2c08aafcae8a0af3cb5a6ae873bbcbd567eae95 Mon Sep 17 00:00:00 2001
|
||||
From 6e0a0631d97b17a82f6ce1996bcb49ee2dbe1544 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Seiderer <ps.report@gmx.net>
|
||||
Date: Fri, 25 Apr 2014 22:30:06 +0200
|
||||
Subject: [PATCH] make-event-names: use input.h from sysroot (instead of host
|
||||
|
|
@ -10,13 +10,13 @@ Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
|||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/make-event-names.py b/src/make-event-names.py
|
||||
index 2092cfd..5bbc669 100755
|
||||
index 2d0924d..945d473 100755
|
||||
--- a/src/make-event-names.py
|
||||
+++ b/src/make-event-names.py
|
||||
@@ -7,8 +7,10 @@
|
||||
@@ -10,8 +10,10 @@ from __future__ import print_function
|
||||
import argparse
|
||||
import re
|
||||
import sys
|
||||
import argparse
|
||||
+import os
|
||||
|
||||
-SOURCE_FILE = "/usr/include/linux/input.h"
|
||||
|
|
|
|||
|
|
@ -1,162 +0,0 @@
|
|||
From da078b9ae22c86279a48ab9888a7b4a6eeadecda Mon Sep 17 00:00:00 2001
|
||||
From: Peter Seiderer <ps.report@gmx.net>
|
||||
Date: Sat, 26 Apr 2014 22:32:46 +0200
|
||||
Subject: [PATCH] make-event-names: fix for python3 print syntax
|
||||
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
src/make-event-names.py | 98 ++++++++++++++++++++++++-------------------------
|
||||
1 file changed, 49 insertions(+), 49 deletions(-)
|
||||
|
||||
diff --git a/src/make-event-names.py b/src/make-event-names.py
|
||||
index 849d577..1c32bc8 100755
|
||||
--- a/src/make-event-names.py
|
||||
+++ b/src/make-event-names.py
|
||||
@@ -44,59 +44,59 @@ blacklist = [
|
||||
def print_bits(bits, prefix):
|
||||
if not hasattr(bits, prefix):
|
||||
return
|
||||
- print "static const char * const %s_map[%s_MAX + 1] = {" % (prefix, prefix.upper())
|
||||
- print " [0 ... %s_MAX] = NULL," % prefix.upper()
|
||||
+ print ("static const char * const %s_map[%s_MAX + 1] = {" % (prefix, prefix.upper()))
|
||||
+ print (" [0 ... %s_MAX] = NULL," % prefix.upper())
|
||||
for val, name in getattr(bits, prefix).items():
|
||||
- print " [%s] = \"%s\"," % (name, name)
|
||||
- print "};"
|
||||
- print ""
|
||||
+ print (" [%s] = \"%s\"," % (name, name))
|
||||
+ print ("};")
|
||||
+ print ("")
|
||||
|
||||
def print_python_bits(bits, prefix):
|
||||
if not hasattr(bits, prefix):
|
||||
return
|
||||
|
||||
- print "%s_map = {" % (prefix)
|
||||
+ print ("%s_map = {" % (prefix))
|
||||
for val, name in getattr(bits, prefix).items():
|
||||
- print " %d : \"%s\"," % (val, name)
|
||||
- print "}"
|
||||
- print "for k, v in %s_map.items():" % (prefix)
|
||||
- print " %s_map[v] = k" % (prefix)
|
||||
- print ""
|
||||
+ print (" %d : \"%s\"," % (val, name))
|
||||
+ print ("}")
|
||||
+ print ("for k, v in %s_map.items():" % (prefix))
|
||||
+ print (" %s_map[v] = k" % (prefix))
|
||||
+ print ("")
|
||||
|
||||
def print_map(bits):
|
||||
- print "static const char * const * const map[EV_MAX + 1] = {"
|
||||
- print " [0 ... EV_MAX] = NULL,"
|
||||
+ print ("static const char * const * const map[EV_MAX + 1] = {")
|
||||
+ print (" [0 ... EV_MAX] = NULL,")
|
||||
|
||||
for prefix in prefixes:
|
||||
if prefix == "BTN_" or prefix == "EV_" or prefix == "INPUT_PROP_":
|
||||
continue
|
||||
- print " [EV_%s] = %s_map," % (prefix[:-1], prefix[:-1].lower())
|
||||
+ print (" [EV_%s] = %s_map," % (prefix[:-1], prefix[:-1].lower()))
|
||||
|
||||
- print "};"
|
||||
- print ""
|
||||
+ print ("};")
|
||||
+ print ("")
|
||||
|
||||
def print_python_map(bits):
|
||||
- print "map = {"
|
||||
+ print ("map = {")
|
||||
|
||||
for val, name in getattr(bits, "ev").items():
|
||||
name = name[3:]
|
||||
if name == "REP" or name == "PWR" or name == "FF_STATUS" or name == "MAX":
|
||||
continue
|
||||
- print " %d : %s_map," % (val, name.lower())
|
||||
+ print (" %d : %s_map," % (val, name.lower()))
|
||||
|
||||
- print "}"
|
||||
- print ""
|
||||
+ print ("}")
|
||||
+ print ("")
|
||||
|
||||
def print_mapping_table(bits):
|
||||
- print "/* THIS FILE IS GENERATED, DO NOT EDIT */"
|
||||
- print ""
|
||||
- print "#ifndef EVENT_NAMES_H"
|
||||
- print "#define EVENT_NAMES_H"
|
||||
- print ""
|
||||
- print "#ifndef SYN_MAX"
|
||||
- print "#define SYN_MAX 3 /* linux/input.h doesn't define that */"
|
||||
- print "#endif"
|
||||
- print ""
|
||||
+ print ("/* THIS FILE IS GENERATED, DO NOT EDIT */")
|
||||
+ print ("")
|
||||
+ print ("#ifndef EVENT_NAMES_H")
|
||||
+ print ("#define EVENT_NAMES_H")
|
||||
+ print ("")
|
||||
+ print ("#ifndef SYN_MAX")
|
||||
+ print ("#define SYN_MAX 3 /* linux/input.h doesn't define that */")
|
||||
+ print ("#endif")
|
||||
+ print ("")
|
||||
|
||||
for prefix in prefixes:
|
||||
if prefix == "BTN_":
|
||||
@@ -105,19 +105,19 @@ def print_mapping_table(bits):
|
||||
|
||||
print_map(bits)
|
||||
|
||||
- print "static const char * event_get_type_name(int type) {"
|
||||
- print " return ev_map[type];"
|
||||
- print " }"
|
||||
- print ""
|
||||
- print "static const char * event_get_code_name(int type, int code) {"
|
||||
- print " return map[type] ? map[type][code] : NULL;"
|
||||
- print "}"
|
||||
- print ""
|
||||
- print "#endif /* EVENT_NAMES_H */"
|
||||
+ print ("static const char * event_get_type_name(int type) {")
|
||||
+ print (" return ev_map[type];")
|
||||
+ print (" }")
|
||||
+ print ("")
|
||||
+ print ("static const char * event_get_code_name(int type, int code) {")
|
||||
+ print (" return map[type] ? map[type][code] : NULL;")
|
||||
+ print ("}")
|
||||
+ print ("")
|
||||
+ print ("#endif /* EVENT_NAMES_H */")
|
||||
|
||||
def print_python_mapping_table(bits):
|
||||
- print "# THIS FILE IS GENERATED, DO NOT EDIT"
|
||||
- print ""
|
||||
+ print ("# THIS FILE IS GENERATED, DO NOT EDIT")
|
||||
+ print ("")
|
||||
|
||||
for prefix in prefixes:
|
||||
if prefix == "BTN_":
|
||||
@@ -126,15 +126,15 @@ def print_python_mapping_table(bits):
|
||||
|
||||
print_python_map(bits)
|
||||
|
||||
- print "def event_get_type_name(type):"
|
||||
- print " return ev_map[type]"
|
||||
- print ""
|
||||
- print ""
|
||||
- print "def event_get_code_name(type, code):"
|
||||
- print " if map.has_key(type) and map[type].has_key(code):"
|
||||
- print " return map[type][code]"
|
||||
- print " return 'UNKNOWN'"
|
||||
- print ""
|
||||
+ print ("def event_get_type_name(type):")
|
||||
+ print (" return ev_map[type]")
|
||||
+ print ("")
|
||||
+ print ("")
|
||||
+ print ("def event_get_code_name(type, code):")
|
||||
+ print (" if map.has_key(type) and map[type].has_key(code):")
|
||||
+ print (" return map[type][code]")
|
||||
+ print (" return 'UNKNOWN'")
|
||||
+ print ("")
|
||||
|
||||
def parse_define(bits, line):
|
||||
m = re.match(r"^#define\s+(\w+)\s+(\w+)", line)
|
||||
--
|
||||
1.8.1.4
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From 3169736eab530cdbd5d123e7df10f51c44090e0b Mon Sep 17 00:00:00 2001
|
||||
From 4618fb3b788715c754872df5fed7bce0186f5089 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Seiderer <ps.report@gmx.net>
|
||||
Date: Sun, 27 Apr 2014 13:23:41 +0200
|
||||
Subject: [PATCH] configure.ac: add '--disable-python-bindings' option
|
||||
|
|
@ -20,10 +20,10 @@ index a83b35f..fb87c76 100644
|
|||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = evemu.pc
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 4e0c3b8..ab1b553 100644
|
||||
index c7e16b3..72c5fdf 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -52,6 +52,17 @@ AS_IF([test "x$enable_tests" != "xno"], [
|
||||
@@ -54,6 +54,17 @@ AS_IF([test "x$enable_tests" != "xno"], [
|
||||
|
||||
AC_SUBST([SUBDIR_TESTS])
|
||||
|
||||
|
|
@ -39,7 +39,7 @@ index 4e0c3b8..ab1b553 100644
|
|||
+
|
||||
+
|
||||
AC_SUBST(AM_CFLAGS,
|
||||
"-Wall -Wextra -pedantic")
|
||||
"-Wall -Wextra")
|
||||
|
||||
--
|
||||
1.8.1.4
|
||||
|
|
|
|||
|
|
@ -1,27 +0,0 @@
|
|||
Description: fixes the syntax for raising exceptions to be Python2 and Python3
|
||||
acceptable.
|
||||
Author: Stephen M. Webb
|
||||
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=706155
|
||||
|
||||
--- a/python/evemu/base.py
|
||||
+++ b/python/evemu/base.py
|
||||
@@ -19,15 +19,15 @@
|
||||
def _call0(self, api_call, *parameters):
|
||||
result = api_call(*parameters)
|
||||
if result == 0 and self.get_c_errno() != 0:
|
||||
- raise exception.ExecutionError, "%s: %s" % (
|
||||
- api_call.__name__, self.get_c_error())
|
||||
+ raise exception.ExecutionError("%s: %s" % (
|
||||
+ api_call.__name__, self.get_c_error()))
|
||||
return result
|
||||
|
||||
def _call(self, api_call, *parameters):
|
||||
result = api_call(*parameters)
|
||||
if result < 0 and self.get_c_errno() != 0:
|
||||
- raise exception.ExecutionError, "%s: %s" % (
|
||||
- api_call.__name__, self.get_c_error())
|
||||
+ raise exception.ExecutionError("%s: %s" % (
|
||||
+ api_call.__name__, self.get_c_error()))
|
||||
return result
|
||||
|
||||
def get_c_errno(self):
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
From f192db7848962a1616e243bb60e705da6c6f3412 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Seiderer <ps.report@gmx.net>
|
||||
Date: Sun, 27 Apr 2014 01:16:16 +0200
|
||||
Subject: [PATCH] python: fix device open for python3
|
||||
|
||||
- use 'rb' instead of 'r+b', fixes:
|
||||
|
||||
>>> import evemu
|
||||
>>> evemu.Device('/dev/input/event0')
|
||||
Traceback (most recent call last):
|
||||
File "<stdin>", line 1, in <module>
|
||||
File "/usr/lib/python3.4/site-packages/evemu/__init__.py", line 50, in __init__
|
||||
io.UnsupportedOperation: File or stream is not seekable.
|
||||
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
python/evemu/__init__.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/python/evemu/__init__.py b/python/evemu/__init__.py
|
||||
index abdbf7e..aa73871 100644
|
||||
--- a/python/evemu/__init__.py
|
||||
+++ b/python/evemu/__init__.py
|
||||
@@ -47,7 +47,7 @@ class Device(object):
|
||||
"""
|
||||
|
||||
if type(f).__name__ == 'str':
|
||||
- self._file = open(f, 'r+b')
|
||||
+ self._file = open(f, 'rb')
|
||||
elif type(f).__name__ == 'file':
|
||||
self._file = f
|
||||
else:
|
||||
--
|
||||
1.8.1.4
|
||||
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
EVEMU_VERSION = 1.2.0
|
||||
EVEMU_VERSION = 2.0.0
|
||||
EVEMU_SITE = http://cgit.freedesktop.org/evemu/snapshot
|
||||
EVEMU_LICENSE = LGPLv3 (library), GPLv3 (tools)
|
||||
EVEMU_LICENSE_FILES = COPYING COPYING.GPL3
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
EVTEST_VERSION = 1.31
|
||||
EVTEST_VERSION = 1.32
|
||||
EVTEST_SOURCE = evtest-$(EVTEST_VERSION).tar.gz
|
||||
EVTEST_SITE = http://cgit.freedesktop.org/evtest/snapshot
|
||||
EVTEST_LICENSE = GPLv2+
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
EXIM_VERSION = 4.83
|
||||
EXIM_VERSION = 4.84
|
||||
EXIM_SOURCE = exim-$(EXIM_VERSION).tar.bz2
|
||||
EXIM_SITE = ftp://ftp.exim.org/pub/exim/exim4
|
||||
EXIM_LICENSE = GPLv2+
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
FFMPEG_VERSION = 2.3.1
|
||||
FFMPEG_VERSION = 2.3.3
|
||||
FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.bz2
|
||||
FFMPEG_SITE = http://ffmpeg.org/releases
|
||||
FFMPEG_INSTALL_STAGING = YES
|
||||
|
|
|
|||
|
|
@ -13,6 +13,11 @@ config BR2_PACKAGE_HOST_GDB
|
|||
|
||||
if BR2_PACKAGE_HOST_GDB
|
||||
|
||||
config BR2_PACKAGE_HOST_GDB_TUI
|
||||
bool "GDB TUI support"
|
||||
help
|
||||
This option enables terminal user interface (TUI) for gdb
|
||||
|
||||
choice
|
||||
prompt "GDB debugger Version"
|
||||
depends on !BR2_arc
|
||||
|
|
|
|||
|
|
@ -114,7 +114,6 @@ HOST_GDB_CONF_OPT = \
|
|||
--target=$(GNU_TARGET_NAME) \
|
||||
--enable-static --disable-shared \
|
||||
--without-uiout \
|
||||
--disable-tui \
|
||||
--disable-gdbtk \
|
||||
--without-x \
|
||||
--enable-threads \
|
||||
|
|
@ -123,6 +122,13 @@ HOST_GDB_CONF_OPT = \
|
|||
$(GDB_DISABLE_BINUTILS_CONF_OPT) \
|
||||
--disable-sim
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HOST_GDB_TUI),y)
|
||||
HOST_GDB_DEPENDENCIES += host-ncurses
|
||||
HOST_GDB_CONF_OPT += --enable-tui
|
||||
else
|
||||
HOST_GDB_CONF_OPT += --disable-tui
|
||||
endif
|
||||
|
||||
ifeq ($(GDB_FROM_GIT),y)
|
||||
HOST_GDB_DEPENDENCIES += host-texinfo
|
||||
else
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
GNUPG2_VERSION = 2.0.25
|
||||
GNUPG2_VERSION = 2.0.26
|
||||
GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2
|
||||
GNUPG2_SITE = ftp://ftp.gnupg.org/gcrypt/gnupg
|
||||
GNUPG2_LICENSE = GPLv3+
|
||||
|
|
|
|||
|
|
@ -0,0 +1,46 @@
|
|||
From 8e081f1bd5c82b842ee317cd55e70f646ae31f05 Mon Sep 17 00:00:00 2001
|
||||
From: Simon Dawson <spdawson@gmail.com>
|
||||
Date: Mon, 25 Aug 2014 10:26:11 +0100
|
||||
Subject: [PATCH] Fix build error when ntpshm is false
|
||||
To: gpsd-dev@nongnu.org
|
||||
|
||||
The build fails as follows
|
||||
|
||||
libgpsd_core.c: In function 'ntpshm_latch':
|
||||
libgpsd_core.c:1660:24: error: 'const struct gps_type_t' has no member named 'time_offset'
|
||||
|| device->device_type->time_offset == NULL)
|
||||
^
|
||||
libgpsd_core.c:1663:33: error: 'const struct gps_type_t' has no member named 'time_offset'
|
||||
fix_time += device->device_type->time_offset(device);
|
||||
^
|
||||
scons: *** [libgpsd_core.os] Error 1
|
||||
|
||||
The solution is to wrap #ifdef NTPSHM_ENABLE around the ntpshm_latch function
|
||||
|
||||
Signed-off-by: Simon Dawson <spdawson@gmail.com>
|
||||
---
|
||||
libgpsd_core.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/libgpsd_core.c b/libgpsd_core.c
|
||||
index 6ec08a4..f7e8075 100644
|
||||
--- a/libgpsd_core.c
|
||||
+++ b/libgpsd_core.c
|
||||
@@ -1638,6 +1638,7 @@ void gpsd_zero_satellites( /*@out@*/ struct gps_data_t *out)
|
||||
#endif
|
||||
}
|
||||
|
||||
+#ifdef NTPSHM_ENABLE
|
||||
void ntpshm_latch(struct gps_device_t *device, struct timedrift_t /*@out@*/*td)
|
||||
/* latch the fact that we've saved a fix */
|
||||
{
|
||||
@@ -1668,5 +1669,6 @@ void ntpshm_latch(struct gps_device_t *device, struct timedrift_t /*@out@*/*td)
|
||||
device->last_fixtime.clock = td->clock.tv_sec + td->clock.tv_nsec / 1e9;
|
||||
#endif /* S_SPLINT_S */
|
||||
}
|
||||
+#endif /* NTPSHM_ENABLE */
|
||||
|
||||
/* end */
|
||||
--
|
||||
1.9.1
|
||||
|
||||
|
|
@ -4,16 +4,14 @@ Signed-off-by: Simon Dawson <spdawson@gmail.com>
|
|||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
|
||||
diff -Nurp a/SConstruct b/SConstruct
|
||||
--- a/SConstruct 2013-11-22 13:10:01.000000000 +0000
|
||||
+++ b/SConstruct 2013-11-23 11:26:57.698486777 +0000
|
||||
@@ -299,11 +299,6 @@ if env["sysroot"]:
|
||||
# system default load path. /lib and /usr/lib should always be on
|
||||
# this; listing them explicitly is a fail-safe against this ldconfig
|
||||
# invocation not doing what we expect.
|
||||
--- a/SConstruct 2014-08-23 18:41:09.000000000 +0100
|
||||
+++ b/SConstruct 2014-08-25 09:46:53.754364989 +0100
|
||||
@@ -300,9 +300,6 @@ if env["sysroot"]:
|
||||
|
||||
# Don't hack RPATH unless libdir points somewhere that is not on the
|
||||
# minimum default load path.
|
||||
-if env["shared"]:
|
||||
- sysrpath = Split(_getoutput("ldconfig -v -N -X 2>/dev/null | sed -n -e '/^\//s/://p'"))
|
||||
- if env["libdir"] not in ["/usr/lib", "/lib"] + sysrpath:
|
||||
- announce("Prepending %s to RPATH." % installdir('libdir', False))
|
||||
- if env["libdir"] not in ["/usr/lib", "/lib"]:
|
||||
- env.Prepend(RPATH=[installdir('libdir')])
|
||||
|
||||
# Give deheader a way to set compiler flags
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
GPSD_VERSION = b4c32aa40cff1b4e1041d5f3004e9d9156cdf96f
|
||||
GPSD_SITE = git://git.savannah.nongnu.org/gpsd.git
|
||||
GPSD_VERSION = 3.11
|
||||
GPSD_SITE = http://download-mirror.savannah.gnu.org/releases/gpsd
|
||||
GPSD_LICENSE = BSD-3c
|
||||
GPSD_LICENSE_FILES = COPYING
|
||||
GPSD_INSTALL_STAGING = YES
|
||||
|
|
@ -19,7 +19,6 @@ GPSD_SCONS_ENV = $(TARGET_CONFIGURE_OPTS)
|
|||
GPSD_SCONS_OPTS = \
|
||||
arch=$(ARCH)\
|
||||
prefix=/usr\
|
||||
chrpath=no\
|
||||
sysroot=$(STAGING_DIR)\
|
||||
strip=no\
|
||||
python=no
|
||||
|
|
@ -48,7 +47,7 @@ ifeq ($(BR2_PACKAGE_QT_NETWORK),y)
|
|||
GPSD_SCONS_ENV += QMAKE="$(QT_QMAKE)"
|
||||
GPSD_DEPENDENCIES += qt host-pkgconf
|
||||
else
|
||||
GPSD_SCONS_OPTS += libQgpsmm=no
|
||||
GPSD_SCONS_OPTS += qt=no
|
||||
endif
|
||||
|
||||
# If libusb is available build it before so the package can use it
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ IPERF_CONF_ENV = \
|
|||
ac_cv_sizeof_bool=1
|
||||
|
||||
IPERF_CONF_OPT = \
|
||||
--disable-dependency-tracking \
|
||||
--disable-web100
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
LIBAO_VERSION = 1.1.0
|
||||
LIBAO_VERSION = 1.2.0
|
||||
LIBAO_SITE = http://downloads.xiph.org/releases/ao
|
||||
LIBAO_DEPENDENCIES = host-pkgconf
|
||||
LIBAO_INSTALL_STAGING = YES
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
LIBIDN_VERSION = 1.28
|
||||
LIBIDN_VERSION = 1.29
|
||||
LIBIDN_SITE = $(BR2_GNU_MIRROR)/libidn
|
||||
LIBIDN_INSTALL_STAGING = YES
|
||||
LIBIDN_CONF_ENV = EMACS="no"
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
LIBMBIM_VERSION = 1.8.0
|
||||
LIBMBIM_VERSION = 1.10.0
|
||||
LIBMBIM_SITE = http://www.freedesktop.org/software/libmbim
|
||||
LIBMBIM_SOURCE = libmbim-$(LIBMBIM_VERSION).tar.xz
|
||||
LIBMBIM_LICENSE = LGPLv2+ (library), GPLv2+ (programs)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,24 @@
|
|||
config BR2_PACKAGE_LIBPHIDGET
|
||||
bool "libphidget"
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
|
||||
select BR2_PACKAGE_LIBUSB
|
||||
help
|
||||
The libphidget library provides an API for controlling Phidgets
|
||||
USB devices. The library translates API function calls to libusb
|
||||
function calls to control attached Phidgets devices that provide
|
||||
GPIO's, DAC's, accelerometers, servo motors, and other capabilities
|
||||
either singly or on combo devices.
|
||||
|
||||
To use libphidget for controlling locally attached devices you
|
||||
need to set up the userspace USB device tree /dev/bus/usb. See
|
||||
file udev/99-phidgets.rules.
|
||||
|
||||
The libphidget library also contains an API for sending commands
|
||||
to a local or remote phidgetwebservice using HTTP. The
|
||||
phidgetwebservice then translates HTTP requests to libphidget API
|
||||
function calls to control locally attached Phidgets devices.
|
||||
|
||||
http://phidgets.com/
|
||||
|
||||
comment "libphidget needs a toolchain w/ threads"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
################################################################################
|
||||
#
|
||||
# libphidget
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBPHIDGET_VERSION = 2.1.8.20140319
|
||||
LIBPHIDGET_SOURCE = libphidget_$(LIBPHIDGET_VERSION).tar.gz
|
||||
LIBPHIDGET_SITE = http://www.phidgets.com/downloads/libraries/
|
||||
LIBPHIDGET_DEPENDENCIES = libusb
|
||||
LIBPHIDGET_CONF_OPT = --disable-ldconfig
|
||||
LIBPHIDGET_INSTALL_STAGING = YES
|
||||
LIBPHIDGET_LICENSE = LGPLv3
|
||||
LIBPHIDGET_LICENSE_FILES = COPYING
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
LIBSOC_VERSION = 0.6.2
|
||||
LIBSOC_VERSION = 0.6.3
|
||||
LIBSOC_SITE = $(call github,jackmitch,libsoc,$(LIBSOC_VERSION))
|
||||
LIBSOC_LICENSE = LGPLv2.1
|
||||
LIBSOC_LICENSE_FILES = COPYING
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
LIBTASN1_VERSION = 4.0
|
||||
LIBTASN1_VERSION = 4.1
|
||||
LIBTASN1_SITE = http://ftp.gnu.org/gnu/libtasn1
|
||||
LIBTASN1_DEPENDENCIES = host-bison
|
||||
LIBTASN1_LICENSE = GPLv3+ LGPLv2.1+
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
MESA3D_VERSION = 10.2.5
|
||||
MESA3D_VERSION = 10.2.6
|
||||
MESA3D_SOURCE = MesaLib-$(MESA3D_VERSION).tar.bz2
|
||||
MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION)
|
||||
MESA3D_LICENSE = MIT, SGI, Khronos
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ METACITY_LICENSE_FILES = COPYING
|
|||
METACITY_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \
|
||||
--x-libraries=$(STAGING_DIR)/usr/lib \
|
||||
--disable-glibtest --disable-gconf \
|
||||
--disable-dependency-tracking \
|
||||
--disable-sm --disable-startup-notification
|
||||
|
||||
METACITY_DEPENDENCIES = libgtk2 \
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
MODEM_MANAGER_VERSION = 1.2.0
|
||||
MODEM_MANAGER_VERSION = 1.4.0
|
||||
MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz
|
||||
MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager
|
||||
MODEM_MANAGER_LICENSE = GPLv2+ (programs, plugins), LGPLv2+ (libmm-glib)
|
||||
|
|
|
|||
|
|
@ -51,7 +51,6 @@ HOST_MYSQL_CONF_OPT = \
|
|||
|
||||
MYSQL_CONF_OPT += \
|
||||
--localstatedir=/var/mysql \
|
||||
--disable-dependency-tracking \
|
||||
--with-atomic-ops=up \
|
||||
--with-embedded-server \
|
||||
--without-query-cache \
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
################################################################################
|
||||
|
||||
NANO_VERSION_MAJOR = 2.3
|
||||
NANO_VERSION = $(NANO_VERSION_MAJOR).5
|
||||
NANO_VERSION = $(NANO_VERSION_MAJOR).6
|
||||
NANO_SITE = http://www.nano-editor.org/dist/v$(NANO_VERSION_MAJOR)
|
||||
NANO_LICENSE = GPLv3+
|
||||
NANO_LICENSE_FILES = COPYING
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
NANOCOM_VERSION = 2.6.1
|
||||
NANOCOM_VERSION = 1.0
|
||||
NANOCOM_SOURCE = nanocom.tar.gz
|
||||
NANOCOM_SITE = http://downloads.sourceforge.net/project/nanocom/nanocom/v1.0
|
||||
NANOCOM_SITE = http://downloads.sourceforge.net/project/nanocom/nanocom/v$(NANOCOM_VERSION)
|
||||
NANOCOM_LICENSE = GPLv2+
|
||||
NANOCOM_LICENSE_FILES = COPYING
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
NMAP_VERSION = 6.46
|
||||
NMAP_VERSION = 6.47
|
||||
NMAP_SITE = http://nmap.org/dist
|
||||
NMAP_SOURCE = nmap-$(NMAP_VERSION).tar.bz2
|
||||
NMAP_DEPENDENCIES = libpcap pcre
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ config BR2_PACKAGE_NODEJS
|
|||
depends on !(BR2_arm920t || BR2_arm922t || BR2_fa526)
|
||||
# uses fork()
|
||||
depends on BR2_USE_MMU
|
||||
select BR2_PACKAGE_ZLIB
|
||||
help
|
||||
Event-driven I/O server-side JavaScript environment based on V8.
|
||||
|
||||
|
|
|
|||
|
|
@ -7,9 +7,9 @@
|
|||
NODEJS_VERSION = 0.10.30
|
||||
NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.gz
|
||||
NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION)
|
||||
NODEJS_DEPENDENCIES = host-python host-nodejs \
|
||||
NODEJS_DEPENDENCIES = host-python host-nodejs zlib \
|
||||
$(call qstrip,$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS))
|
||||
HOST_NODEJS_DEPENDENCIES = host-python
|
||||
HOST_NODEJS_DEPENDENCIES = host-python host-zlib
|
||||
NODEJS_LICENSE = MIT (core code); MIT, Apache and BSD family licenses (Bundled components)
|
||||
NODEJS_LICENSE_FILES = LICENSE
|
||||
|
||||
|
|
@ -32,6 +32,7 @@ define HOST_NODEJS_CONFIGURE_CMDS
|
|||
--without-snapshot \
|
||||
--without-dtrace \
|
||||
--without-etw \
|
||||
--shared-zlib \
|
||||
)
|
||||
endef
|
||||
|
||||
|
|
@ -69,6 +70,7 @@ define NODEJS_CONFIGURE_CMDS
|
|||
$(HOST_DIR)/usr/bin/python2 ./configure \
|
||||
--prefix=/usr \
|
||||
--without-snapshot \
|
||||
--shared-zlib \
|
||||
$(if $(BR2_PACKAGE_OPENSSL),--shared-openssl,--without-ssl) \
|
||||
$(if $(BR2_PACKAGE_NODEJS_NPM),,--without-npm) \
|
||||
--without-dtrace \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
config BR2_PACKAGE_ODHCPLOC
|
||||
bool "odhcploc"
|
||||
help
|
||||
Open DHCP Locate (ODHCPLoc) is program to locate and
|
||||
display active DHCP servers on a subnet.
|
||||
Can be used to scan for rogue DHCP servers.
|
||||
|
||||
http://odhcploc.sourceforge.net/
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
################################################################################
|
||||
#
|
||||
# odhcploc
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ODHCPLOC_VERSION = 20111021
|
||||
ODHCPLOC_SITE = http://downloads.sourceforge.net/project/odhcploc/$(ODHCPLOC_VERSION)
|
||||
ODHCPLOC_LICENSE = ISC
|
||||
ODHCPLOC_LICENSE_FILES = COPYING
|
||||
|
||||
define ODHCPLOC_BUILD_CMDS
|
||||
$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all
|
||||
endef
|
||||
|
||||
define ODHCPLOC_INSTALL_TARGET_CMDS
|
||||
$(MAKE) PREFIX=/usr DESTDIR=$(TARGET_DIR) -C $(@D) install
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
ORC_VERSION = 0.4.21
|
||||
ORC_VERSION = 0.4.22
|
||||
ORC_SOURCE = orc-$(ORC_VERSION).tar.xz
|
||||
ORC_SITE = http://gstreamer.freedesktop.org/data/src/orc
|
||||
ORC_LICENSE = BSD-2c, BSD-3c
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
config BR2_PACKAGE_PHIDGETWEBSERVICE
|
||||
bool "phidgetwebservice"
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # libusb, libphidget
|
||||
select BR2_PACKAGE_LIBPHIDGET
|
||||
help
|
||||
phidgetwebservice (the Phidget WebService) provides an HTTP
|
||||
front-end to the libphidget device control API. This provides
|
||||
an alternative to the libphidget C linkage interface for
|
||||
controlling locally attached Phidgets USB devices and it also
|
||||
allows you to control Phidget USB devices remotely when the host
|
||||
running the phidgetwebservice has an exposed network interface.
|
||||
|
||||
The phidgetwebservice client program uses the libphidget HTTP
|
||||
functions to send commands to the phidgetwebservice.
|
||||
|
||||
http://phidgets.com/
|
||||
|
||||
comment "phidgetwebservice needs a toolchain w/ threads"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
################################################################################
|
||||
#
|
||||
# phidgetwebservice
|
||||
#
|
||||
################################################################################
|
||||
|
||||
PHIDGETWEBSERVICE_VERSION = 2.1.8.20140319
|
||||
PHIDGETWEBSERVICE_SOURCE = phidgetwebservice_$(PHIDGETWEBSERVICE_VERSION).tar.gz
|
||||
PHIDGETWEBSERVICE_SITE = http://www.phidgets.com/downloads/libraries/
|
||||
PHIDGETWEBSERVICE_DEPENDENCIES = libphidget
|
||||
PHIDGETWEBSERVICE_LICENSE = LGPLv3
|
||||
PHIDGETWEBSERVICE_LICENSE_FILES = COPYING
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
|
@ -135,6 +135,16 @@ comment "MySQL drivers need a toolchain w/ C++"
|
|||
depends on BR2_USE_MMU
|
||||
depends on !BR2_INSTALL_LIBSTDCPP
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_PDO_POSTGRESQL
|
||||
bool "PostgreSQL"
|
||||
depends on BR2_TOOLCHAIN_USES_GLIBC
|
||||
select BR2_PACKAGE_POSTGRESQL
|
||||
help
|
||||
PDO driver for PostgreSQL
|
||||
|
||||
comment "PostgreSQL driver needs an (e)glibc toolchain"
|
||||
depends on !BR2_TOOLCHAIN_USES_GLIBC
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_PDO_SQLITE
|
||||
bool "SQLite3"
|
||||
select BR2_PACKAGE_SQLITE
|
||||
|
|
|
|||
|
|
@ -162,6 +162,10 @@ ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_MYSQL),y)
|
|||
PHP_CONF_OPT += --with-pdo-mysql=$(STAGING_DIR)/usr
|
||||
PHP_DEPENDENCIES += mysql
|
||||
endif
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_POSTGRESQL),y)
|
||||
PHP_CONF_OPT += --with-pdo-pgsql=$(STAGING_DIR)/usr
|
||||
PHP_DEPENDENCIES += postgresql
|
||||
endif
|
||||
endif
|
||||
|
||||
### Use external PCRE if it's available
|
||||
|
|
|
|||
|
|
@ -140,6 +140,7 @@ define $(2)_CONFIGURE_CMDS
|
|||
--disable-documentation \
|
||||
--with-xmlto=no \
|
||||
--with-fop=no \
|
||||
--disable-dependency-tracking \
|
||||
$$(DISABLE_NLS) \
|
||||
$$(DISABLE_LARGEFILE) \
|
||||
$$(DISABLE_IPV6) \
|
||||
|
|
@ -169,6 +170,7 @@ define $(2)_CONFIGURE_CMDS
|
|||
--disable-documentation \
|
||||
--with-xmlto=no \
|
||||
--with-fop=no \
|
||||
--disable-dependency-tracking \
|
||||
$$(QUIET) $$($$(PKG)_CONF_OPT) \
|
||||
)
|
||||
endef
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
#!/bin/sh
|
||||
|
||||
#
|
||||
# Minimal pg_config implementation as replacement for the native pg_config application
|
||||
# Only implements --includedir and --libdir
|
||||
#
|
||||
|
||||
prefix=/usr
|
||||
|
||||
case "$1" in
|
||||
--includedir)
|
||||
echo "$prefix/include"
|
||||
;;
|
||||
--libdir)
|
||||
echo "$prefix/lib"
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $0 {--includedir|--libdir}"
|
||||
esac
|
||||
|
|
@ -4,13 +4,14 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
POSTGRESQL_VERSION = 9.3.4
|
||||
POSTGRESQL_VERSION = 9.3.5
|
||||
POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2
|
||||
POSTGRESQL_SITE = http://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION)
|
||||
POSTGRESQL_LICENSE = PostgreSQL
|
||||
POSTGRESQL_LICENSE_FILES = COPYRIGHT
|
||||
|
||||
POSTGRESQL_INSTALL_STAGING = YES
|
||||
POSTGRESQL_CONFIG_SCRIPTS = pg_config
|
||||
|
||||
ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
|
||||
POSTGRESQL_CONF_OPT += --disable-thread-safety
|
||||
|
|
@ -56,6 +57,13 @@ endef
|
|||
|
||||
POSTGRESQL_POST_INSTALL_TARGET_HOOKS += POSTGRESQL_INSTALL_TARGET_FIXUP
|
||||
|
||||
define POSTGRESQL_INSTALL_CUSTOM_PG_CONFIG
|
||||
$(INSTALL) -m 0755 -D package/postgresql/pg_config \
|
||||
$(STAGING_DIR)/usr/bin/pg_config
|
||||
endef
|
||||
|
||||
POSTGRESQL_POST_INSTALL_STAGING_HOOKS += POSTGRESQL_INSTALL_CUSTOM_PG_CONFIG
|
||||
|
||||
define POSTGRESQL_INSTALL_INIT_SYSV
|
||||
$(INSTALL) -m 0755 -D package/postgresql/S50postgresql \
|
||||
$(TARGET_DIR)/etc/init.d/S50postgresql
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
QEMU_VERSION = 1.6.0
|
||||
QEMU_VERSION = 2.1.0
|
||||
QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.bz2
|
||||
QEMU_SITE = http://wiki.qemu.org/download
|
||||
QEMU_LICENSE = GPLv2 LGPLv2.1 MIT BSD-3c BSD-2c Others/BSD-1c
|
||||
|
|
|
|||
|
|
@ -30,11 +30,15 @@ config BR2_PACKAGE_QT_ODBC
|
|||
|
||||
config BR2_PACKAGE_QT_PSQL
|
||||
bool "PostgreSQL Driver"
|
||||
depends on BROKEN # libpgsql not in BR
|
||||
select BR2_PACKAGE_POSTGRESQL
|
||||
depends on BR2_TOOLCHAIN_USES_GLIBC
|
||||
help
|
||||
Build PostgreSQL driver
|
||||
If unsure, say n.
|
||||
|
||||
comment "PostgreSQL needs an (e)glibc toolchain"
|
||||
depends on !BR2_TOOLCHAIN_USES_GLIBC
|
||||
|
||||
choice
|
||||
prompt "SQLite 3 support"
|
||||
default BR2_PACKAGE_QT_SQLITE_NONE
|
||||
|
|
|
|||
|
|
@ -343,6 +343,8 @@ QT_CONFIGURE_OPTS += -qt-sql-odbc
|
|||
endif
|
||||
ifeq ($(BR2_PACKAGE_QT_PSQL),y)
|
||||
QT_CONFIGURE_OPTS += -qt-sql-psql
|
||||
QT_CONFIGURE_ENV += PSQL_LIBS=-L$(STAGING_DIR)/usr/lib
|
||||
QT_DEPENDENCIES += postgresql
|
||||
endif
|
||||
ifeq ($(BR2_PACKAGE_QT_SQLITE_QT),y)
|
||||
QT_CONFIGURE_OPTS += -qt-sql-sqlite
|
||||
|
|
@ -503,6 +505,7 @@ define QT_CONFIGURE_CMDS
|
|||
PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
|
||||
PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
|
||||
PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \
|
||||
$(QT_CONFIGURE_ENV) \
|
||||
MAKEFLAGS="$(MAKEFLAGS) -j$(PARALLEL_JOBS)" ./configure \
|
||||
$(if $(VERBOSE),-verbose,-silent) \
|
||||
-force-pkg-config \
|
||||
|
|
|
|||
|
|
@ -62,6 +62,18 @@ config BR2_PACKAGE_QT5BASE_MYSQL
|
|||
help
|
||||
Build MySQL plugin
|
||||
If unsure, say n.
|
||||
|
||||
config BR2_PACKAGE_QT5BASE_PSQL
|
||||
bool "PostgreSQL Plugin"
|
||||
select BR2_PACKAGE_POSTGRESQL
|
||||
depends on BR2_TOOLCHAIN_USES_GLIBC
|
||||
help
|
||||
Build PostgreSQL plugin
|
||||
If unsure, say n.
|
||||
|
||||
comment "PostgreSQL needs an (e)glibc toolchain"
|
||||
depends on !BR2_TOOLCHAIN_USES_GLIBC
|
||||
|
||||
choice
|
||||
prompt "SQLite 3 support"
|
||||
default BR2_PACKAGE_QT5BASE_SQLITE_NONE
|
||||
|
|
|
|||
|
|
@ -66,6 +66,14 @@ else
|
|||
QT5BASE_CONFIGURE_OPTS += -no-sql-mysql
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5BASE_PSQL),y)
|
||||
QT5BASE_CONFIGURE_OPTS += -plugin-sql-psql
|
||||
QT5BASE_CONFIGURE_ENV += PSQL_LIBS=-L$(STAGING_DIR)/usr/lib
|
||||
QT5BASE_DEPENDENCIES += postgresql
|
||||
else
|
||||
QT5BASE_CONFIGURE_OPTS += -no-sql-psql
|
||||
endif
|
||||
|
||||
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_QT),-plugin-sql-sqlite)
|
||||
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM),-system-sqlite)
|
||||
QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM),sqlite)
|
||||
|
|
@ -170,6 +178,7 @@ define QT5BASE_CONFIGURE_CMDS
|
|||
PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig" \
|
||||
PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
|
||||
MAKEFLAGS="$(MAKEFLAGS) -j$(PARALLEL_JOBS)" \
|
||||
$(QT5BASE_CONFIGURE_ENV) \
|
||||
./configure \
|
||||
-v \
|
||||
-prefix /usr \
|
||||
|
|
|
|||
|
|
@ -4,11 +4,10 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
RUBY_VERSION_MAJOR = 1.9
|
||||
RUBY_VERSION = $(RUBY_VERSION_MAJOR).3-p545
|
||||
# 1.9.1 directory used for extensions
|
||||
RUBY_VERSION_EXT = 1.9.1
|
||||
RUBY_SITE = ftp://ftp.ruby-lang.org/pub/ruby/$(RUBY_VERSION_MAJOR)
|
||||
RUBY_VERSION_MAJOR = 2.1
|
||||
RUBY_VERSION = $(RUBY_VERSION_MAJOR).2
|
||||
RUBY_VERSION_EXT = 2.1.0
|
||||
RUBY_SITE = http://cache.ruby-lang.org/pub/ruby/$(RUBY_VERSION_MAJOR)
|
||||
RUBY_DEPENDENCIES = host-pkgconf host-ruby
|
||||
HOST_RUBY_DEPENDENCIES = host-pkgconf
|
||||
RUBY_MAKE_ENV = $(TARGET_MAKE_ENV)
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
SQLITE_VERSION = 3080500
|
||||
SQLITE_VERSION = 3080600
|
||||
SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz
|
||||
SQLITE_SITE = http://www.sqlite.org/2014
|
||||
SQLITE_LICENSE = Public domain
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
################################################################################
|
||||
|
||||
SQUID_VERSION_MAJOR = 3.4
|
||||
SQUID_VERSION = $(SQUID_VERSION_MAJOR).6
|
||||
SQUID_VERSION = $(SQUID_VERSION_MAJOR).7
|
||||
SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz
|
||||
SQUID_SITE = http://www.squid-cache.org/Versions/v3/$(SQUID_VERSION_MAJOR)
|
||||
SQUID_LICENSE = GPLv2+
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
STUNNEL_VERSION = 5.02
|
||||
STUNNEL_VERSION = 5.03
|
||||
STUNNEL_SITE = http://ftp.nluug.nl/pub/networking/stunnel/archive/5.x
|
||||
STUNNEL_DEPENDENCIES = openssl
|
||||
STUNNEL_CONF_OPT = --with-ssl=$(STAGING_DIR)/usr --with-threads=fork
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
UPMPDCLI_VERSION = 0.7.1
|
||||
UPMPDCLI_VERSION = 0.8.0
|
||||
UPMPDCLI_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads
|
||||
UPMPDCLI_LICENSE = GPLv2+
|
||||
UPMPDCLI_LICENSE_FILES = COPYING
|
||||
|
|
|
|||
|
|
@ -4,11 +4,10 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
ZSH_VERSION = 5.0.5
|
||||
ZSH_VERSION = 5.0.6
|
||||
ZSH_SITE = http://downloads.sourceforge.net/project/zsh/zsh/$(ZSH_VERSION)
|
||||
ZSH_LICENSE = MIT-like
|
||||
ZSH_LICENSE_FILES = LICENCE
|
||||
|
||||
ZSH_DEPENDENCIES = ncurses
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
|
|
|||
|
|
@ -636,6 +636,7 @@ while (my ($distname, $dist) = each %dist) {
|
|||
# the scheme is not used, because the job is done by the BR download infrastructure
|
||||
# the auth part is not used, because we use $(BR2_CPAN_MIRROR)
|
||||
my($filename, $directories, $suffix) = fileparse( $path, q{tar.gz}, q{tgz} );
|
||||
$directories =~ s|/$||;
|
||||
my $dependencies = join q{ }, qw( = perl ),
|
||||
map( { q{host-} . fsname( $_ ); } sort @{$deps_build{$distname}} ),
|
||||
map( { fsname( $_ ); } sort @{$deps_runtime{$distname}} );
|
||||
|
|
|
|||
Loading…
Reference in New Issue