diff options
| author | Baruch Siach <baruch@tkos.co.il> | 2017-04-13 08:07:26 +0300 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2017-04-24 16:08:34 +0200 |
| commit | 97e5325375c1af7cc97e181fce11af387a2f5c45 (patch) | |
| tree | 27147914062b9e4232b55f5cae91f46e5488b50e | |
| parent | 023919520fb74330ba477bed033fafcf790dbd0a (diff) | |
| download | buildroot-97e5325375c1af7cc97e181fce11af387a2f5c45.tar.gz buildroot-97e5325375c1af7cc97e181fce11af387a2f5c45.zip | |
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>
(cherry picked from commit 110eb42854578001838fccab4a388b3fa8269f82)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
| -rw-r--r-- | package/trinity/trinity.hash | 1 | ||||
| -rw-r--r-- | package/trinity/trinity.mk | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/package/trinity/trinity.hash b/package/trinity/trinity.hash index e290a40920..5bf9992dca 100644 --- a/package/trinity/trinity.hash +++ b/package/trinity/trinity.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 3ef7ae05dba14f8bb626121983a08bb09d1d51a19de38bd9a8e0f29b11d9e3c9 trinity-v1.6.tar.gz +sha256 5601474b10973b99f6f4ecc67c8ac54000754d7110553cc81c7648bd7e73c810 b0e66a2d084ffc210bc1fc247efb4d177e9f7e3d.patch diff --git a/package/trinity/trinity.mk b/package/trinity/trinity.mk index 7596e92ba8..ee00d78279 100644 --- a/package/trinity/trinity.mk +++ b/package/trinity/trinity.mk @@ -9,6 +9,8 @@ TRINITY_SITE = $(call github,kernelslacker,trinity,$(TRINITY_VERSION)) TRINITY_LICENSE = GPLv2 TRINITY_LICENSE_FILES = COPYING +TRINITY_PATCH = https://github.com/kernelslacker/trinity/commit/b0e66a2d084ffc210bc1fc247efb4d177e9f7e3d.patch + define TRINITY_CONFIGURE_CMDS (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure.sh) endef |
