Permalink
Browse files

br-e10-next tree sync and compile. Trying to fix recv image as it is …

…broken right now

Signed-off-by: J.C. Woltz <jwoltz@gmail.com>
  • Loading branch information...
1 parent ecfc671 commit aa62b13a1f63e266c7293ca0530e8b4ab73e2e02 @jcwoltz committed Jul 26, 2012
Showing with 576 additions and 191 deletions.
  1. +5 −4 br-e10-next/.config
  2. +5 −0 br-e10-next/board/synapse/e10/root-additions/root/scripts/update-jcu.sh
  3. +3 −2 br-e10-next/package/bluez_utils/Config.in
  4. +5 −3 br-e10-next/package/connman/Config.in
  5. +4 −0 br-e10-next/package/dbus/Config.in
  6. +4 −0 br-e10-next/package/efl/libedbus/Config.in
  7. +4 −0 br-e10-next/package/gnutls/Config.in
  8. +19 −10 br-e10-next/package/gpsd/Config.in
  9. +79 −0 br-e10-next/package/gpsd/gpsd-01-sconstruct-python-2.5-compat.patch
  10. +44 −0 br-e10-next/package/gpsd/gpsd-02-sconstruct-ncurses-config-path.patch
  11. +17 −0 br-e10-next/package/gpsd/gpsd-03-sconstruct-disable-rpath.patch
  12. +0 −23 br-e10-next/package/gpsd/gpsd-fix-libgpsmm.patch
  13. +0 −47 br-e10-next/package/gpsd/gpsd-navcom.patch
  14. +112 −72 br-e10-next/package/gpsd/gpsd.mk
  15. +1 −1 br-e10-next/package/libsoup/Config.in
  16. +38 −0 br-e10-next/package/m4/m4-1.4.16-no-gets.patch
  17. +3 −2 br-e10-next/package/mediastreamer/mediastreamer.mk
  18. +5 −4 br-e10-next/package/network-manager/Config.in
  19. +4 −2 br-e10-next/package/ofono/Config.in
  20. +1 −1 br-e10-next/package/php/php.mk
  21. +4 −4 br-e10-next/package/pkg-generic.mk
  22. +4 −0 br-e10-next/package/qt/Config.in
  23. +8 −1 br-e10-next/package/qt/qt.mk
  24. +27 −0 br-e10-next/package/radvd/radvd-highjob.patch
  25. +3 −2 br-e10-next/package/samba/Config.in
  26. +3 −0 br-e10-next/package/scons/scons.mk
  27. +4 −2 br-e10-next/package/systemd/Config.in
  28. +47 −0 br-e10-next/package/tar/tar-1.26-no-gets.patch
  29. +25 −0 ...xt/package/x11r7/xserver_xorg-server/xserver_xorg-server-01-add-dlopen-libs-flags-to-kdrive.patch
  30. +87 −0 ...xt/package/x11r7/xserver_xorg-server/xserver_xorg-server-02-supply-dl-code-with-dlopen-libs.patch
  31. +1 −0 br-e10-next/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
  32. +0 −4 br-e10-next/target/Config.in.arch
  33. +4 −0 br-e10-next/toolchain/toolchain-external/Config.in
  34. +4 −5 br-e10-recv/.config
  35. +2 −2 package-build/buildit.sh
View
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2012.08-git-00404-g41f2fbe-dirty Configuration
+# Buildroot 2012.08-git-00452-gaadffcd-dirty Configuration
#
BR2_HAVE_DOT_CONFIG=y
BR2_arm=y
@@ -200,8 +200,8 @@ BR2_PTHREADS_NATIVE=y
#
# System configuration
#
-BR2_TARGET_GENERIC_HOSTNAME="e10-nextc7b3"
-BR2_TARGET_GENERIC_ISSUE="E10 Next build 20120721"
+BR2_TARGET_GENERIC_HOSTNAME="e10-nextc7b4"
+BR2_TARGET_GENERIC_ISSUE="E10 Next build 20120726"
# BR2_ROOTFS_DEVICE_CREATION_STATIC is not set
# BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS is not set
# BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV is not set
@@ -670,7 +670,8 @@ BR2_PACKAGE_LIBFTDI=y
BR2_PACKAGE_LIBTFDI_CPP=y
# BR2_PACKAGE_LIBHID is not set
# BR2_PACKAGE_LIBIQRF is not set
-# BR2_PACKAGE_LIBNFC is not set
+BR2_PACKAGE_LIBNFC=y
+BR2_PACKAGE_LIBNFC_EXAMPLES=y
# BR2_PACKAGE_LIBNFC_LLCP is not set
BR2_PACKAGE_LIBUSB=y
BR2_PACKAGE_LIBUSB_COMPAT=y
@@ -3,3 +3,8 @@
scp -P 22174 stfu@jcu.homelinux.org:UserMain.py /root/UserMain.py
chown root:root /root/UserMain.py
chmod 755 /root/UserMain.py
+wget http://www.jcwoltz.com/e10/createSNAPSQLlite.txt
+/usr/bin/sqlite3 dc.sqlite < createSNAPSQLlite.txt
+#mkdir sc
+/bin/sync
+echo "Reboot to make sure all works. Don't dorget to install Snap Connect first"
@@ -1,6 +1,7 @@
config BR2_PACKAGE_BLUEZ_UTILS
bool "bluez-utils"
depends on BR2_USE_WCHAR # libglib2
+ depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
select BR2_PACKAGE_DBUS
select BR2_PACKAGE_LIBGLIB2
help
@@ -30,5 +31,5 @@ config BR2_PACKAGE_BLUEZ_UTILS_USB
endif
-comment "bluez-utils require a toolchain with WCHAR support"
- depends on !(BR2_USE_WCHAR)
+comment "bluez-utils require a toolchain with WCHAR and thread support"
+ depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
@@ -5,8 +5,9 @@ config BR2_PACKAGE_CONNMAN
select BR2_PACKAGE_IPTABLES
select BR2_PACKAGE_GNUTLS
depends on !(BR2_UCLIBC_VERSION_0_9_31 || BR2_UCLIBC_VERSION_0_9_32)
- depends on BR2_USE_WCHAR # libglib2
+ depends on BR2_USE_WCHAR # libglib2 and gnutls
depends on BR2_INET_IPV6
+ depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
help
The Connection Manager (ConnMan) project provides a daemon for
managing internet connections within embedded devices running
@@ -46,5 +47,6 @@ config BR2_PACKAGE_CONNMAN_CLIENT
endif # BR2_PACKAGE_CONNMAN
-comment "connman needs a toolchain with IPv6, WCHAR and resolver support"
- depends on BR2_UCLIBC_VERSION_0_9_31 || BR2_UCLIBC_VERSION_0_9_32 || !BR2_USE_WCHAR || !BR2_INET_IPV6
+comment "connman needs a toolchain with IPv6, WCHAR, thread and resolver support"
+ depends on BR2_UCLIBC_VERSION_0_9_31 || BR2_UCLIBC_VERSION_0_9_32 || \
+ !BR2_USE_WCHAR || !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS
@@ -1,5 +1,6 @@
config BR2_PACKAGE_DBUS
bool "dbus"
+ depends on BR2_TOOLCHAIN_HAS_THREADS
help
The D-Bus message bus system.
@@ -23,3 +24,6 @@ choice
select BR2_PACKAGE_LIBXML2
endchoice
+
+comment "dbus requires a toolchain with thread support"
+ depends on !BR2_TOOLCHAIN_HAS_THREADS
@@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBEDBUS
select BR2_PACKAGE_LIBEINA
select BR2_PACKAGE_LIBECORE
select BR2_PACKAGE_DBUS
+ depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
help
E_Dbus is a set of wrappers around D-Bus APIs so they can be
easily used by EFL applications, automatically providing
@@ -30,3 +31,6 @@ config BR2_PACKAGE_LIBEDBUS_NOTIFY
Notify support.
endif
+
+comment "libedbus requires a toolchain with thread support"
+ depends on !BR2_TOOLCHAIN_HAS_THREADS
@@ -1,8 +1,12 @@
config BR2_PACKAGE_GNUTLS
bool "gnutls"
select BR2_PACKAGE_LIBGCRYPT
+ depends on BR2_USE_WCHAR
help
GnuTLS is a secure communications library implementing the SSL
and TLS protocols and technologies around them.
http://www.gnu.org/software/gnutls/gnutls.html
+
+comment "gnutls requires a toolchain with WCHAR support"
+ depends on !BR2_USE_WCHAR
@@ -20,9 +20,6 @@ config BR2_PACKAGE_GPSD_DEVICES
menu "Features"
depends on BR2_PACKAGE_GPSD
-config BR2_PACKAGE_GPSD_TIMING
- bool "latency timing support"
-
config BR2_PACKAGE_GPSD_CLIENT_DEBUG
bool "client debugging support"
@@ -31,17 +28,17 @@ config BR2_PACKAGE_GPSD_OLDSTYLE
config BR2_PACKAGE_GPSD_PROFILING
bool "profiling support"
+ depends on !BR2_TOOLCHAIN_BUILDROOT && !BR2_TOOLCHAIN_CTNG_uClibc && !BR2_TOOLCHAIN_EXTERNAL_UCLIBC
+
+comment "profiling support not available with uClibc-based toolchain"
+ depends on BR2_TOOLCHAIN_BUILDROOT || BR2_TOOLCHAIN_CTNG_uClibc || BR2_TOOLCHAIN_EXTERNAL_UCLIBC
config BR2_PACKAGE_GPSD_NTP_SHM
bool "NTP time hinting support"
config BR2_PACKAGE_GPSD_PPS
bool "PPS time syncing support"
-config BR2_PACKAGE_GPSD_PPS_ON_CTS
- bool "PPS pulse on CTS rather than DCD"
- depends on BR2_PACKAGE_GPSD_PPS
-
config BR2_PACKAGE_GPSD_USER
bool "GPSD privilege revocation user"
config BR2_PACKAGE_GPSD_USER_VALUE
@@ -85,9 +82,6 @@ config BR2_PACKAGE_GPSD_CONTROLSEND
bool "allow gpsctl/gpsmon to change device settings"
default y
-config BR2_PACKAGE_GPSD_RAW
- bool "enable raw measurement processing"
-
config BR2_PACKAGE_GPSD_SQUELCH
bool "squelch gpsd_report and gpsd_hexdump to save cpu"
@@ -116,6 +110,11 @@ config BR2_PACKAGE_GPSD_EVERMORE
help
EverMore binary support
+config BR2_PACKAGE_GPSD_FURY
+ bool "Fury"
+ help
+ Jackson Labs Fury and Firefly support
+
config BR2_PACKAGE_GPSD_FV18
bool "FV-18"
help
@@ -131,6 +130,11 @@ config BR2_PACKAGE_GPSD_GARMIN_SIMPLE_TXT
help
Garmin Simple Text support
+config BR2_PACKAGE_GPSD_GEOSTAR
+ bool "Geostar"
+ help
+ Geostar Protocol support
+
config BR2_PACKAGE_GPSD_GPSCLOCK
bool "GPSClock"
help
@@ -162,6 +166,11 @@ config BR2_PACKAGE_GPSD_NAVCOM
help
Navcom binary support
+config BR2_PACKAGE_GPSD_NMEA2000
+ bool "nmea2000"
+ help
+ NMEA2000/CAN support
+
config BR2_PACKAGE_GPSD_OCEANSERVER
bool "OceanServer"
help
@@ -0,0 +1,79 @@
+Remove all the with ... as foo constructs
+
+Those constructs have been introduced in Python 2.6, and some of our
+autobuilders still use Python 2.5, so replace them with constructs
+that are compatible with Python 2.5.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/SConstruct
+===================================================================
+--- a/SConstruct
++++ b/SConstruct
+@@ -366,8 +366,8 @@
+
+ def CheckXsltproc(context):
+ context.Message('Checking that xsltproc can make man pages... ')
+- with open("xmltest.xml", "w") as ofp:
+- ofp.write('''
++ ofp = open("xmltest.xml", "w")
++ ofp.write('''
+ <refentry id="foo.1">
+ <refmeta>
+ <refentrytitle>foo</refentrytitle>
+@@ -380,6 +380,7 @@
+ </refnamediv>
+ </refentry>
+ ''')
++ ofp.close()
+ probe = "xsltproc --nonet --noout '%s' xmltest.xml" % (docbook_man_uri,)
+ ret = context.TryAction(probe)[0]
+ os.remove("xmltest.xml")
+@@ -1042,8 +1043,9 @@
+ # build timebase.h
+ def timebase_h(target, source, env):
+ from leapsecond import make_leapsecond_include
+- with open(target[0].abspath, 'w') as f:
+- f.write(make_leapsecond_include(source[0].abspath))
++ f = open(target[0].abspath, 'w')
++ f.write(make_leapsecond_include(source[0].abspath))
++ f.close()
+ env.Command(target="timebase.h", source="leapseconds.cache",
+ action=timebase_h)
+
+@@ -1116,15 +1118,17 @@
+ ('@DEVMAIL@', devmail),
+ ('@LIBGPSVERSION@', libgps_version),
+ )
+- with open(str(source[0])) as sfp:
+- content = sfp.read()
++ sfp = open(str(source[0]))
++ content = sfp.read()
++ sfp.close()
+ for (s, t) in substmap:
+ content = content.replace(s, t)
+ m = re.search("@[A-Z]+@", content)
+ if m and m.group(0) not in map(lambda x: x[0], substmap):
+ print >>sys.stderr, "Unknown subst token %s in %s." % (m.group(0), sfp.name)
+- with open(str(target[0]), "w") as tfp:
+- tfp.write(content)
++ tfp = open(str(target[0]), "w")
++ tfp.write(content)
++ tfp.close()
+
+ templated = glob.glob("*.in") + glob.glob("*/*.in") + glob.glob("*/*/*.in")
+
+@@ -1560,9 +1564,10 @@
+ def validation_list(target, source, env):
+ for page in glob.glob("www/*.html"):
+ if not '-head' in page:
+- with open(page) as fp:
+- if "Valid HTML" in fp.read():
+- print os.path.join(website, os.path.basename(page))
++ fp = open(page)
++ if "Valid HTML" in fp.read():
++ print os.path.join(website, os.path.basename(page))
++ fp.close()
+ Utility("validation-list", [www], validation_list)
+
+ # How to update the website
@@ -0,0 +1,44 @@
+Add option to specify the path to ncurses5-config
+
+By default, gpsd's SConstruct looks in the PATH to find
+ncurses5-config, which means that it finds our HOST_DIR
+ncurses5-config. We add an option that allows to specify a custom path
+to the ncurses5-config script.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/SConstruct
+===================================================================
+--- a/SConstruct
++++ b/SConstruct
+@@ -172,6 +172,7 @@
+ ("fixed_stop_bits", 0, "fixed serial port stop bits"),
+ ("target", "", "cross-development target"),
+ ("sysroot", "", "cross-development system root"),
++ ("ncurses_config", "", "ncurses5-config path"),
+ )
+ for (name, default, help) in nonboolopts:
+ opts.Add(name, help, default)
+@@ -447,6 +448,11 @@
+ else:
+ pkg_config = lambda pkg: ['!%s --cflags --libs --static %s' %(env['PKG_CONFIG'], pkg, )]
+
++if env['ncurses_config']:
++ ncurses_config = env['ncurses_config']
++else:
++ ncurses_config = "ncurses5-config"
++
+ # The actual distinction here is whether the platform has ncurses in the
+ # base system or not. If it does, pkg-config is not likely to tell us
+ # anything useful. FreeBSD does, Linux doesn't. Most likely other BSDs
+@@ -455,8 +461,8 @@
+ if env['ncurses']:
+ if config.CheckPKG('ncurses'):
+ ncurseslibs = pkg_config('ncurses')
+- elif config.CheckExecutable('ncurses5-config --version', 'ncurses5-config'):
+- ncurseslibs = ['!ncurses5-config --libs --cflags']
++ elif config.CheckExecutable('%s --version' % ncurses_config, 'ncurses5-config'):
++ ncurseslibs = ['!%s --libs --cflags' % ncurses_config]
+ elif sys.platform.startswith('freebsd'):
+ ncurseslibs= [ '-lncurses' ]
+ elif sys.platform.startswith('openbsd'):
@@ -0,0 +1,17 @@
+Disable addition of RPATH to the generated libraries
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/SConstruct
+===================================================================
+--- a/SConstruct
++++ b/SConstruct
+@@ -273,8 +273,6 @@
+ env.Prepend(LIBPATH=[installdir('libdir')])
+ else:
+ env.Prepend(LIBPATH=[env["sysroot"] + installdir('libdir')])
+-if env["shared"]:
+- env.Prepend(RPATH=[installdir('libdir')])
+
+ # Give deheader a way to set compiler flags
+ if 'MORECFLAGS' in os.environ:
@@ -1,23 +0,0 @@
-diff -Nura gpsd-2.95.orig/Makefile.in gpsd-2.95.x/Makefile.in
---- gpsd-2.95.orig/Makefile.in 2010-07-13 19:48:24.000000000 -0300
-+++ gpsd-2.95.x/Makefile.in 2010-07-27 17:40:28.902568874 -0300
-@@ -546,7 +546,7 @@
- libgps_VERSION__REVISION = 0
- libgps_VERSION_AGE = 0
- libgps_VERSION_NUMBER = $(libgps_VERSION_AGE):$(libgps_VERSION__REVISION):$(libgps_VERSION_AGE)
--libgps_la_LDFLAGS = -version-number $(libgps_VERSION_CURRENT):$(libgps_VERSION__REVISION):$(libgps_VERSION_AGE)
-+libgps_la_LDFLAGS = -version-number $(libgps_VERSION_CURRENT):$(libgps_VERSION__REVISION):$(libgps_VERSION_AGE) $(LDFLAGS)
- lib_LTLIBRARIES = libgps.la libgpsd.la
- libgps_SONAME = $(shell expr $(libgps_VERSION_CURRENT) - $(libgps_VERSION_AGE))
- libgps_VERSION = $(libgps_SONAME).$(libgps_VERSION_AGE).$(libgps_VERSION__REVISION)
-@@ -612,8 +612,8 @@
- libgpsd_la_SOURCES = $(libgpsd_c_sources) $(libgpsd_h_sources) \
- driver_rtcm2.h packet_states.h
-
--@LIBGPSMM_ENABLE_FALSE@libgps_la_LINK = /bin/sh ./libtool --tag=CC --mode=link gcc $(libgps_la_LDFLAGS) -o $@
--@LIBGPSMM_ENABLE_TRUE@libgps_la_LINK = /bin/sh ./libtool --tag=CXX --mode=link g++ $(libgps_la_LDFLAGS) -o $@
-+@LIBGPSMM_ENABLE_FALSE@libgps_la_LINK = /bin/sh ./libtool --tag=CC --mode=link $(CC) $(libgps_la_LDFLAGS) -o $@
-+@LIBGPSMM_ENABLE_TRUE@libgps_la_LINK = /bin/sh ./libtool --tag=CXX --mode=link $(CXX) $(libgps_la_LDFLAGS) -o $@
- nodist_libgpsd_la_SOURCES = packet_names.h ais_json.i
- libgps_la_LIBADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) $(LIBPTHREAD)
- libgpsd_la_LIBADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) $(LIBPTHREAD) $(BLUEZ_LIBS) libgps.la
Oops, something went wrong.

0 comments on commit aa62b13

Please sign in to comment.