From 03f9ce54630c3fdc7b3f227ef24f3c6ddea95051 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 10 Feb 2017 21:48:09 +0100 Subject: [PATCH 01/74] package/ffmpeg: bump version to 3.2.4 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/ffmpeg/ffmpeg.hash | 2 +- package/ffmpeg/ffmpeg.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ffmpeg/ffmpeg.hash b/package/ffmpeg/ffmpeg.hash index 6adf7e440a..33942b9763 100644 --- a/package/ffmpeg/ffmpeg.hash +++ b/package/ffmpeg/ffmpeg.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 54ce502aca10b7e6059f19220ea2f68fa0c9c4c4d255ae13e615f08f0c94dcc5 ffmpeg-3.2.3.tar.xz +sha256 6e38ff14f080c98b58cf5967573501b8cb586e3a173b591f3807d8f0660daf7a ffmpeg-3.2.4.tar.xz diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 6540d41c52..4447b724c4 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -FFMPEG_VERSION = 3.2.3 +FFMPEG_VERSION = 3.2.4 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz FFMPEG_SITE = http://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES From 25707b2fd63abbf93417d7d878c29d7585914ea9 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 10 Feb 2017 17:17:10 +0100 Subject: [PATCH 02/74] lxc: enable selinux if package is selected Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/lxc/lxc.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index 455814b9c9..b79197fa57 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -29,6 +29,13 @@ else LXC_CONF_OPTS += --disable-seccomp endif +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +LXC_CONF_OPTS += --enable-selinux +LXC_DEPENDENCIES += libselinux +else +LXC_CONF_OPTS += --disable-selinux +endif + ifeq ($(BR2_PACKAGE_HAS_LUAINTERPRETER),y) LXC_CONF_OPTS += --enable-lua LXC_DEPENDENCIES += luainterpreter From f56b13897b9f30c78d7ccd78a25b1e985179d2ab Mon Sep 17 00:00:00 2001 From: Andrey Yurovsky Date: Fri, 10 Feb 2017 11:08:15 -0800 Subject: [PATCH 03/74] package: qemu: bump version to 2.8.0 This adds a CPU definition for the Cortex A7 along with improvements described here: http://wiki.qemu-project.org/ChangeLog/2.8 Tested on an ARM Cortex A7 target (both target and host builds). The change log does not describe any incompatible changes that would affect buildroot targets as far as I am aware. Signed-off-by: Andrey Yurovsky Signed-off-by: Thomas Petazzoni --- package/qemu/qemu.hash | 2 +- package/qemu/qemu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash index 572a5c911a..19cb306938 100644 --- a/package/qemu/qemu.hash +++ b/package/qemu/qemu.hash @@ -1,2 +1,2 @@ # Locally computed, tarball verified with GPG signature -sha256 326e739506ba690daf69fc17bd3913a6c313d9928d743bd8eddb82f403f81e53 qemu-2.7.0.tar.bz2 +sha256 dafd5d7f649907b6b617b822692f4c82e60cf29bc0fc58bc2036219b591e5e62 qemu-2.8.0.tar.bz2 diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 66efcba345..e744556d9b 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -4,7 +4,7 @@ # ################################################################################ -QEMU_VERSION = 2.7.0 +QEMU_VERSION = 2.8.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 From 8f8c02e596e781df77b8cd7d5e7b3c33ae5e36b2 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Sun, 12 Feb 2017 03:04:44 +0100 Subject: [PATCH 04/74] classpath: bump to version 0.99 Drop both patches since they are included upstream. We don't need to autoreconf now. Note: classpath 0.99 has a bug in it's autoconf scripts, such that configure always fails when specifying --disable-tools[1]. We enable these for now. Also explicitly disable GJDoc generation, as this defaults to on now. --disable-plugin is not needed any more, since this is now the default. [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70660 Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- package/classpath/0001-fix-gmp-include.patch | 46 -- package/classpath/0002-add-config-rpath.patch | 680 ------------------ package/classpath/classpath.hash | 4 +- package/classpath/classpath.mk | 7 +- 4 files changed, 5 insertions(+), 732 deletions(-) delete mode 100644 package/classpath/0001-fix-gmp-include.patch delete mode 100644 package/classpath/0002-add-config-rpath.patch diff --git a/package/classpath/0001-fix-gmp-include.patch b/package/classpath/0001-fix-gmp-include.patch deleted file mode 100644 index f7a392093f..0000000000 --- a/package/classpath/0001-fix-gmp-include.patch +++ /dev/null @@ -1,46 +0,0 @@ -The GMP include is hardcoded to /usr/include causing obvious problems. - -From classpath CVS: -http://cvs.savannah.gnu.org/viewvc/classpath/configure.ac?root=classpath&r1=1.245&r2=1.246 - -[Gustavo: ditch -L or libtool complains loudly] - -Signed-off-by: Gustavo Zacarias - ---- a/configure.ac 2010/01/30 01:33:50 1.245 -+++ b/configure.ac 2010/05/04 12:29:23 1.246 -@@ -752,10 +752,32 @@ - dnl __gmpz_mul_si for earlier versions (>= 3.1). - dnl IMPORTANT: if you decide to look for __gmpz_combit, don't forget to - dnl change the name of the corresponding ac_ variable on lines 860... -+ AC_ARG_WITH(gmp, [ --with-gmp=PATH specify prefix directory for the installed GMP package. -+ Equivalent to --with-gmp-include=PATH/include -+ plus --with-gmp-lib=PATH/lib]) -+ AC_ARG_WITH(gmp_include, [ --with-gmp-include=PATH specify directory for installed GMP include files]) -+ AC_ARG_WITH(gmp_lib, [ --with-gmp-lib=PATH specify directory for the installed GMP library]) -+ - if test "x${COMPILE_GMP}" = xyes; then -+ AC_MSG_CHECKING([for GMP directories]) -+ if test "x$with_gmp" != x; then -+ gmplibs="-lgmp" -+ gmpinc="-I$with_gmp/include" -+ if test "x$with_gmp_include" != x; then -+ gmpinc="-I$with_gmp_include $gmpinc" -+ fi -+ if test "x$with_gmp_lib" != x; then -+ gmplibs="$gmplibs" -+ fi -+ else -+ with_gmp="/usr" -+ gmplibs="-lgmp" -+ gmpinc="-I/usr/include" -+ fi -+ AC_MSG_RESULT([prefix=$with_gmp, libs=$gmplibs, inc=$gmpinc]) - AC_CHECK_LIB(gmp, __gmpz_mul_si, -- [GMP_CFLAGS=-I/usr/include -- GMP_LIBS=-lgmp ], -+ [GMP_CFLAGS="$gmpinc" -+ GMP_LIBS="$gmplibs" ], - [GMP_CFLAGS= - GMP_LIBS= ]) - AC_SUBST(GMP_CFLAGS) diff --git a/package/classpath/0002-add-config-rpath.patch b/package/classpath/0002-add-config-rpath.patch deleted file mode 100644 index 3a8a7d0952..0000000000 --- a/package/classpath/0002-add-config-rpath.patch +++ /dev/null @@ -1,680 +0,0 @@ -Add config.rpath from upstream CVS to avoid (re)autoconfiguring errors. - -Signed-off-by: Gustavo Zacarias - -diff -Nura classpath-0.98.orig/config.rpath classpath-0.98/config.rpath ---- classpath-0.98.orig/config.rpath 1969-12-31 21:00:00.000000000 -0300 -+++ classpath-0.98/config.rpath 2013-07-10 09:36:51.894281025 -0300 -@@ -0,0 +1,672 @@ -+#! /bin/sh -+# Output a system dependent set of variables, describing how to set the -+# run time search path of shared libraries in an executable. -+# -+# Copyright 1996-2010 Free Software Foundation, Inc. -+# Taken from GNU libtool, 2001 -+# Originally by Gordon Matzigkeit , 1996 -+# -+# This file is free software; the Free Software Foundation gives -+# unlimited permission to copy and/or distribute it, with or without -+# modifications, as long as this notice is preserved. -+# -+# The first argument passed to this file is the canonical host specification, -+# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM -+# or -+# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM -+# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld -+# should be set by the caller. -+# -+# The set of defined variables is at the end of this script. -+ -+# Known limitations: -+# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer -+# than 256 bytes, otherwise the compiler driver will dump core. The only -+# known workaround is to choose shorter directory names for the build -+# directory and/or the installation directory. -+ -+# All known linkers require a `.a' archive for static linking (except MSVC, -+# which needs '.lib'). -+libext=a -+shrext=.so -+ -+host="$1" -+host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -+host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -+host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+ -+# Code taken from libtool.m4's _LT_CC_BASENAME. -+ -+for cc_temp in $CC""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'` -+ -+# Code taken from libtool.m4's _LT_COMPILER_PIC. -+ -+wl= -+if test "$GCC" = yes; then -+ wl='-Wl,' -+else -+ case "$host_os" in -+ aix*) -+ wl='-Wl,' -+ ;; -+ darwin*) -+ case $cc_basename in -+ xlc*) -+ wl='-Wl,' -+ ;; -+ esac -+ ;; -+ mingw* | cygwin* | pw32* | os2* | cegcc*) -+ ;; -+ hpux9* | hpux10* | hpux11*) -+ wl='-Wl,' -+ ;; -+ irix5* | irix6* | nonstopux*) -+ wl='-Wl,' -+ ;; -+ newsos6) -+ ;; -+ linux* | k*bsd*-gnu) -+ case $cc_basename in -+ ecc*) -+ wl='-Wl,' -+ ;; -+ icc* | ifort*) -+ wl='-Wl,' -+ ;; -+ lf95*) -+ wl='-Wl,' -+ ;; -+ pgcc | pgf77 | pgf90) -+ wl='-Wl,' -+ ;; -+ ccc*) -+ wl='-Wl,' -+ ;; -+ como) -+ wl='-lopt=' -+ ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ wl='-Wl,' -+ ;; -+ esac -+ ;; -+ esac -+ ;; -+ osf3* | osf4* | osf5*) -+ wl='-Wl,' -+ ;; -+ rdos*) -+ ;; -+ solaris*) -+ wl='-Wl,' -+ ;; -+ sunos4*) -+ wl='-Qoption ld ' -+ ;; -+ sysv4 | sysv4.2uw2* | sysv4.3*) -+ wl='-Wl,' -+ ;; -+ sysv4*MP*) -+ ;; -+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -+ wl='-Wl,' -+ ;; -+ unicos*) -+ wl='-Wl,' -+ ;; -+ uts4*) -+ ;; -+ esac -+fi -+ -+# Code taken from libtool.m4's _LT_LINKER_SHLIBS. -+ -+hardcode_libdir_flag_spec= -+hardcode_libdir_separator= -+hardcode_direct=no -+hardcode_minus_L=no -+ -+case "$host_os" in -+ cygwin* | mingw* | pw32* | cegcc*) -+ # FIXME: the MSVC++ port hasn't been tested in a loooong time -+ # When not using gcc, we currently assume that we are using -+ # Microsoft Visual C++. -+ if test "$GCC" != yes; then -+ with_gnu_ld=no -+ fi -+ ;; -+ interix*) -+ # we just hope/assume this is gcc and not c89 (= MSVC++) -+ with_gnu_ld=yes -+ ;; -+ openbsd*) -+ with_gnu_ld=no -+ ;; -+esac -+ -+ld_shlibs=yes -+if test "$with_gnu_ld" = yes; then -+ # Set some defaults for GNU ld with shared library support. These -+ # are reset later if shared libraries are not supported. Putting them -+ # here allows them to be overridden if necessary. -+ # Unlike libtool, we use -rpath here, not --rpath, since the documented -+ # option of GNU ld is called -rpath, not --rpath. -+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -+ case "$host_os" in -+ aix[3-9]*) -+ # On AIX/PPC, the GNU linker is very broken -+ if test "$host_cpu" != ia64; then -+ ld_shlibs=no -+ fi -+ ;; -+ amigaos*) -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_minus_L=yes -+ # Samuel A. Falvo II reports -+ # that the semantics of dynamic libraries on AmigaOS, at least up -+ # to version 4, is to share data among multiple programs linked -+ # with the same dynamic library. Since this doesn't match the -+ # behavior of shared libraries on other platforms, we cannot use -+ # them. -+ ld_shlibs=no -+ ;; -+ beos*) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ : -+ else -+ ld_shlibs=no -+ fi -+ ;; -+ cygwin* | mingw* | pw32* | cegcc*) -+ # hardcode_libdir_flag_spec is actually meaningless, as there is -+ # no search path for DLLs. -+ hardcode_libdir_flag_spec='-L$libdir' -+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then -+ : -+ else -+ ld_shlibs=no -+ fi -+ ;; -+ interix[3-9]*) -+ hardcode_direct=no -+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ ;; -+ gnu* | linux* | k*bsd*-gnu) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ : -+ else -+ ld_shlibs=no -+ fi -+ ;; -+ netbsd*) -+ ;; -+ solaris*) -+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then -+ ld_shlibs=no -+ elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ : -+ else -+ ld_shlibs=no -+ fi -+ ;; -+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) -+ case `$LD -v 2>&1` in -+ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) -+ ld_shlibs=no -+ ;; -+ *) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' -+ else -+ ld_shlibs=no -+ fi -+ ;; -+ esac -+ ;; -+ sunos4*) -+ hardcode_direct=yes -+ ;; -+ *) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ : -+ else -+ ld_shlibs=no -+ fi -+ ;; -+ esac -+ if test "$ld_shlibs" = no; then -+ hardcode_libdir_flag_spec= -+ fi -+else -+ case "$host_os" in -+ aix3*) -+ # Note: this linker hardcodes the directories in LIBPATH if there -+ # are no directories specified by -L. -+ hardcode_minus_L=yes -+ if test "$GCC" = yes; then -+ # Neither direct hardcoding nor static linking is supported with a -+ # broken collect2. -+ hardcode_direct=unsupported -+ fi -+ ;; -+ aix[4-9]*) -+ if test "$host_cpu" = ia64; then -+ # On IA64, the linker does run time linking by default, so we don't -+ # have to do anything special. -+ aix_use_runtimelinking=no -+ else -+ aix_use_runtimelinking=no -+ # Test if we are trying to use run time linking or normal -+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we -+ # need to do runtime linking. -+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) -+ for ld_flag in $LDFLAGS; do -+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then -+ aix_use_runtimelinking=yes -+ break -+ fi -+ done -+ ;; -+ esac -+ fi -+ hardcode_direct=yes -+ hardcode_libdir_separator=':' -+ if test "$GCC" = yes; then -+ case $host_os in aix4.[012]|aix4.[012].*) -+ collect2name=`${CC} -print-prog-name=collect2` -+ if test -f "$collect2name" && \ -+ strings "$collect2name" | grep resolve_lib_name >/dev/null -+ then -+ # We have reworked collect2 -+ : -+ else -+ # We have old collect2 -+ hardcode_direct=unsupported -+ hardcode_minus_L=yes -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_libdir_separator= -+ fi -+ ;; -+ esac -+ fi -+ # Begin _LT_AC_SYS_LIBPATH_AIX. -+ echo 'int main () { return 0; }' > conftest.c -+ ${CC} ${LDFLAGS} conftest.c -o conftest -+ aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -+}'` -+ if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -+}'` -+ fi -+ if test -z "$aix_libpath"; then -+ aix_libpath="/usr/lib:/lib" -+ fi -+ rm -f conftest.c conftest -+ # End _LT_AC_SYS_LIBPATH_AIX. -+ if test "$aix_use_runtimelinking" = yes; then -+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" -+ else -+ if test "$host_cpu" = ia64; then -+ hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' -+ else -+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" -+ fi -+ fi -+ ;; -+ amigaos*) -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_minus_L=yes -+ # see comment about different semantics on the GNU ld section -+ ld_shlibs=no -+ ;; -+ bsdi[45]*) -+ ;; -+ cygwin* | mingw* | pw32* | cegcc*) -+ # When not using gcc, we currently assume that we are using -+ # Microsoft Visual C++. -+ # hardcode_libdir_flag_spec is actually meaningless, as there is -+ # no search path for DLLs. -+ hardcode_libdir_flag_spec=' ' -+ libext=lib -+ ;; -+ darwin* | rhapsody*) -+ hardcode_direct=no -+ if test "$GCC" = yes ; then -+ : -+ else -+ case $cc_basename in -+ xlc*) -+ ;; -+ *) -+ ld_shlibs=no -+ ;; -+ esac -+ fi -+ ;; -+ dgux*) -+ hardcode_libdir_flag_spec='-L$libdir' -+ ;; -+ freebsd1*) -+ ld_shlibs=no -+ ;; -+ freebsd2.2*) -+ hardcode_libdir_flag_spec='-R$libdir' -+ hardcode_direct=yes -+ ;; -+ freebsd2*) -+ hardcode_direct=yes -+ hardcode_minus_L=yes -+ ;; -+ freebsd* | dragonfly*) -+ hardcode_libdir_flag_spec='-R$libdir' -+ hardcode_direct=yes -+ ;; -+ hpux9*) -+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator=: -+ hardcode_direct=yes -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ hardcode_minus_L=yes -+ ;; -+ hpux10*) -+ if test "$with_gnu_ld" = no; then -+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator=: -+ hardcode_direct=yes -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ hardcode_minus_L=yes -+ fi -+ ;; -+ hpux11*) -+ if test "$with_gnu_ld" = no; then -+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator=: -+ case $host_cpu in -+ hppa*64*|ia64*) -+ hardcode_direct=no -+ ;; -+ *) -+ hardcode_direct=yes -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ hardcode_minus_L=yes -+ ;; -+ esac -+ fi -+ ;; -+ irix5* | irix6* | nonstopux*) -+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator=: -+ ;; -+ netbsd*) -+ hardcode_libdir_flag_spec='-R$libdir' -+ hardcode_direct=yes -+ ;; -+ newsos6) -+ hardcode_direct=yes -+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator=: -+ ;; -+ openbsd*) -+ if test -f /usr/libexec/ld.so; then -+ hardcode_direct=yes -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ else -+ case "$host_os" in -+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) -+ hardcode_libdir_flag_spec='-R$libdir' -+ ;; -+ *) -+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ ;; -+ esac -+ fi -+ else -+ ld_shlibs=no -+ fi -+ ;; -+ os2*) -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_minus_L=yes -+ ;; -+ osf3*) -+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator=: -+ ;; -+ osf4* | osf5*) -+ if test "$GCC" = yes; then -+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -+ else -+ # Both cc and cxx compiler support -rpath directly -+ hardcode_libdir_flag_spec='-rpath $libdir' -+ fi -+ hardcode_libdir_separator=: -+ ;; -+ solaris*) -+ hardcode_libdir_flag_spec='-R$libdir' -+ ;; -+ sunos4*) -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_direct=yes -+ hardcode_minus_L=yes -+ ;; -+ sysv4) -+ case $host_vendor in -+ sni) -+ hardcode_direct=yes # is this really true??? -+ ;; -+ siemens) -+ hardcode_direct=no -+ ;; -+ motorola) -+ hardcode_direct=no #Motorola manual says yes, but my tests say they lie -+ ;; -+ esac -+ ;; -+ sysv4.3*) -+ ;; -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ ld_shlibs=yes -+ fi -+ ;; -+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) -+ ;; -+ sysv5* | sco3.2v5* | sco5v6*) -+ hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' -+ hardcode_libdir_separator=':' -+ ;; -+ uts4*) -+ hardcode_libdir_flag_spec='-L$libdir' -+ ;; -+ *) -+ ld_shlibs=no -+ ;; -+ esac -+fi -+ -+# Check dynamic linker characteristics -+# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER. -+# Unlike libtool.m4, here we don't care about _all_ names of the library, but -+# only about the one the linker finds when passed -lNAME. This is the last -+# element of library_names_spec in libtool.m4, or possibly two of them if the -+# linker has special search rules. -+library_names_spec= # the last element of library_names_spec in libtool.m4 -+libname_spec='lib$name' -+case "$host_os" in -+ aix3*) -+ library_names_spec='$libname.a' -+ ;; -+ aix[4-9]*) -+ library_names_spec='$libname$shrext' -+ ;; -+ amigaos*) -+ library_names_spec='$libname.a' -+ ;; -+ beos*) -+ library_names_spec='$libname$shrext' -+ ;; -+ bsdi[45]*) -+ library_names_spec='$libname$shrext' -+ ;; -+ cygwin* | mingw* | pw32* | cegcc*) -+ shrext=.dll -+ library_names_spec='$libname.dll.a $libname.lib' -+ ;; -+ darwin* | rhapsody*) -+ shrext=.dylib -+ library_names_spec='$libname$shrext' -+ ;; -+ dgux*) -+ library_names_spec='$libname$shrext' -+ ;; -+ freebsd1*) -+ ;; -+ freebsd* | dragonfly*) -+ case "$host_os" in -+ freebsd[123]*) -+ library_names_spec='$libname$shrext$versuffix' ;; -+ *) -+ library_names_spec='$libname$shrext' ;; -+ esac -+ ;; -+ gnu*) -+ library_names_spec='$libname$shrext' -+ ;; -+ hpux9* | hpux10* | hpux11*) -+ case $host_cpu in -+ ia64*) -+ shrext=.so -+ ;; -+ hppa*64*) -+ shrext=.sl -+ ;; -+ *) -+ shrext=.sl -+ ;; -+ esac -+ library_names_spec='$libname$shrext' -+ ;; -+ interix[3-9]*) -+ library_names_spec='$libname$shrext' -+ ;; -+ irix5* | irix6* | nonstopux*) -+ library_names_spec='$libname$shrext' -+ case "$host_os" in -+ irix5* | nonstopux*) -+ libsuff= shlibsuff= -+ ;; -+ *) -+ case $LD in -+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;; -+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;; -+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;; -+ *) libsuff= shlibsuff= ;; -+ esac -+ ;; -+ esac -+ ;; -+ linux*oldld* | linux*aout* | linux*coff*) -+ ;; -+ linux* | k*bsd*-gnu) -+ library_names_spec='$libname$shrext' -+ ;; -+ knetbsd*-gnu) -+ library_names_spec='$libname$shrext' -+ ;; -+ netbsd*) -+ library_names_spec='$libname$shrext' -+ ;; -+ newsos6) -+ library_names_spec='$libname$shrext' -+ ;; -+ nto-qnx*) -+ library_names_spec='$libname$shrext' -+ ;; -+ openbsd*) -+ library_names_spec='$libname$shrext$versuffix' -+ ;; -+ os2*) -+ libname_spec='$name' -+ shrext=.dll -+ library_names_spec='$libname.a' -+ ;; -+ osf3* | osf4* | osf5*) -+ library_names_spec='$libname$shrext' -+ ;; -+ rdos*) -+ ;; -+ solaris*) -+ library_names_spec='$libname$shrext' -+ ;; -+ sunos4*) -+ library_names_spec='$libname$shrext$versuffix' -+ ;; -+ sysv4 | sysv4.3*) -+ library_names_spec='$libname$shrext' -+ ;; -+ sysv4*MP*) -+ library_names_spec='$libname$shrext' -+ ;; -+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -+ library_names_spec='$libname$shrext' -+ ;; -+ uts4*) -+ library_names_spec='$libname$shrext' -+ ;; -+esac -+ -+sed_quote_subst='s/\(["`$\\]\)/\\\1/g' -+escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"` -+shlibext=`echo "$shrext" | sed -e 's,^\.,,'` -+escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` -+escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` -+escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` -+ -+LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' < Date: Sun, 12 Feb 2017 00:04:24 +0200 Subject: [PATCH 05/74] e2fsprogs: bump to version 1.43.4 Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/e2fsprogs/e2fsprogs.hash | 4 ++-- package/e2fsprogs/e2fsprogs.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/e2fsprogs/e2fsprogs.hash b/package/e2fsprogs/e2fsprogs.hash index 5fd9f3d6b4..cf41e3a3d5 100644 --- a/package/e2fsprogs/e2fsprogs.hash +++ b/package/e2fsprogs/e2fsprogs.hash @@ -1,2 +1,2 @@ -# From https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.43.3/sha256sums.asc -sha256 744ca4e9a8e6c943601b2744d1ae658e5f37d35b5ea5b1dea86985320bd87f37 e2fsprogs-1.43.3.tar.xz +# From https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.43.4/sha256sums.asc +sha256 54b3f21123a531a6a536b9cdcc21344b0122a72790dbe4dacc98e64db25e4a24 e2fsprogs-1.43.4.tar.xz diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index 0253510bf7..e5016842de 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -4,7 +4,7 @@ # ################################################################################ -E2FSPROGS_VERSION = 1.43.3 +E2FSPROGS_VERSION = 1.43.4 E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION) E2FSPROGS_LICENSE = GPLv2, libuuid BSD-3c, libss and libet MIT-like with advertising clause From 292998ca752a899ef0d91e2507e47535af7178ac Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 12 Feb 2017 15:40:18 +0100 Subject: [PATCH 06/74] classpath: fix typo in CLASSPATH_CONF_OPTS definition This typo was introduced by commit 8f8c02e596e781df77b8cd7d5e7b3c33ae5e36b2 ("classpath: bump to version 0.99"). Signed-off-by: Thomas Petazzoni --- package/classpath/classpath.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/classpath/classpath.mk b/package/classpath/classpath.mk index 97b7f0deda..e4cd0f8987 100644 --- a/package/classpath/classpath.mk +++ b/package/classpath/classpath.mk @@ -11,7 +11,7 @@ CLASSPATH_CONF_OPTS = \ --disable-rpath \ --disable-Werror \ --disable-gconf-peer \ - --disable-gjdoc + --disable-gjdoc \ --enable-tools # classpath assumes qt runs on top of X11, but we From 193d83ebd8e334ff6760ff50e0da8dfd4bc12cab Mon Sep 17 00:00:00 2001 From: Gwenhael Goavec-Merou Date: Fri, 10 Feb 2017 15:01:12 +0100 Subject: [PATCH 07/74] gqrx: new package Gqrx is an open source software defined radio (SDR) receiver implemented using GNU Radio and the Qt GUI toolkit. Currently it works on Linux and Mac with hardware supported by gr-osmosdr, including Funcube Dongle, RTL-SDR, Airspy, HackRF, BladeRF, RFSpace, USRP and SoapySDR. Gqrx can operate as an AM/FM/SSB receiver with audio output or as an FFT-only instrument. There are also various hooks for interacting with external application using network sockets. Signed-off-by: Gwenhael Goavec-Merou Reviewed-by: Romain Naour [Thomas: - remove unneeded dependency from Config.in, inherited from Qt5 - add entry to DEVELOPERS file.] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + .../gqrx/0001-fix_compilation_in_gcc-6.patch | 34 +++++++++++++++ package/gqrx/Config.in | 43 +++++++++++++++++++ package/gqrx/gqrx.hash | 2 + package/gqrx/gqrx.mk | 15 +++++++ 6 files changed, 96 insertions(+) create mode 100644 package/gqrx/0001-fix_compilation_in_gcc-6.patch create mode 100644 package/gqrx/Config.in create mode 100644 package/gqrx/gqrx.hash create mode 100644 package/gqrx/gqrx.mk diff --git a/DEVELOPERS b/DEVELOPERS index 94f6804548..ef9614510c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -744,6 +744,7 @@ F: package/zd1211-firmware/ N: Gwenhael Goavec-Merou F: package/gnuradio/ +F: package/gqrx/ F: package/gr-osmosdr/ F: package/libusbgx/ F: package/python-cheetah/ diff --git a/package/Config.in b/package/Config.in index deff0fe2c2..e78fb755d5 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1451,6 +1451,7 @@ menu "Miscellaneous" source "package/empty/Config.in" source "package/gnuradio/Config.in" source "package/googlefontdirectory/Config.in" + source "package/gqrx/Config.in" source "package/gr-osmosdr/Config.in" source "package/gsettings-desktop-schemas/Config.in" source "package/haveged/Config.in" diff --git a/package/gqrx/0001-fix_compilation_in_gcc-6.patch b/package/gqrx/0001-fix_compilation_in_gcc-6.patch new file mode 100644 index 0000000000..22ec1effe9 --- /dev/null +++ b/package/gqrx/0001-fix_compilation_in_gcc-6.patch @@ -0,0 +1,34 @@ +From e6baaee4968345a53e977f593362267a91041cff Mon Sep 17 00:00:00 2001 +From: Valentin Ochs +Date: Fri, 21 Oct 2016 20:12:50 +0200 +Subject: [PATCH] Cosmetic & readability changes + +Backport patch from +https://github.com/csete/gqrx/commit/e6baaee4968345a53e977f593362267a91041cff + +Fix compilation in gcc-6 + +Signed-off-by: Valentin Ochs +Signed-off-by: Gwenhael Goavec-Merou +--- +diff --git a/src/qtgui/plotter.cpp b/src/qtgui/plotter.cpp +index e491632..b877546 100644 +--- a/src/qtgui/plotter.cpp ++++ b/src/qtgui/plotter.cpp +@@ -1336,8 +1336,11 @@ void CPlotter::drawOverlay() + #endif + + int level = 0; +- for (; level < nLevels && tagEnd[level] > x; level++); +- level %= nLevels; ++ while(level < nLevels && tagEnd[level] > x) ++ level++; ++ ++ if(level == nLevels) ++ level = 0; + + tagEnd[level] = x + nameWidth + slant - 1; + m_BookmarkTags.append(qMakePair(QRect(x, level * levelHeight, nameWidth + slant, fontHeight), bookmarks[i].frequency)); +-- +2.10.2 + diff --git a/package/gqrx/Config.in b/package/gqrx/Config.in new file mode 100644 index 0000000000..5f7a561aa8 --- /dev/null +++ b/package/gqrx/Config.in @@ -0,0 +1,43 @@ +comment "gqrx needs a toolchain w/ C++, threads, wchar" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_USE_WCHAR + +comment "gqrx needs qt5, gnuradio, fftw's single precision, alsa-lib or portaudio" + depends on !BR2_PACKAGE_GNURADIO || !BR2_PACKAGE_FFTW_PRECISION_SINGLE || \ + !(BR2_PACKAGE_ALSA_LIB || BR2_PACKAGE_PORTAUDIO) || !BR2_PACKAGE_QT5 + +config BR2_PACKAGE_GQRX + bool "gqrx" + depends on BR2_PACKAGE_ALSA_LIB || BR2_PACKAGE_PORTAUDIO # gr-audio + depends on BR2_PACKAGE_FFTW_PRECISION_SINGLE # gnuradio + depends on BR2_PACKAGE_GNURADIO + depends on BR2_PACKAGE_QT5 + depends on BR2_INSTALL_LIBSTDCPP # boost + depends on BR2_TOOLCHAIN_HAS_THREADS # boost + depends on BR2_USE_WCHAR # boost + select BR2_PACKAGE_BOOST + select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS + select BR2_PACKAGE_BOOST_SYSTEM + select BR2_PACKAGE_GNURADIO_ANALOG + select BR2_PACKAGE_GNURADIO_AUDIO + select BR2_PACKAGE_GNURADIO_BLOCKS + select BR2_PACKAGE_GNURADIO_DIGITAL + select BR2_PACKAGE_GNURADIO_FFT + select BR2_PACKAGE_GNURADIO_FILTER + select BR2_PACKAGE_GR_OSMOSDR + select BR2_PACKAGE_QT5BASE_GUI + select BR2_PACKAGE_QT5BASE_WIDGETS + select BR2_PACKAGE_QT5SVG + help + Gqrx is an open source software defined radio (SDR) receiver + implemented using GNU Radio and the Qt GUI + toolkit. Currently it works on Linux and Mac with hardware + supported by gr-osmosdr, including Funcube Dongle, RTL-SDR, + Airspy, HackRF, BladeRF, RFSpace, USRP and SoapySDR. + + Gqrx can operate as an AM/FM/SSB receiver with audio output + or as an FFT-only instrument. There are also various hooks + for interacting with external application using network + sockets. + + http://gqrx.dk/ diff --git a/package/gqrx/gqrx.hash b/package/gqrx/gqrx.hash new file mode 100644 index 0000000000..2d126aa50a --- /dev/null +++ b/package/gqrx/gqrx.hash @@ -0,0 +1,2 @@ +# Locally calculated: +sha256 53d25db8d987a41ccccaf6fd85262bd7770cdfab5539b5901c4558756483c9db gqrx-v2.6.tar.gz diff --git a/package/gqrx/gqrx.mk b/package/gqrx/gqrx.mk new file mode 100644 index 0000000000..b591e60e24 --- /dev/null +++ b/package/gqrx/gqrx.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# gqrx +# +################################################################################ + +GQRX_VERSION = v2.6 +GQRX_SITE = $(call github,csete,gqrx,$(GQRX_VERSION)) +GQRX_LICENSE = GPLv3+, Apache-2.0 +GQRX_LICENSE_FILES = COPYING LICENSE-CTK +GQRX_DEPENDENCIES = boost gnuradio gr-osmosdr qt5base qt5svg + +GQRX_CONF_OPTS = -DLINUX_AUDIO_BACKEND=Gr-audio + +$(eval $(cmake-package)) From e528ed77401f2a62b0284c289deab8a3c1d5d76f Mon Sep 17 00:00:00 2001 From: Gwenhael Goavec-Merou Date: Mon, 13 Feb 2017 17:13:18 +0100 Subject: [PATCH 08/74] gnuradio: make gr-audio select alsa-lib if no backend selected gr-audio may be built with alsa-lib or portaudio support. To simplify dependencies if no backend is selected, we automatically select alsa-lib as the default audio backend if portaudio is not enabled. Signed-off-by: Gwenhael Goavec-Merou Signed-off-by: Thomas Petazzoni --- package/gnuradio/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in index 8301afe8f2..0291d70967 100644 --- a/package/gnuradio/Config.in +++ b/package/gnuradio/Config.in @@ -32,7 +32,7 @@ if BR2_PACKAGE_GNURADIO config BR2_PACKAGE_GNURADIO_AUDIO bool "gr-audio" - depends on BR2_PACKAGE_ALSA_LIB || BR2_PACKAGE_PORTAUDIO + select BR2_PACKAGE_ALSA_LIB if !BR2_PACKAGE_PORTAUDIO help Add audio source/sink to GNU Radio From af0cc55f322f40a93655f9688993d8397acd6da2 Mon Sep 17 00:00:00 2001 From: Gwenhael Goavec-Merou Date: Mon, 13 Feb 2017 17:13:19 +0100 Subject: [PATCH 09/74] gqrx: remove audio backend dependencies Now that the gnuradio gr-audio option selects an audio backend by default, it is no longer needed to depends on BR2_PACKAGE_ALSA_LIB or BR2_PACKAGE_PORTAUDIO in the qgrx package. Signed-off-by: Gwenhael Goavec-Merou Signed-off-by: Thomas Petazzoni --- package/gqrx/Config.in | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/gqrx/Config.in b/package/gqrx/Config.in index 5f7a561aa8..1dc40c6d24 100644 --- a/package/gqrx/Config.in +++ b/package/gqrx/Config.in @@ -2,13 +2,12 @@ comment "gqrx needs a toolchain w/ C++, threads, wchar" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_USE_WCHAR -comment "gqrx needs qt5, gnuradio, fftw's single precision, alsa-lib or portaudio" +comment "gqrx needs qt5, gnuradio, fftw's single precision" depends on !BR2_PACKAGE_GNURADIO || !BR2_PACKAGE_FFTW_PRECISION_SINGLE || \ - !(BR2_PACKAGE_ALSA_LIB || BR2_PACKAGE_PORTAUDIO) || !BR2_PACKAGE_QT5 + !BR2_PACKAGE_QT5 config BR2_PACKAGE_GQRX bool "gqrx" - depends on BR2_PACKAGE_ALSA_LIB || BR2_PACKAGE_PORTAUDIO # gr-audio depends on BR2_PACKAGE_FFTW_PRECISION_SINGLE # gnuradio depends on BR2_PACKAGE_GNURADIO depends on BR2_PACKAGE_QT5 From 743f5076df0a852f25d55c3bcb1d3e33eec07055 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 13 Feb 2017 23:17:27 +0100 Subject: [PATCH 10/74] gnutls: bump version to 3.5.9 Signed-off-by: Peter Korsgaard --- package/gnutls/gnutls.hash | 2 +- package/gnutls/gnutls.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gnutls/gnutls.hash b/package/gnutls/gnutls.hash index 121f75a702..156d2aa94d 100644 --- a/package/gnutls/gnutls.hash +++ b/package/gnutls/gnutls.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 0e97f243ae72b70307d684b84c7fe679385aa7a7a0e37e5be810193dcc17d4ff gnutls-3.5.8.tar.xz +sha256 82b10f0c4ef18f4e64ad8cef5dbaf14be732f5095a41cf366b4ecb4050382951 gnutls-3.5.9.tar.xz diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index 4fab812819..932c0fab0c 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -5,7 +5,7 @@ ################################################################################ GNUTLS_VERSION_MAJOR = 3.5 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).8 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).9 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = ftp://ftp.gnutls.org/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = LGPLv2.1+ (core library), GPLv3+ (gnutls-openssl library) From e6ca4ed3b9db794d958e61a3f757f6717efddb7f Mon Sep 17 00:00:00 2001 From: Fabio Porcedda Date: Tue, 14 Feb 2017 17:40:40 +0100 Subject: [PATCH 11/74] barebox: bump to version 2017.02.0 Signed-off-by: Fabio Porcedda Signed-off-by: Peter Korsgaard --- boot/barebox/Config.in | 4 ++-- boot/barebox/barebox.hash | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in index e6ecd821fd..85956d6552 100644 --- a/boot/barebox/Config.in +++ b/boot/barebox/Config.in @@ -12,7 +12,7 @@ choice Select the specific Barebox version you want to use config BR2_TARGET_BAREBOX_LATEST_VERSION - bool "2017.01.0" + bool "2017.02.0" config BR2_TARGET_BAREBOX_CUSTOM_VERSION bool "Custom version" @@ -40,7 +40,7 @@ endif config BR2_TARGET_BAREBOX_VERSION string - default "2017.01.0" if BR2_TARGET_BAREBOX_LATEST_VERSION + default "2017.02.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 diff --git a/boot/barebox/barebox.hash b/boot/barebox/barebox.hash index f769c1d802..5750597062 100644 --- a/boot/barebox/barebox.hash +++ b/boot/barebox/barebox.hash @@ -1,5 +1,5 @@ -# http://www.barebox.org/download/barebox-2017.01.0.tar.bz2.md5 -md5 d2933437885497b09d69d6e6f4beeffc barebox-2017.01.0.tar.bz2 +# http://www.barebox.org/download/barebox-2017.02.0.tar.bz2.md5 +md5 4651f5fa5e794a9739dd71eece0fe702 barebox-2017.02.0.tar.bz2 # Locally calculated -sha256 ca4cc06bdc7183e3fcb4bed300f1e820df1e022a7b86fdcf64205ddb6a103567 barebox-2017.01.0.tar.bz2 +sha256 d65d864fe598d61ed9c6712e32d50742e6996aae02acaae5955c3b22166344cb barebox-2017.02.0.tar.bz2 From c11883d18048474f6ed74c30b885659935b825b0 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 15 Feb 2017 07:37:25 -0300 Subject: [PATCH 12/74] sqlite: bump to version 3.17.0 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/sqlite/sqlite.hash | 4 ++-- package/sqlite/sqlite.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sqlite/sqlite.hash b/package/sqlite/sqlite.hash index bb3707da5e..5c5b8ecffa 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,4 +1,4 @@ # From http://www.sqlite.org/download.html -sha1 64ca578ad44a94115b1db0406740e14288f74bb8 sqlite-autoconf-3160200.tar.gz +sha1 7bcff1c158ed9e2c0e159c1b4b6c36d4d65dff8c sqlite-autoconf-3170000.tar.gz # Calculated based on the hash above -sha256 65cc0c3e9366f50c0679c5ccd31432cea894bc4a3e8947dabab88c8693263615 sqlite-autoconf-3160200.tar.gz +sha256 a4e485ad3a16e054765baf6371826b5000beed07e626510896069c0bf013874c sqlite-autoconf-3170000.tar.gz diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index 790caaf4df..76babd3e4a 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,7 +4,7 @@ # ################################################################################ -SQLITE_VERSION = 3160200 +SQLITE_VERSION = 3170000 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz SQLITE_SITE = http://www.sqlite.org/2017 SQLITE_LICENSE = Public domain From b1a986e81d144cbddfcbbc06fff77f6d7cf2c06d Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 15 Feb 2017 07:37:49 -0300 Subject: [PATCH 13/74] libglib2: bump to version 2.50.3 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/libglib2/libglib2.hash | 4 ++-- package/libglib2/libglib2.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash index 94bf8700b3..b31c21266b 100644 --- a/package/libglib2/libglib2.hash +++ b/package/libglib2/libglib2.hash @@ -1,2 +1,2 @@ -# https://download.gnome.org/sources/glib/2.50/glib-2.50.2.sha256sum -sha256 be68737c1f268c05493e503b3b654d2b7f43d7d0b8c5556f7e4651b870acfbf5 glib-2.50.2.tar.xz +# https://download.gnome.org/sources/glib/2.50/glib-2.50.3.sha256sum +sha256 82ee94bf4c01459b6b00cb9db0545c2237921e3060c0b74cff13fbc020cfd999 glib-2.50.3.tar.xz diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index ddd1f39652..faf6b3c9f6 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGLIB2_VERSION_MAJOR = 2.50 -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).2 +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).3 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) LIBGLIB2_LICENSE = LGPLv2+ From 90be2119321089e4e7442b2b89ace93174c309f4 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 15 Feb 2017 07:38:37 -0300 Subject: [PATCH 14/74] libgtk3: bump to version 3.22.8 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/libgtk3/libgtk3.hash | 4 ++-- package/libgtk3/libgtk3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libgtk3/libgtk3.hash b/package/libgtk3/libgtk3.hash index 12a25c9cfc..07c2db15a2 100644 --- a/package/libgtk3/libgtk3.hash +++ b/package/libgtk3/libgtk3.hash @@ -1,2 +1,2 @@ -# From http://ftp.gnome.org/pub/gnome/sources/gtk+/3.22/gtk+-3.22.7.sha256sum -sha256 a3a27564bfb1679ebbc75c37cd2bcd6e727c8bdfbcd3984d29305bf9ee60d432 gtk+-3.22.7.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/gtk+/3.22/gtk+-3.22.8.sha256sum +sha256 c7254a88df5c17e9609cee9e848c3d0104512707edad4c3b4f256b131f8d3af1 gtk+-3.22.8.tar.xz diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index a1b8fc60a2..852987d2bf 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGTK3_VERSION_MAJOR = 3.22 -LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).7 +LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).8 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz LIBGTK3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK3_VERSION_MAJOR) LIBGTK3_LICENSE = LGPLv2+ From 6e833d3065a17d200e0d9e2bfa285d8e4467d095 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 15 Feb 2017 07:38:50 -0300 Subject: [PATCH 15/74] libepoxy: bump to version 1.4.0 Drop all patches since they're upstream, yay! Switch to the gnome mirror since it's more handy than github, and it also allows to drop autoreconf since it's a distribution tarball with the configure script is already generated. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- ...forms-based-on-configuration-results.patch | 125 ------------------ ...add-an-option-to-disable-glx-support.patch | 39 ------ ...glx-actually-work-on-osx-and-windows.patch | 67 ---------- ...-use-glx-instead-of-opengl-framework.patch | 95 ------------- ...005-Forward-egl-cflags-into-epoxy.pc.patch | 45 ------- .../libepoxy/0006-Make-egl-conditional.patch | 59 --------- package/libepoxy/libepoxy.hash | 4 +- package/libepoxy/libepoxy.mk | 8 +- 8 files changed, 6 insertions(+), 436 deletions(-) delete mode 100644 package/libepoxy/0001-select-platforms-based-on-configuration-results.patch delete mode 100644 package/libepoxy/0002-add-an-option-to-disable-glx-support.patch delete mode 100644 package/libepoxy/0003-make-enable-glx-actually-work-on-osx-and-windows.patch delete mode 100644 package/libepoxy/0004-darwin-use-glx-instead-of-opengl-framework.patch delete mode 100644 package/libepoxy/0005-Forward-egl-cflags-into-epoxy.pc.patch delete mode 100644 package/libepoxy/0006-Make-egl-conditional.patch diff --git a/package/libepoxy/0001-select-platforms-based-on-configuration-results.patch b/package/libepoxy/0001-select-platforms-based-on-configuration-results.patch deleted file mode 100644 index e3a7b4995c..0000000000 --- a/package/libepoxy/0001-select-platforms-based-on-configuration-results.patch +++ /dev/null @@ -1,125 +0,0 @@ -From 7eff2bf8e27599c1c94217b2bb1b73d4b7d18e59 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Wed, 6 May 2015 10:45:22 +0200 -Subject: [PATCH 1/4] select platforms based on configuration results -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Andreas Müller -Fetched from pull #81 on github for libepoxy: -https://github.com/anholt/libepoxy/pull/81/commits -Signed-off-by: Gustavo Zacarias ---- - configure.ac | 13 +++++-------- - src/dispatch_common.c | 9 ++++++--- - src/dispatch_common.h | 9 +++++---- - 3 files changed, 16 insertions(+), 15 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 2d67726..225ab73 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -58,6 +58,10 @@ AC_CHECK_HEADER([KHR/khrplatform.h], - # uintptr_t to a void *") by default. Kill that. - XORG_TESTSET_CFLAG(CWARNFLAGS, [-Wno-int-conversion]) - -+PKG_CHECK_MODULES(X11, [x11], [x11=yes], [x11=no]) -+ -+AM_CONDITIONAL(HAVE_X11, test x$x11 = xyes) -+ - has_znow=yes - - case $host_os in -@@ -86,7 +90,7 @@ case $host_os in - ;; - *) - build_egl=yes -- build_glx=yes -+ build_glx=$x11 - build_wgl=no - # On platforms with dlopen, we load everything dynamically and - # don't link against a specific window system or GL implementation. -@@ -144,13 +148,6 @@ esac - - AC_SUBST([VISIBILITY_CFLAGS]) - --PKG_CHECK_MODULES(X11, [x11], [x11=yes], [x11=no]) --if test x$x11 = xno -a x$build_glx = xyes; then -- AC_MSG_ERROR([libX11 headers (libx11-dev) required to build with GLX support]) --fi -- --AM_CONDITIONAL(HAVE_X11, test x$x11 = xyes) -- - PKG_CHECK_MODULES(GL, [gl], [gl=yes], [gl=no]) - - AC_CONFIG_FILES([ -diff --git a/src/dispatch_common.c b/src/dispatch_common.c -index 013027f..163d348 100644 ---- a/src/dispatch_common.c -+++ b/src/dispatch_common.c -@@ -656,10 +656,13 @@ epoxy_get_proc_address(const char *name) - #elif defined(__APPLE__) - return epoxy_gl_dlsym(name); - #else -+#if PLATFORM_HAS_GLX - if (epoxy_current_context_is_glx()) { - return glXGetProcAddressARB((const GLubyte *)name); -- } else { -+ } else -+#endif /* PLATFORM_HAS_GLX */ - #if PLATFORM_HAS_EGL -+ { - GLenum egl_api = epoxy_egl_get_current_gl_context_api(); - - switch (egl_api) { -@@ -669,10 +672,10 @@ epoxy_get_proc_address(const char *name) - case EGL_NONE: - break; - } --#endif - } -+#endif /* PLATFORM_HAS_EGL */ - errx(1, "Couldn't find current GLX or EGL context.\n"); --#endif -+#endif /* _WIN32 | __APPLE__*/ - } - - WRAPPER_VISIBILITY (void) -diff --git a/src/dispatch_common.h b/src/dispatch_common.h -index 676a4d5..2728b45 100644 ---- a/src/dispatch_common.h -+++ b/src/dispatch_common.h -@@ -21,12 +21,13 @@ - * IN THE SOFTWARE. - */ - -+#include - #include - - #ifdef _WIN32 - #define PLATFORM_HAS_EGL 0 - #define PLATFORM_HAS_GLX 0 --#define PLATFORM_HAS_WGL 1 -+#define PLATFORM_HAS_WGL BUILD_WGL - #define EPOXY_IMPORTEXPORT __declspec(dllexport) - #elif defined(__APPLE__) - #define PLATFORM_HAS_EGL 0 -@@ -34,13 +35,13 @@ - #define PLATFORM_HAS_WGL 0 - #define EPOXY_IMPORTEXPORT - #elif defined(ANDROID) --#define PLATFORM_HAS_EGL 1 -+#define PLATFORM_HAS_EGL BUILD_EGL - #define PLATFORM_HAS_GLX 0 - #define PLATFORM_HAS_WGL 0 - #define EPOXY_IMPORTEXPORT - #else --#define PLATFORM_HAS_EGL 1 --#define PLATFORM_HAS_GLX 1 -+#define PLATFORM_HAS_EGL BUILD_EGL -+#define PLATFORM_HAS_GLX BUILD_GLX - #define PLATFORM_HAS_WGL 0 - #define EPOXY_IMPORTEXPORT - #endif - diff --git a/package/libepoxy/0002-add-an-option-to-disable-glx-support.patch b/package/libepoxy/0002-add-an-option-to-disable-glx-support.patch deleted file mode 100644 index a81547de1c..0000000000 --- a/package/libepoxy/0002-add-an-option-to-disable-glx-support.patch +++ /dev/null @@ -1,39 +0,0 @@ -From a9efde0fb2678cd26bdf26d256732d97ded0c595 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Wed, 6 May 2015 11:05:48 +0200 -Subject: [PATCH 2/4] add an option to disable glx support -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -this option would help us in yocto to get deterministic build results - -Signed-off-by: Andreas Müller -Fetched from pull #81 on github for libepoxy: -https://github.com/anholt/libepoxy/pull/81/commits -Signed-off-by: Gustavo Zacarias ---- - configure.ac | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 225ab73..d3d947c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -58,7 +58,14 @@ AC_CHECK_HEADER([KHR/khrplatform.h], - # uintptr_t to a void *") by default. Kill that. - XORG_TESTSET_CFLAG(CWARNFLAGS, [-Wno-int-conversion]) - --PKG_CHECK_MODULES(X11, [x11], [x11=yes], [x11=no]) -+AC_ARG_ENABLE([glx], -+ [AS_HELP_STRING([--disable-glx], -+ [disable if you don't want x11/glx support])], -+ [], -+ [enable_glx=yes] -+ ) -+ -+PKG_CHECK_MODULES(X11, [x11], [x11=$enable_glx], [x11=no]) - - AM_CONDITIONAL(HAVE_X11, test x$x11 = xyes) - - diff --git a/package/libepoxy/0003-make-enable-glx-actually-work-on-osx-and-windows.patch b/package/libepoxy/0003-make-enable-glx-actually-work-on-osx-and-windows.patch deleted file mode 100644 index 5b0d4fece2..0000000000 --- a/package/libepoxy/0003-make-enable-glx-actually-work-on-osx-and-windows.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 902ea1eb073187603ec2eda4d2a146bef96592d4 Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston Sequoia -Date: Mon, 18 Jan 2016 10:08:44 -0800 -Subject: [PATCH 3/4] Make --enable-glx actually work on OSX and Windows - -Followup for anholt/libepoxy#52 - -Signed-off-by: Jeremy Huddleston Sequoia -Fetched from pull #81 on github for libepoxy: -https://github.com/anholt/libepoxy/pull/81/commits -Signed-off-by: Gustavo Zacarias ---- - configure.ac | 6 +++--- - src/dispatch_common.h | 4 ++-- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d3d947c..b4c7ede 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -61,7 +61,7 @@ XORG_TESTSET_CFLAG(CWARNFLAGS, [-Wno-int-conversion]) - AC_ARG_ENABLE([glx], - [AS_HELP_STRING([--disable-glx], - [disable if you don't want x11/glx support])], -- [], -+ [enable_glx=$enableval], - [enable_glx=yes] - ) - -@@ -74,7 +74,7 @@ has_znow=yes - case $host_os in - mingw*) - build_egl=no -- build_glx=no -+ build_glx=$x11 - build_wgl=yes - # On windows, the DLL has to have all of its functions - # resolved at link time, so we have to link directly aginst -@@ -89,7 +89,7 @@ case $host_os in - ;; - darwin*) - build_egl=no -- build_glx=no -+ build_glx=$x11 - build_wgl=no - build_apple=yes - has_znow=no -diff --git a/src/dispatch_common.h b/src/dispatch_common.h -index 2728b45..c30ce44 100644 ---- a/src/dispatch_common.h -+++ b/src/dispatch_common.h -@@ -26,12 +26,12 @@ - - #ifdef _WIN32 - #define PLATFORM_HAS_EGL 0 --#define PLATFORM_HAS_GLX 0 -+#define PLATFORM_HAS_GLX BUILD_GLX - #define PLATFORM_HAS_WGL BUILD_WGL - #define EPOXY_IMPORTEXPORT __declspec(dllexport) - #elif defined(__APPLE__) - #define PLATFORM_HAS_EGL 0 --#define PLATFORM_HAS_GLX 0 -+#define PLATFORM_HAS_GLX BUILD_GLX - #define PLATFORM_HAS_WGL 0 - #define EPOXY_IMPORTEXPORT - #elif defined(ANDROID) - diff --git a/package/libepoxy/0004-darwin-use-glx-instead-of-opengl-framework.patch b/package/libepoxy/0004-darwin-use-glx-instead-of-opengl-framework.patch deleted file mode 100644 index be9b009f5c..0000000000 --- a/package/libepoxy/0004-darwin-use-glx-instead-of-opengl-framework.patch +++ /dev/null @@ -1,95 +0,0 @@ -From d010922282580a32dfebcda12ee1c307b3ef6005 Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston Sequoia -Date: Mon, 18 Jan 2016 09:49:55 -0800 -Subject: [PATCH 4/4] darwin: Use GLX instead of OpenGL.framework if it is the - current context - -Also makes a stab at similar support for Win32 - -anholt/libepoxy#63 - -Signed-off-by: Jeremy Huddleston Sequoia -Fetched from pull #81 on github for libepoxy: -https://github.com/anholt/libepoxy/pull/81/commits -Signed-off-by: Gustavo Zacarias ---- - src/dispatch_common.c | 29 ++++++++++++++++------------- - 1 file changed, 16 insertions(+), 13 deletions(-) - -diff --git a/src/dispatch_common.c b/src/dispatch_common.c -index 163d348..cb9f76a 100644 ---- a/src/dispatch_common.c -+++ b/src/dispatch_common.c -@@ -482,16 +482,20 @@ epoxy_glx_dlsym(const char *name) - void * - epoxy_gl_dlsym(const char *name) - { --#ifdef _WIN32 -+#if defined(_WIN32) || defined(__APPLE__) -+if (!epoxy_current_context_is_glx()) { -+# if defined(_WIN32) - return do_dlsym(&api.gl_handle, "OPENGL32", name, true); --#elif defined(__APPLE__) -+# elif defined(__APPLE__) - return do_dlsym(&api.gl_handle, - "/System/Library/Frameworks/OpenGL.framework/Versions/Current/OpenGL", - name, true); --#else -+# endif -+} -+#endif -+ - /* There's no library for desktop GL support independent of GLX. */ - return epoxy_glx_dlsym(name); --#endif - } - - void * -@@ -615,7 +619,7 @@ epoxy_get_bootstrap_proc_address(const char *name) - */ - #if PLATFORM_HAS_GLX - if (api.glx_handle && glXGetCurrentContext()) -- return epoxy_gl_dlsym(name); -+ return epoxy_glx_dlsym(name); - #endif - - /* If epoxy hasn't loaded any API-specific library yet, try to -@@ -644,22 +648,17 @@ epoxy_get_bootstrap_proc_address(const char *name) - } - #endif /* PLATFORM_HAS_EGL */ - -- /* Fall back to GLX */ -+ /* Fall back to the platform default */ - return epoxy_gl_dlsym(name); - } - - void * - epoxy_get_proc_address(const char *name) - { --#ifdef _WIN32 -- return wglGetProcAddress(name); --#elif defined(__APPLE__) -- return epoxy_gl_dlsym(name); --#else - #if PLATFORM_HAS_GLX - if (epoxy_current_context_is_glx()) { - return glXGetProcAddressARB((const GLubyte *)name); -- } else -+ } - #endif /* PLATFORM_HAS_GLX */ - #if PLATFORM_HAS_EGL - { -@@ -674,8 +673,12 @@ epoxy_get_proc_address(const char *name) - } - } - #endif /* PLATFORM_HAS_EGL */ -+#if defined(_WIN32) -+ return wglGetProcAddress(name); -+#elif defined(__APPLE__) -+ return epoxy_gl_dlsym(name); -+#endif - errx(1, "Couldn't find current GLX or EGL context.\n"); --#endif /* _WIN32 | __APPLE__*/ - } - - WRAPPER_VISIBILITY (void) diff --git a/package/libepoxy/0005-Forward-egl-cflags-into-epoxy.pc.patch b/package/libepoxy/0005-Forward-egl-cflags-into-epoxy.pc.patch deleted file mode 100644 index d13f01def5..0000000000 --- a/package/libepoxy/0005-Forward-egl-cflags-into-epoxy.pc.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 68e5f1574758240aedfe8653d7aaae62cdb08bf5 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Sun, 20 Dec 2015 10:07:06 -0300 -Subject: [PATCH] Forward egl cflags into epoxy.pc - -When building mesa egl without x11 and gles2 the headers need a -MESA_EGL_NO_X11_HEADERS define, so put them in epoxy.pc as well since -otherwise builds will fail. - -Signed-off-by: Gustavo Zacarias ---- -Status: pull request https://github.com/anholt/libepoxy/pull/80 - - configure.ac | 2 ++ - epoxy.pc.in | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index c7cffb2..7b599de 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -102,6 +102,8 @@ if test x$build_egl = xyes; then - AC_DEFINE([BUILD_EGL], [1], [build EGL tests]) - fi - -+AC_SUBST(EGL_CFLAGS) -+ - PKG_CHECK_MODULES(GL, [gl], [gl=yes], [gl=no]) - if test x$gl = xno; then - build_glx=no -diff --git a/epoxy.pc.in b/epoxy.pc.in -index 8c85a33..f377da5 100644 ---- a/epoxy.pc.in -+++ b/epoxy.pc.in -@@ -6,6 +6,6 @@ includedir=@includedir@ - Name: epoxy - Description: epoxy GL dispatch Library - Version: @PACKAGE_VERSION@ --Cflags: -I${includedir} -+Cflags: -I${includedir} @EGL_CFLAGS@ - Libs: -L${libdir} -lepoxy - Libs.private: @DLOPEN_LIBS@ --- -2.4.10 - diff --git a/package/libepoxy/0006-Make-egl-conditional.patch b/package/libepoxy/0006-Make-egl-conditional.patch deleted file mode 100644 index 752e8e4fb9..0000000000 --- a/package/libepoxy/0006-Make-egl-conditional.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 5492e81f317e48141b0687ad77252c52c2dfcd6d Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Fri, 5 Feb 2016 19:03:39 -0300 -Subject: [PATCH] Make egl conditional - -Mesa can be built with GLX and without EGL support, so make this -possible in epoxy as well. - -Signed-off-by: Gustavo Zacarias ---- - configure.ac | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 6e56599..21e3a25 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -58,6 +58,13 @@ AC_CHECK_HEADER([KHR/khrplatform.h], - # uintptr_t to a void *") by default. Kill that. - XORG_TESTSET_CFLAG(CWARNFLAGS, [-Wno-int-conversion]) - -+AC_ARG_ENABLE([egl], -+ [AS_HELP_STRING([--disable-egl], -+ [disable if you don't want egl support])], -+ [enable_egl=$enableval], -+ [enable_egl=yes] -+ ) -+ - AC_ARG_ENABLE([glx], - [AS_HELP_STRING([--disable-glx], - [disable if you don't want x11/glx support])], -@@ -65,6 +72,7 @@ AC_ARG_ENABLE([glx], - [enable_glx=yes] - ) - -+PKG_CHECK_MODULES(EGL, [egl], [egl=$enable_egl], [egl=no]) - PKG_CHECK_MODULES(X11, [x11], [x11=$enable_glx], [x11=no]) - - AM_CONDITIONAL(HAVE_X11, test x$x11 = xyes) -@@ -96,7 +104,7 @@ case $host_os in - EPOXY_LINK_LIBS="" - ;; - *) -- build_egl=yes -+ build_egl=$egl - build_glx=$x11 - build_wgl=no - # On platforms with dlopen, we load everything dynamically and -@@ -109,7 +117,6 @@ AC_SUBST(EPOXY_LINK_LIBS) - - AM_CONDITIONAL(BUILD_EGL, test x$build_egl = xyes) - if test x$build_egl = xyes; then -- PKG_CHECK_MODULES(EGL, [egl]) - AC_DEFINE([BUILD_EGL], [1], [build EGL tests]) - fi - --- -2.4.10 - diff --git a/package/libepoxy/libepoxy.hash b/package/libepoxy/libepoxy.hash index cb35cd4020..eec1363260 100644 --- a/package/libepoxy/libepoxy.hash +++ b/package/libepoxy/libepoxy.hash @@ -1,2 +1,2 @@ -# Locally calculated -sha256 6700ddedffb827b42c72cce1e0be6fba67b678b19bf256e1b5efd3ea38cc2bb4 libepoxy-v1.3.1.tar.gz +# From ftp://ftp.gnome.org/pub/gnome/sources/libepoxy/1.4/libepoxy-1.4.0.sha256sum +sha256 25a906b14a921bc2b488cfeaa21a00486fe92630e4a9dd346e4ecabeae52ab41 libepoxy-1.4.0.tar.xz diff --git a/package/libepoxy/libepoxy.mk b/package/libepoxy/libepoxy.mk index 7436e8fed6..dbfd6b8819 100644 --- a/package/libepoxy/libepoxy.mk +++ b/package/libepoxy/libepoxy.mk @@ -4,11 +4,11 @@ # ################################################################################ -LIBEPOXY_VERSION = v1.3.1 -LIBEPOXY_SITE = $(call github,anholt,libepoxy,$(LIBEPOXY_VERSION)) +LIBEPOXY_VERSION_MAJOR = 1.4 +LIBEPOXY_VERSION = $(LIBEPOXY_VERSION_MAJOR).0 +LIBEPOXY_SITE = http://ftp.gnome.org/pub/gnome/sources/libepoxy/$(LIBEPOXY_VERSION_MAJOR) +LIBEPOXY_SOURCE = libepoxy-$(LIBEPOXY_VERSION).tar.xz LIBEPOXY_INSTALL_STAGING = YES -# For patches 0001-0006: -LIBEPOXY_AUTORECONF = YES LIBEPOXY_DEPENDENCIES = xutil_util-macros LIBEPOXY_LICENSE = MIT LIBEPOXY_LICENSE_FILES = COPYING From ac82e0ebada7efef4d7fbc4ce3de4748808c00b4 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 15 Feb 2017 15:09:41 -0300 Subject: [PATCH 16/74] file: bump to version 5.30 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/file/file.hash | 2 +- package/file/file.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/file/file.hash b/package/file/file.hash index 9a4c9f1197..3fafff8e7b 100644 --- a/package/file/file.hash +++ b/package/file/file.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 ea661277cd39bf8f063d3a83ee875432cc3680494169f952787e002bdd3884c0 file-5.29.tar.gz +sha256 694c2432e5240187524c9e7cf1ec6acc77b47a0e19554d34c14773e43dbbf214 file-5.30.tar.gz diff --git a/package/file/file.mk b/package/file/file.mk index 3309c95fa8..ea0d0ecab5 100644 --- a/package/file/file.mk +++ b/package/file/file.mk @@ -4,7 +4,7 @@ # ################################################################################ -FILE_VERSION = 5.29 +FILE_VERSION = 5.30 FILE_SITE = ftp://ftp.astron.com/pub/file FILE_DEPENDENCIES = host-file zlib HOST_FILE_DEPENDENCIES = host-zlib From 24576234c52e26e7f47fbf8ce969e3f4f62399f8 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 15 Feb 2017 15:09:57 -0300 Subject: [PATCH 17/74] strace: bump to version 4.16 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/strace/strace.hash | 6 +++--- package/strace/strace.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/strace/strace.hash b/package/strace/strace.hash index c7695ff391..a0d4d2b8e3 100644 --- a/package/strace/strace.hash +++ b/package/strace/strace.hash @@ -1,3 +1,3 @@ -# From https://sourceforge.net/projects/strace/files/strace/4.15/ -md5 1ff96209fec19914c920608ed0791864 strace-4.15.tar.xz -sha1 18fbaeb07d089023764f618f179091b663a0d21e strace-4.15.tar.xz +# From https://sourceforge.net/projects/strace/files/strace/4.16/ +md5 2873366cac98770efcbed6e748d5ef23 strace-4.16.tar.xz +sha1 b780a8cd2e60ea836cfd3468e0f81623a346d180 strace-4.16.tar.xz diff --git a/package/strace/strace.mk b/package/strace/strace.mk index b8de81afd2..15a0fbf451 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRACE_VERSION = 4.15 +STRACE_VERSION = 4.16 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz STRACE_SITE = http://downloads.sourceforge.net/project/strace/strace/$(STRACE_VERSION) STRACE_LICENSE = BSD-3c From 89f837c977aca3a273b184e9a0932544b45b4cf0 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 15 Feb 2017 16:16:12 -0300 Subject: [PATCH 18/74] grep: bump to version 3.0 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/grep/grep.hash | 2 +- package/grep/grep.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/grep/grep.hash b/package/grep/grep.hash index 326737a2fd..77420ad694 100644 --- a/package/grep/grep.hash +++ b/package/grep/grep.hash @@ -1,2 +1,2 @@ # Locally calculated after checking signature -sha256 ad4cc44d23074a1c3a8baae8fbafff2a8c60f38a9a6108f985eef6fbee6dcaeb grep-2.27.tar.xz +sha256 e2c81db5056e3e8c5995f0bb5d0d0e1cad1f6f45c3b2fc77b6e81435aed48ab5 grep-3.0.tar.xz diff --git a/package/grep/grep.mk b/package/grep/grep.mk index 7615f30bac..74688312df 100644 --- a/package/grep/grep.mk +++ b/package/grep/grep.mk @@ -4,7 +4,7 @@ # ################################################################################ -GREP_VERSION = 2.27 +GREP_VERSION = 3.0 GREP_SITE = $(BR2_GNU_MIRROR)/grep GREP_SOURCE = grep-$(GREP_VERSION).tar.xz GREP_LICENSE = GPLv3+ From 1445c78ded351e6dd9265e5be1299d1f2bae93b1 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 15 Feb 2017 16:49:32 -0300 Subject: [PATCH 19/74] fping: bump to version 3.16 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/fping/fping.hash | 2 +- package/fping/fping.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fping/fping.hash b/package/fping/fping.hash index 99c01cfad0..8c1909ed91 100644 --- a/package/fping/fping.hash +++ b/package/fping/fping.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 d86f2281bda4653c7049e6ba8fce24ba67edbf9193b7bb1cf6219b0c8ddce4e6 fping-3.12.tar.gz +sha256 2f753094e4df3cdb1d99be1687c0fb7d2f14c0d526ebf03158c8c5519bc78f54 fping-3.16.tar.gz diff --git a/package/fping/fping.mk b/package/fping/fping.mk index c576dd1abd..5970d6379a 100644 --- a/package/fping/fping.mk +++ b/package/fping/fping.mk @@ -4,7 +4,7 @@ # ################################################################################ -FPING_VERSION = 3.12 +FPING_VERSION = 3.16 FPING_SITE = http://fping.org/dist FPING_LICENSE = BSD-like FPING_LICENSE_FILES = COPYING From 71c56ecc0a720d727deb2aaa6e778405752f1c29 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 15 Feb 2017 16:49:42 -0300 Subject: [PATCH 20/74] sed: bump to version 4.4 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/sed/Config.in | 5 +++-- package/sed/sed.hash | 2 +- package/sed/sed.mk | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/sed/Config.in b/package/sed/Config.in index 6adebf24de..b8d182aafd 100644 --- a/package/sed/Config.in +++ b/package/sed/Config.in @@ -3,9 +3,10 @@ config BR2_PACKAGE_SED depends on BR2_USE_WCHAR depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS help - Super-useful stream editor. + sed (stream editor) is a non-interactive command-line text + editor. - http://sed.sourceforge.net/ + https://www.gnu.org/software/sed/ comment "sed needs a toolchain w/ wchar" depends on !BR2_USE_WCHAR diff --git a/package/sed/sed.hash b/package/sed/sed.hash index e7f2db591f..652c573615 100644 --- a/package/sed/sed.hash +++ b/package/sed/sed.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 fea0a94d4b605894f3e2d5572e3f96e4413bcad3a085aae7367c2cf07908b2ff sed-4.2.2.tar.gz +sha256 cbd6ebc5aaf080ed60d0162d7f6aeae58211a1ee9ba9bb25623daa6cd942683b sed-4.4.tar.xz diff --git a/package/sed/sed.mk b/package/sed/sed.mk index 71c62d0fd2..68bcb9881d 100644 --- a/package/sed/sed.mk +++ b/package/sed/sed.mk @@ -4,7 +4,8 @@ # ################################################################################ -SED_VERSION = 4.2.2 +SED_VERSION = 4.4 +SED_SOURCE = sed-$(SED_VERSION).tar.xz SED_SITE = $(BR2_GNU_MIRROR)/sed SED_LICENSE = GPLv3 SED_LICENSE_FILES = COPYING From 84ca4704ac757016182e2abb5b6e4336e1eeb982 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 15 Feb 2017 18:02:39 -0300 Subject: [PATCH 21/74] libinput: bump to version 1.6.1 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/libinput/libinput.hash | 4 ++-- package/libinput/libinput.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libinput/libinput.hash b/package/libinput/libinput.hash index dd3573f2e1..7dd4c04110 100644 --- a/package/libinput/libinput.hash +++ b/package/libinput/libinput.hash @@ -1,2 +1,2 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2017-January/032746.html -sha256 b7534f518d735c643aedca2fb4694683dfddc8d0600cfb628c87a18e65255832 libinput-1.6.0.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2017-February/032940.html +sha256 9d816f13eee63bcca0e9c3bb652c52ab55f39be4d1b90b54e4bfd1dc92ef55a8 libinput-1.6.1.tar.xz diff --git a/package/libinput/libinput.mk b/package/libinput/libinput.mk index 52aca9acfd..776e1af032 100644 --- a/package/libinput/libinput.mk +++ b/package/libinput/libinput.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBINPUT_VERSION = 1.6.0 +LIBINPUT_VERSION = 1.6.1 LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.xz LIBINPUT_SITE = http://www.freedesktop.org/software/libinput LIBINPUT_DEPENDENCIES = host-pkgconf libevdev mtdev udev From b4f54a98a38905fb4ca5413e174263913e20c9c3 Mon Sep 17 00:00:00 2001 From: Erwan Gautron Date: Tue, 14 Feb 2017 10:37:54 +0000 Subject: [PATCH 22/74] raptor: install package to staging The raptor package installs some libraries, which will be useful for upcoming packages parts of librdf.org, such as rasqal and redland. Signed-off-by: Erwan Gautron Signed-off-by: Thomas Petazzoni --- package/raptor/raptor.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/raptor/raptor.mk b/package/raptor/raptor.mk index aea14e393f..2653663307 100644 --- a/package/raptor/raptor.mk +++ b/package/raptor/raptor.mk @@ -10,6 +10,7 @@ RAPTOR_SITE = http://download.librdf.org/source RAPTOR_DEPENDENCIES = libxml2 libxslt RAPTOR_LICENSE = GPLv2+ or LGPLv2.1+ or Apache-2.0+ RAPTOR_LICENSE_FILES = LICENSE.txt +RAPTOR_INSTALL_STAGING = YES # Flag is added to make sure the patch is applied for the configure.ac of raptor. RAPTOR_AUTORECONF = YES From 434c9777bea905afde2c5cbc21ac8d2b7f8186a2 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 16 Feb 2017 15:24:01 -0300 Subject: [PATCH 23/74] unionfs: bump to version 2.0 Drop upstream patch. Update ioctl patch since it's still required to build for musl. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- ...Revert-to-old-pre-1.0-meta-directory.patch | 36 ------------------- ...01-include-asm-ioctl.h-for-_IOC_SIZE.patch | 26 ++++++++++++++ package/unionfs/unionfs.hash | 4 +-- package/unionfs/unionfs.mk | 4 +-- 4 files changed, 29 insertions(+), 41 deletions(-) delete mode 100644 package/unionfs/0001-Revert-to-old-pre-1.0-meta-directory.patch create mode 100644 package/unionfs/0001-include-asm-ioctl.h-for-_IOC_SIZE.patch diff --git a/package/unionfs/0001-Revert-to-old-pre-1.0-meta-directory.patch b/package/unionfs/0001-Revert-to-old-pre-1.0-meta-directory.patch deleted file mode 100644 index 228441b38a..0000000000 --- a/package/unionfs/0001-Revert-to-old-pre-1.0-meta-directory.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 93c2f9bd8b058b28016e6db2421e5b38eac0606c Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Thu, 17 Dec 2015 15:06:38 +0100 -Subject: [PATCH] Revert to old pre-1.0 meta directory - -Unionfs changed its meta directory from .unionfs to .unionfs-fuse with the -unionfs -> unionfs-fuse rename. The rename later got reverted everywhere -but the meta directory, so now unionfs doesn't find the whiteout files from -older releases. - -Revert back to the pre-1.0 behaviour to fix this. - -Committed upstream: -https://github.com/rpodgorny/unionfs-fuse/commit/93c2f9bd8b058b28016e6db2421e5b38eac0606c - -Signed-off-by: Peter Korsgaard ---- - src/unionfs.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/unionfs.h b/src/unionfs.h -index c2b5ee3..74b824f 100644 ---- a/src/unionfs.h -+++ b/src/unionfs.h -@@ -10,7 +10,7 @@ - #define PATHLEN_MAX 1024 - #define HIDETAG "_HIDDEN~" - --#define METANAME ".unionfs-fuse" -+#define METANAME ".unionfs" - #define METADIR (METANAME "/") // string concetanation! - - // fuse meta files, we might want to hide those --- -2.1.4 - diff --git a/package/unionfs/0001-include-asm-ioctl.h-for-_IOC_SIZE.patch b/package/unionfs/0001-include-asm-ioctl.h-for-_IOC_SIZE.patch new file mode 100644 index 0000000000..f3d8fa15ad --- /dev/null +++ b/package/unionfs/0001-include-asm-ioctl.h-for-_IOC_SIZE.patch @@ -0,0 +1,26 @@ +From d33635fe940ff898e026d3fb77446e52f8f2bd3f Mon Sep 17 00:00:00 2001 +From: Gustavo Zacarias +Date: Thu, 16 Feb 2017 14:59:30 -0300 +Subject: [PATCH] include asm/ioctl.h for _IOC_SIZE + +Signed-off-by: Gustavo Zacarias +--- + src/unionfs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/unionfs.c b/src/unionfs.c +index 5aed5ce..f6cd368 100644 +--- a/src/unionfs.c ++++ b/src/unionfs.c +@@ -32,7 +32,7 @@ + #include + #include + #include +-#include ++#include + + #ifdef linux + #include +-- +2.10.2 + diff --git a/package/unionfs/unionfs.hash b/package/unionfs/unionfs.hash index c843a0e8c1..fcc1d58d6e 100644 --- a/package/unionfs/unionfs.hash +++ b/package/unionfs/unionfs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2ee80bd0634a61adb2159212e155d607a0a82ad659214ae6edb3530396cccc09 unionfs-1.0.tar.gz -sha256 c8526f80448f344fba0100e5510793b6de985b24a8b526d9a6803bcd713d9de2 0001-include-asm-ioctl.h-for-_IOC_SIZE.patch +sha256 f24d7dd64c678cefacbebf2727b61e3127b8ecb6bb9176d7117dd31503455643 unionfs-2.0.tar.gz +sha256 976ca25b7706911f1a6e981c0fd236b607f497aa0b23d407825b0aad41f7c896 0001-include-asm-ioctl.h-for-_IOC_SIZE.patch diff --git a/package/unionfs/unionfs.mk b/package/unionfs/unionfs.mk index 0fa9c940f9..4281e84c4d 100644 --- a/package/unionfs/unionfs.mk +++ b/package/unionfs/unionfs.mk @@ -4,10 +4,8 @@ # ################################################################################ -UNIONFS_VERSION = 1.0 +UNIONFS_VERSION = 2.0 UNIONFS_SITE = $(call github,rpodgorny,unionfs-fuse,v$(UNIONFS_VERSION)) -UNIONFS_PATCH = \ - http://git.alpinelinux.org/cgit/aports/plain/main/unionfs-fuse/0001-include-asm-ioctl.h-for-_IOC_SIZE.patch UNIONFS_DEPENDENCIES = libfuse host-pkgconf UNIONFS_LICENSE = BSD-3c UNIONFS_LICENSE_FILES = LICENSE From 6440a5f72f610aadf3320a04143531a95b2db563 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 16 Feb 2017 15:23:49 -0300 Subject: [PATCH 24/74] f2fs-tools: bump to version 1.8.0 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/f2fs-tools/f2fs-tools.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/f2fs-tools/f2fs-tools.mk b/package/f2fs-tools/f2fs-tools.mk index d3956c448d..ac8bd39f45 100644 --- a/package/f2fs-tools/f2fs-tools.mk +++ b/package/f2fs-tools/f2fs-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -F2FS_TOOLS_VERSION = v1.6.1 +F2FS_TOOLS_VERSION = v1.8.0 F2FS_TOOLS_SITE = http://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git F2FS_TOOLS_SITE_METHOD = git F2FS_TOOLS_CONF_ENV = ac_cv_file__git=no From c1674fe0515c31bb546796ee1ed40f2e7600c694 Mon Sep 17 00:00:00 2001 From: Danomi Manchego Date: Wed, 15 Feb 2017 22:14:27 -0500 Subject: [PATCH 25/74] json-c: bump to version 0.12.1-20160607 [Peter: stick to the github helper] Signed-off-by: Danomi Manchego Signed-off-by: Peter Korsgaard --- package/json-c/json-c.hash | 2 +- package/json-c/json-c.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/json-c/json-c.hash b/package/json-c/json-c.hash index 6550895560..1868d75042 100644 --- a/package/json-c/json-c.hash +++ b/package/json-c/json-c.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 99304a4a633f1ee281d6a521155a182824dd995139d5ed6ee5c93093c281092b json-c-json-c-0.12-20140410.tar.gz +sha256 989e09b99ded277a0a651cd18b81fcb76885fea08769d7a21b6da39fb8a34816 json-c-json-c-0.12.1-20160607.tar.gz diff --git a/package/json-c/json-c.mk b/package/json-c/json-c.mk index 35243f13a1..7adbcafa72 100644 --- a/package/json-c/json-c.mk +++ b/package/json-c/json-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -JSON_C_VERSION = json-c-0.12-20140410 +JSON_C_VERSION = json-c-0.12.1-20160607 JSON_C_SITE = $(call github,json-c,json-c,$(JSON_C_VERSION)) JSON_C_INSTALL_STAGING = YES JSON_C_MAKE = $(MAKE1) From cda721e1a54004f0857992e66470a9a5dec0c8e1 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Fri, 17 Feb 2017 12:20:01 +0100 Subject: [PATCH 26/74] perl-cross: bump to version 1.1.4 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/perl/perl.hash | 4 ++-- package/perl/perl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl/perl.hash b/package/perl/perl.hash index 41c1ce8a61..b815295ffe 100644 --- a/package/perl/perl.hash +++ b/package/perl/perl.hash @@ -3,5 +3,5 @@ md5 af6a84c7c3e2b8b269c105a5db2f6d53 perl-5.2 sha1 5bec25d8821b81a5939ee220997f4c8ab1c13e31 perl-5.24.1.tar.xz sha256 03a77bac4505c270f1890ece75afc7d4b555090b41aa41ea478747e23b2afb3f perl-5.24.1.tar.xz -# Hashes from: http://github.com/arsv/perl-cross/releases/download/1.1.3/perl-cross-1.1.3.hash -sha256 181b24ff71815fb2c8065e6ea139d106796eee0964aebfd8081f0b7f69e0696d perl-cross-1.1.3.tar.gz +# Hashes from: http://github.com/arsv/perl-cross/releases/download/1.1.4/perl-cross-1.1.4.hash +sha256 c840a327d5464ca271cac40d52e2d199330875527bf1003c28a6e550fb7bcc57 perl-cross-1.1.4.tar.gz diff --git a/package/perl/perl.mk b/package/perl/perl.mk index 224b4cbaae..b407e05698 100644 --- a/package/perl/perl.mk +++ b/package/perl/perl.mk @@ -13,7 +13,7 @@ PERL_LICENSE = Artistic or GPLv1+ PERL_LICENSE_FILES = Artistic Copying README PERL_INSTALL_STAGING = YES -PERL_CROSS_VERSION = 1.1.3 +PERL_CROSS_VERSION = 1.1.4 # DO NOT refactor with the github helper (the result is not the same) PERL_CROSS_SITE = https://github.com/arsv/perl-cross/releases/download/$(PERL_CROSS_VERSION) PERL_CROSS_SOURCE = perl-cross-$(PERL_CROSS_VERSION).tar.gz From 7ab3cdaa34ff7e2b2adb403907337d415f68b2f8 Mon Sep 17 00:00:00 2001 From: Lionel Flandrin Date: Fri, 17 Feb 2017 14:08:21 +0100 Subject: [PATCH 27/74] package/python-psutil: bump to version 5.1.3 Signed-off-by: Lionel Flandrin Signed-off-by: Peter Korsgaard --- package/python-psutil/python-psutil.hash | 4 ++-- package/python-psutil/python-psutil.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-psutil/python-psutil.hash b/package/python-psutil/python-psutil.hash index ead2d9c5ba..c0b795b855 100644 --- a/package/python-psutil/python-psutil.hash +++ b/package/python-psutil/python-psutil.hash @@ -1,3 +1,3 @@ # md5 from https://pypi.python.org/pypi/psutil/json, sha256 locally computed -md5 199a366dba829c88bddaf5b41d19ddc0 psutil-4.3.1.tar.gz -sha256 38f74182fb9e15cafd0cdf0821098a95cc17301807aed25634a18b66537ba51b psutil-4.3.1.tar.gz +md5 3090e32d42761086ae82036cadb95ba3 psutil-5.1.3.tar.gz +sha256 959bd58bdc8152b0a143cb3bd822d4a1b8f7230617b0e3eb2ff6e63812120f2b psutil-5.1.3.tar.gz diff --git a/package/python-psutil/python-psutil.mk b/package/python-psutil/python-psutil.mk index 1032318813..2bb865d741 100644 --- a/package/python-psutil/python-psutil.mk +++ b/package/python-psutil/python-psutil.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PSUTIL_VERSION = 4.3.1 +PYTHON_PSUTIL_VERSION = 5.1.3 PYTHON_PSUTIL_SOURCE = psutil-$(PYTHON_PSUTIL_VERSION).tar.gz -PYTHON_PSUTIL_SITE = https://pypi.python.org/packages/78/cc/f267a1371f229bf16db6a4e604428c3b032b823b83155bd33cef45e49a53 +PYTHON_PSUTIL_SITE = https://pypi.python.org/packages/78/0a/aa90434c6337dd50d182a81fe4ae4822c953e166a163d1bf5f06abb1ac0b PYTHON_PSUTIL_SETUP_TYPE = setuptools PYTHON_PSUTIL_LICENSE = BSD-3c PYTHON_PSUTIL_LICENSE_FILES = LICENSE From 194cb3f32087736581b02813dcb549a83c90910e Mon Sep 17 00:00:00 2001 From: Danomi Manchego Date: Wed, 15 Feb 2017 22:13:29 -0500 Subject: [PATCH 28/74] ffmpeg: remove example source code from target There does not appear to be a way to configure the example code installation, so this mod gets rid of it with a post-install hook. Signed-off-by: Danomi Manchego Signed-off-by: Peter Korsgaard --- package/ffmpeg/ffmpeg.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 4447b724c4..449cca2ce3 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -496,4 +496,9 @@ define FFMPEG_CONFIGURE_CMDS ) endef +define FFMPEG_REMOVE_EXAMPLE_SRC_FILES + rm -rf $(TARGET_DIR)/usr/share/ffmpeg/examples +endef +FFMPEG_POST_INSTALL_TARGET_HOOKS += FFMPEG_REMOVE_EXAMPLE_SRC_FILES + $(eval $(autotools-package)) From 30c4b5843f1e15f4103e60c994cdc2328b8fa2d3 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 16 Feb 2017 14:50:56 +0200 Subject: [PATCH 29/74] ebtables: enable for musl Add two patches that fix build with musl. The first patch is upstream. The second patch uses the Buildroot workaround to suppress conflicting struct ethhdr definitions. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- ...ove-C-specific-compiler-hint-macro-_.patch | 50 +++++++++++++++++++ .../0002-Fix-musl-compatibility.patch | 30 +++++++++++ package/ebtables/Config.in | 2 - 3 files changed, 80 insertions(+), 2 deletions(-) create mode 100644 package/ebtables/0001-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch create mode 100644 package/ebtables/0002-Fix-musl-compatibility.patch diff --git a/package/ebtables/0001-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch b/package/ebtables/0001-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch new file mode 100644 index 0000000000..bd7bead093 --- /dev/null +++ b/package/ebtables/0001-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch @@ -0,0 +1,50 @@ +From f8079671326e9fd079391d24911a9a8a77f1d6fd Mon Sep 17 00:00:00 2001 +From: Felix Janda +Date: Sat, 16 May 2015 12:31:58 +0200 +Subject: [PATCH] ethernetdb.h: Remove C++ specific compiler hint macro _THROW + +Fixes compilation with musl libc + +Signed-off-by: Felix Janda +Signed-off-by: Pablo Neira Ayuso +Signed-off-by: Baruch Siach +--- +Patch status: upstream commit f8079671326e9fd0 + + include/ethernetdb.h | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +diff --git a/include/ethernetdb.h b/include/ethernetdb.h +index 46d8bfd1b7e5..1683abe01987 100644 +--- a/include/ethernetdb.h ++++ b/include/ethernetdb.h +@@ -38,21 +38,20 @@ struct ethertypeent { + + /* Open ethertype data base files and mark them as staying open even + after a later search if STAY_OPEN is non-zero. */ +-extern void setethertypeent(int __stay_open) __THROW; ++extern void setethertypeent(int __stay_open); + + /* Close ethertype data base files and clear `stay open' flag. */ +-extern void endethertypeent(void) __THROW; ++extern void endethertypeent(void); + + /* Get next entry from ethertype data base file. Open data base if + necessary. */ +-extern struct ethertypeent *getethertypeent(void) __THROW; ++extern struct ethertypeent *getethertypeent(void); + + /* Return entry from ethertype data base for network with NAME. */ +-extern struct ethertypeent *getethertypebyname(__const char *__name) +- __THROW; ++extern struct ethertypeent *getethertypebyname(__const char *__name); + + /* Return entry from ethertype data base which number is PROTO. */ +-extern struct ethertypeent *getethertypebynumber(int __ethertype) __THROW; ++extern struct ethertypeent *getethertypebynumber(int __ethertype); + + + #endif /* ethernetdb.h */ +-- +2.11.0 + diff --git a/package/ebtables/0002-Fix-musl-compatibility.patch b/package/ebtables/0002-Fix-musl-compatibility.patch new file mode 100644 index 0000000000..5e9f534b46 --- /dev/null +++ b/package/ebtables/0002-Fix-musl-compatibility.patch @@ -0,0 +1,30 @@ +From 138e7efdc8cad6453620c6366e6fa5e786593f7f Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Thu, 16 Feb 2017 14:41:48 +0200 +Subject: [PATCH] Fix musl compatibility + +Include netinet/ether.h before kernel headers to suppress the conflicting +definition of struct ethhdr. + +Signed-off-by: Baruch Siach +--- +Upstream status: not upstreamable; depends on Buildroot local musl patch +--- + include/ebtables_u.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/ebtables_u.h b/include/ebtables_u.h +index 35a5bcc54c86..268b1fd599d2 100644 +--- a/include/ebtables_u.h ++++ b/include/ebtables_u.h +@@ -24,6 +24,7 @@ + #ifndef EBTABLES_U_H + #define EBTABLES_U_H + #include ++#include + #include + #include + +-- +2.11.0 + diff --git a/package/ebtables/Config.in b/package/ebtables/Config.in index fa123b196e..2fdac06cd1 100644 --- a/package/ebtables/Config.in +++ b/package/ebtables/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_EBTABLES bool "ebtables" - depends on !BR2_TOOLCHAIN_USES_MUSL # mixes userspace and kernel headers depends on BR2_USE_MMU # fork() help Ethernet bridge frame table administration @@ -8,5 +7,4 @@ config BR2_PACKAGE_EBTABLES http://ebtables.netfilter.org/ comment "ebtables needs a glibc or uClibc toolchain" - depends on BR2_TOOLCHAIN_USES_MUSL depends on BR2_USE_MMU From 897f7f124245f95fca334acfa77ffd7aaadb5f88 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 17 Feb 2017 12:21:16 -0300 Subject: [PATCH 30/74] poppler: bump to version 0.52.0 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/poppler/poppler.hash | 2 +- package/poppler/poppler.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/poppler/poppler.hash b/package/poppler/poppler.hash index af597e0297..1c57ef3b58 100644 --- a/package/poppler/poppler.hash +++ b/package/poppler/poppler.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 e997c9ad81a8372f2dd03a02b00692b8cc479c220340c8881edaca540f402c1f poppler-0.51.0.tar.xz +sha256 528b661738839f9a25f6e580fcd2d5db007e0a1948580c6489f0062798ca1992 poppler-0.52.0.tar.xz diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk index fda8284507..5c2d0968e2 100644 --- a/package/poppler/poppler.mk +++ b/package/poppler/poppler.mk @@ -4,7 +4,7 @@ # ################################################################################ -POPPLER_VERSION = 0.51.0 +POPPLER_VERSION = 0.52.0 POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz POPPLER_SITE = http://poppler.freedesktop.org POPPLER_DEPENDENCIES = fontconfig host-pkgconf From 217d68bdf543f14853cda2675d005206a9ce2f83 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 17 Feb 2017 19:34:37 +0100 Subject: [PATCH 31/74] boards/nanopi-neo: update defconfig - update to released kernel and U-Boot, - move the headers config closer to the kernel ones, - update readme.txt. Signed-off-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- board/nanopi-neo/readme.txt | 7 +++---- configs/nanopi_neo_defconfig | 11 +++++------ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/board/nanopi-neo/readme.txt b/board/nanopi-neo/readme.txt index 95fc62897a..539df541d8 100644 --- a/board/nanopi-neo/readme.txt +++ b/board/nanopi-neo/readme.txt @@ -2,7 +2,7 @@ Intro ===== The instructions herein are valid for the FriendlyARM NanoPi NEO, -both the 256MiB and 512MiB versions. They should also work the the +both the 256MiB and 512MiB versions. They should also work for the NanoPi NEO Air, but this is untested so far. The FriendlyARM Nanopi NEO is a 4x4cm² board with an Allwiner H3 SoC: @@ -14,9 +14,8 @@ The FriendlyARM Nanopi NEO is a 4x4cm² board with an Allwiner H3 SoC: - 10/100 ethernet MAC - GPIOs, SPI, I2c... -Support for the Nanopi NEO in U-Boot and Linux is very recent, so -much so that we have to use an -rc tag for U-Boot and a special -Linux tree. +Support for the Nanopi NEO in U-Boot and Linux is very recent, so only +core, basic features are available. Unfortunately, support for the ethernet MAC and the USB OTG are not yet upstream, but are being actively worked on. diff --git a/configs/nanopi_neo_defconfig b/configs/nanopi_neo_defconfig index ba4534a1da..958c976ff1 100644 --- a/configs/nanopi_neo_defconfig +++ b/configs/nanopi_neo_defconfig @@ -2,19 +2,18 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y -# Cannot use same headers as the kernel, because kernel is 4.9 -# and we only know 4.8 at best so far -BR2_KERNEL_HEADERS_4_8=y - BR2_TARGET_GENERIC_HOSTNAME="nanopi-neo" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the NanoPi NEO" BR2_ROOTFS_POST_BUILD_SCRIPT="board/nanopi-neo/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/nanopi-neo/post-image.sh" +# Linux headers same as kernel, a 4.9 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y + # Use a -rc kernel to get the DTS BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9-rc3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.10" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-nanopi-neo" @@ -23,7 +22,7 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-nanopi-neo" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.11-rc3" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y From 8557294fd189e27a5a9adc421fbd5006285a0c47 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 19 Feb 2017 09:16:05 +0100 Subject: [PATCH 32/74] package/libva: project moved to github For details read https://lists.01.org/pipermail/intel-vaapi-media/2017-January/000001.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libva/Config.in | 2 +- package/libva/libva.hash | 4 ++-- package/libva/libva.mk | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/libva/Config.in b/package/libva/Config.in index 467b9d2fa4..75692f2ece 100644 --- a/package/libva/Config.in +++ b/package/libva/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_LIBVA IDCT, Motion Compensation etc.) for the prevailing coding standards today (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3). - http://www.freedesktop.org/wiki/Software/vaapi/ + https://01.org/linuxmedia/vaapi comment "libva needs a toolchain w/ threads, dynamic library" depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/libva/libva.hash b/package/libva/libva.hash index e63f4dbd83..1f248f8b67 100644 --- a/package/libva/libva.hash +++ b/package/libva/libva.hash @@ -1,2 +1,2 @@ -# From https://lists.freedesktop.org/archives/libva/2016-November/004730.html -sha1 18e46f3d5a0e971eb0ec9fe14bc021e69eb13fb8 libva-1.7.3.tar.bz2 +# Locally computed +sha256 f0f816a725007fbf3c7ed816ff71ba420696bec63ff49045e9b23d9b34ac73c8 libva-1.7.3.tar.gz diff --git a/package/libva/libva.mk b/package/libva/libva.mk index cf42b70e84..bce69072e4 100644 --- a/package/libva/libva.mk +++ b/package/libva/libva.mk @@ -5,8 +5,7 @@ ################################################################################ LIBVA_VERSION = 1.7.3 -LIBVA_SOURCE = libva-$(LIBVA_VERSION).tar.bz2 -LIBVA_SITE = http://www.freedesktop.org/software/vaapi/releases/libva +LIBVA_SITE = $(call github,01org,libva,libva-$(LIBVA_VERSION)) LIBVA_LICENSE = MIT LIBVA_LICENSE_FILES = COPYING LIBVA_AUTORECONF = YES From d8cd8eff93c918196092a7fba812d6b8367a77b2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 19 Feb 2017 09:16:06 +0100 Subject: [PATCH 33/74] package/libva-intel-driver: project moved to github For details read https://lists.01.org/pipermail/intel-vaapi-media/2017-January/000001.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libva-intel-driver/Config.in | 2 +- package/libva-intel-driver/libva-intel-driver.hash | 4 ++-- package/libva-intel-driver/libva-intel-driver.mk | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/libva-intel-driver/Config.in b/package/libva-intel-driver/Config.in index 0f5b656b12..a39e554984 100644 --- a/package/libva-intel-driver/Config.in +++ b/package/libva-intel-driver/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_LIBVA_INTEL_DRIVER help VA-API back-end driver for Intel graphics chips - https://01.org/linuxgraphics/community/vaapi + https://01.org/linuxmedia/vaapi comment "libva intel driver needs a toolchain w/ threads, dynamic library" depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/libva-intel-driver/libva-intel-driver.hash b/package/libva-intel-driver/libva-intel-driver.hash index 10664d051b..a9688763a9 100644 --- a/package/libva-intel-driver/libva-intel-driver.hash +++ b/package/libva-intel-driver/libva-intel-driver.hash @@ -1,2 +1,2 @@ -# From https://lists.freedesktop.org/archives/libva/2016-November/004731.html -sha1 5100f187afc4e39fce5664b96fe11a38faa9afaa libva-intel-driver-1.7.3.tar.bz2 +# Locally computed +sha256 c1f02cbdf0398f096ddc91096fac6ee62267a54955f6d235d73a8ff2ea888118 libva-intel-driver-1.7.3.tar.gz diff --git a/package/libva-intel-driver/libva-intel-driver.mk b/package/libva-intel-driver/libva-intel-driver.mk index 86f6eaa60e..e2f855bb33 100644 --- a/package/libva-intel-driver/libva-intel-driver.mk +++ b/package/libva-intel-driver/libva-intel-driver.mk @@ -5,8 +5,8 @@ ################################################################################ LIBVA_INTEL_DRIVER_VERSION = 1.7.3 -LIBVA_INTEL_DRIVER_SOURCE = libva-intel-driver-$(LIBVA_INTEL_DRIVER_VERSION).tar.bz2 -LIBVA_INTEL_DRIVER_SITE = http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver +LIBVA_INTEL_DRIVER_SITE = \ + $(call github,01org,intel-vaapi-driver,$(LIBVA_INTEL_DRIVER_VERSION)) LIBVA_INTEL_DRIVER_LICENSE = MIT LIBVA_INTEL_DRIVER_LICENSE_FILES = COPYING # needed to work around https://bugs.freedesktop.org/show_bug.cgi?id=79478 From 5e5219b84dff676257f8ad32816e760c733bdcec Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 19 Feb 2017 12:17:15 +0100 Subject: [PATCH 34/74] cjson: bump to version 1.3.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/cjson/cjson.hash | 2 +- package/cjson/cjson.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cjson/cjson.hash b/package/cjson/cjson.hash index 903880f7c5..0072725977 100644 --- a/package/cjson/cjson.hash +++ b/package/cjson/cjson.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 1d976ca423d714b7e836cfbc1980b56f49962d0dfe654edb3c2ffa5c713af242 cjson-v1.2.1.tar.gz +sha256 f1c528103844ffb992e17625ac8a3e8ee742021b1c2478e53cee4b085c0f413d cjson-v1.3.0.tar.gz diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk index 11c34c5d78..5ff990e17a 100644 --- a/package/cjson/cjson.mk +++ b/package/cjson/cjson.mk @@ -4,7 +4,7 @@ # ################################################################################ -CJSON_VERSION = v1.2.1 +CJSON_VERSION = v1.3.0 CJSON_SITE = $(call github,DaveGamble,cjson,$(CJSON_VERSION)) CJSON_INSTALL_STAGING = YES CJSON_LICENSE = MIT From d0cb7dfc6f511482e6120d90275365888b9b4080 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 19 Feb 2017 12:29:22 +0100 Subject: [PATCH 35/74] cjson: do not build tests Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/cjson/cjson.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk index 5ff990e17a..aea9578526 100644 --- a/package/cjson/cjson.mk +++ b/package/cjson/cjson.mk @@ -9,5 +9,7 @@ CJSON_SITE = $(call github,DaveGamble,cjson,$(CJSON_VERSION)) CJSON_INSTALL_STAGING = YES CJSON_LICENSE = MIT CJSON_LICENSE_FILES = LICENSE +CJSON_CONF_OPTS += \ + -DENABLE_CJSON_TEST=OFF $(eval $(cmake-package)) From e3ddd1c1f3304423e7143b99aad151355a3baada Mon Sep 17 00:00:00 2001 From: Zoltan Gyarmati Date: Sun, 19 Feb 2017 14:19:08 +0100 Subject: [PATCH 36/74] package/crudini: upgrade to 0.9 Signed-off-by: Zoltan Gyarmati Signed-off-by: Peter Korsgaard --- package/crudini/crudini.hash | 6 +++--- package/crudini/crudini.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/crudini/crudini.hash b/package/crudini/crudini.hash index 2796e7a8c6..9279847be9 100644 --- a/package/crudini/crudini.hash +++ b/package/crudini/crudini.hash @@ -1,3 +1,3 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=0664fa2f9d36e411e839b5394d8c2951, sha256 locally computed -md5 0664fa2f9d36e411e839b5394d8c2951 crudini-0.8.tar.gz -sha256 effdf8feb7efe252af87143c8756bbc69e2679afb6173083d38be02284385e5f crudini-0.8.tar.gz +# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=9b8500c90467f0a61c714fbe852c2a66, sha256 locally computed +md5 9b8500c90467f0a61c714fbe852c2a66 crudini-0.9.tar.gz +sha256 10512a5a2f7b54b42e48a1d00f0c6398947c2ba6c264b9fdef86677f0e949fd3 crudini-0.9.tar.gz diff --git a/package/crudini/crudini.mk b/package/crudini/crudini.mk index 501c9e01fb..8fe3232dc5 100644 --- a/package/crudini/crudini.mk +++ b/package/crudini/crudini.mk @@ -4,8 +4,8 @@ # ################################################################################ -CRUDINI_VERSION = 0.8 -CRUDINI_SITE = https://pypi.python.org/packages/23/4a/934b05bbe5af4fd390207c5e935efbae6439809aad65ab0702e236c1b5f5 +CRUDINI_VERSION = 0.9 +CRUDINI_SITE = https://pypi.python.org/packages/b5/65/5588903472f30fa01ca4951be00c03a317b27bac4cd1e945bd16b2c1b6d3 CRUDINI_SETUP_TYPE = setuptools CRUDINI_LICENSE = GPLv2 CRUDINI_LICENSE_FILES = COPYING From 688c9aab75c740919ddab80dff769986846c8f6f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 17 Feb 2017 17:33:10 +0100 Subject: [PATCH 37/74] board: add support for nexbox a95x Nexbox A95X is a low cost Android STB based around an Amlogic s905(x) SoC (quad A53), 8/16GB eMMC and 1/2GB RAM. Both the s905 (gxbb) and s905x (gxl) variant is supported. This defconfig uses mainline Linux. As the mainline support for s905 is quite young, use the latest release candidate. There is currently no support for this board in U-Boot or sources available for the vendor U-Boot, so the defconfig doesn't build a u-boot and instead uses the existing U-Boot available in the eMMC. This also means that we need to wrap the kernel as uImage, which isn't suppported for aarch64. Instead this is done in the post-build script. Mainline aarch64 defconfig builds most drivers modular, so add mdev for module autoloading. [Peter: explicitly set BR2_cortex_a53=y] Signed-off-by: Peter Korsgaard --- board/nexbox/a95x/boot.txt | 11 ++++++++ board/nexbox/a95x/genimage.cfg | 28 +++++++++++++++++++ board/nexbox/a95x/post-build.sh | 12 +++++++++ board/nexbox/a95x/post-image.sh | 14 ++++++++++ board/nexbox/a95x/readme.txt | 48 +++++++++++++++++++++++++++++++++ configs/nexbox_a95x_defconfig | 20 ++++++++++++++ 6 files changed, 133 insertions(+) create mode 100644 board/nexbox/a95x/boot.txt create mode 100644 board/nexbox/a95x/genimage.cfg create mode 100755 board/nexbox/a95x/post-build.sh create mode 100755 board/nexbox/a95x/post-image.sh create mode 100644 board/nexbox/a95x/readme.txt create mode 100644 configs/nexbox_a95x_defconfig diff --git a/board/nexbox/a95x/boot.txt b/board/nexbox/a95x/boot.txt new file mode 100644 index 0000000000..b538b4a9ab --- /dev/null +++ b/board/nexbox/a95x/boot.txt @@ -0,0 +1,11 @@ +setenv bootargs console=ttyAML0,115200 earlyprintk root=/dev/mmcblk1p2 rootwait + +fatload mmc 0:1 0x01080000 uImage + +if itest.s "${aml_dt}" == "gxl_p212_2g"; then + fatload mmc 0:1 $dtb_mem_addr meson-gxl-nexbox-a95x.dtb +else + fatload mmc 0:1 $dtb_mem_addr meson-gxbb-nexbox-a95x.dtb +fi + +bootm 0x1080000 - $dtb_mem_addr diff --git a/board/nexbox/a95x/genimage.cfg b/board/nexbox/a95x/genimage.cfg new file mode 100644 index 0000000000..c6c80f860b --- /dev/null +++ b/board/nexbox/a95x/genimage.cfg @@ -0,0 +1,28 @@ +image boot.vfat { + vfat { + files = { + "uImage", + "meson-gxbb-nexbox-a95x.dtb", + "meson-gxl-nexbox-a95x.dtb", + "boot.scr" + } + } + size = 32M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + size = 512M + } +} diff --git a/board/nexbox/a95x/post-build.sh b/board/nexbox/a95x/post-build.sh new file mode 100755 index 0000000000..9f4cc04518 --- /dev/null +++ b/board/nexbox/a95x/post-build.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +BOARD_DIR="$(dirname $0)" +MKIMAGE=$HOST_DIR/usr/bin/mkimage + +$MKIMAGE -C none -A arm64 -T script -d $BOARD_DIR/boot.txt $BINARIES_DIR/boot.scr + +# vendor u-boot uses uImage +if [ -e $BINARIES_DIR/Image ]; then + $MKIMAGE -A arm64 -O linux -T kernel -C none -a 0x1080000 -e 0x1080000 \ + -n linux -d $BINARIES_DIR/Image $BINARIES_DIR/uImage +fi diff --git a/board/nexbox/a95x/post-image.sh b/board/nexbox/a95x/post-image.sh new file mode 100755 index 0000000000..359b4c9e7c --- /dev/null +++ b/board/nexbox/a95x/post-image.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +BOARD_DIR="$(dirname $0)" +GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" + +rm -rf "${GENIMAGE_TMP}" + +genimage \ + --rootpath "${TARGET_DIR}" \ + --tmppath "${GENIMAGE_TMP}" \ + --inputpath "${BINARIES_DIR}" \ + --outputpath "${BINARIES_DIR}" \ + --config "${GENIMAGE_CFG}" diff --git a/board/nexbox/a95x/readme.txt b/board/nexbox/a95x/readme.txt new file mode 100644 index 0000000000..e08b4e4e6b --- /dev/null +++ b/board/nexbox/a95x/readme.txt @@ -0,0 +1,48 @@ +Nexbox A95X + +Intro +===== + +Nexbox A95X is a low cost Android STB based around an Amlogic s905(x) SoC +(quad A53), 8/16GB eMMC and 1/2GB RAM. To use this defconfig, wires to the +internal UART solder pads must be added. See the linux-meson page for +details: + +http://linux-meson.com/doku.php?id=nexbox_a95x_s905 + +Both the s905 (gxbb) and s905x (gxl) variant is supported. + +This default configuration will allow you to start experimenting with the +buildroot environment for the A95X. With the current configuration it will +bring-up the board from microSD, and allow access through the serial +console. + +How to build it +=============== + +Configure Buildroot: + + $ make nexbox_a95x_defconfig + +Compile everything and build the SD card image: + + $ make + +How to write the SD card +======================== + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto a microSD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + +How to boot +=========== + +Insert microSD card and connect serial cable. Power board and stop +U-Boot by pressing any key. Boot the system by typing: + +fatload mmc 0:1 0x1070000 boot.scr +autoscr 0x1070000 diff --git a/configs/nexbox_a95x_defconfig b/configs/nexbox_a95x_defconfig new file mode 100644 index 0000000000..906a22b0ff --- /dev/null +++ b/configs/nexbox_a95x_defconfig @@ -0,0 +1,20 @@ +BR2_aarch64=y +BR2_cortex_a53=y +BR2_KERNEL_HEADERS_4_9=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/nexbox/a95x/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/nexbox/a95x/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.10-rc8" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="amlogic/meson-gxbb-nexbox-a95x amlogic/meson-gxl-nexbox-a95x" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y From a1e02440f3035cfbe5119c00457b3e1c2f7ac4d1 Mon Sep 17 00:00:00 2001 From: Zoltan Gyarmati Date: Sun, 19 Feb 2017 23:54:20 +0100 Subject: [PATCH 38/74] package/quazip: update to 0.7.3 Signed-off-by: Zoltan Gyarmati Signed-off-by: Thomas Petazzoni --- package/quazip/quazip.hash | 2 +- package/quazip/quazip.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/quazip/quazip.hash b/package/quazip/quazip.hash index 2f73c459c6..87bf7c2c50 100644 --- a/package/quazip/quazip.hash +++ b/package/quazip/quazip.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 91d827fbcafd099ae814cc18a8dd3bb709da6b8a27c918ee1c6c03b3f29440f4 quazip-0.7.2.tar.gz +sha256 2ad4f354746e8260d46036cde1496c223ec79765041ea28eb920ced015e269b5 quazip-0.7.3.tar.gz diff --git a/package/quazip/quazip.mk b/package/quazip/quazip.mk index 91b2f56328..caf112eba7 100644 --- a/package/quazip/quazip.mk +++ b/package/quazip/quazip.mk @@ -4,7 +4,7 @@ # ################################################################################ -QUAZIP_VERSION = 0.7.2 +QUAZIP_VERSION = 0.7.3 QUAZIP_SITE = http://sourceforge.net/projects/quazip/files/quazip/$(QUAZIP_VERSION) QUAZIP_INSTALL_STAGING = YES QUAZIP_DEPENDENCIES = \ From 400eaa3452e9380ec77ac62266530055506ea6e7 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 20 Feb 2017 08:57:33 -0300 Subject: [PATCH 39/74] linux: bump default to version 4.10 Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- linux/Config.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/linux/Config.in b/linux/Config.in index 740dd391c9..7f18219009 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -26,7 +26,7 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (4.9.9)" + bool "Latest version (4.10)" config BR2_LINUX_KERNEL_CUSTOM_VERSION bool "Custom version" @@ -97,7 +97,11 @@ endif config BR2_LINUX_KERNEL_VERSION string +<<<<<<< a1e02440f3035cfbe5119c00457b3e1c2f7ac4d1 default "4.9.9" if BR2_LINUX_KERNEL_LATEST_VERSION +======= + default "4.10" if BR2_LINUX_KERNEL_LATEST_VERSION +>>>>>>> linux: bump default to version 4.10 default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL From 369b66fc366e3841ffb4dd2d35696f27799ae374 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 20 Feb 2017 08:57:34 -0300 Subject: [PATCH 40/74] toolchain: add 4.10.x choice for headers Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-common.in | 5 +++++ .../toolchain-external-custom/Config.in.options | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in index 96d5709763..379006d024 100644 --- a/toolchain/toolchain-common.in +++ b/toolchain/toolchain-common.in @@ -243,10 +243,15 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + # This order guarantees that the highest version is set, as kconfig # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "4.10" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10 default "4.9" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 default "4.8" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 default "4.7" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index ed2b082d7b..668ea3d9d5 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -89,6 +89,10 @@ choice m = ( LINUX_VERSION_CODE >> 8 ) & 0xFF p = ( LINUX_VERSION_CODE >> 0 ) & 0xFF +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_10 + bool "4.10.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9 bool "4.9.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 From 1cc0c0dc82b62433d697f8dc811ed8ce3b51daea Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 20 Feb 2017 08:57:35 -0300 Subject: [PATCH 41/74] linux-headers: bump to 4.10 kernel version Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- package/linux-headers/Config.in.host | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index b1d117a8ca..3610426055 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -6,7 +6,7 @@ config BR2_PACKAGE_HOST_LINUX_HEADERS choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL - default BR2_KERNEL_HEADERS_4_9 + default BR2_KERNEL_HEADERS_4_10 help Select the kernel version to get headers from. @@ -67,6 +67,10 @@ choice bool "Linux 4.9.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + config BR2_KERNEL_HEADERS_4_10 + bool "Linux 4.10.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10 + config BR2_KERNEL_HEADERS_VERSION bool "Manually specified Linux version" endchoice @@ -87,6 +91,10 @@ choice This is used to hide/show some packages that have strict requirements on the version of kernel headers. +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_10 + bool "4.10.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9 bool "4.9.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 @@ -224,5 +232,5 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.1.38" if BR2_KERNEL_HEADERS_4_1 default "4.4.48" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.9" if BR2_KERNEL_HEADERS_4_9 + default "4.10" if BR2_KERNEL_HEADERS_4_10 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 689f3c5031e47a7923c50d8cdf8208cc94314c53 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 20 Feb 2017 08:57:36 -0300 Subject: [PATCH 42/74] configs/mx6sx_udoo_neo: Bump to kernel 4.10 The imx6sx-udoo-neo dts patches have been upstreamed in kernel 4.10, so bump to this version and remove the local patches. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- .../patches/linux/0001-udoo_neo_support.patch | 560 ------------------ configs/mx6sx_udoo_neo_defconfig | 7 +- 2 files changed, 3 insertions(+), 564 deletions(-) delete mode 100644 board/udoo/neo/patches/linux/0001-udoo_neo_support.patch diff --git a/board/udoo/neo/patches/linux/0001-udoo_neo_support.patch b/board/udoo/neo/patches/linux/0001-udoo_neo_support.patch deleted file mode 100644 index 2e8cea5d12..0000000000 --- a/board/udoo/neo/patches/linux/0001-udoo_neo_support.patch +++ /dev/null @@ -1,560 +0,0 @@ -From 76e691fc7653b85d390e58710e5c7db73ca49367 Mon Sep 17 00:00:00 2001 -From: Andreas Färber -Date: Sun, 16 Oct 2016 16:44:23 +0200 -Subject: ARM: dts: imx6sx: Add UDOO Neo support -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Add initial device trees for UDOO Neo Basic, Extended and Full boards: -* Serial console is enabled, other serial ports are prepared. -* I2C based PMIC is enabled. -* Ethernet is enabled for Basic and Full. -* SDHC is enabled, with the SDIO_PWR GPIO modeled as a regulator. -* Both user LEDs are enabled, with the orange one reserved for the M4 - and with the SD card as default trigger for the red LED. - -The decision on a board compatible string is deferred to later. - -Cc: Ettore Chimenti -Signed-off-by: Andreas Färber -Signed-off-by: Shawn Guo ---- - arch/arm/boot/dts/Makefile | 5 +- - arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts | 69 ++++++ - arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts | 54 +++++ - arch/arm/boot/dts/imx6sx-udoo-neo-full.dts | 69 ++++++ - arch/arm/boot/dts/imx6sx-udoo-neo.dtsi | 293 +++++++++++++++++++++++++ - 5 files changed, 489 insertions(+), 1 deletion(-) - create mode 100644 arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts - create mode 100644 arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts - create mode 100644 arch/arm/boot/dts/imx6sx-udoo-neo-full.dts - create mode 100644 arch/arm/boot/dts/imx6sx-udoo-neo.dtsi - -diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index 019976b..da0197d 100644 ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -417,7 +417,10 @@ dtb-$(CONFIG_SOC_IMX6SX) += \ - imx6sx-sabreauto.dtb \ - imx6sx-sdb-reva.dtb \ - imx6sx-sdb-sai.dtb \ -- imx6sx-sdb.dtb -+ imx6sx-sdb.dtb \ -+ imx6sx-udoo-neo-basic.dtb \ -+ imx6sx-udoo-neo-extended.dtb \ -+ imx6sx-udoo-neo-full.dtb - dtb-$(CONFIG_SOC_IMX6UL) += \ - imx6ul-14x14-evk.dtb \ - imx6ul-geam-kit.dtb \ -diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts b/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts -new file mode 100644 -index 0000000..0b88878 ---- /dev/null -+++ b/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts -@@ -0,0 +1,69 @@ -+/* -+ * Copyright (c) 2016 Andreas Färber -+ * -+ * This file is dual-licensed: you can use it either under the terms -+ * of the GPL or the X11 license, at your option. Note that this dual -+ * licensing only applies to this file, and not this project as a -+ * whole. -+ * -+ * a) This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of the -+ * License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * Or, alternatively, -+ * -+ * b) Permission is hereby granted, free of charge, to any person -+ * obtaining a copy of this software and associated documentation -+ * files (the "Software"), to deal in the Software without -+ * restriction, including without limitation the rights to use, -+ * copy, modify, merge, publish, distribute, sublicense, and/or -+ * sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following -+ * conditions: -+ * -+ * The above copyright notice and this permission notice shall be -+ * included in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -+ * OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+/dts-v1/; -+ -+#include "imx6sx-udoo-neo.dtsi" -+ -+/ { -+ model = "UDOO Neo Basic"; -+ compatible = "fsl,imx6sx"; -+ -+ memory { -+ reg = <0x80000000 0x20000000>; -+ }; -+}; -+ -+&fec1 { -+ phy-handle = <ðphy1>; -+ status = "okay"; -+ -+ mdio { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ ethphy1: ethernet-phy@0 { -+ compatible = "ethernet-phy-ieee802.3-c22"; -+ reg = <0>; -+ }; -+ }; -+}; -diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts b/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts -new file mode 100644 -index 0000000..d6fdd17 ---- /dev/null -+++ b/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts -@@ -0,0 +1,54 @@ -+/* -+ * Copyright (c) 2016 Andreas Färber -+ * -+ * This file is dual-licensed: you can use it either under the terms -+ * of the GPL or the X11 license, at your option. Note that this dual -+ * licensing only applies to this file, and not this project as a -+ * whole. -+ * -+ * a) This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of the -+ * License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * Or, alternatively, -+ * -+ * b) Permission is hereby granted, free of charge, to any person -+ * obtaining a copy of this software and associated documentation -+ * files (the "Software"), to deal in the Software without -+ * restriction, including without limitation the rights to use, -+ * copy, modify, merge, publish, distribute, sublicense, and/or -+ * sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following -+ * conditions: -+ * -+ * The above copyright notice and this permission notice shall be -+ * included in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -+ * OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+/dts-v1/; -+ -+#include "imx6sx-udoo-neo.dtsi" -+ -+/ { -+ model = "UDOO Neo Extended"; -+ compatible = "fsl,imx6sx"; -+ -+ memory { -+ reg = <0x80000000 0x40000000>; -+ }; -+}; -diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts b/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts -new file mode 100644 -index 0000000..d8c3577 ---- /dev/null -+++ b/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts -@@ -0,0 +1,69 @@ -+/* -+ * Copyright (c) 2016 Andreas Färber -+ * -+ * This file is dual-licensed: you can use it either under the terms -+ * of the GPL or the X11 license, at your option. Note that this dual -+ * licensing only applies to this file, and not this project as a -+ * whole. -+ * -+ * a) This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of the -+ * License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * Or, alternatively, -+ * -+ * b) Permission is hereby granted, free of charge, to any person -+ * obtaining a copy of this software and associated documentation -+ * files (the "Software"), to deal in the Software without -+ * restriction, including without limitation the rights to use, -+ * copy, modify, merge, publish, distribute, sublicense, and/or -+ * sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following -+ * conditions: -+ * -+ * The above copyright notice and this permission notice shall be -+ * included in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -+ * OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+/dts-v1/; -+ -+#include "imx6sx-udoo-neo.dtsi" -+ -+/ { -+ model = "UDOO Neo Full"; -+ compatible = "fsl,imx6sx"; -+ -+ memory { -+ reg = <0x80000000 0x40000000>; -+ }; -+}; -+ -+&fec1 { -+ phy-handle = <ðphy1>; -+ status = "okay"; -+ -+ mdio { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ ethphy1: ethernet-phy@0 { -+ compatible = "ethernet-phy-ieee802.3-c22"; -+ reg = <0>; -+ }; -+ }; -+}; -diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi b/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi -new file mode 100644 -index 0000000..2b65d26 ---- /dev/null -+++ b/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi -@@ -0,0 +1,293 @@ -+/* -+ * Copyright (c) 2016 Andreas Färber -+ * -+ * This file is dual-licensed: you can use it either under the terms -+ * of the GPL or the X11 license, at your option. Note that this dual -+ * licensing only applies to this file, and not this project as a -+ * whole. -+ * -+ * a) This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of the -+ * License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * Or, alternatively, -+ * -+ * b) Permission is hereby granted, free of charge, to any person -+ * obtaining a copy of this software and associated documentation -+ * files (the "Software"), to deal in the Software without -+ * restriction, including without limitation the rights to use, -+ * copy, modify, merge, publish, distribute, sublicense, and/or -+ * sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following -+ * conditions: -+ * -+ * The above copyright notice and this permission notice shall be -+ * included in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -+ * OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+#include "imx6sx.dtsi" -+ -+/ { -+ compatible = "fsl,imx6sx"; -+ -+ chosen { -+ stdout-path = "serial0:115200n8"; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ -+ red { -+ label = "udoo-neo:red:mmc"; -+ gpios = <&gpio6 0 GPIO_ACTIVE_HIGH>; -+ default-state = "off"; -+ linux,default-trigger = "mmc0"; -+ }; -+ -+ orange { -+ label = "udoo-neo:orange:user"; -+ gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>; -+ default-state = "keep"; -+ }; -+ }; -+ -+ reg_sdio_pwr: regulator-sdio-pwr { -+ compatible = "regulator-fixed"; -+ gpio = <&gpio6 1 GPIO_ACTIVE_HIGH>; -+ enable-active-high; -+ regulator-name = "SDIO_PWR"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ regulator-boot-on; -+ }; -+}; -+ -+&cpu0 { -+ arm-supply = <&sw1a_reg>; -+ soc-supply = <&sw1c_reg>; -+}; -+ -+&fec1 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_enet1>; -+ phy-mode = "rmii"; -+ phy-reset-gpios = <&gpio2 1 GPIO_ACTIVE_LOW>; -+}; -+ -+&i2c1 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_i2c1>; -+ clock-frequency = <100000>; -+ status = "okay"; -+ -+ pmic: pmic@08 { -+ compatible = "fsl,pfuze3000"; -+ reg = <0x08>; -+ -+ regulators { -+ sw1a_reg: sw1a { -+ regulator-min-microvolt = <700000>; -+ regulator-max-microvolt = <1475000>; -+ regulator-boot-on; -+ regulator-always-on; -+ regulator-ramp-delay = <6250>; -+ }; -+ -+ sw1c_reg: sw1b { -+ regulator-min-microvolt = <700000>; -+ regulator-max-microvolt = <1475000>; -+ regulator-boot-on; -+ regulator-always-on; -+ regulator-ramp-delay = <6250>; -+ }; -+ -+ sw2_reg: sw2 { -+ regulator-min-microvolt = <1500000>; -+ regulator-max-microvolt = <1850000>; -+ regulator-boot-on; -+ regulator-always-on; -+ }; -+ -+ sw3a_reg: sw3 { -+ regulator-min-microvolt = <900000>; -+ regulator-max-microvolt = <1650000>; -+ regulator-boot-on; -+ regulator-always-on; -+ }; -+ -+ swbst_reg: swbst { -+ regulator-min-microvolt = <5000000>; -+ regulator-max-microvolt = <5150000>; -+ }; -+ -+ snvs_reg: vsnvs { -+ regulator-min-microvolt = <1000000>; -+ regulator-max-microvolt = <3000000>; -+ regulator-boot-on; -+ regulator-always-on; -+ }; -+ -+ vref_reg: vrefddr { -+ regulator-boot-on; -+ regulator-always-on; -+ }; -+ -+ vgen1_reg: vldo1 { -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <3300000>; -+ regulator-always-on; -+ }; -+ -+ vgen2_reg: vldo2 { -+ regulator-min-microvolt = <800000>; -+ regulator-max-microvolt = <1550000>; -+ }; -+ -+ vgen3_reg: vccsd { -+ regulator-min-microvolt = <2850000>; -+ regulator-max-microvolt = <3300000>; -+ regulator-always-on; -+ }; -+ -+ vgen4_reg: v33 { -+ regulator-min-microvolt = <2850000>; -+ regulator-max-microvolt = <3300000>; -+ regulator-always-on; -+ }; -+ -+ vgen5_reg: vldo3 { -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <3300000>; -+ regulator-always-on; -+ }; -+ -+ vgen6_reg: vldo4 { -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <3300000>; -+ regulator-always-on; -+ }; -+ }; -+ }; -+}; -+ -+&iomuxc { -+ pinctrl_enet1: enet1grp { -+ fsl,pins = -+ , -+ , -+ , -+ , -+ , -+ , -+ -+ , -+ , -+ , -+ , -+ , -+ , -+ -+ ; -+ }; -+ -+ pinctrl_i2c1: i2c1grp { -+ fsl,pins = -+ , -+ ; -+ }; -+ -+ pinctrl_uart1: uart1grp { -+ fsl,pins = -+ , -+ ; -+ }; -+ -+ pinctrl_uart2: uart2grp { -+ fsl,pins = -+ , -+ ; -+ }; -+ -+ pinctrl_uart5: uart5grp { -+ fsl,pins = -+ , -+ ; -+ }; -+ -+ pinctrl_uart6: uart6grp { -+ fsl,pins = -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ ; -+ }; -+ -+ pinctrl_usdhc2: usdhc2grp { -+ fsl,pins = -+ , -+ , -+ , -+ , -+ , -+ , -+ ; /* CD */ -+ }; -+}; -+ -+&uart1 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_uart1>; -+ status = "okay"; -+}; -+ -+/* Cortex-M4 serial */ -+&uart2 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_uart2>; -+ status = "disabled"; -+}; -+ -+/* Arduino serial */ -+&uart5 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_uart5>; -+ status = "disabled"; -+}; -+ -+&uart6 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_uart6>; -+ uart-has-rtscts; -+ status = "disabled"; -+}; -+ -+&usdhc2 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_usdhc2>; -+ vmmc-supply = <®_sdio_pwr>; -+ bus-width = <4>; -+ cd-gpios = <&gpio6 2 GPIO_ACTIVE_LOW>; -+ no-1-8-v; -+ keep-power-in-suspend; -+ wakeup-source; -+ status = "okay"; -+}; --- -cgit v0.12 diff --git a/configs/mx6sx_udoo_neo_defconfig b/configs/mx6sx_udoo_neo_defconfig index a465eb974c..b7475d7c70 100644 --- a/configs/mx6sx_udoo_neo_defconfig +++ b/configs/mx6sx_udoo_neo_defconfig @@ -3,11 +3,10 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 4.9 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +# Linux headers same as kernel, a 4.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_10=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/udoo/neo/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/udoo/neo/post-image.sh" -BR2_GLOBAL_PATCH_DIR="board/udoo/neo/patches" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y @@ -19,7 +18,7 @@ BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.10" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-udoo-neo-basic imx6sx-udoo-neo-full imx6sx-udoo-neo-extended" From 075d26900b4fdd4994831fc66e26682bacb5a90a Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 19 Feb 2017 14:51:24 +0100 Subject: [PATCH 43/74] toolchain-external: bump Linaro ARM toolchain to 2017.02 Tested with qemu-2.7.1-2.fc25 and the qemu_arm_vexpress_defconfig Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- .../toolchain-external-linaro-arm/Config.in | 6 +++--- .../toolchain-external-linaro-arm.hash | 4 ++-- .../toolchain-external-linaro-arm.mk | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in b/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in index 78aeb8ea41..f538eb7eb3 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in +++ b/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in @@ -4,7 +4,7 @@ comment "Linaro toolchains available for Cortex-A + EABIhf" depends on !BR2_STATIC_LIBS config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM - bool "Linaro ARM 2016.11" + bool "Linaro ARM 2017.02" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A || BR2_ARM_CPU_ARMV8 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" @@ -19,8 +19,8 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM select BR2_TOOLCHAIN_HAS_FORTRAN help Linaro toolchain for the ARM architecture. It uses Linaro - GCC 2016.11 (based on gcc 6.2.1), Linaro GDB 2016.11 (based on - GDB 7.12), glibc 2.23, Binutils 2016.11 (based on 2.27). It + GCC 2017.02 (based on gcc 6.3.1), Linaro GDB 2017.02 (based on + GDB 7.12), glibc 2.23, Binutils 2017.02 (based on 2.27). It generates code that runs on all Cortex-A profile devices, but tuned for the Cortex-A9. The code generated is Thumb 2, with the hard floating point calling convention, and uses diff --git a/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.hash b/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.hash index d4452c3786..ec861ec1d9 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.hash +++ b/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a2a4968bfb8537c1b3280b4f475d90d53a1a0f05f7afc7b43efed266cc4de446 gcc-linaro-6.2.1-2016.11-i686_arm-linux-gnueabihf.tar.xz -sha256 5eb7ab2f8a0b4b960900321505cd6923a072cb3e2412102f5f72a6e74c2f0a55 gcc-linaro-6.2.1-2016.11-x86_64_arm-linux-gnueabihf.tar.xz +sha256 2505348d30fd3f67544b8915ad7a557e643fbf987f3113e092463b37577c9b95 gcc-linaro-6.3.1-2017.02-i686_arm-linux-gnueabihf.tar.xz +sha256 fe1cae02e0734665487b9b642171a5685a6e91416cea869bb22590f6dc7260c3 gcc-linaro-6.3.1-2017.02-x86_64_arm-linux-gnueabihf.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.mk b/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.mk index e098f47757..b8ba43ced8 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.mk +++ b/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.mk @@ -4,13 +4,13 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION = 2016.11 -TOOLCHAIN_EXTERNAL_LINARO_ARM_SITE = https://releases.linaro.org/components/toolchain/binaries/6.2-$(TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION)/arm-linux-gnueabihf +TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION = 2017.02 +TOOLCHAIN_EXTERNAL_LINARO_ARM_SITE = https://releases.linaro.org/components/toolchain/binaries/6.3-$(TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION)/arm-linux-gnueabihf ifeq ($(HOSTARCH),x86) -TOOLCHAIN_EXTERNAL_LINARO_ARM_SOURCE = gcc-linaro-6.2.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION)-i686_arm-linux-gnueabihf.tar.xz +TOOLCHAIN_EXTERNAL_LINARO_ARM_SOURCE = gcc-linaro-6.3.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION)-i686_arm-linux-gnueabihf.tar.xz else -TOOLCHAIN_EXTERNAL_LINARO_ARM_SOURCE = gcc-linaro-6.2.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION)-x86_64_arm-linux-gnueabihf.tar.xz +TOOLCHAIN_EXTERNAL_LINARO_ARM_SOURCE = gcc-linaro-6.3.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION)-x86_64_arm-linux-gnueabihf.tar.xz endif $(eval $(toolchain-external-package)) From 52f059f38d463159540d87c0a46edd98eea5629d Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 19 Feb 2017 14:51:25 +0100 Subject: [PATCH 44/74] toolchain-external: bump Linaro ARMeb toolchain to 2017.02 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- .../toolchain-external-linaro-armeb/Config.in | 6 +++--- .../toolchain-external-linaro-armeb.hash | 4 ++-- .../toolchain-external-linaro-armeb.mk | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in b/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in index c7f2f5f60c..14c7481f81 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in +++ b/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in @@ -4,7 +4,7 @@ comment "Linaro toolchains available for Cortex-A + EABIhf" depends on !BR2_STATIC_LIBS config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB - bool "Linaro armeb 2016.11" + bool "Linaro armeb 2017.02" depends on BR2_armeb depends on BR2_ARM_CPU_ARMV7A || BR2_ARM_CPU_ARMV8 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" @@ -18,8 +18,8 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB select BR2_TOOLCHAIN_GCC_AT_LEAST_6 help Linaro toolchain for the ARM big endian architecture. It - uses Linaro GCC 2016.11 (based on gcc 6.2.1), Linaro GDB - 2016.11 (based on GDB 7.12), glibc 2.23, Binutils 2016.11 + uses Linaro GCC 2017.02 (based on gcc 6.3.1), Linaro GDB + 2017.02 (based on GDB 7.12), glibc 2.23, Binutils 2017.02 (based on 2.27). It generates code that runs on all Cortex-A profile devices, but tuned for the Cortex-A9. The code generated is Thumb 2, with the hard floating point calling diff --git a/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.hash b/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.hash index a041539ba6..8266145d4f 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.hash +++ b/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 05a34c56da56b9b1e1a61ad1217dc4e751e1d277932dbeaa82b6c242cf0f2ec9 gcc-linaro-6.2.1-2016.11-i686_armeb-linux-gnueabihf.tar.xz -sha256 319cb7c6363a3116357b163d0b4f9e0c27cfcb6153f3c26a34edf892819f12e5 gcc-linaro-6.2.1-2016.11-x86_64_armeb-linux-gnueabihf.tar.xz +sha256 e98aeec91bf8a75247220f41ed189a3e81f1e6c6869423c9b6c83716d6558e61 gcc-linaro-6.3.1-2017.02-i686_armeb-linux-gnueabihf.tar.xz +sha256 7a1ec874859c8b30b5e13bfba63372170ea78587a0ab6a587a115c932bb3498c gcc-linaro-6.3.1-2017.02-x86_64_armeb-linux-gnueabihf.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.mk b/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.mk index ba138e1b50..999d11eda7 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.mk +++ b/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.mk @@ -4,13 +4,13 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION = 2016.11 -TOOLCHAIN_EXTERNAL_LINARO_ARMEB_SITE = https://releases.linaro.org/components/toolchain/binaries/6.2-$(TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION)/armeb-linux-gnueabihf +TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION = 2017.02 +TOOLCHAIN_EXTERNAL_LINARO_ARMEB_SITE = https://releases.linaro.org/components/toolchain/binaries/6.3-$(TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION)/armeb-linux-gnueabihf ifeq ($(HOSTARCH),x86) -TOOLCHAIN_EXTERNAL_LINARO_ARMEB_SOURCE = gcc-linaro-6.2.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION)-i686_armeb-linux-gnueabihf.tar.xz +TOOLCHAIN_EXTERNAL_LINARO_ARMEB_SOURCE = gcc-linaro-6.3.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION)-i686_armeb-linux-gnueabihf.tar.xz else -TOOLCHAIN_EXTERNAL_LINARO_ARMEB_SOURCE = gcc-linaro-6.2.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION)-x86_64_armeb-linux-gnueabihf.tar.xz +TOOLCHAIN_EXTERNAL_LINARO_ARMEB_SOURCE = gcc-linaro-6.3.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION)-x86_64_armeb-linux-gnueabihf.tar.xz endif $(eval $(toolchain-external-package)) From 641fe0e39240af8e7cf03bc5ff14ba268f41bba7 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 19 Feb 2017 14:51:26 +0100 Subject: [PATCH 45/74] toolchain-external: bump Linaro AArch64 toolchain to 2017.02 Tested with qemu-2.7.1-2.fc25 and the qemu_aarch64_virt_defconfig Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- .../toolchain-external-linaro-aarch64/Config.in | 2 +- .../toolchain-external-linaro-aarch64.hash | 4 ++-- .../toolchain-external-linaro-aarch64.mk | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in index 4dc8dacbe4..caa5ed340a 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in +++ b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in @@ -1,5 +1,5 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64 - bool "Linaro AArch64 2016.11" + bool "Linaro AArch64 2017.02" depends on BR2_aarch64 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on !BR2_STATIC_LIBS diff --git a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.hash b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.hash index f7f4209060..2379290943 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.hash +++ b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 057156a47b9cd68cdc0b48adcbe96c8249e3653b082f6c051dd75cb644f64b3a gcc-linaro-6.2.1-2016.11-i686_aarch64-linux-gnu.tar.xz -sha256 539cc29320bd84178cd093aae0b06b1ee5476511cecaba989faf9c6a1d4cdf81 gcc-linaro-6.2.1-2016.11-x86_64_aarch64-linux-gnu.tar.xz +sha256 e8d1dba8712e3f3994faf742d5c5dff7deba69f94e9655b1e673df7f26b0908b gcc-linaro-6.3.1-2017.02-i686_aarch64-linux-gnu.tar.xz +sha256 10670e1c5d2ab77b937a26cc7f2a22e8eb6cb223e2df7c763f02ce63339e66bc gcc-linaro-6.3.1-2017.02-x86_64_aarch64-linux-gnu.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.mk b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.mk index fb498fe273..ff3d3dbf33 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.mk +++ b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.mk @@ -4,13 +4,13 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION = 2016.11 -TOOLCHAIN_EXTERNAL_LINARO_AARCH64_SITE = https://releases.linaro.org/components/toolchain/binaries/6.2-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION)/aarch64-linux-gnu +TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION = 2017.02 +TOOLCHAIN_EXTERNAL_LINARO_AARCH64_SITE = https://releases.linaro.org/components/toolchain/binaries/6.3-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION)/aarch64-linux-gnu ifeq ($(HOSTARCH),x86) -TOOLCHAIN_EXTERNAL_LINARO_AARCH64_SOURCE = gcc-linaro-6.2.1-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION)-i686_aarch64-linux-gnu.tar.xz +TOOLCHAIN_EXTERNAL_LINARO_AARCH64_SOURCE = gcc-linaro-6.3.1-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION)-i686_aarch64-linux-gnu.tar.xz else -TOOLCHAIN_EXTERNAL_LINARO_AARCH64_SOURCE = gcc-linaro-6.2.1-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION)-x86_64_aarch64-linux-gnu.tar.xz +TOOLCHAIN_EXTERNAL_LINARO_AARCH64_SOURCE = gcc-linaro-6.3.1-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION)-x86_64_aarch64-linux-gnu.tar.xz endif $(eval $(toolchain-external-package)) From 6c5ffa24fa981d3cc01c33dc1db20d24048fdbda Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 18 Feb 2017 15:54:00 +0100 Subject: [PATCH 46/74] package/enlightenment: bump to version 0.21.6 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/enlightenment/enlightenment.hash | 4 ++-- package/enlightenment/enlightenment.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/enlightenment/enlightenment.hash b/package/enlightenment/enlightenment.hash index 1548f200b2..777ee2d9f4 100644 --- a/package/enlightenment/enlightenment.hash +++ b/package/enlightenment/enlightenment.hash @@ -1,2 +1,2 @@ -# From https://www.enlightenment.org/news/e-0.21.5-release -sha256 f0745a660f70851c4ada9866b2a525185bfc5cd1685aa86e4cdb68f2c1c154bb enlightenment-0.21.5.tar.xz +# From https://www.enlightenment.org/news/e-0.21.6-release +sha256 ed0714b54d692cbcec412bdb169e5360355347ce775d27d6ae0cee25111b563d enlightenment-0.21.6.tar.xz diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk index 7037afe11c..6529287bc8 100644 --- a/package/enlightenment/enlightenment.mk +++ b/package/enlightenment/enlightenment.mk @@ -4,7 +4,7 @@ # ################################################################################ -ENLIGHTENMENT_VERSION = 0.21.5 +ENLIGHTENMENT_VERSION = 0.21.6 ENLIGHTENMENT_SOURCE = enlightenment-$(ENLIGHTENMENT_VERSION).tar.xz ENLIGHTENMENT_SITE = http://download.enlightenment.org/rel/apps/enlightenment ENLIGHTENMENT_LICENSE = BSD-2c From 09c989420db1599c7650ae614c672ea5e699d641 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 20 Feb 2017 22:02:52 +0100 Subject: [PATCH 47/74] linux: fix up bad merge conflict Fix commit 400eaa3452e9380ec77ac62266530055506ea6e7 ("linux: bump default to version 4.10") in which a conflict was not correctly resolved. Reported-by: Romain Naour Signed-off-by: Thomas Petazzoni --- linux/Config.in | 4 ---- 1 file changed, 4 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 7f18219009..890b8483e1 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -97,11 +97,7 @@ endif config BR2_LINUX_KERNEL_VERSION string -<<<<<<< a1e02440f3035cfbe5119c00457b3e1c2f7ac4d1 - default "4.9.9" if BR2_LINUX_KERNEL_LATEST_VERSION -======= default "4.10" if BR2_LINUX_KERNEL_LATEST_VERSION ->>>>>>> linux: bump default to version 4.10 default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL From e36f0881bd8aa4b3889c9b68b2976ca873603b20 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 11 Dec 2016 15:47:27 +0100 Subject: [PATCH 48/74] madplay: workaround not needed anymore The patches for uClibc-ng are upstream and added to buildroot. Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/madplay/madplay.mk | 8 -------- 1 file changed, 8 deletions(-) diff --git a/package/madplay/madplay.mk b/package/madplay/madplay.mk index 6b13819754..2606ac8d66 100644 --- a/package/madplay/madplay.mk +++ b/package/madplay/madplay.mk @@ -11,14 +11,6 @@ MADPLAY_LICENSE_FILES = COPYING COPYRIGHT MADPLAY_LIBTOOL_PATCH = NO MADPLAY_DEPENDENCIES = libmad libid3tag $(if $(BR2_PACKAGE_GETTEXT),gettext) -# Workaround a bug in uClibc-ng, which exposes madvise() but doesn't -# provide the corresponding MADV_* definitions. Bug reported at -# http://mailman.uclibc-ng.org/pipermail/devel/2016-December/001306.html. madvise() -# is anyway useless on noMMU. -ifeq ($(BR2_USE_MMU),) -MADPLAY_CONF_ENV += ac_cv_func_madvise=no -endif - # Check if ALSA is built, then we should configure after alsa-lib so # ./configure can find alsa-lib. ifeq ($(BR2_PACKAGE_MADPLAY_ALSA),y) From 6a27508ffb2c9d4821e5ec08c5f616a62b669001 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 16 Feb 2017 15:14:13 +0200 Subject: [PATCH 49/74] Revert "package/iptables: nfsynproxy not available on musl" This reverts commit 497f15b301273cd81e54b4fcc5da6ab90e27796c. As the comment says, musl version 1.1.13 contains commit 53f41fb568ae4. Buildroot now ships musl version 1.1.16, so enable build with musl. Cc: Bernd Kuhls Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/iptables/Config.in | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/iptables/Config.in b/package/iptables/Config.in index cdcd1c2893..e6b12603e0 100644 --- a/package/iptables/Config.in +++ b/package/iptables/Config.in @@ -9,10 +9,6 @@ if BR2_PACKAGE_IPTABLES config BR2_PACKAGE_IPTABLES_BPF_NFSYNPROXY bool "bpfc and nfsynproxy" - # this dependency can be removed when using a musl version - # containing this commit: - # http://git.musl-libc.org/cgit/musl/commit/?id=53f41fb568ae43034c9876cc9bd3961fd6d13671 - depends on !BR2_TOOLCHAIN_USES_MUSL select BR2_PACKAGE_LIBPCAP help Build bpf compiler and nfsynproxy configuration tool. From 0c05b2f6b731ca802f6c7a6fc5fd39693793e48d Mon Sep 17 00:00:00 2001 From: Ilias Apalodimas Date: Wed, 15 Feb 2017 10:38:51 +0200 Subject: [PATCH 50/74] ipset: install libraries to staging Some packages may require libipset, for example keepalived. Signed-off-by: Ilias Apalodimas Signed-off-by: Thomas Petazzoni --- package/ipset/ipset.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk index db4952b1d5..bb40fee3d1 100644 --- a/package/ipset/ipset.mk +++ b/package/ipset/ipset.mk @@ -13,5 +13,6 @@ IPSET_CONF_OPTS = --with-kmod=no IPSET_AUTORECONF = YES IPSET_LICENSE = GPLv2 IPSET_LICENSE_FILES = COPYING +IPSET_INSTALL_STAGING = YES $(eval $(autotools-package)) From 9a7ac39605e1bf416db033b009e6c09f54f44fdf Mon Sep 17 00:00:00 2001 From: Ilias Apalodimas Date: Wed, 15 Feb 2017 10:38:52 +0200 Subject: [PATCH 51/74] keepalived: new package Signed-off-by: Ilias Apalodimas [Thomas: - rewrap Config.in help text - add dependency on !BR2_STATIC_LIBS since the code uses libdl.] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/keepalived/Config.in | 20 +++++++++++++++++++ package/keepalived/keepalived.hash | 3 +++ package/keepalived/keepalived.mk | 32 ++++++++++++++++++++++++++++++ 5 files changed, 59 insertions(+) create mode 100644 package/keepalived/Config.in create mode 100644 package/keepalived/keepalived.hash create mode 100644 package/keepalived/keepalived.mk diff --git a/DEVELOPERS b/DEVELOPERS index ef9614510c..3784a28ec1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -766,6 +766,9 @@ F: package/python-rpi-gpio/ N: Ignacy Gawędzki F: package/angularjs/ +N: Ilias Apalodimas +F: package/keepalived/ + N: James Knight F: package/atkmm/ F: package/cairomm/ diff --git a/package/Config.in b/package/Config.in index e78fb755d5..e6dbe5822e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1547,6 +1547,7 @@ menu "Networking applications" source "package/irssi/Config.in" source "package/iw/Config.in" source "package/janus-gateway/Config.in" + source "package/keepalived/Config.in" source "package/kismet/Config.in" source "package/knock/Config.in" source "package/leafnode2/Config.in" diff --git a/package/keepalived/Config.in b/package/keepalived/Config.in new file mode 100644 index 0000000000..efa745ad9e --- /dev/null +++ b/package/keepalived/Config.in @@ -0,0 +1,20 @@ +config BR2_PACKAGE_KEEPALIVED + bool "keepalived" + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS # uses libdl + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_POPT + help + The main goal of the keepalived project is to add a strong & + robust keepalive facility to the Linux Virtual Server + project. It implements a multilayer TCP/IP stack + checks. Keepalived implements a framework based on three + family checks: Layer3, Layer4 & Layer5. This framework gives + the daemon the ability of checking a LVS server pool + states. Keepalived can be sumarize as a LVS driving daemon. + + http://www.keepalived.org/ + +comment "keepalived needs a toolchain w/ dynamic library" + depends on BR2_USE_MMU + depends on BR2_STATIC_LIBS diff --git a/package/keepalived/keepalived.hash b/package/keepalived/keepalived.hash new file mode 100644 index 0000000000..e86858707b --- /dev/null +++ b/package/keepalived/keepalived.hash @@ -0,0 +1,3 @@ +# From http://www.keepalived.org/download.html +md5 744025d57c7f065c42fe925b0283897e keepalived-1.3.2.tar.gz +sha1 449f06dfce07e05c1ebd516d0545182e1416f264 keepalived-1.3.2.tar.gz diff --git a/package/keepalived/keepalived.mk b/package/keepalived/keepalived.mk new file mode 100644 index 0000000000..da5b5d81dd --- /dev/null +++ b/package/keepalived/keepalived.mk @@ -0,0 +1,32 @@ +################################################################################ +# +# keepalived +# +################################################################################ + +KEEPALIVED_VERSION = 1.3.2 +KEEPALIVED_SITE = http://www.keepalived.org/software +KEEPALIVED_DEPENDENCIES = host-pkgconf openssl popt +KEEPALIVED_LICENSE = GPLv2+ +KEEPALIVED_LICENSE_FILES = COPYING +KEEPALIVED_CONF_OPTS += --disable-dbus + +ifeq ($(BR2_PACKAGE_LIBNL),y) +KEEPALIVED_DEPENDENCIES += libnfnetlink +endif + +ifeq ($(BR2_PACKAGE_IPSET),y) +KEEPALIVED_DEPENDENCIES += ipset +KEEPALIVED_CONF_OPTS += --enable-libipset +else +KEEPALIVED_CONF_OPTS += --disable-libipset +endif + +ifeq ($(BR2_PACKAGE_IPTABLES),y) +KEEPALIVED_DEPENDENCIES += iptables +KEEPALIVED_CONF_OPTS += --enable-libiptc +else +KEEPALIVED_CONF_OPTS += --disable-libiptc +endif + +$(eval $(autotools-package)) From a17be324e53fc596aec4dea079972ae004cf5d32 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 21 Feb 2017 14:34:46 +0100 Subject: [PATCH 52/74] nexbox_a95x_defconfig: bump kernel to final 4.10 And use same version for header headers as well. [Peter: explicitly set BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_10 as pointed out by Thomas] Signed-off-by: Peter Korsgaard --- configs/nexbox_a95x_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/nexbox_a95x_defconfig b/configs/nexbox_a95x_defconfig index 906a22b0ff..375b4d3f03 100644 --- a/configs/nexbox_a95x_defconfig +++ b/configs/nexbox_a95x_defconfig @@ -1,13 +1,13 @@ BR2_aarch64=y BR2_cortex_a53=y -BR2_KERNEL_HEADERS_4_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_10=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/nexbox/a95x/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/nexbox/a95x/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.10-rc8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.10" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="amlogic/meson-gxbb-nexbox-a95x amlogic/meson-gxl-nexbox-a95x" From c75f0a4d69db655bb523fbab30e0f4656bc5fb71 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 21 Feb 2017 09:54:45 -0300 Subject: [PATCH 53/74] configs/liteboard: Bump to kernel 4.10 The imx6ul-liteboard dts patches have been upstreamed in kernel 4.10, so bump to this version and remove the local patches Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- ...ts-imx6ul-Add-DTS-for-liteSOM-module.patch | 113 ----------- ...ARM-dts-imx6ul-Add-DTS-for-liteBoard.patch | 190 ------------------ configs/grinn_liteboard_defconfig | 5 +- 3 files changed, 2 insertions(+), 306 deletions(-) delete mode 100644 board/grinn/liteboard/patches/linux/0001-ARM-dts-imx6ul-Add-DTS-for-liteSOM-module.patch delete mode 100644 board/grinn/liteboard/patches/linux/0002-ARM-dts-imx6ul-Add-DTS-for-liteBoard.patch diff --git a/board/grinn/liteboard/patches/linux/0001-ARM-dts-imx6ul-Add-DTS-for-liteSOM-module.patch b/board/grinn/liteboard/patches/linux/0001-ARM-dts-imx6ul-Add-DTS-for-liteSOM-module.patch deleted file mode 100644 index b6ea1b69dd..0000000000 --- a/board/grinn/liteboard/patches/linux/0001-ARM-dts-imx6ul-Add-DTS-for-liteSOM-module.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 8cbabc57257bdbf5f1cf039a265c875da8ddc2e9 Mon Sep 17 00:00:00 2001 -From: Marcin Niestroj -Date: Fri, 21 Oct 2016 17:07:16 +0200 -Subject: [PATCH 1/2] ARM: dts: imx6ul: Add DTS for liteSOM module - -This is a SOM (System on Module), so it will be part of another boards. -Hence, this is a "dtsi" file that will be included from another device -tree files. - -Hardware specification: - * Freescale i.MX6UL SoC - * up to 512 MB RAM - * eMMC on uSDHC2 - -Signed-off-by: Marcin Niestroj -Reviewed-by: Fabio Estevam -Signed-off-by: Shawn Guo ---- - arch/arm/boot/dts/imx6ul-litesom.dtsi | 82 +++++++++++++++++++++++++++++++++++ - 1 file changed, 82 insertions(+) - create mode 100644 arch/arm/boot/dts/imx6ul-litesom.dtsi - -diff --git a/arch/arm/boot/dts/imx6ul-litesom.dtsi b/arch/arm/boot/dts/imx6ul-litesom.dtsi -new file mode 100644 -index 000000000000..461292d33417 ---- /dev/null -+++ b/arch/arm/boot/dts/imx6ul-litesom.dtsi -@@ -0,0 +1,82 @@ -+/* -+ * Copyright 2016 Grinn -+ * -+ * Author: Marcin Niestroj -+ * -+ * This file is dual-licensed: you can use it either under the terms -+ * of the GPL or the X11 license, at your option. Note that this dual -+ * licensing only applies to this file, and not this project as a -+ * whole. -+ * -+ * a) This file is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * version 2 as published by the Free Software Foundation. -+ * -+ * This file is distributed in the hope that it will be useful -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * Or, alternatively -+ * -+ * b) Permission is hereby granted, free of charge, to any person -+ * obtaining a copy of this software and associated documentation -+ * files (the "Software"), to deal in the Software without -+ * restriction, including without limitation the rights to use -+ * copy, modify, merge, publish, distribute, sublicense, and/or -+ * sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following -+ * conditions: -+ * -+ * The above copyright notice and this permission notice shall be -+ * included in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY -+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -+ * OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+#include "imx6ul.dtsi" -+ -+/ { -+ model = "Grinn i.MX6UL liteSOM"; -+ compatible = "grinn,imx6ul-litesom", "fsl,imx6ul"; -+ -+ memory { -+ reg = <0x80000000 0x20000000>; -+ }; -+}; -+ -+&iomuxc { -+ pinctrl_usdhc2: usdhc2grp { -+ fsl,pins = < -+ MX6UL_PAD_NAND_RE_B__USDHC2_CLK 0x10069 -+ MX6UL_PAD_NAND_WE_B__USDHC2_CMD 0x17059 -+ MX6UL_PAD_NAND_DATA00__USDHC2_DATA0 0x17059 -+ MX6UL_PAD_NAND_DATA01__USDHC2_DATA1 0x17059 -+ MX6UL_PAD_NAND_DATA02__USDHC2_DATA2 0x17059 -+ MX6UL_PAD_NAND_DATA03__USDHC2_DATA3 0x17059 -+ MX6UL_PAD_NAND_DATA04__USDHC2_DATA4 0x17059 -+ MX6UL_PAD_NAND_DATA05__USDHC2_DATA5 0x17059 -+ MX6UL_PAD_NAND_DATA06__USDHC2_DATA6 0x17059 -+ MX6UL_PAD_NAND_DATA07__USDHC2_DATA7 0x17059 -+ MX6UL_PAD_NAND_ALE__USDHC2_RESET_B 0x17059 -+ >; -+ }; -+}; -+ -+&usdhc2 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_usdhc2>; -+ no-1-8-v; -+ non-removable; -+ keep-power-in-suspend; -+ wakeup-source; -+ bus-width = <8>; -+ status = "okay"; -+}; --- -2.11.0 - diff --git a/board/grinn/liteboard/patches/linux/0002-ARM-dts-imx6ul-Add-DTS-for-liteBoard.patch b/board/grinn/liteboard/patches/linux/0002-ARM-dts-imx6ul-Add-DTS-for-liteBoard.patch deleted file mode 100644 index c73cd4faaf..0000000000 --- a/board/grinn/liteboard/patches/linux/0002-ARM-dts-imx6ul-Add-DTS-for-liteBoard.patch +++ /dev/null @@ -1,190 +0,0 @@ -From 35a8bca870bedebb9d37ad58b905863cba780f9f Mon Sep 17 00:00:00 2001 -From: Marcin Niestroj -Date: Fri, 21 Oct 2016 17:07:17 +0200 -Subject: [PATCH 2/2] ARM: dts: imx6ul: Add DTS for liteBoard - -liteBoard is a development board which uses liteSOM as its base. - -Hardware specification: - * liteSOM (i.MX6UL, DRAM, eMMC) - * Ethernet PHY (id 0) - * USB host (usb_otg1) - * MicroSD slot (uSDHC1) - -Signed-off-by: Marcin Niestroj -Reviewed-by: Fabio Estevam -Signed-off-by: Shawn Guo ---- - arch/arm/boot/dts/Makefile | 1 + - arch/arm/boot/dts/imx6ul-liteboard.dts | 147 +++++++++++++++++++++++++++++++++ - 2 files changed, 148 insertions(+) - create mode 100644 arch/arm/boot/dts/imx6ul-liteboard.dts - -diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index c558ba75cbcc..a587ce231f83 100644 ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -420,6 +420,7 @@ dtb-$(CONFIG_SOC_IMX6SX) += \ - dtb-$(CONFIG_SOC_IMX6UL) += \ - imx6ul-14x14-evk.dtb \ - imx6ul-geam-kit.dtb \ -+ imx6ul-liteboard.dtb \ - imx6ul-pico-hobbit.dtb \ - imx6ul-tx6ul-0010.dtb \ - imx6ul-tx6ul-0011.dtb \ -diff --git a/arch/arm/boot/dts/imx6ul-liteboard.dts b/arch/arm/boot/dts/imx6ul-liteboard.dts -new file mode 100644 -index 000000000000..6e04cb9202f4 ---- /dev/null -+++ b/arch/arm/boot/dts/imx6ul-liteboard.dts -@@ -0,0 +1,147 @@ -+/* -+ * Copyright 2016 Grinn -+ * -+ * Author: Marcin Niestroj -+ * -+ * This file is dual-licensed: you can use it either under the terms -+ * of the GPL or the X11 license, at your option. Note that this dual -+ * licensing only applies to this file, and not this project as a -+ * whole. -+ * -+ * a) This file is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * version 2 as published by the Free Software Foundation. -+ * -+ * This file is distributed in the hope that it will be useful -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * Or, alternatively -+ * -+ * b) Permission is hereby granted, free of charge, to any person -+ * obtaining a copy of this software and associated documentation -+ * files (the "Software"), to deal in the Software without -+ * restriction, including without limitation the rights to use -+ * copy, modify, merge, publish, distribute, sublicense, and/or -+ * sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following -+ * conditions: -+ * -+ * The above copyright notice and this permission notice shall be -+ * included in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY -+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -+ * OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+/dts-v1/; -+ -+#include "imx6ul-litesom.dtsi" -+ -+/ { -+ model = "Grinn i.MX6UL liteBoard"; -+ compatible = "grinn,imx6ul-liteboard", "grinn,imx6ul-litesom", -+ "fsl,imx6ul"; -+ -+ chosen { -+ stdout-path = &uart1; -+ }; -+ -+ reg_usb_otg1_vbus: regulator-usb-otg1-vbus { -+ compatible = "regulator-fixed"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_usb_otg1_vbus>; -+ regulator-name = "usb_otg1_vbus"; -+ regulator-min-microvolt = <5000000>; -+ regulator-max-microvolt = <5000000>; -+ gpio = <&gpio2 8 GPIO_ACTIVE_LOW>; -+ }; -+}; -+ -+&iomuxc { -+ pinctrl_enet1: enet1grp { -+ fsl,pins = < -+ MX6UL_PAD_GPIO1_IO07__ENET1_MDC 0x1b0b0 -+ MX6UL_PAD_GPIO1_IO06__ENET1_MDIO 0x1b0b0 -+ MX6UL_PAD_ENET1_RX_EN__ENET1_RX_EN 0x1b0b0 -+ MX6UL_PAD_ENET1_RX_ER__ENET1_RX_ER 0x1b0b0 -+ MX6UL_PAD_ENET1_RX_DATA0__ENET1_RDATA00 0x1b0b0 -+ MX6UL_PAD_ENET1_RX_DATA1__ENET1_RDATA01 0x1b0b0 -+ MX6UL_PAD_ENET1_TX_EN__ENET1_TX_EN 0x1b0b0 -+ MX6UL_PAD_ENET1_TX_DATA0__ENET1_TDATA00 0x1b0b0 -+ MX6UL_PAD_ENET1_TX_DATA1__ENET1_TDATA01 0x1b0b0 -+ MX6UL_PAD_ENET1_TX_CLK__ENET1_REF_CLK1 0x4001b031 -+ >; -+ }; -+ -+ pinctrl_uart1: uart1grp { -+ fsl,pins = < -+ MX6UL_PAD_UART1_TX_DATA__UART1_DCE_TX 0x1b0b1 -+ MX6UL_PAD_UART1_RX_DATA__UART1_DCE_RX 0x1b0b1 -+ >; -+ }; -+ -+ pinctrl_usdhc1: usdhc1grp { -+ fsl,pins = < -+ MX6UL_PAD_UART1_RTS_B__GPIO1_IO19 0x17059 -+ MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x17059 -+ MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x10071 -+ MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 0x17059 -+ MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x17059 -+ MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x17059 -+ MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x17059 -+ >; -+ }; -+ -+ pinctrl_usb_otg1_vbus: usb-otg1-vbus { -+ fsl,pins = < -+ MX6UL_PAD_ENET2_RX_DATA0__GPIO2_IO08 0x79 -+ >; -+ }; -+}; -+ -+&fec1 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_enet1>; -+ phy-mode = "rmii"; -+ phy-handle = <ðphy0>; -+ status = "okay"; -+ -+ mdio { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ ethphy0: ethernet-phy@0 { -+ reg = <0>; -+ }; -+ }; -+}; -+ -+&uart1 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_uart1>; -+ status = "okay"; -+}; -+ -+&usbotg1 { -+ vbus-supply = <®_usb_otg1_vbus>; -+ dr_mode = "host"; -+ status = "okay"; -+}; -+ -+&usdhc1 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_usdhc1>; -+ cd-gpios = <&gpio1 19 GPIO_ACTIVE_LOW>; -+ no-1-8-v; -+ keep-power-in-suspend; -+ wakeup-source; -+ status = "okay"; -+}; --- -2.11.0 - diff --git a/configs/grinn_liteboard_defconfig b/configs/grinn_liteboard_defconfig index 11c240f465..70ec296492 100644 --- a/configs/grinn_liteboard_defconfig +++ b/configs/grinn_liteboard_defconfig @@ -1,13 +1,12 @@ BR2_arm=y BR2_cortex_a7=y -BR2_GLOBAL_PATCH_DIR="board/grinn/liteboard/patches" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_10=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/grinn/liteboard/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.10" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-liteboard" From 3cc28355f591089c636c7f94d7ec0f5498d290ba Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 14 Feb 2017 21:21:31 +0100 Subject: [PATCH 54/74] package/hiredis: fix makefile code Signed-off-by: "Yann E. MORIN" Cc: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/hiredis/hiredis.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/hiredis/hiredis.mk b/package/hiredis/hiredis.mk index eb96711ab7..cd406f1439 100644 --- a/package/hiredis/hiredis.mk +++ b/package/hiredis/hiredis.mk @@ -19,7 +19,7 @@ ifeq ($(BR2_STATIC_LIBS),y) HIREDIS_TARGETS += static else ifeq ($(BR2_SHARED_LIBS),y) HIREDIS_TARGETS += dynamic -else ifeq $(BR2_SHARED_STATIC_LIBS),y) +else ifeq ($(BR2_SHARED_STATIC_LIBS),y) HIREDIS_TARGETS += dynamic static endif From 81ea69036e92825e6de633fd373f5963b0bd2f54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wojciech=20Nizi=C5=84ski?= Date: Wed, 22 Feb 2017 11:19:06 +0100 Subject: [PATCH 55/74] package/turbolua: bump version to v2.1.0 Signed-off-by: Wojciech Nizinski [Thomas: use the v2.1.0 tag rather than a full commit sha1.] Signed-off-by: Thomas Petazzoni --- package/turbolua/turbolua.hash | 2 +- package/turbolua/turbolua.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/turbolua/turbolua.hash b/package/turbolua/turbolua.hash index d460b4f667..dc718f8594 100644 --- a/package/turbolua/turbolua.hash +++ b/package/turbolua/turbolua.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 bff771b6a670f764366eff50e1644f1c5d8d526324e0b6adfda42d9f69791833 turbolua-6fbc5cbfed1cc8c3820d4c1bfb55258c764040f0.tar.gz +sha256 8b810aa531fcaf05020531fe904d449742fd0da85c31e925a7efa9816d1f8f88 turbolua-v2.1.0.tar.gz diff --git a/package/turbolua/turbolua.mk b/package/turbolua/turbolua.mk index bf9e27f16c..49877fab68 100644 --- a/package/turbolua/turbolua.mk +++ b/package/turbolua/turbolua.mk @@ -4,7 +4,7 @@ # ################################################################################ -TURBOLUA_VERSION = 6fbc5cbfed1cc8c3820d4c1bfb55258c764040f0 +TURBOLUA_VERSION = v2.1.0 TURBOLUA_SITE = $(call github,kernelsauce,turbo,$(TURBOLUA_VERSION)) TURBOLUA_DEPENDENCIES = luajit TURBOLUA_LICENSE = Apache-2.0 From 487b419cc647da18f04a98ee69c160705f0c44e8 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 22 Feb 2017 16:14:08 -0300 Subject: [PATCH 56/74] gdk-pixbuf: bump to version 2.36.5 This release needs a new tweak regarding loaders.cache - it's now used to build the thumbnailer. Since we already generate it using the host variant for the target we can re-use this for the build step. It's not necessary to used the tweaked version since the build one is only used to account for mime types, not the plugins/loaders themselves. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/gdk-pixbuf/gdk-pixbuf.hash | 4 ++-- package/gdk-pixbuf/gdk-pixbuf.mk | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/package/gdk-pixbuf/gdk-pixbuf.hash b/package/gdk-pixbuf/gdk-pixbuf.hash index 827b386380..e92f4982a0 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.hash +++ b/package/gdk-pixbuf/gdk-pixbuf.hash @@ -1,2 +1,2 @@ -# From http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.36/gdk-pixbuf-2.36.4.sha256sum -sha256 0b19901c3eb0596141d2d48ddb9dac79ad1524bdf59366af58ab38fcb9ee7463 gdk-pixbuf-2.36.4.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.36/gdk-pixbuf-2.36.5.sha256sum +sha256 7ace06170291a1f21771552768bace072ecdea9bd4a02f7658939b9a314c40fc gdk-pixbuf-2.36.5.tar.xz diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk index 4fe6bd7b7f..e4d3658c51 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.mk +++ b/package/gdk-pixbuf/gdk-pixbuf.mk @@ -5,7 +5,7 @@ ################################################################################ GDK_PIXBUF_VERSION_MAJOR = 2.36 -GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).4 +GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).5 GDK_PIXBUF_SOURCE = gdk-pixbuf-$(GDK_PIXBUF_VERSION).tar.xz GDK_PIXBUF_SITE = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/$(GDK_PIXBUF_VERSION_MAJOR) GDK_PIXBUF_LICENSE = LGPLv2+ @@ -73,5 +73,14 @@ define GDK_PIXBUF_DISABLE_TESTS endef GDK_PIXBUF_POST_PATCH_HOOKS += GDK_PIXBUF_DISABLE_TESTS +# Target gdk-pixbuf needs loaders.cache populated to build for the +# thumbnailer. Use the host-built since it matches the target options +# regarding mime types (which is the used information). +define GDK_PIXBUF_COPY_LOADERS_CACHE + cp -f $(HOST_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \ + $(@D)/gdk-pixbuf +endef +GDK_PIXBUF_POST_PATCH_HOOKS += GDK_PIXBUF_COPY_LOADERS_CACHE + $(eval $(autotools-package)) $(eval $(host-autotools-package)) From 1f4e1656bc1176442671104acde1e4033377636e Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 23 Feb 2017 16:44:48 -0300 Subject: [PATCH 57/74] gdk-pixbuf: copy loaders.cache later on Trying to copy loaders.cache from host-gdk-pixbuf to the gdk-pixbuf build directory in the post-patch hook is too early when using TLP (it breaks horribly) since host-gdk-pixbuf isn't built yet during the massive unpack/patch cycle. Switch it to the pre-build hook instead which ensures that gdk-pixbuf dependencies were already built. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/gdk-pixbuf/gdk-pixbuf.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk index e4d3658c51..0f4eeb1eba 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.mk +++ b/package/gdk-pixbuf/gdk-pixbuf.mk @@ -80,7 +80,7 @@ define GDK_PIXBUF_COPY_LOADERS_CACHE cp -f $(HOST_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \ $(@D)/gdk-pixbuf endef -GDK_PIXBUF_POST_PATCH_HOOKS += GDK_PIXBUF_COPY_LOADERS_CACHE +GDK_PIXBUF_PRE_BUILD_HOOKS += GDK_PIXBUF_COPY_LOADERS_CACHE $(eval $(autotools-package)) $(eval $(host-autotools-package)) From 9190cb61fd15a3d92d84e473bd94146396a7dea2 Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Tue, 21 Feb 2017 19:31:27 +0530 Subject: [PATCH 58/74] gflags: bump to version v2.2.0 Signed-off-by: Rahul Bedarkar Signed-off-by: Thomas Petazzoni --- package/gflags/gflags.hash | 2 +- package/gflags/gflags.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gflags/gflags.hash b/package/gflags/gflags.hash index 5b224113d9..b9eeb57ac3 100644 --- a/package/gflags/gflags.hash +++ b/package/gflags/gflags.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 d8331bd0f7367c8afd5fcb5f5e85e96868a00fd24b7276fa5fcee1e5575c2662 gflags-v2.1.2.tar.gz +sha256 466c36c6508a451734e4f4d76825cf9cd9b8716d2b70ef36479ae40f08271f88 gflags-v2.2.0.tar.gz diff --git a/package/gflags/gflags.mk b/package/gflags/gflags.mk index 89111ed987..94f2210394 100644 --- a/package/gflags/gflags.mk +++ b/package/gflags/gflags.mk @@ -4,7 +4,7 @@ # ################################################################################ -GFLAGS_VERSION = v2.1.2 +GFLAGS_VERSION = v2.2.0 GFLAGS_SITE = $(call github,gflags,gflags,$(GFLAGS_VERSION)) GFLAGS_INSTALL_STAGING = YES GFLAGS_LICENSE = BSD-3c From 64da2fd2594ac05f84ef04376745dff1d32a8f09 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 24 Feb 2017 21:24:00 -0300 Subject: [PATCH 59/74] ccache: bump to version 3.3.4 Switch download URL to avoid a redirect. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/ccache/ccache.hash | 4 ++-- package/ccache/ccache.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/ccache/ccache.hash b/package/ccache/ccache.hash index bde53f794d..5354572638 100644 --- a/package/ccache/ccache.hash +++ b/package/ccache/ccache.hash @@ -1,2 +1,2 @@ -# Verified key https://samba.org/ftp/ccache/ccache-3.3.3.tar.xz.asc - sha256 computed locally -sha256 3b02a745da1cfa9eb438af7147e0fd3545e2f6163de9e5b07da86f58859f04ec ccache-3.3.3.tar.xz +# Verified key https://samba.org/ftp/ccache/ccache-3.3.4.tar.xz.asc - sha256 computed locally +sha256 24f15bf389e38c41548c9c259532187774ec0cb9686c3497bbb75504c8dc404f ccache-3.3.4.tar.xz diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk index f174a5d01c..6a20ee8ab7 100644 --- a/package/ccache/ccache.mk +++ b/package/ccache/ccache.mk @@ -4,8 +4,8 @@ # ################################################################################ -CCACHE_VERSION = 3.3.3 -CCACHE_SITE = https://samba.org/ftp/ccache +CCACHE_VERSION = 3.3.4 +CCACHE_SITE = https://www.samba.org/ftp/ccache CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz CCACHE_LICENSE = GPLv3+, others CCACHE_LICENSE_FILES = LICENSE.txt GPL-3.0.txt From f07f07241ec413687a38eccdfd335698425ba0db Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 22 Feb 2017 16:46:23 +0100 Subject: [PATCH 60/74] runc: bump to version 9df8b306d01f59d3a8029be411de015b7304dd8f Version bump as a dependency of docker-engine v1.13.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/runc/runc.hash | 2 +- package/runc/runc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/runc/runc.hash b/package/runc/runc.hash index 0b6a24ffcb..a053b6f1d6 100644 --- a/package/runc/runc.hash +++ b/package/runc/runc.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 374822cc2895ed3899b7a3a03b566413ea782fccec1307231f27894e9c6d5bea runc-50a19c6ff828c58e5dab13830bd3dacde268afe5.tar.gz +sha256 11f69923a786efb82b65d9f1eec0ac665a985e631a67f3f4d466dac720efacdd runc-9df8b306d01f59d3a8029be411de015b7304dd8f.tar.gz diff --git a/package/runc/runc.mk b/package/runc/runc.mk index 95afcaaff8..5862733c2c 100644 --- a/package/runc/runc.mk +++ b/package/runc/runc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUNC_VERSION = 50a19c6ff828c58e5dab13830bd3dacde268afe5 +RUNC_VERSION = 9df8b306d01f59d3a8029be411de015b7304dd8f RUNC_SITE = $(call github,opencontainers,runc,$(RUNC_VERSION)) RUNC_LICENSE = Apache-2.0 RUNC_LICENSE_FILES = LICENSE From d0d6b5f9e4f3771b0f7eaa7b01ff7d6770c16d6b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 22 Feb 2017 16:46:24 +0100 Subject: [PATCH 61/74] docker-containerd: bump to version aa8187dbd3b7ad67d8e5e3a15115d3eef43a7ed1 Version bump as a dependency of docker-engine v1.13.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/docker-containerd/docker-containerd.hash | 2 +- package/docker-containerd/docker-containerd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-containerd/docker-containerd.hash b/package/docker-containerd/docker-containerd.hash index f27e38ed23..0505ab11b0 100644 --- a/package/docker-containerd/docker-containerd.hash +++ b/package/docker-containerd/docker-containerd.hash @@ -1,2 +1,2 @@ # Computed locally -sha256 88e099af66b50abe7f2159f13bdab793fa5199d8d5b9a9ef7a68171abb4359be docker-containerd-v0.2.5.tar.gz +sha256 77ea44af1531d46b22f0444eb506590d1b7e5a9fe891cc6f8e36db5c2aef2d80 docker-containerd-aa8187dbd3b7ad67d8e5e3a15115d3eef43a7ed1.tar.gz diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk index c04552a68e..1430387931 100644 --- a/package/docker-containerd/docker-containerd.mk +++ b/package/docker-containerd/docker-containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CONTAINERD_VERSION = v0.2.5 +DOCKER_CONTAINERD_VERSION = aa8187dbd3b7ad67d8e5e3a15115d3eef43a7ed1 DOCKER_CONTAINERD_SITE = $(call github,docker,containerd,$(DOCKER_CONTAINERD_VERSION)) DOCKER_CONTAINERD_LICENSE = Apache-2.0 DOCKER_CONTAINERD_LICENSE_FILES = LICENSE.code From e8d4c34b542c70aa922fcc6db0d26c99654cf14a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 22 Feb 2017 16:46:25 +0100 Subject: [PATCH 62/74] docker-engine: bump to version 1.13.1 - Remove patch as it has been applied upstream since 1.13 - go packages are now in vendor instead of vendor/src so update slightly the configure and build commands Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...es-with-tailing-rotated-jsonlog-file.patch | 297 ------------------ package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 7 +- 3 files changed, 5 insertions(+), 301 deletions(-) delete mode 100644 package/docker-engine/0001-Fix-issues-with-tailing-rotated-jsonlog-file.patch diff --git a/package/docker-engine/0001-Fix-issues-with-tailing-rotated-jsonlog-file.patch b/package/docker-engine/0001-Fix-issues-with-tailing-rotated-jsonlog-file.patch deleted file mode 100644 index 413cfd6f7b..0000000000 --- a/package/docker-engine/0001-Fix-issues-with-tailing-rotated-jsonlog-file.patch +++ /dev/null @@ -1,297 +0,0 @@ -From 8d6f2e3fe8851b581309da25fc4c32f8be675932 Mon Sep 17 00:00:00 2001 -From: Brian Goff -Date: Mon, 11 Jul 2016 16:31:42 -0400 -Subject: [PATCH] Fix issues with tailing rotated jsonlog file - -Fixes a race where the log reader would get events for both an actual -rotation as we from fsnotify (`fsnotify.Rename`). -This issue becomes extremely apparent when rotations are fast, for -example: - -``` -$ docker run -d --name test --log-opt max-size=1 --log-opt max-file=2 -busybox sh -c 'while true; do echo hello; usleep 100000; done' -``` - -With this change the log reader for jsonlogs can handle rotations that -happen as above. - -Instead of listening for both fs events AND rotation events -simultaneously, potentially meaning we see 2 rotations for only a single -rotation due to channel buffering, only listen for fs events (like -`Rename`) and then wait to be notified about rotation by the logger. -This makes sure that we don't see 2 rotations for 1, and that we don't -start trying to read until the logger is actually ready for us to. - -Signed-off-by: Brian Goff - -This commit is pending upstream commit fixing broken log tailing. The -original commit can be found in the PR here: - - - https://github.com/docker/docker/pull/24514 - -Signed-off-by: Christian Stewart ---- - daemon/logger/jsonfilelog/read.go | 180 +++++++++++++++++++++++++------------- - 1 file changed, 119 insertions(+), 61 deletions(-) - -diff --git a/daemon/logger/jsonfilelog/read.go b/daemon/logger/jsonfilelog/read.go -index bea83dd..0cb44af 100644 ---- a/daemon/logger/jsonfilelog/read.go -+++ b/daemon/logger/jsonfilelog/read.go -@@ -3,11 +3,14 @@ package jsonfilelog - import ( - "bytes" - "encoding/json" -+ "errors" - "fmt" - "io" - "os" - "time" - -+ "gopkg.in/fsnotify.v1" -+ - "github.com/Sirupsen/logrus" - "github.com/docker/docker/daemon/logger" - "github.com/docker/docker/pkg/filenotify" -@@ -44,6 +47,10 @@ func (l *JSONFileLogger) ReadLogs(config logger.ReadConfig) *logger.LogWatcher { - func (l *JSONFileLogger) readLogs(logWatcher *logger.LogWatcher, config logger.ReadConfig) { - defer close(logWatcher.Msg) - -+ // lock so the read stream doesn't get corrupted do to rotations or other log data written while we read -+ // This will block writes!!! -+ l.mu.Lock() -+ - pth := l.writer.LogPath() - var files []io.ReadSeeker - for i := l.writer.MaxFiles(); i > 1; i-- { -@@ -61,6 +68,7 @@ func (l *JSONFileLogger) readLogs(logWatcher *logger.LogWatcher, config logger.R - latestFile, err := os.Open(pth) - if err != nil { - logWatcher.Err <- err -+ l.mu.Unlock() - return - } - -@@ -80,6 +88,7 @@ func (l *JSONFileLogger) readLogs(logWatcher *logger.LogWatcher, config logger.R - if err := latestFile.Close(); err != nil { - logrus.Errorf("Error closing file: %v", err) - } -+ l.mu.Unlock() - return - } - -@@ -87,7 +96,6 @@ func (l *JSONFileLogger) readLogs(logWatcher *logger.LogWatcher, config logger.R - latestFile.Seek(0, os.SEEK_END) - } - -- l.mu.Lock() - l.readers[logWatcher] = struct{}{} - l.mu.Unlock() - -@@ -128,92 +136,142 @@ func tailFile(f io.ReadSeeker, logWatcher *logger.LogWatcher, tail int, since ti - } - } - -+func watchFile(name string) (filenotify.FileWatcher, error) { -+ fileWatcher, err := filenotify.New() -+ if err != nil { -+ return nil, err -+ } -+ -+ if err := fileWatcher.Add(name); err != nil { -+ logrus.WithField("logger", "json-file").Warnf("falling back to file poller due to error: %v", err) -+ fileWatcher.Close() -+ fileWatcher = filenotify.NewPollingWatcher() -+ -+ if err := fileWatcher.Add(name); err != nil { -+ fileWatcher.Close() -+ logrus.Debugf("error watching log file for modifications: %v", err) -+ return nil, err -+ } -+ } -+ return fileWatcher, nil -+} -+ - func followLogs(f *os.File, logWatcher *logger.LogWatcher, notifyRotate chan interface{}, since time.Time) { - dec := json.NewDecoder(f) - l := &jsonlog.JSONLog{} - -- fileWatcher, err := filenotify.New() -+ name := f.Name() -+ fileWatcher, err := watchFile(name) - if err != nil { - logWatcher.Err <- err -+ return - } - defer func() { - f.Close() - fileWatcher.Close() - }() -- name := f.Name() - -- if err := fileWatcher.Add(name); err != nil { -- logrus.WithField("logger", "json-file").Warnf("falling back to file poller due to error: %v", err) -- fileWatcher.Close() -- fileWatcher = filenotify.NewPollingWatcher() -+ var retries int -+ handleRotate := func() error { -+ f.Close() -+ fileWatcher.Remove(name) - -+ // retry when the file doesn't exist -+ for retries := 0; retries <= 5; retries++ { -+ f, err = os.Open(name) -+ if err == nil || !os.IsNotExist(err) { -+ break -+ } -+ } -+ if err != nil { -+ return err -+ } - if err := fileWatcher.Add(name); err != nil { -- logrus.Debugf("error watching log file for modifications: %v", err) -- logWatcher.Err <- err -- return -+ return err - } -+ dec = json.NewDecoder(f) -+ return nil - } - -- var retries int -- for { -- msg, err := decodeLogLine(dec, l) -- if err != nil { -- if err != io.EOF { -- // try again because this shouldn't happen -- if _, ok := err.(*json.SyntaxError); ok && retries <= maxJSONDecodeRetry { -- dec = json.NewDecoder(f) -- retries++ -- continue -+ errRetry := errors.New("retry") -+ errDone := errors.New("done") -+ waitRead := func() error { -+ select { -+ case e := <-fileWatcher.Events(): -+ switch e.Op { -+ case fsnotify.Write: -+ dec = json.NewDecoder(f) -+ return nil -+ case fsnotify.Rename, fsnotify.Remove: -+ <-notifyRotate -+ if err := handleRotate(); err != nil { -+ return err - } -- -- // io.ErrUnexpectedEOF is returned from json.Decoder when there is -- // remaining data in the parser's buffer while an io.EOF occurs. -- // If the json logger writes a partial json log entry to the disk -- // while at the same time the decoder tries to decode it, the race condition happens. -- if err == io.ErrUnexpectedEOF && retries <= maxJSONDecodeRetry { -- reader := io.MultiReader(dec.Buffered(), f) -- dec = json.NewDecoder(reader) -- retries++ -- continue -+ return nil -+ } -+ return errRetry -+ case err := <-fileWatcher.Errors(): -+ logrus.Debug("logger got error watching file: %v", err) -+ // Something happened, let's try and stay alive and create a new watcher -+ if retries <= 5 { -+ fileWatcher, err = watchFile(name) -+ if err != nil { -+ return err - } -- -- return -+ retries++ -+ return errRetry - } -+ return err -+ case <-logWatcher.WatchClose(): -+ fileWatcher.Remove(name) -+ return errDone -+ } -+ } - -- select { -- case <-fileWatcher.Events(): -- dec = json.NewDecoder(f) -- continue -- case <-fileWatcher.Errors(): -- logWatcher.Err <- err -- return -- case <-logWatcher.WatchClose(): -- fileWatcher.Remove(name) -- return -- case <-notifyRotate: -- f.Close() -- fileWatcher.Remove(name) -- -- // retry when the file doesn't exist -- for retries := 0; retries <= 5; retries++ { -- f, err = os.Open(name) -- if err == nil || !os.IsNotExist(err) { -- break -- } -+ handleDecodeErr := func(err error) error { -+ if err == io.EOF { -+ for err := waitRead(); err != nil; { -+ if err == errRetry { -+ // retry the waitRead -+ continue - } -+ return err -+ } -+ return nil -+ } -+ // try again because this shouldn't happen -+ if _, ok := err.(*json.SyntaxError); ok && retries <= maxJSONDecodeRetry { -+ dec = json.NewDecoder(f) -+ retries++ -+ return nil -+ } -+ // io.ErrUnexpectedEOF is returned from json.Decoder when there is -+ // remaining data in the parser's buffer while an io.EOF occurs. -+ // If the json logger writes a partial json log entry to the disk -+ // while at the same time the decoder tries to decode it, the race condition happens. -+ if err == io.ErrUnexpectedEOF && retries <= maxJSONDecodeRetry { -+ reader := io.MultiReader(dec.Buffered(), f) -+ dec = json.NewDecoder(reader) -+ retries++ -+ return nil -+ } -+ return err -+ } - -- if err = fileWatcher.Add(name); err != nil { -- logWatcher.Err <- err -- return -- } -- if err != nil { -- logWatcher.Err <- err -+ // main loop -+ for { -+ msg, err := decodeLogLine(dec, l) -+ if err != nil { -+ if err := handleDecodeErr(err); err != nil { -+ if err == errDone { - return - } -- -- dec = json.NewDecoder(f) -- continue -+ // we got an unrecoverable error, so return -+ logWatcher.Err <- err -+ return - } -+ // ready to try again -+ continue - } - - retries = 0 // reset retries since we've succeeded --- -2.7.3 - diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index 5e09453e49..bc1b846527 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 0413f3513c2a6842ed9cf837154c8a722e9b34cb36b33430348489baa183707e docker-engine-v1.12.6.tar.gz +sha256 2730e7cc15492de8f1d6f9510c64620fc9004c8afc1410bf3ebac9fc3f9f83c6 docker-engine-v1.13.1.tar.gz diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index d575662dde..0701dce472 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,8 +4,8 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = v1.12.6 -DOCKER_ENGINE_COMMIT = 78d18021ecba00c00730dec9d56de6896f9e708d +DOCKER_ENGINE_VERSION = v1.13.1 +DOCKER_ENGINE_COMMIT = 092cba3727bb9b4a2f0e922cd6c0f93ea270e363 DOCKER_ENGINE_SITE = $(call github,docker,docker,$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 @@ -66,6 +66,7 @@ DOCKER_ENGINE_BUILD_TAGS += exclude_graphdriver_vfs endif define DOCKER_ENGINE_CONFIGURE_CMDS + mkdir -p $(DOCKER_ENGINE_GOPATH)/src/github.com/docker ln -fs $(@D) $(DOCKER_ENGINE_GOPATH)/src/github.com/docker/docker cd $(@D) && \ GITCOMMIT="$$(echo $(DOCKER_ENGINE_COMMIT) | head -c7)" \ @@ -100,7 +101,7 @@ define DOCKER_ENGINE_BUILD_CMDS -o $(@D)/bin/$(target) \ -tags "$(DOCKER_ENGINE_BUILD_TAGS)" \ -ldflags "$(DOCKER_ENGINE_GLDFLAGS)" \ - ./cmd/$(target) + github.com/docker/docker/cmd/$(target) ) endef From 739b66e8d9c5c1e228486c8b4ed2be2fb1e8559d Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 26 Feb 2017 17:48:53 +0100 Subject: [PATCH 63/74] package/sdl2: enable opengl support OpenGl support mean GLX so it require X11 support. Select automatically BR2_PACKAGE_SDL2_X11 to enable minimal X11 libraries support (libx11 and libxext). Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/sdl2/Config.in | 11 +++++++++++ package/sdl2/sdl2.mk | 8 +++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/package/sdl2/Config.in b/package/sdl2/Config.in index 8fc14ee737..6345133c42 100644 --- a/package/sdl2/Config.in +++ b/package/sdl2/Config.in @@ -29,6 +29,17 @@ comment "X11 video driver needs X.org" depends on !BR2_PACKAGE_XORG7 depends on BR2_USE_MMU +config BR2_PACKAGE_SDL2_OPENGL + bool "OpenGL (GLX)" + depends on BR2_PACKAGE_HAS_LIBGL + depends on BR2_PACKAGE_XORG7 + depends on BR2_USE_MMU # X11 video driver + select BR2_PACKAGE_SDL2_X11 + +comment "OpenGL support needs X11 and an OpenGL provider" + depends on BR2_USE_MMU + depends on !BR2_PACKAGE_HAS_LIBGL || !BR2_PACKAGE_XORG7 + endif comment "sdl2 needs a toolchain w/ dynamic library" diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 2ec12e639e..3f210f8d60 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -18,7 +18,6 @@ SDL2_CONF_OPTS += \ --disable-esd \ --disable-dbus \ --disable-pulseaudio \ - --disable-video-opengl \ --disable-video-opengles \ --disable-video-wayland @@ -99,6 +98,13 @@ else SDL2_CONF_OPTS += --disable-video-x11 --without-x endif +ifeq ($(BR2_PACKAGE_SDL2_OPENGL),y) +SDL2_CONF_OPTS += --enable-video-opengl +SDL2_DEPENDENCIES += libgl +else +SDL2_CONF_OPTS += --disable-video-opengl +endif + ifeq ($(BR2_PACKAGE_TSLIB),y) SDL2_DEPENDENCIES += tslib SDL2_CONF_OPTS += --enable-input-tslib From 8cdf3f7bcd4495c2932455141de8aa7ae66a849b Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 26 Feb 2017 17:48:54 +0100 Subject: [PATCH 64/74] package/sdl2: enable OpenGL ES support Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/sdl2/Config.in | 7 +++++++ package/sdl2/sdl2.mk | 8 +++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/package/sdl2/Config.in b/package/sdl2/Config.in index 6345133c42..a2971edc89 100644 --- a/package/sdl2/Config.in +++ b/package/sdl2/Config.in @@ -40,6 +40,13 @@ comment "OpenGL support needs X11 and an OpenGL provider" depends on BR2_USE_MMU depends on !BR2_PACKAGE_HAS_LIBGL || !BR2_PACKAGE_XORG7 +config BR2_PACKAGE_SDL2_OPENGLES + bool "OpenGL ES" + depends on BR2_PACKAGE_HAS_LIBGLES + +comment "OpenGL ES support needs an OpenGL ES provider" + depends on !BR2_PACKAGE_HAS_LIBGLES + endif comment "sdl2 needs a toolchain w/ dynamic library" diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 3f210f8d60..d2ee50dc1d 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -18,7 +18,6 @@ SDL2_CONF_OPTS += \ --disable-esd \ --disable-dbus \ --disable-pulseaudio \ - --disable-video-opengles \ --disable-video-wayland # We must enable static build to get compilation successful. @@ -105,6 +104,13 @@ else SDL2_CONF_OPTS += --disable-video-opengl endif +ifeq ($(BR2_PACKAGE_SDL2_OPENGLES),y) +SDL2_CONF_OPTS += --enable-video-opengles +SDL2_DEPENDENCIES += libgles +else +SDL2_CONF_OPTS += --disable-video-opengles +endif + ifeq ($(BR2_PACKAGE_TSLIB),y) SDL2_DEPENDENCIES += tslib SDL2_CONF_OPTS += --enable-input-tslib From 5c61a6ab32d9c495f0234ebc46fe5fc2f8c1f4ff Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 26 Feb 2017 17:48:55 +0100 Subject: [PATCH 65/74] package/lugaru: new package Lugaru needs SDL2 library with OpenGL support which require X11 support. Otherwise Lugaru error out with "No dynamic GL support in video driver" message. https://osslugaru.gitlab.io/ Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + .../0001-ImageIO-fix-invalid-conversion.patch | 35 +++++++++++++++++ package/lugaru/Config.in | 38 +++++++++++++++++++ package/lugaru/lugaru.hash | 2 + package/lugaru/lugaru.mk | 30 +++++++++++++++ 6 files changed, 107 insertions(+) create mode 100644 package/lugaru/0001-ImageIO-fix-invalid-conversion.patch create mode 100644 package/lugaru/Config.in create mode 100644 package/lugaru/lugaru.hash create mode 100644 package/lugaru/lugaru.mk diff --git a/DEVELOPERS b/DEVELOPERS index 3784a28ec1..c7ca3ca0c0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1291,6 +1291,7 @@ F: package/expedite/ F: package/iqvlinux/ F: package/liblinear/ F: package/linux-syscall-support/ +F: package/lugaru/ F: package/mcelog/ F: package/openpowerlink/ F: package/stress-ng/ diff --git a/package/Config.in b/package/Config.in index e6dbe5822e..3fa820b054 100644 --- a/package/Config.in +++ b/package/Config.in @@ -222,6 +222,7 @@ menu "Games" source "package/gnuchess/Config.in" source "package/lbreakout2/Config.in" source "package/ltris/Config.in" + source "package/lugaru/Config.in" source "package/opentyrian/Config.in" source "package/opentyrian-data/Config.in" source "package/prboom/Config.in" diff --git a/package/lugaru/0001-ImageIO-fix-invalid-conversion.patch b/package/lugaru/0001-ImageIO-fix-invalid-conversion.patch new file mode 100644 index 0000000000..6096477cd5 --- /dev/null +++ b/package/lugaru/0001-ImageIO-fix-invalid-conversion.patch @@ -0,0 +1,35 @@ +From 73e56ba8e91b6bae59220e6f25c1b7c15817edb5 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sun, 12 Feb 2017 21:17:44 +0100 +Subject: [PATCH] ImageIO: fix invalid conversion + +Fixes: +Source/Utils/ImageIO.cpp:125:27: error: invalid conversion from 'int' to 'boolean' [-fpermissive] + cinfo.quantize_colors = 0; + ^ + +quantize_colors type is bool, so it must be initialized to TRUE or FALSE. + +Patch status: upsteam + +Signed-off-by: Romain Naour +--- + Source/Utils/ImageIO.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Source/Utils/ImageIO.cpp b/Source/Utils/ImageIO.cpp +index 706c201..c19a63e 100644 +--- a/Source/Utils/ImageIO.cpp ++++ b/Source/Utils/ImageIO.cpp +@@ -122,7 +122,7 @@ static bool load_jpg(const char* file_name, ImageRec& tex) + (void)jpeg_read_header(&cinfo, TRUE); + + cinfo.out_color_space = JCS_RGB; +- cinfo.quantize_colors = 0; ++ cinfo.quantize_colors = FALSE; + (void)jpeg_calc_output_dimensions(&cinfo); + (void)jpeg_start_decompress(&cinfo); + +-- +2.9.3 + diff --git a/package/lugaru/Config.in b/package/lugaru/Config.in new file mode 100644 index 0000000000..521c89aeb0 --- /dev/null +++ b/package/lugaru/Config.in @@ -0,0 +1,38 @@ +config BR2_PACKAGE_LUGARU + bool "lugaru" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_HAS_LIBGL # libglu + depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS + depends on BR2_PACKAGE_XORG7 # SDL2 OpenGL (GLX) + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # openal + depends on BR2_USE_MMU # SDL2 OpenGL (GLX) + depends on !BR2_STATIC_LIBS # SDL2 + select BR2_PACKAGE_JPEG + select BR2_PACKAGE_LIBGLU # GL/glu.h + select BR2_PACKAGE_LIBPNG + select BR2_PACKAGE_LIBVORBIS + select BR2_PACKAGE_OPENAL + select BR2_PACKAGE_SDL2 + select BR2_PACKAGE_SDL2_OPENGL + select BR2_PACKAGE_ZLIB + help + Lugaru (pronounced Loo-GAH-roo) is a cross-platform + third-person action game. The main character, Turner, is an + anthropomorphic rebel bunny rabbit with impressive combat + skills. In his quest to find those responsible for + slaughtering his village, he uncovers a far-reaching + conspiracy involving the corrupt leaders of the rabbit + republic and the starving wolves from a nearby den. Turner + takes it upon himself to fight against their plot and save + his fellow rabbits from slavery. + + https://osslugaru.gitlab.io/ + +comment "lugaru needs X11 and a toolchain w/ C++, OpenGL backend, gcc >= 4.7, NPTL, dynamic library" + depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS + depends on BR2_PACKAGE_XORG7 + depends on BR2_USE_MMU + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_HAS_LIBGL || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ + BR2_STATIC_LIBS diff --git a/package/lugaru/lugaru.hash b/package/lugaru/lugaru.hash new file mode 100644 index 0000000000..6ba2bca6ec --- /dev/null +++ b/package/lugaru/lugaru.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 f3ea477caf78911c69939fbdc163f9f6517c7ef2267e716a0e050be1a166ef97 lugaru-1.2.tar.xz diff --git a/package/lugaru/lugaru.mk b/package/lugaru/lugaru.mk new file mode 100644 index 0000000000..770493172e --- /dev/null +++ b/package/lugaru/lugaru.mk @@ -0,0 +1,30 @@ +################################################################################ +# +# lugaru +# +################################################################################ + +LUGARU_VERSION = 1.2 +LUGARU_SITE = https://bitbucket.org/osslugaru/lugaru/downloads +LUGARU_SOURCE = lugaru-$(LUGARU_VERSION).tar.xz + +LUGARU_LICENSE = GPLv2+, CC-BY-SA-3.0 (Wolfire and Slib assets), \ + CC-BY-SA-4.0 (OSS Lugaru, Jendraz and Philtron R. assets) +LUGARU_LICENSE_FILES = COPYING.txt CONTENT-LICENSE.txt + +LUGARU_DEPENDENCIES = host-pkgconf jpeg libgl libglu libpng libvorbis \ + openal sdl2 zlib + +# Avoid incompatible posix_memalign declaration on x86 and x86_64 with +# musl. +# https://gcc.gnu.org/ml/gcc-patches/2015-05/msg01425.html +ifeq ($(BR2_TOOLCHAIN_USES_MUSL):$(BR2_i386)$(BR2_x86_64),y:y) +define LUGARU_REMOVE_PEDANTIC + $(SED) 's% -pedantic%%' $(@D)/CMakeLists.txt +endef +LUGARU_POST_PATCH_HOOKS += LUGARU_REMOVE_PEDANTIC +endif + +LUGARU_CONF_OPTS = -DSYSTEM_INSTALL=ON + +$(eval $(cmake-package)) From 8477c6ffcb0cf56aa9878398f4ef5ddc3c25409e Mon Sep 17 00:00:00 2001 From: Cam Mannett Date: Sat, 25 Feb 2017 11:43:21 +0000 Subject: [PATCH 66/74] pru-software-support: bump version to 5.1.0 Signed-off-by: Cam Mannett Signed-off-by: Thomas Petazzoni --- package/pru-software-support/pru-software-support.hash | 2 +- package/pru-software-support/pru-software-support.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/pru-software-support/pru-software-support.hash b/package/pru-software-support/pru-software-support.hash index 8f624da764..f4ce8e466e 100644 --- a/package/pru-software-support/pru-software-support.hash +++ b/package/pru-software-support/pru-software-support.hash @@ -1,2 +1,2 @@ # Locally-calculated hash -sha256 b257535ca9b1641d1a238795f3c7004064c573a91cf4a1fa566e3f7c2360c38f pru-software-support-804b548e69ef9fdf44445f6d0968d81cb8a1e7b4.tar.gz +sha256 1e880d74f9a1d04324e6255cb7a0e3d40f92e08809dc81dc6c714447bac5c335 pru-software-support-v5.1.0.tar.gz diff --git a/package/pru-software-support/pru-software-support.mk b/package/pru-software-support/pru-software-support.mk index 06983c275d..adaa4ac6e6 100644 --- a/package/pru-software-support/pru-software-support.mk +++ b/package/pru-software-support/pru-software-support.mk @@ -4,10 +4,10 @@ # ################################################################################ -PRU_SOFTWARE_SUPPORT_VERSION = 804b548e69ef9fdf44445f6d0968d81cb8a1e7b4 -PRU_SOFTWARE_SUPPORT_SITE = git://git.ti.com/pru-software-support-package/pru-software-support-package.git +PRU_SOFTWARE_SUPPORT_VERSION = v5.1.0 +PRU_SOFTWARE_SUPPORT_SITE = https://git.ti.com/pru-software-support-package/pru-software-support-package/archive-tarball/$(PRU_SOFTWARE_SUPPORT_VERSION)? PRU_SOFTWARE_SUPPORT_LICENSE = BSD-3c, GPLv2, Public Domain -PRU_SOFTWARE_SUPPORT_LICENSE_FILES = PRU-Package-v4.0-Manifest.html +PRU_SOFTWARE_SUPPORT_LICENSE_FILES = PRU-Package-v5.0-Manifest.html PRU_SOFTWARE_SUPPORT_DEPENDENCIES = host-ti-cgt-pru host-pru-software-support HOST_PRU_SOFTWARE_SUPPORT_DEPENDENCIES = host-ti-cgt-pru From 82bc0222e793b10763d5cc20ec26cd6822f96677 Mon Sep 17 00:00:00 2001 From: Cam Mannett Date: Sat, 25 Feb 2017 08:26:16 +0000 Subject: [PATCH 67/74] ti-cgt-pru: bump version to 2.1.4 Signed-off-by: Cam Mannett Signed-off-by: Thomas Petazzoni --- package/ti-cgt-pru/ti-cgt-pru.hash | 2 +- package/ti-cgt-pru/ti-cgt-pru.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ti-cgt-pru/ti-cgt-pru.hash b/package/ti-cgt-pru/ti-cgt-pru.hash index 1c19b33fd6..3ff08ace32 100644 --- a/package/ti-cgt-pru/ti-cgt-pru.hash +++ b/package/ti-cgt-pru/ti-cgt-pru.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 df85cd1ed3aea12d577854ece11bf5f2af6ace8c39959eea4cf2fa5973924e0e ti_cgt_pru_2.1.3_linux_installer_x86.bin +sha256 c80dbf35e7401f4c122ff25cc2f6b5db496607782fb4583cee8663a2763f4472 ti_cgt_pru_2.1.4_linux_installer_x86.bin diff --git a/package/ti-cgt-pru/ti-cgt-pru.mk b/package/ti-cgt-pru/ti-cgt-pru.mk index d94f09197f..d6de05e5da 100644 --- a/package/ti-cgt-pru/ti-cgt-pru.mk +++ b/package/ti-cgt-pru/ti-cgt-pru.mk @@ -4,9 +4,9 @@ # ################################################################################ -TI_CGT_PRU_VERSION = 2.1.3 +TI_CGT_PRU_VERSION = 2.1.4 TI_CGT_PRU_SOURCE = ti_cgt_pru_$(TI_CGT_PRU_VERSION)_linux_installer_x86.bin -TI_CGT_PRU_SITE = http://software-dl.ti.com/codegen/esd/cgt_public_sw/PRU/$(TI_CGT_PRU_VERSION) +TI_CGT_PRU_SITE = http://downloads.ti.com/codegen/esd/cgt_public_sw/PRU/$(TI_CGT_PRU_VERSION) TI_CGT_PRU_LICENSE = TI Technology and Software Publicly Available License (compiler + PRU library), \ Boost Software License 1.0 (compiler), \ BSD-2c, BSD-3c, MIT, Academic Free License 3.0, Hewlett-Packard (PRU library) From 63565627884d2e69488688438203aece13b0786b Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Fri, 24 Feb 2017 19:21:02 +0530 Subject: [PATCH 68/74] kmod: bump to version 24 Signed-off-by: Rahul Bedarkar Signed-off-by: Thomas Petazzoni --- package/kmod/kmod.hash | 2 +- package/kmod/kmod.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kmod/kmod.hash b/package/kmod/kmod.hash index 8220fd493b..be350c423a 100644 --- a/package/kmod/kmod.hash +++ b/package/kmod/kmod.hash @@ -1,2 +1,2 @@ # From https://www.kernel.org/pub/linux/utils/kernel/kmod/sha256sums.asc -sha256 d303d5519faec9d69e1132f6b37db2579db17a7fb5c1517da0115d03ba168155 kmod-23.tar.xz +sha256 610b8d1df172acc39a4fdf1eaa47a57b04873c82f32152e7a62e29b6ff9cb397 kmod-24.tar.xz diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk index 7492b926f0..61cc0b8ee2 100644 --- a/package/kmod/kmod.mk +++ b/package/kmod/kmod.mk @@ -4,7 +4,7 @@ # ################################################################################ -KMOD_VERSION = 23 +KMOD_VERSION = 24 KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod KMOD_INSTALL_STAGING = YES From 3e89311e42e34251daaae70cfb5d20f3dfdd245b Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 23 Feb 2017 20:58:33 -0300 Subject: [PATCH 69/74] libsigsegv: bump to version 2.11 Drop all patches, they're upstream. And match that by dropping autoreconf as well. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- ...rection-for-the-AArch64-architecture.patch | 28 ----------------- ...tion-for-the-Microblaze-architecture.patch | 26 ---------------- ...ection-for-the-Blackfin-architecture.patch | 29 ----------------- ...rection-for-the-Nios-II-architecture.patch | 31 ------------------- .../0005-fix-sparc64-stackpointer.patch | 16 ---------- package/libsigsegv/libsigsegv.hash | 2 +- package/libsigsegv/libsigsegv.mk | 4 +-- 7 files changed, 2 insertions(+), 134 deletions(-) delete mode 100644 package/libsigsegv/0001-Add-stack-direction-for-the-AArch64-architecture.patch delete mode 100644 package/libsigsegv/0002-Add-stack-direction-for-the-Microblaze-architecture.patch delete mode 100644 package/libsigsegv/0003-Add-stack-direction-for-the-Blackfin-architecture.patch delete mode 100644 package/libsigsegv/0004-Add-stack-direction-for-the-Nios-II-architecture.patch delete mode 100644 package/libsigsegv/0005-fix-sparc64-stackpointer.patch diff --git a/package/libsigsegv/0001-Add-stack-direction-for-the-AArch64-architecture.patch b/package/libsigsegv/0001-Add-stack-direction-for-the-AArch64-architecture.patch deleted file mode 100644 index a3b03a0024..0000000000 --- a/package/libsigsegv/0001-Add-stack-direction-for-the-AArch64-architecture.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 790e8f620f06834f3fd03c310cbecd1416536987 Mon Sep 17 00:00:00 2001 -From: Will Newton -Date: Tue, 28 May 2013 18:31:46 +0100 -Subject: [PATCH 2/5] Add stack direction for the AArch64 architecture - -On this architecture, the stack grows downward. - -Signed-off-by: Will Newton -Signed-off-by: Thomas Petazzoni ---- - m4/stack-direction.m4 | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4 -index 39c1a28..3f70530 100644 ---- a/m4/stack-direction.m4 -+++ b/m4/stack-direction.m4 -@@ -13,6 +13,7 @@ AC_DEFUN([SV_STACK_DIRECTION], - case "$host_cpu" in - dnl See the #define STACK_GROWS_DOWNWARD in gcc-3.1/gcc/config/*/*.h. - a29k | \ -+ aarch64* | \ - alpha* | \ - arc | \ - arm* | strongarm* | xscale* | \ --- -2.1.0 - diff --git a/package/libsigsegv/0002-Add-stack-direction-for-the-Microblaze-architecture.patch b/package/libsigsegv/0002-Add-stack-direction-for-the-Microblaze-architecture.patch deleted file mode 100644 index d3795d3fe7..0000000000 --- a/package/libsigsegv/0002-Add-stack-direction-for-the-Microblaze-architecture.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f4395ff932758884416753f88f5d98f33ec67479 Mon Sep 17 00:00:00 2001 -From: Spenser Gilliland -Date: Mon, 29 Dec 2014 13:54:54 +0100 -Subject: [PATCH 3/5] Add stack direction for the Microblaze architecture - -Signed-off-by: Spenser Gilliland -Signed-off-by: Thomas Petazzoni ---- - m4/stack-direction.m4 | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4 -index 3f70530..53f4216 100644 ---- a/m4/stack-direction.m4 -+++ b/m4/stack-direction.m4 -@@ -32,6 +32,7 @@ AC_DEFUN([SV_STACK_DIRECTION], - m68* | \ - m88k | \ - mcore | \ -+ microblaze | \ - mips* | \ - mmix | \ - mn10200 | \ --- -2.1.0 - diff --git a/package/libsigsegv/0003-Add-stack-direction-for-the-Blackfin-architecture.patch b/package/libsigsegv/0003-Add-stack-direction-for-the-Blackfin-architecture.patch deleted file mode 100644 index 5d8232a1b6..0000000000 --- a/package/libsigsegv/0003-Add-stack-direction-for-the-Blackfin-architecture.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 55a707283dbb3b2fdcaaa4e177d050e122cfc2a0 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 29 Dec 2014 13:55:16 +0100 -Subject: [PATCH 4/5] Add stack direction for the Blackfin architecture - -The stack grows downward on Blackfin, see -https://sourceware.org/binutils/docs/as/Blackfin-Syntax.html: "The -stack grows by decrementing the stack pointer.". - -Signed-off-by: Thomas Petazzoni ---- - m4/stack-direction.m4 | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4 -index 53f4216..1a97d5a 100644 ---- a/m4/stack-direction.m4 -+++ b/m4/stack-direction.m4 -@@ -18,6 +18,7 @@ AC_DEFUN([SV_STACK_DIRECTION], - arc | \ - arm* | strongarm* | xscale* | \ - avr | \ -+ bfin | \ - c1 | c2 | c32 | c34 | c38 | \ - clipper | \ - cris | \ --- -2.1.0 - diff --git a/package/libsigsegv/0004-Add-stack-direction-for-the-Nios-II-architecture.patch b/package/libsigsegv/0004-Add-stack-direction-for-the-Nios-II-architecture.patch deleted file mode 100644 index ee4778ea0c..0000000000 --- a/package/libsigsegv/0004-Add-stack-direction-for-the-Nios-II-architecture.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 24bac122bf4ffe437bb4f6ca633ad08f31a23d73 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 29 Dec 2014 13:56:54 +0100 -Subject: [PATCH 5/5] Add stack direction for the Nios II architecture - -According to Altera Application Binary Interface document for the Nios -II architecture -(http://www.altera.com/literature/hb/nios2/n2cpu_nii51016.pdf): - - "The stack grows downward (i.e. towards lower addresses). ". - -Signed-off-by: Thomas Petazzoni ---- - m4/stack-direction.m4 | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4 -index 1a97d5a..d9c5157 100644 ---- a/m4/stack-direction.m4 -+++ b/m4/stack-direction.m4 -@@ -38,6 +38,7 @@ AC_DEFUN([SV_STACK_DIRECTION], - mmix | \ - mn10200 | \ - mn10300 | \ -+ nios2 | \ - ns32k | \ - pdp11 | \ - pj* | \ --- -2.1.0 - diff --git a/package/libsigsegv/0005-fix-sparc64-stackpointer.patch b/package/libsigsegv/0005-fix-sparc64-stackpointer.patch deleted file mode 100644 index 62de35f6e0..0000000000 --- a/package/libsigsegv/0005-fix-sparc64-stackpointer.patch +++ /dev/null @@ -1,16 +0,0 @@ -Fix sparc64 build. - -Signed-off-by: Waldemar Brodkorb - -diff -Nur libsigsegv-2.10.orig/src/fault-linux-sparc.h libsigsegv-2.10/src/fault-linux-sparc.h ---- libsigsegv-2.10.orig/src/fault-linux-sparc.h 2009-08-01 17:06:49.000000000 +0200 -+++ libsigsegv-2.10/src/fault-linux-sparc.h 2015-11-29 11:55:29.000000000 +0100 -@@ -27,4 +27,8 @@ - (see also ) - are quite different types. */ - -+#if __WORDSIZE == 64 -+#define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.mc_gregs[REG_O6] -+#else - #define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gregs[REG_O6] -+#endif diff --git a/package/libsigsegv/libsigsegv.hash b/package/libsigsegv/libsigsegv.hash index 0151105f84..e937259ece 100644 --- a/package/libsigsegv/libsigsegv.hash +++ b/package/libsigsegv/libsigsegv.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 8460a4a3dd4954c3d96d7a4f5dd5bc4d9b76f5754196aa245287553b26d2199a libsigsegv-2.10.tar.gz +sha256 dd7c2eb2ef6c47189406d562c1dc0f96f2fc808036834d596075d58377e37a18 libsigsegv-2.11.tar.gz diff --git a/package/libsigsegv/libsigsegv.mk b/package/libsigsegv/libsigsegv.mk index a5bb31c9cf..14733695ea 100644 --- a/package/libsigsegv/libsigsegv.mk +++ b/package/libsigsegv/libsigsegv.mk @@ -4,13 +4,11 @@ # ################################################################################ -LIBSIGSEGV_VERSION = 2.10 +LIBSIGSEGV_VERSION = 2.11 LIBSIGSEGV_SITE = $(BR2_GNU_MIRROR)/libsigsegv LIBSIGSEGV_INSTALL_STAGING = YES LIBSIGSEGV_CONF_ENV = sv_cv_fault_posix=yes LIBSIGSEGV_LICENSE = GPLv2+ LIBSIGSEGV_LICENSE_FILES = COPYING -LIBSIGSEGV_AUTORECONF = YES - $(eval $(autotools-package)) From d0035543432edddee4dcb017ac4dd74832133e89 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 23 Feb 2017 20:58:51 -0300 Subject: [PATCH 70/74] nano: bump to version 2.7.5 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/nano/nano.hash | 2 +- package/nano/nano.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nano/nano.hash b/package/nano/nano.hash index aa3e27b917..6264faa7f2 100644 --- a/package/nano/nano.hash +++ b/package/nano/nano.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 752170643039e2c95a433de357f0c70a8c4c4c561a90a7e7259a63e225b659b9 nano-2.7.4.tar.xz +sha256 a64d24e6bc4fc448376d038f9a755af77f8e748c9051b6f45bf85e783a7e67e4 nano-2.7.5.tar.xz diff --git a/package/nano/nano.mk b/package/nano/nano.mk index 4632bed3b1..dc6aa13001 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -5,7 +5,7 @@ ################################################################################ NANO_VERSION_MAJOR = 2.7 -NANO_VERSION = $(NANO_VERSION_MAJOR).4 +NANO_VERSION = $(NANO_VERSION_MAJOR).5 NANO_SITE = https://www.nano-editor.org/dist/v$(NANO_VERSION_MAJOR) NANO_SOURCE = nano-$(NANO_VERSION).tar.xz NANO_LICENSE = GPLv3+ From 9905f5344f4fd329ba819ba966c5adc29367166c Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 27 Feb 2017 16:32:13 +0200 Subject: [PATCH 71/74] modem-manager: bump to version 1.6.4 Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/modem-manager/modem-manager.hash | 2 +- package/modem-manager/modem-manager.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/modem-manager/modem-manager.hash b/package/modem-manager/modem-manager.hash index 481f7dd434..2a2b96d124 100644 --- a/package/modem-manager/modem-manager.hash +++ b/package/modem-manager/modem-manager.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 e4544398d9c166f8e13fe7c97149f262ad1fb48af980e0d4f9c34013920c6393 ModemManager-1.6.2.tar.xz +sha256 cdd5b4cb1e4d7643643a28ccbfc4bb354bfa9cb89a77ea160ebdf7926171c668 ModemManager-1.6.4.tar.xz diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index c74c224387..6a9b6a04ef 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -4,7 +4,7 @@ # ################################################################################ -MODEM_MANAGER_VERSION = 1.6.2 +MODEM_MANAGER_VERSION = 1.6.4 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) From 11dcdd92bc3180b2ca2a26ed29bb5fdd98312054 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 27 Feb 2017 19:09:05 +0200 Subject: [PATCH 72/74] usb_modeswitch: bump to version 2.5.0 Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/usb_modeswitch/usb_modeswitch.hash | 2 +- package/usb_modeswitch/usb_modeswitch.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/usb_modeswitch/usb_modeswitch.hash b/package/usb_modeswitch/usb_modeswitch.hash index 807b63f023..b202e6353a 100644 --- a/package/usb_modeswitch/usb_modeswitch.hash +++ b/package/usb_modeswitch/usb_modeswitch.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 17dc32bf10df8e370f2369b5137d34dfd8f2347faaa51524c5f21c922f42e212 usb-modeswitch-2.4.0.tar.bz2 +sha256 31c0be280d49a99ec3dc0be3325bef320d9c04b50714ef0ce1e36a614d687633 usb-modeswitch-2.5.0.tar.bz2 diff --git a/package/usb_modeswitch/usb_modeswitch.mk b/package/usb_modeswitch/usb_modeswitch.mk index e196db582d..57996ab5f9 100644 --- a/package/usb_modeswitch/usb_modeswitch.mk +++ b/package/usb_modeswitch/usb_modeswitch.mk @@ -4,7 +4,7 @@ # ################################################################################ -USB_MODESWITCH_VERSION = 2.4.0 +USB_MODESWITCH_VERSION = 2.5.0 USB_MODESWITCH_SOURCE = usb-modeswitch-$(USB_MODESWITCH_VERSION).tar.bz2 USB_MODESWITCH_SITE = http://www.draisberghof.de/usb_modeswitch USB_MODESWITCH_DEPENDENCIES = libusb From ab692a644c8134ed121ebd96f539998e2c0f81be Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 27 Feb 2017 19:09:06 +0200 Subject: [PATCH 73/74] usb_modeswitch_data: bump to version 20170205 Drop upstream patch. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- .../usb_modeswitch_data/0001-makefile.patch | 28 ------------------- .../usb_modeswitch_data.hash | 2 +- .../usb_modeswitch_data.mk | 2 +- 3 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 package/usb_modeswitch_data/0001-makefile.patch diff --git a/package/usb_modeswitch_data/0001-makefile.patch b/package/usb_modeswitch_data/0001-makefile.patch deleted file mode 100644 index 28441fe003..0000000000 --- a/package/usb_modeswitch_data/0001-makefile.patch +++ /dev/null @@ -1,28 +0,0 @@ -Fixed Makefile install sections to not reload udev rules. In a -cross-compiler environment, it is not wanted to reload the host udev rules. - -Signed-off-by: J.C. Woltz -Signed-off-by: Patrick Ziegler ---- a/Makefile 2013-06-10 22:32:53.000000000 +0200 -+++ b/Makefile 2013-06-11 10:38:03.181161401 +0200 -@@ -13,9 +13,9 @@ - clean: - $(RM) 40-usb_modeswitch.rules - --install: all files-install db-install rules-reload -+install: all files-install db-install - --install-packed: files-install db-install-packed rules-reload -+install-packed: files-install db-install-packed - - files-install: - install -d $(PREFIX)/share/usb_modeswitch -@@ -54,7 +54,7 @@ - fi \ - fi - --uninstall: files-uninstall rules-reload -+uninstall: files-uninstall - - files-uninstall: - $(RM) $(RULESDIR)/40-usb_modeswitch.rules diff --git a/package/usb_modeswitch_data/usb_modeswitch_data.hash b/package/usb_modeswitch_data/usb_modeswitch_data.hash index 0df5475ea3..e19fcac628 100644 --- a/package/usb_modeswitch_data/usb_modeswitch_data.hash +++ b/package/usb_modeswitch_data/usb_modeswitch_data.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 d679a44a48b1d1f243fea6b4d2bd54e0e08010ff579dd81eaf698954c0c6dfa7 usb-modeswitch-data-20160112.tar.bz2 +sha256 e2dcfd9d28928d8d8f03381571a23442b3c50d48d343bc40a1a07d01662738d1 usb-modeswitch-data-20170205.tar.bz2 diff --git a/package/usb_modeswitch_data/usb_modeswitch_data.mk b/package/usb_modeswitch_data/usb_modeswitch_data.mk index a0cbc126df..6d75b31983 100644 --- a/package/usb_modeswitch_data/usb_modeswitch_data.mk +++ b/package/usb_modeswitch_data/usb_modeswitch_data.mk @@ -4,7 +4,7 @@ # ################################################################################ -USB_MODESWITCH_DATA_VERSION = 20160112 +USB_MODESWITCH_DATA_VERSION = 20170205 USB_MODESWITCH_DATA_SOURCE = usb-modeswitch-data-$(USB_MODESWITCH_DATA_VERSION).tar.bz2 USB_MODESWITCH_DATA_SITE = http://www.draisberghof.de/usb_modeswitch USB_MODESWITCH_DATA_DEPENDENCIES = usb_modeswitch From 9a6c03a390872d7ce91b619fdaf1d674491ad8cb Mon Sep 17 00:00:00 2001 From: James Balean Date: Sun, 26 Feb 2017 21:09:46 -0600 Subject: [PATCH 74/74] systemd: enable optional PAM support This commit enables PAM support in systemd if BR2_PACKAGE_LINUX_PAM is set. Some essential config files are not installed without the --enable-pam option. Signed-off-by: James Balean Signed-off-by: Thomas Petazzoni --- package/systemd/systemd.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index fce5d8411c..0d2f416300 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -30,7 +30,6 @@ SYSTEMD_CONF_OPTS += \ --enable-blkid \ --enable-static=no \ --disable-manpages \ - --disable-pam \ --disable-ima \ --disable-libcryptsetup \ --disable-efi \ @@ -108,6 +107,13 @@ else SYSTEMD_CONF_OPTS += --disable-lz4 endif +ifeq ($(BR2_PACKAGE_LINUX_PAM),y) +SYSTEMD_DEPENDENCIES += linux-pam +SYSTEMD_CONF_OPTS += --enable-pam +else +SYSTEMD_CONF_OPTS += --disable-pam +endif + ifeq ($(BR2_PACKAGE_XZ),y) SYSTEMD_DEPENDENCIES += xz SYSTEMD_CONF_OPTS += --enable-xz