newrelic: update to 6.0.1.155

Along with the version bump, we tweak the LICENSE checksum, since the
file changed locations in the repository.

We also add a patch to setup.py to allow the version of setuptools_scm
in oe-core to satisfy the build requirements.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Bruce Ashfield 2021-02-09 21:35:54 -05:00
parent ac5e9f55a5
commit bd6bf732ef
2 changed files with 39 additions and 3 deletions

View File

@ -0,0 +1,32 @@
From a61cea5053730f8180eb1fc8b4cb0f94ff4fc176 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Tue, 9 Feb 2021 21:31:19 -0500
Subject: [PATCH] setup.py: tweak setuptools_scm version dependency
The version dependency of <4 isn't showing any issues in builds.
The oe-core version is 5+, and carrying a secondary version is
not trivial or something we want to do.
So we tweak the version to accept what we have in oe-core.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
index ade43a9..889a74f 100644
--- a/setup.py
+++ b/setup.py
@@ -132,7 +132,7 @@ kwargs = dict(
"git_describe_command": "git describe --dirty --tags --long --match *.*.*.*",
"write_to": "newrelic/version.txt",
},
- setup_requires=["setuptools_scm>=3.2,<4"],
+ setup_requires=["setuptools_scm>=3.2"],
description = "New Relic Python Agent",
long_description = open(readme_file).read(),
url = "https://newrelic.com/docs/python/new-relic-for-python",
--
2.19.1

View File

@ -6,13 +6,17 @@ DESCRIPTION = "\
"
SECTION = "devel/python"
LICENSE = "BSD-3-Clause & MIT & Python-2.0 & BSD-2-Clause & NewRelic"
LIC_FILES_CHKSUM = "file://newrelic/LICENSE;md5=b4840908dbb9e62b3d8891e77187b34f"
LIC_FILES_CHKSUM = "file://LICENSE;md5=2b42edef8fa55315f34f2370b4715ca9"
SRC_URI[md5sum] = "53115aea6cbdf0e2721279c230230600"
SRC_URI[sha256sum] = "340ebcdb0dd08bfb597c71598d6d8f746a93f7e4921f10b3616c9142c608a14d"
SRC_URI[md5sum] = "0acf701c37ceb590e2a12d358ced16d7"
SRC_URI[sha256sum] = "e96689fc75eb2b1591903ad9e74225f5e1da734afcd3151d318c53f6635b5dda"
inherit pypi setuptools3
DEPENDS += "python3-setuptools-scm-native"
SRC_URI += "file://0001-setup.py-tweak-setuptools_scm-version-dependency.patch"
FILES_${PN}-dbg += "\
${PYTHON_SITEPACKAGES_DIR}/newrelic-${PV}/newrelic/*/.debug \
${PYTHON_SITEPACKAGES_DIR}/newrelic-${PV}/newrelic/packages/*/.debug/ \