jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-30 14:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

trinity: bump to version 1.7

Browse Source 
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>
This commit is contained in:
Baruch Siach 2017-04-13 08:29:19 +03:00 committed by Thomas Petazzoni
parent 110eb42854
commit a81ec97cfd
3 changed files with 5 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
package/trinity/0001-mips-fix-prctl-s.patch
View File

@ -1,39 +0,0 @@
From d61dd102b95b9791e45d6bbf1e34814b8c6c1731 Mon Sep 17 00:00:00 2001
From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Date: Mon, 14 Dec 2015 14:46:37 +0000
Subject: [PATCH] mips: fix prctl's
It looks like a typo in the syscalls/prctl.c file. It's lacking the PR_
preffix, and due to that 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,
^
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
syscalls/prctl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/syscalls/prctl.c b/syscalls/prctl.c
index 523f03e..5a64fb3 100644
--- a/syscalls/prctl.c
+++ b/syscalls/prctl.c
@@ -34,7 +34,7 @@ static int prctl_opts[] = {
PR_GET_NO_NEW_PRIVS, PR_GET_TID_ADDRESS, PR_SET_THP_DISABLE, PR_GET_THP_DISABLE,
PR_MPX_ENABLE_MANAGEMENT, PR_MPX_DISABLE_MANAGEMENT,
#ifdef __mips__
- GET_FP_MODE, SET_FP_MODE,
+ PR_GET_FP_MODE, PR_SET_FP_MODE,
#endif
PR_CAP_AMBIENT,
};
--
2.4.10

2
package/trinity/trinity.hash
View File

@ -1,3 +1,3 @@
# Locally calculated # Locally calculated
sha256 3ef7ae05dba14f8bb626121983a08bb09d1d51a19de38bd9a8e0f29b11d9e3c9 trinity-v1.6.tar.gz sha256 4cb2bd4049ce523fdf47490c4c18b8eb713c720d4b3b13d6ec2ae246aac908ad trinity-1.7.tar.xz
sha256 5601474b10973b99f6f4ecc67c8ac54000754d7110553cc81c7648bd7e73c810 b0e66a2d084ffc210bc1fc247efb4d177e9f7e3d.patch sha256 5601474b10973b99f6f4ecc67c8ac54000754d7110553cc81c7648bd7e73c810 b0e66a2d084ffc210bc1fc247efb4d177e9f7e3d.patch

7
package/trinity/trinity.mk
View File

@ -4,15 +4,16 @@
# #
################################################################################ ################################################################################
TRINITY_VERSION = v1.6 TRINITY_VERSION = 1.7
TRINITY_SITE = $(call github,kernelslacker,trinity,$(TRINITY_VERSION)) TRINITY_SITE = http://codemonkey.org.uk/projects/trinity
TRINITY_SOURCE = trinity-$(TRINITY_VERSION).tar.xz
TRINITY_LICENSE = GPL-2.0 TRINITY_LICENSE = GPL-2.0
TRINITY_LICENSE_FILES = COPYING TRINITY_LICENSE_FILES = COPYING
TRINITY_PATCH = https://github.com/kernelslacker/trinity/commit/b0e66a2d084ffc210bc1fc247efb4d177e9f7e3d.patch TRINITY_PATCH = https://github.com/kernelslacker/trinity/commit/b0e66a2d084ffc210bc1fc247efb4d177e9f7e3d.patch
define TRINITY_CONFIGURE_CMDS define TRINITY_CONFIGURE_CMDS
(cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure.sh) (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure)
endef endef
define TRINITY_BUILD_CMDS define TRINITY_BUILD_CMDS