diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/tcf-agent/tcf-agent/0001-Fixed-copyright-messages.patch | 56 | ||||
-rw-r--r-- | meta/recipes-devtools/tcf-agent/tcf-agent_git.bb | 3 |
2 files changed, 1 insertions, 58 deletions
diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent/0001-Fixed-copyright-messages.patch b/meta/recipes-devtools/tcf-agent/tcf-agent/0001-Fixed-copyright-messages.patch deleted file mode 100644 index ed73808e99..0000000000 --- a/meta/recipes-devtools/tcf-agent/tcf-agent/0001-Fixed-copyright-messages.patch +++ /dev/null | |||
@@ -1,56 +0,0 @@ | |||
1 | From 20ac1f939a8a97b03abec55d865050fdaa0f343a Mon Sep 17 00:00:00 2001 | ||
2 | From: Eugene Tarassov <eugenet@xilinx.com> | ||
3 | Date: Tue, 8 Jan 2019 21:56:16 -0800 | ||
4 | Subject: [oe-core][PATCH 1/1] Fixed copyright messages | ||
5 | |||
6 | Upstream-Status: Backport [https://git.eclipse.org/c/tcf/org.eclipse.tcf.agent.git/commit/?id=20ac1f939a8a97b03abec55d865050fdaa0f343a] | ||
7 | |||
8 | Signed-off-by: Joe Slater <joe.slater@windriver.com> | ||
9 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
10 | --- | ||
11 | agent/tcf/framework/channel_lws.c | 2 +- | ||
12 | agent/tcf/framework/cpudefs-mdep-mux.h | 19 +++++++++++++------ | ||
13 | 2 files changed, 14 insertions(+), 7 deletions(-) | ||
14 | |||
15 | diff --git a/agent/tcf/framework/channel_lws.c b/agent/tcf/framework/channel_lws.c | ||
16 | index 0cb9585..d9352f3 100644 | ||
17 | --- a/tcf/framework/channel_lws.c | ||
18 | +++ b/tcf/framework/channel_lws.c | ||
19 | @@ -1,5 +1,5 @@ | ||
20 | /******************************************************************************* | ||
21 | - * Copyright (c) 2016-2017 Wind River Systems, Inc. | ||
22 | + * Copyright (c) 2016-2018 Wind River Systems, Inc. and others. | ||
23 | * All rights reserved. This program and the accompanying materials | ||
24 | * are made available under the terms of the Eclipse Public License v1.0 | ||
25 | * and Eclipse Distribution License v1.0 which accompany this distribution. | ||
26 | diff --git a/agent/tcf/framework/cpudefs-mdep-mux.h b/agent/tcf/framework/cpudefs-mdep-mux.h | ||
27 | index c9e0db7..0397a6a 100644 | ||
28 | --- a/tcf/framework/cpudefs-mdep-mux.h | ||
29 | +++ b/tcf/framework/cpudefs-mdep-mux.h | ||
30 | @@ -1,10 +1,17 @@ | ||
31 | -/* | ||
32 | - * Copyright (c) 2013 Wind River Systems, Inc. | ||
33 | +/******************************************************************************* | ||
34 | + * Copyright (c) 2013 Wind River Systems, Inc. and others. | ||
35 | + * All rights reserved. This program and the accompanying materials | ||
36 | + * are made available under the terms of the Eclipse Public License v1.0 | ||
37 | + * and Eclipse Distribution License v1.0 which accompany this distribution. | ||
38 | + * The Eclipse Public License is available at | ||
39 | + * http://www.eclipse.org/legal/epl-v10.html | ||
40 | + * and the Eclipse Distribution License is available at | ||
41 | + * http://www.eclipse.org/org/documents/edl-v10.php. | ||
42 | + * You may elect to redistribute this code under either of these licenses. | ||
43 | * | ||
44 | - * The right to copy, distribute, modify or otherwise make use | ||
45 | - * of this software may be licensed only pursuant to the terms | ||
46 | - * of an applicable Wind River license agreement. | ||
47 | - */ | ||
48 | + * Contributors: | ||
49 | + * Wind River Systems - initial API and implementation | ||
50 | + *******************************************************************************/ | ||
51 | |||
52 | #include <tcf/config.h> | ||
53 | |||
54 | -- | ||
55 | 2.7.4 | ||
56 | |||
diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb index 4ff309dd80..e67eccc75c 100644 --- a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb +++ b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb | |||
@@ -6,7 +6,7 @@ BUGTRACKER = "https://bugs.eclipse.org/bugs/" | |||
6 | LICENSE = "EPL-1.0 | EDL-1.0" | 6 | LICENSE = "EPL-1.0 | EDL-1.0" |
7 | LIC_FILES_CHKSUM = "file://edl-v10.html;md5=522a390a83dc186513f0500543ad3679" | 7 | LIC_FILES_CHKSUM = "file://edl-v10.html;md5=522a390a83dc186513f0500543ad3679" |
8 | 8 | ||
9 | SRCREV = "a022ef2f1acfd9209a1bf792dda14ae4b0d1b60f" | 9 | SRCREV = "2735e3d6b7eccb05ab232825c618c837d27a5010" |
10 | PV = "1.7.0+git${SRCPV}" | 10 | PV = "1.7.0+git${SRCPV}" |
11 | 11 | ||
12 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" | 12 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" |
@@ -15,7 +15,6 @@ SRC_URI = "git://git.eclipse.org/r/tcf/org.eclipse.tcf.agent.git;protocol=https | |||
15 | file://ldflags.patch \ | 15 | file://ldflags.patch \ |
16 | file://tcf-agent.init \ | 16 | file://tcf-agent.init \ |
17 | file://tcf-agent.service \ | 17 | file://tcf-agent.service \ |
18 | file://0001-Fixed-copyright-messages.patch \ | ||
19 | " | 18 | " |
20 | 19 | ||
21 | DEPENDS = "util-linux openssl" | 20 | DEPENDS = "util-linux openssl" |