[meta-oe] influxdb: Upgrade to 1.8.10

Message ID 20211130022556.2903431-1-raj.khem@gmail.com
State New
Headers show
Series [meta-oe] influxdb: Upgrade to 1.8.10 | expand

Commit Message

Khem Raj Nov. 30, 2021, 2:25 a.m. UTC
Changes are here [1]

License-Update: Updated copyright info [2]

Fix sh interpreter path

[1] https://dl.influxdata.com/platform/nightlies/1.8/CHANGELOG.md
[2] https://github.com/influxdata/influxdb/commit/809ac4f0d5280a2391ed1af84e2a331d37525913#diff-c693279643b8cd5d248172d9c22cb7cf4ed163a3c98c8a3f69c2717edd3eacb7

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...se-env-to-deduce-sh-interpreter-path.patch | 23 +++++++++++++++++++
 ...{influxdb_1.7.10.bb => influxdb_1.8.10.bb} |  9 ++++----
 2 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 meta-oe/recipes-dbs/influxdb/influxdb/0001-ci-Use-env-to-deduce-sh-interpreter-path.patch
 rename meta-oe/recipes-dbs/influxdb/{influxdb_1.7.10.bb => influxdb_1.8.10.bb} (83%)

Patch

diff --git a/meta-oe/recipes-dbs/influxdb/influxdb/0001-ci-Use-env-to-deduce-sh-interpreter-path.patch b/meta-oe/recipes-dbs/influxdb/influxdb/0001-ci-Use-env-to-deduce-sh-interpreter-path.patch
new file mode 100644
index 0000000000..4c4d65a5c0
--- /dev/null
+++ b/meta-oe/recipes-dbs/influxdb/influxdb/0001-ci-Use-env-to-deduce-sh-interpreter-path.patch
@@ -0,0 +1,23 @@ 
+From be6c7051c1ca5daf84066e0c8411c507eb168362 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 29 Nov 2021 18:16:18 -0800
+Subject: [PATCH] ci: Use env to deduce sh interpreter path
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ scripts/ci/run_perftest.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/ci/run_perftest.sh b/scripts/ci/run_perftest.sh
+index e86ed1c9b0..53f65f34c4 100755
+--- a/scripts/ci/run_perftest.sh
++++ b/scripts/ci/run_perftest.sh
+@@ -1,4 +1,4 @@
+-#!/usr/bin/sh -ex
++#!/usr/bin/env sh -ex
+ 
+ # Install Telegraf
+ wget -qO- https://repos.influxdata.com/influxdb.key | apt-key add -
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-dbs/influxdb/influxdb_1.7.10.bb b/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb
similarity index 83%
rename from meta-oe/recipes-dbs/influxdb/influxdb_1.7.10.bb
rename to meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb
index fa360b8d1d..1f206807cf 100644
--- a/meta-oe/recipes-dbs/influxdb/influxdb_1.7.10.bb
+++ b/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb
@@ -2,7 +2,7 @@  DESCRIPTION = "InfluxDB is a time series database designed to handle high write
 HOMEPAGE = "https://www.influxdata.com/products/influxdb-overview/"
 
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=ba8146ad9cc2a128209983265136e06a"
+LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=f39a8d10930fb37bd59adabb3b9d0bd6"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
@@ -17,16 +17,17 @@  GO_INSTALL = "\
 "
 
 SRC_URI = "\
-    git://${GO_IMPORT};protocol=https;branch=1.7;destsuffix=${BPN}-${PV}/src/${GO_IMPORT} \
+    git://${GO_IMPORT};protocol=https;branch=1.8;destsuffix=${BPN}-${PV}/src/${GO_IMPORT} \
+    file://0001-ci-Use-env-to-deduce-sh-interpreter-path.patch;patchdir=src/${GO_IMPORT} \
     file://influxdb \
     file://influxdb.conf \
 "
 
 SRC_URI:append:mipsarch = " file://0001-patch-term-module-for-mips-ispeed-ospeed-termios-abs.patch;patchdir=src/${GO_IMPORT}"
 
-SRCREV = "c958f436b2e538a88a7815aad721c7774a0b8f63"
+SRCREV = "688e697c51fd5353725da078555adbeff0363d01"
 
-inherit go-mod systemd update-rc.d useradd
+inherit go-mod pkgconfig systemd update-rc.d useradd
 
 USERADD_PACKAGES = "${PN}"
 USERADD_PARAM:${PN} = "--system -d /var/lib/influxdb -m -s /bin/nologin influxdb"