Commit graph

30 commits

Author SHA1 Message Date
Baruch Siach f56814faa8 trinity: fix build with kernel headers v4.17+
Kernel v4.17 removed the linux/irda.h header. Add a patch to skip the
irda test when the header is missing.

Fixes:
http://autobuild.buildroot.net/results/39d/39d131048d6eb3cd4d802dae462116f7728c41fd/
http://autobuild.buildroot.net/results/af2/af2288711d1a0939a06ea51e65ed32d39e395e2b/
http://autobuild.buildroot.net/results/41f/41fead6d53dba2539ba246f682973e0b5967f3d0/

Cc: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2018-06-08 16:28:37 +02:00
Baruch Siach 412443fb8f trinity: fix build with glibc 2.27
glibc 2.27 added a system call wrapper for memfd_create() which collides
with the local definition of the same symbol in trinity. Add a patch to
detect the presence of memfd_create(), and avoid collision.

Fixes:
http://autobuild.buildroot.net/results/fda/fda07327395921fdc79cbb4f24b662209fee1be1/
http://autobuild.buildroot.net/results/f98/f98f43657cbf519a626257af5a21c8c228423856/
http://autobuild.buildroot.net/results/575/57558c418ea5c5011ac22e5236beff4d823c825b/

Cc: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2018-03-13 09:26:30 +01:00
Baruch Siach 91bbfe3483 Revert "trinity: add optional dependency on btrfs-progs"
This reverts commit a81782a3f5.

The trinity package does not use btrfs-progs, only btrfs kernel headers.

Cc: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-12-03 23:09:13 +01:00
Baruch Siach 092a4955ce trinity: bump to version 1.8
Drop upstream patches.

Add an upstream patch fixing build with kernel headers v4.14 or newer.

Enable build for musl; Marcin Nowakowski fixed all incompatibilities in
this version.

Fixes:
http://autobuild.buildroot.net/results/1a8/1a891bfa1f29060003bb7f4fce100aa5a1034673/
http://autobuild.buildroot.net/results/f22/f22cb03a4ec1eafb89ca5e81a2864f928117b54d/

Cc: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-12-03 23:09:10 +01:00
Matt Weber da34a889d2 trinity: undefined UIO_MAXIOV need sys/io.h
This upstream patch fixes the build error produced by building for
powerpc 32bit after the glibc bump to 2.26 with the following internal
toolchain config.

gcc5.4.0
glibc2.26
bin2.28.1
linux4.1.43

Failure log:
  CC	net/proto-ipv4.o
net/proto-ipv4.c: In function ‘ip_setsockopt’:
net/proto-ipv4.c:231:49: error: ‘UIO_MAXIOV’ undeclared (first use in this function); did you mean ‘_IO_MAGIC’?
   so->optlen = rnd() % sizeof(unsigned long)*(2*UIO_MAXIOV+512);
                                                 ^~~~~~~~~~
                                                 _IO_MAGIC

Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
[Arnout: add Matthew's Sob to the patch]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2017-10-06 19:23:35 +02:00
Thomas Petazzoni bbbe00ea35 trinity: don't download patches from Github
Patches downloaded from Github are not stable, so bring them in the
tree.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2017-07-03 00:05:18 +02:00
Marcin Nowakowski 981c39ea72 trinity: fix MIPS support
Add an upstream patch that fixes segfaults when executed on MIPS due to
incorrect handling of system call numbers on MIPS platforms.

Signed-off-by: Marcin Nowakowski <marcin.nowakowski@imgtec.com>
Cc: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-07-01 12:45:47 +02:00
Rahul Bedarkar 44a8c5dc82 trinity: needs __sync_val_compare_and_swap_4
syscalls/futex.c uses sync_val_compare_and_swap(). So add dependency on
BR2_TOOLCHAIN_HAS_SYNC_4.

Fixes:
  http://autobuild.buildroot.net/results/17f/17f7fe79242a40ff3e588748230de7bf2a010941

Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-04-18 17:41:00 +02:00
Baruch Siach a81782a3f5 trinity: add optional dependency on btrfs-progs
Cc: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-04-16 10:39:37 +02:00
Baruch Siach 078f65c889 trinity: fix detection of BPF features
Add upstream patch to detect presence of the map_flags field in bpf_attr.

Fixes:
http://autobuild.buildroot.net/results/1d3/1d3dcb908b7bb4559e1103e09907ab043ed44679/
http://autobuild.buildroot.net/results/269/269e1c125094b97dd9dfda0e174d2c9f3b103c3b/

Cc: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-04-16 10:39:36 +02:00
Baruch Siach 6bd62849f8 trinity: fix build BPF support is missing
Use upstream patch.

Fixes:
http://autobuild.buildroot.net/results/2ae/2ae76fb61d017d99653d57807cb62c4d8c91ff4d/
http://autobuild.buildroot.net/results/a53/a5391fc272f99b80974582ea735d764db8dc8e9e/

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-04-14 10:54:37 +02:00
Baruch Siach f4a263cad2 trinity: fix ipv6 headers detection
The trinity configure script looks into a host header to check for libc/kernel
headers conflict resolution. This is not compatible with cross compilation.
Add a patch that does direct compilation test instead.

This issue was not caught by the autobuilder yet.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-04-14 10:54:34 +02:00
Baruch Siach a81ec97cfd trinity: bump to version 1.7
Use upstream provided tarball.

Drop upstream patch.

Cc: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-04-13 21:29:32 +02:00
Baruch Siach 110eb42854 trinity: fix glibc/kernel headers conflict
Add upstream patch that fixes conflicting definitions of ax25 related structs.

Fixes:
http://autobuild.buildroot.net/results/b40/b40d045f41dc4dbc66d5092ea5e9e045cd825e31/
http://autobuild.buildroot.net/results/367/367199b6071c450159aa2ea74d6d1b4b7cb89a88/
http://autobuild.buildroot.net/results/35e/35e97e51a6f7184d7b708c62a726ab91a0f546b2/

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-04-13 21:27:17 +02:00
Rahul Bedarkar af31c309e7 boot, linux, package: use SPDX short identifier for GPLv2/GPLv2+
We want to use SPDX identifier for license strings as much as possible.
SPDX short identifier for GPLv2/GPLv2+ is GPL-2.0/GPL-2.0+.

This change is done by using following command.
find . -name "*.mk" | xargs sed -ri '/LICENSE( )?[\+:]?=/s/\<GPLv2\>/GPL-2.0/g'

Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-04-01 15:16:38 +02:00
Erico Nunes 5f1e0e688b trinity: fix Config.in depends on logic
The comment from trinity Config.in currently does not show up in
menuconfig for glibc or uClibc toolchains with older headers.
This commit fixes the logic so that it shows up when either one of the
dependencies from trinity are not met.

Signed-off-by: Erico Nunes <nunes.erico@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-10-30 16:42:16 +01:00
Bernd Kuhls 637c1372bb package/trinity: needs headers >= 3.4
IPV6_UNICAST_IF was added with kernel 3.4:
https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/log/include/linux/in6.h?id=refs/tags/v3.4.112

To prove this compare with kernel 3.3:
https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/log/include/linux/in6.h?h=linux-3.3.y

The trinity package contains some compat code in
https://github.com/kernelslacker/trinity/blob/master/include/compat.h

but it does not trigger for IPV6_UNICAST_IF
https://github.com/kernelslacker/trinity/blob/master/include/compat.h#L662

Instead of hacking compat.h to death just depend on headers >= 3.4.

Fixes a build error
net/proto-ipv6.c: At top level:
net/proto-ipv6.c:157:12: error: ‘IPV6_UNICAST_IF’ undeclared here (not in a function)
  { .name = IPV6_UNICAST_IF, },

not yet caught by autobuilders using this defconfig:
http://autobuild.buildroot.net/results/394/394e22be0ef986463e97b3040dad8f978262732c/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-10-22 16:11:45 +02:00
Thomas Petazzoni 0a076414af trinity: refactor dependencies using BR2_PACKAGE_TRINITY_ARCH_SUPPORTS
In order to avoid duplicating architecture dependencies in the trinity
Config.in file, this commit introduces a
BR2_PACKAGE_TRINITY_ARCH_SUPPORTS Config.in variable.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-10-22 16:10:24 +02:00
Rahul Bedarkar b5d9f376ae trinity: not available on musl
After fixing following build failures with musl:

* error: unknown type name __uint32_t and __uint64_t
* error: unknown type name pid_t and uid_t
* error: fatal error: bits/sockaddr.h: No such file or directory

it fails with

  fds/files.c: In function 'file_tree_callback':
  fds/files.c:172:10: error: 'FTW_CONTINUE' undeclared (first use in this function)
     return FTW_CONTINUE;
            ^
  fds/files.c:172:10: note: each undeclared identifier is reported only once for each function it appears in
  fds/files.c:178:10: error: 'FTW_SKIP_SUBTREE' undeclared (first use in this function)
     return FTW_SKIP_SUBTREE;
            ^
  fds/files.c:185:10: error: 'FTW_STOP' undeclared (first use in this function)
     return FTW_STOP;
            ^
  fds/files.c: In function 'open_fds_from_path':
  fds/files.c:197:26: error: 'FTW_ACTIONRETVAL' undeclared (first use in this function)
    int flags = FTW_DEPTH | FTW_ACTIONRETVAL | FTW_MOUNT;

As per ftw man-page, flag FTW_ACTIONRETVAL is specific to glibc. It is
not available on musl. Since package uses it unconditionally, we mark
it not available on musl.

Fixes:
  http://autobuild.buildroot.net/results/cb4/cb4a665746652679487dee2c2e4bca881be3724b/

Cc: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2016-10-18 22:24:21 +02:00
Rahul Bedarkar c2c4b4a3c1 trinity: needs MMU support
Fixes:
  http://autobuild.buildroot.net/results/2fc/2fca707deb6fda2da83ab817f8e594f76415d997/

Cc: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-09-21 20:29:05 +02:00
Vicente Olivert Riera c82bbfb24f trinity: add a hash file
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-12-14 17:55:06 +01:00
Vicente Olivert Riera cacba8c1d1 trinity: fix typo in MIPS' GET_FP_MODE and SET_FP_MODE macros
Add a patch to fix a typo in the syscalls/prctl.c file. The
PR_GET_FP_MODE and PR_SET_FP_MODE macros are defined in
include/compat.h, but then syscalls/prctl.c tries to use GET_FP_MODE and
SET_FP_MODE. It's lacking the PR_ preffix, and this is causing build
failures like this one:

  CC	syscalls/prctl.o
syscalls/prctl.c:37:2: error: 'GET_FP_MODE' undeclared here (not in a
function)
  GET_FP_MODE, SET_FP_MODE,
  ^
syscalls/prctl.c:37:15: error: 'SET_FP_MODE' undeclared here (not
in a function)
  GET_FP_MODE, SET_FP_MODE,
               ^

This patch has been sent upstream.

Fixes:
  http://autobuild.buildroot.net/results/12f/12f3144b5d99aa1872f6073f3aaac7f8a9c5cfdc/

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-12-14 17:55:01 +01:00
Andrew Donnellan ae326e3351 trinity: bump to version 1.6
Bump trinity version to 1.6. Remove backported vt.c missing include patch
as it is now included in the upstream release.

Signed-off-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-11-11 15:09:20 +01:00
Gustavo Zacarias 79ce08bbdc packages: remove non-IPv6 dependencies and tweaks
Now that IPv6 is mandatory remove package dependencies and conditionals
for it.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-04-22 23:06:35 +02:00
Vicente Olivert Riera aabfbd6139 trinity: fix building with uClibc
"#include <linux/serial.h>" is needed in order to build trinity
successfully with uClibc. Otherwise it would fail displaying an error
message like this one:

-----------------------------------------
ioctls/vt.c:152:8: error: invalid application of 'sizeof' to incomplete
type 'struct serial_rs485'
  IOCTL(TIOCGRS485),

ioctls/vt.c:155:8: error: invalid application of 'sizeof' to incomplete
type 'struct serial_rs485'
  IOCTL(TIOCSRS485),
-----------------------------------------

Backporting an upstream patch to fix this problem.

Upstream commit:

  fb4a1adc45

Fixes:

  http://autobuild.buildroot.net/results/ca1/ca18c7d19ac2870d6b973923c8225509a12f831a/

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-03-19 13:37:51 +01:00
Vicente Olivert Riera f0e9e311e8 trinity: bump version to v1.5
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-03-19 13:37:30 +01:00
Fabio Porcedda 19068bdd50 trinity: bump version to fix a build failure using Linux 3.19 headers
bump to the following trinity repository commit:

kvm: Add ifdef around IA64 ioctls.
Fix build error.

  CC	ioctls/kvm.o
In file included from ioctls/kvm.c:8:0:
ioctls/kvm.c:115:8: error: ‘KVM_IA64_VCPU_GET_STACK’ undeclared here (not in a function)
  IOCTL(KVM_IA64_VCPU_GET_STACK),
        ^
include/ioctls.h:53:15: note: in definition of macro ‘IOCTL’
  { .request = _request, .name = #_request, }
               ^
ioctls/kvm.c:116:8: error: ‘KVM_IA64_VCPU_SET_STACK’ undeclared here (not in a function)
  IOCTL(KVM_IA64_VCPU_SET_STACK),
        ^
include/ioctls.h:53:15: note: in definition of macro ‘IOCTL’
  { .request = _request, .name = #_request, }

IA64 ioctls were removed in Linux 3.19.

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-02-23 12:27:09 +01:00
Vicente Olivert Riera 763e85d9bd trinity: enable only for supported architectures
This package only has support for some architectures which are listed in
the project website: http://codemonkey.org.uk/projects/trinity/

We enable this package only for those supported architectures which are
also supported in Buildroot.

Fixes:
	http://autobuild.buildroot.net/results/ea7/ea788f1f0ed5ee4e9b1bf0c8a0d1304e7467dc77/

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-10-28 18:49:28 +01:00
Vicente Olivert Riera 0f8cba1b5e trinity: Bump version to fix a PowerPC build failure
Some PowerPC toolchains have old Linux headers which don't define the
KVM_CREATE_SPAPR_TCE and KVM_ALLOCATE_RMA macros. To workaround this
problem we enclose the lines which use these macros into ifdef blocks.

This fix has been merged upstream so we bump the version to fix the
problem in Buildroot as well.

Fixes:
	http://autobuild.buildroot.net/results/3a4/3a4e7e6077cd4bbbcb8fe398e0938ad228306d2d/

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-10-27 17:40:21 +01:00
Vicente Olivert Riera ab88446507 package/trinity: New package
Adding the Trinity Linux System call fuzz tester.

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Tested-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-24 23:47:37 +02:00