diff options
author | jmbills <jason.m.bills@intel.com> | 2022-01-18 21:55:05 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-18 21:55:05 +0300 |
commit | 7cf0c1cd0ce835d1833509b7b911e8a97380278b (patch) | |
tree | 0b45c3beaa9874facc4ed1a2395a31e42be0135d /poky/meta/recipes-devtools/tcf-agent | |
parent | 4dac5fcd49b5e2de1074f1363775ec0f19041072 (diff) | |
parent | 1fc0d70f658da30091bcd49f9bf29aecd6b99ba7 (diff) | |
download | openbmc-7cf0c1cd0ce835d1833509b7b911e8a97380278b.tar.xz |
Merge pull request #76 from Intel-BMC/update1-0.86
Update
Diffstat (limited to 'poky/meta/recipes-devtools/tcf-agent')
-rw-r--r-- | poky/meta/recipes-devtools/tcf-agent/tcf-agent/0001-Fixed-copyright-messages.patch | 56 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb | 9 |
2 files changed, 4 insertions, 61 deletions
diff --git a/poky/meta/recipes-devtools/tcf-agent/tcf-agent/0001-Fixed-copyright-messages.patch b/poky/meta/recipes-devtools/tcf-agent/tcf-agent/0001-Fixed-copyright-messages.patch deleted file mode 100644 index ed73808e9..000000000 --- a/poky/meta/recipes-devtools/tcf-agent/tcf-agent/0001-Fixed-copyright-messages.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 20ac1f939a8a97b03abec55d865050fdaa0f343a Mon Sep 17 00:00:00 2001 -From: Eugene Tarassov <eugenet@xilinx.com> -Date: Tue, 8 Jan 2019 21:56:16 -0800 -Subject: [oe-core][PATCH 1/1] Fixed copyright messages - -Upstream-Status: Backport [https://git.eclipse.org/c/tcf/org.eclipse.tcf.agent.git/commit/?id=20ac1f939a8a97b03abec55d865050fdaa0f343a] - -Signed-off-by: Joe Slater <joe.slater@windriver.com> -Signed-off-by: Mingli Yu <mingli.yu@windriver.com> ---- - agent/tcf/framework/channel_lws.c | 2 +- - agent/tcf/framework/cpudefs-mdep-mux.h | 19 +++++++++++++------ - 2 files changed, 14 insertions(+), 7 deletions(-) - -diff --git a/agent/tcf/framework/channel_lws.c b/agent/tcf/framework/channel_lws.c -index 0cb9585..d9352f3 100644 ---- a/tcf/framework/channel_lws.c -+++ b/tcf/framework/channel_lws.c -@@ -1,5 +1,5 @@ - /******************************************************************************* -- * Copyright (c) 2016-2017 Wind River Systems, Inc. -+ * Copyright (c) 2016-2018 Wind River Systems, Inc. and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * and Eclipse Distribution License v1.0 which accompany this distribution. -diff --git a/agent/tcf/framework/cpudefs-mdep-mux.h b/agent/tcf/framework/cpudefs-mdep-mux.h -index c9e0db7..0397a6a 100644 ---- a/tcf/framework/cpudefs-mdep-mux.h -+++ b/tcf/framework/cpudefs-mdep-mux.h -@@ -1,10 +1,17 @@ --/* -- * Copyright (c) 2013 Wind River Systems, Inc. -+/******************************************************************************* -+ * Copyright (c) 2013 Wind River Systems, Inc. and others. -+ * All rights reserved. This program and the accompanying materials -+ * are made available under the terms of the Eclipse Public License v1.0 -+ * and Eclipse Distribution License v1.0 which accompany this distribution. -+ * The Eclipse Public License is available at -+ * http://www.eclipse.org/legal/epl-v10.html -+ * and the Eclipse Distribution License is available at -+ * http://www.eclipse.org/org/documents/edl-v10.php. -+ * You may elect to redistribute this code under either of these licenses. - * -- * The right to copy, distribute, modify or otherwise make use -- * of this software may be licensed only pursuant to the terms -- * of an applicable Wind River license agreement. -- */ -+ * Contributors: -+ * Wind River Systems - initial API and implementation -+ *******************************************************************************/ - - #include <tcf/config.h> - --- -2.7.4 - diff --git a/poky/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb b/poky/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb index c186db681..e67eccc75 100644 --- a/poky/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb +++ b/poky/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb @@ -6,7 +6,7 @@ BUGTRACKER = "https://bugs.eclipse.org/bugs/" LICENSE = "EPL-1.0 | EDL-1.0" LIC_FILES_CHKSUM = "file://edl-v10.html;md5=522a390a83dc186513f0500543ad3679" -SRCREV = "a022ef2f1acfd9209a1bf792dda14ae4b0d1b60f" +SRCREV = "2735e3d6b7eccb05ab232825c618c837d27a5010" PV = "1.7.0+git${SRCPV}" 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 file://ldflags.patch \ file://tcf-agent.init \ file://tcf-agent.service \ - file://0001-Fixed-copyright-messages.patch \ " DEPENDS = "util-linux openssl" @@ -56,8 +55,8 @@ do_install() { oe_runmake install INSTALLROOT=${D} install -d ${D}${sysconfdir}/init.d/ install -m 0755 ${WORKDIR}/tcf-agent.init ${D}${sysconfdir}/init.d/tcf-agent - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/tcf-agent.service ${D}${systemd_unitdir}/system - sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/tcf-agent.service + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/tcf-agent.service ${D}${systemd_system_unitdir} + sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/tcf-agent.service } |