influxdb: Upgrade to 2.7.1 release
PATCH 1/1 influxdb: Upgrade to 2.7.1 release
---
...1.2-xxhash-to-fix-build-with-go-1.17.patch | 39 -------------------
...e-for-mips-ispeed-ospeed-termios-abs.patch | 17 ++++----
.../{influxdb_1.8.10.bb => influxdb_2.7.1.bb} | 7 ++--
3 files changed, 11 insertions(+), 52 deletions(-)
delete mode 100644 meta-oe/recipes-dbs/influxdb/influxdb/0001-Use-v2.1.2-xxhash-to-fix-build-with-go-1.17.patch
rename meta-oe/recipes-dbs/influxdb/{influxdb_1.8.10.bb => influxdb_2.7.1.bb} (87%)meta-oe/recipes-dbs/influxdb/influxdb/0001-Use-v2.1.2-xxhash-to-fix-build-with-go-1.17.patch deleted +0 -39
@@ -1,39 +0,0 @@ -From 4ca405e9763fd0ba747ef00edd30648b66992fbb Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Tue, 30 Nov 2021 15:14:39 -0800 -Subject: [PATCH] Use v2.1.2 xxhash to fix build with go 1.17 - -Fixes -| # github.com/cespare/xxhash -| asm: xxhash_amd64.s:120: when dynamic linking, R15 is clobbered by a global variable access and is used here: 000 -92 (/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/influxdb/1.8.10-r0/build/pkg/mod/github.com/cespare/xxhash@ -v1.1.0/xxhash_amd64.s:120) ADDQ R15, AX -| asm: assembly failed - -Upstream-Status: Backport [https://github.com/cespare/xxhash/commit/e7a6b52374f7e2abfb8abb27249d53a1997b09a7] - -Signed-off-by: Khem Raj <[email protected]> ---- - go.mod | 3 ++- - go.sum | 2 ++ - 2 files changed, 4 insertions(+), 1 deletion(-) - ---- a/go.mod -+++ b/go.mod -@@ -55,3 +55,5 @@ require ( - gonum.org/v1/gonum v0.6.0 // indirect - google.golang.org/grpc v1.26.0 - ) -+ -+replace github.com/cespare/xxhash => github.com/kraj/xxhash v1.1.1-0.20211201014032-8254a11eab56 ---- a/go.sum -+++ b/go.sum -@@ -188,6 +188,8 @@ github.com/kr/pretty v0.1.0/go.mod h1:dA - github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= - github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= - github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -+github.com/kraj/xxhash v1.1.1-0.20211201014032-8254a11eab56 h1:hCQ0jTkNInQ7PpNeGlSV9s+QMi6nUyyMuz37Bg3TduE= -+github.com/kraj/xxhash v1.1.1-0.20211201014032-8254a11eab56/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= - github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A= - github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= - github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4=
meta-oe/recipes-dbs/influxdb/influxdb/0001-patch-term-module-for-mips-ispeed-ospeed-termios-abs.patch +8 -9
@@ -12,20 +12,19 @@ Signed-off-by: Khem Raj <[email protected]> --- a/go.mod +++ b/go.mod -@@ -56,4 +56,5 @@ require ( - google.golang.org/grpc v1.26.0 +@@ -223,3 +223,4 @@ require ( ) + replace github.com/nats-io/nats-streaming-server v0.11.2 => github.com/influxdata/nats-streaming-server v0.11.3-0.20201112040610-c277f7560803 +replace github.com/pkg/term => github.com/kraj/term v0.0.0-20210111231523-7c42fcb0e627 - replace github.com/cespare/xxhash => github.com/kraj/xxhash v1.1.1-0.20211201014032-8254a11eab56 --- a/go.sum +++ b/go.sum -@@ -188,6 +188,8 @@ github.com/kr/pretty v0.1.0/go.mod h1:dA - github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= - github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= +@@ -610,6 +610,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= + github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= + github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kraj/term v0.0.0-20210111231523-7c42fcb0e627 h1:3/XXm86KqrOZEJvEmFlzl3NTFA99n5Pd/cSXl60LmuA= +github.com/kraj/term v0.0.0-20210111231523-7c42fcb0e627/go.mod h1:BYR4E+NOQrH+NhXE71KuBNmyR1lQ+yDvP+O3IIHO5bM= - github.com/kraj/xxhash v1.1.1-0.20211201014032-8254a11eab56 h1:hCQ0jTkNInQ7PpNeGlSV9s+QMi6nUyyMuz37Bg3TduE= - github.com/kraj/xxhash v1.1.1-0.20211201014032-8254a11eab56/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= - github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A= + github.com/labstack/echo/v4 v4.2.1/go.mod h1:AA49e0DZ8kk5jTOOCKNuPR6oTnBS0dYiM4FW1e6jwpg= + github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k= + github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 h1:SOEGU9fKiNWd/HOJuq6+3iTQz8KNCLtVX6idSoTLdUw=
meta-oe/recipes-dbs/influxdb/influxdb_2.7.1.bb renamed from meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb +3 -4
@@ -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=f39a8d10930fb37bd59adabb3b9d0bd6" +LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=86f93342918318318c795b9999bd8131" RDEPENDS:${PN} = "bash" RDEPENDS:${PN}-dev = "bash"
@@ -15,15 +15,14 @@ GO_INSTALL = "\ " SRC_URI = "\ - git://${GO_IMPORT};protocol=https;branch=1.8;destsuffix=${BPN}-${PV}/src/${GO_IMPORT} \ - file://0001-Use-v2.1.2-xxhash-to-fix-build-with-go-1.17.patch;patchdir=src/${GO_IMPORT} \ + git://${GO_IMPORT};protocol=https;branch=2.7;destsuffix=${BPN}-${PV}/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 = "688e697c51fd5353725da078555adbeff0363d01" +SRCREV = "407fa622e9a0a48516dacc7564f7ba59c8307da9" inherit go-mod pkgconfig systemd update-rc.d useradd
Signature · 1 line
2.41.0
Hi Khem,
Quoted 9 lines · Khem Raj
Signed-off-by Khem Raj <[email protected]>--- ...1.2-xxhash-to-fix-build-with-go-1.17.patch | 39 ------------------- ...e-for-mips-ispeed-ospeed-termios-abs.patch | 17 ++++---- .../{influxdb_1.8.10.bb => influxdb_2.7.1.bb} | 7 ++-- 3 files changed, 11 insertions(+), 52 deletions(-) delete mode 100644 meta-oe/recipes-dbs/influxdb/influxdb/0001-Use-v2.1.2-xxhash-to-fix-build-with-go-1.17.patch rename meta-oe/recipes-dbs/influxdb/{influxdb_1.8.10.bb =>
Quoted 3 lines
influxdb_2.7.1.bb} (87%)
Seems that this patch has never been upstreamed. Am I correct?
Is there any reason?
Thanks & Regards
Quoted 176 lines
diff --git
a/meta-oe/recipes-dbs/influxdb/influxdb/0001-Use-v2.1.2-xxhash-to-fix-build-with-go-1.17.patchb/meta-oe/recipes-dbs/influxdb/influxdb/0001-Use-v2.1.2-xxhash-to-fix-build-with-go-1.17.patchdeleted file mode 100644
index e31c7be1ec..0000000000
---a/meta-oe/recipes-dbs/influxdb/influxdb/0001-Use-v2.1.2-xxhash-to-fix-build-with-go-1.17.patch+++/dev/nullmeta-oe/recipes-dbs/influxdb/influxdb/0001-Use-v2.1.2-xxhash-to-fix-build-with-go-1.17.patch deleted +0
-8@@ -1,39 +0,0 @@ -From 4ca405e9763fd0ba747ef00edd30648b66992fbb Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Tue, 30 Nov 2021 15:14:39 -0800 -Subject: [PATCH] Use v2.1.2 xxhash to fix build with go 1.17 - -Fixes -| # github.com/cespare/xxhash -| asm: xxhash_amd64.s:120: when dynamic linking, R15 is clobbered by aglobal variable access and is used here: 000
-92 (/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/influxdb/1.8.10-r0/build/pkg/mod/github.com/cespare/xxhash@-v1.1.0/xxhash_amd64.s:120
<http://github.com/cespare/[email protected]/xxhash_amd64.s:120>)
ADDQ R15, AX
-| asm: assembly failed(quoted diff) +0
-2- -Upstream-Status: Backport [https://github.com/cespare/xxhash/commit/e7a6b52374f7e2abfb8abb27249d53a1997b09a7
]meta-oe/recipes-dbs/influxdb/influxdb/0001-Use-v2.1.2-xxhash-to-fix-build-with-go-1.17.patch deleted +0
-15- -Signed-off-by: Khem Raj <[email protected]> ---- - go.mod | 3 ++- - go.sum | 2 ++ - 2 files changed, 4 insertions(+), 1 deletion(-) - ---- a/go.mod -+++ b/go.mod -@@ -55,3 +55,5 @@ require ( - gonum.org/v1/gonum v0.6.0 // indirect - google.golang.org/grpc v1.26.0 - ) -+ -+replace github.com/cespare/xxhash => github.com/kraj/xxhashv1.1.1-0.20211201014032-8254a11eab56
---- a/go.sum
-+++ b/go.sum
-@@ -188,6 +188,8 @@ github.com/kr/pretty v0.1.0/go.mod h1:dA
- github.com/kr/pty v1.1.1/go.mod
h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
- github.com/kr/text v0.1.0
h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
- github.com/kr/text v0.1.0/go.mod
h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-+github.com/kraj/xxhash v1.1.1-0.20211201014032-8254a11eab56 h1:hCQ0jTkNInQ7PpNeGlSV9s+QMi6nUyyMuz37Bg3TduE=
-+github.com/kraj/xxhash v1.1.1-0.20211201014032-8254a11eab56/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
- github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A=
- github.com/lib/pq v1.0.0/go.mod
h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
- github.com/mattn/go-colorable v0.0.9
h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4=
diff --gita/meta-oe/recipes-dbs/influxdb/influxdb/0001-patch-term-module-for-mips-ispeed-ospeed-termios-abs.patchb/meta-oe/recipes-dbs/influxdb/influxdb/0001-patch-term-module-for-mips-ispeed-ospeed-termios-abs.patchindexb05fd3666b..55382b4636100644
---a/meta-oe/recipes-dbs/influxdb/influxdb/0001-patch-term-module-for-mips-ispeed-ospeed-termios-abs.patch
+++b/meta-oe/recipes-dbs/influxdb/influxdb/0001-patch-term-module-for-mips-ispeed-ospeed-termios-abs.patchmeta-oe/recipes-dbs/influxdb/influxdb/0001-patch-term-module-for-mips-ispeed-ospeed-termios-abs.patch +2
-2@@ -12,20 +12,19 @@ Signed-off-by: Khem Raj <[email protected]> --- a/go.mod +++ b/go.mod -@@ -56,4 +56,5 @@ require ( - google.golang.org/grpc v1.26.0 +@@ -223,3 +223,4 @@ require ( ) + replace github.com/nats-io/nats-streaming-server v0.11.2 =>github.com/influxdata/nats-streaming-server v0.11.3-0.20201112040610-c277f7560803
+replace github.com/pkg/term => github.com/kraj/term
v0.0.0-20210111231523-7c42fcb0e627
- replace github.com/cespare/xxhash => github.com/kraj/xxhash v1.1.1-0.20211201014032-8254a11eab56
--- a/go.sum
+++ b/go.sum
-@@ -188,6 +188,8 @@ github.com/kr/pretty v0.1.0/go.mod h1:dA
- github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
- github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+@@ -610,6 +610,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn
github.com/kr/text v0.1.0/go.mod
h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kraj/term v0.0.0-20210111231523-7c42fcb0e627
h1:3/XXm86KqrOZEJvEmFlzl3NTFA99n5Pd/cSXl60LmuA=
+github.com/kraj/term v0.0.0-20210111231523-7c42fcb0e627/go.mod
h1:BYR4E+NOQrH+NhXE71KuBNmyR1lQ+yDvP+O3IIHO5bM=
- github.com/kraj/xxhash v1.1.1-0.20211201014032-8254a11eab56 h1:hCQ0jTkNInQ7PpNeGlSV9s+QMi6nUyyMuz37Bg3TduE=
- github.com/kraj/xxhash v1.1.1-0.20211201014032-8254a11eab56/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
- github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A=
+ github.com/labstack/echo/v4 v4.2.1/go.mod h1:AA49e0DZ8kk5jTOOCKNuPR6oTnBS0dYiM4FW1e6jwpg=
+ github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
+ github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 h1:SOEGU9fKiNWd/HOJuq6+3iTQz8KNCLtVX6idSoTLdUw=meta-oe/recipes-dbs/influxdb/influxdb_2.7.1.bb renamed from meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb +0
-0@@ -2,7 +2,7 @@ DESCRIPTION = "InfluxDB is a time series database designedto handle high write
HOMEPAGE = "https://www.influxdata.com/products/influxdb-overview/"LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=f39a8d10930fb37bd59adabb3b9d0bd6" +LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=86f93342918318318c795b9999bd8131"RDEPENDS:${PN} = "bash"
RDEPENDS:${PN}-dev = "bash"meta-oe/recipes-dbs/influxdb/influxdb_2.7.1.bb renamed from meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb +1
-2@@ -15,15 +15,14 @@ GO_INSTALL = "\ " SRC_URI = "\ - git://${GO_IMPORT};protocol=https;branch=1.8;destsuffix=${BPN}-${PV}/src/${GO_IMPORT} \ - file://0001-Use-v2.1.2-xxhash-to-fix-build-with-go-1.17.patch;patchdir=src/${GO_IMPORT} \ + git://${GO_IMPORT};protocol=https;branch=2.7;destsuffix=${BPN}-${PV}/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}"meta-oe/recipes-dbs/influxdb/influxdb_2.7.1.bb renamed from meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb +1
-2-SRCREV = "688e697c51fd5353725da078555adbeff0363d01" +SRCREV = "407fa622e9a0a48516dacc7564f7ba59c8307da9" inherit go-mod pkgconfig systemd update-rc.d useradd --2.41.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#103307):
https://lists.openembedded.org/g/openembedded-devel/message/103307
Mute This Topic: https://lists.openembedded.org/mt/99550402/4240582
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Quoted 15 lines · Clément Péron
Hi Khem,
Quoted 10 lines · Khem Raj
Signed-off-by Khem Raj <[email protected]>--- ...1.2-xxhash-to-fix-build-with-go-1.17.patch | 39 ------------------- ...e-for-mips-ispeed-ospeed-termios-abs.patch | 17 ++++---- .../{influxdb_1.8.10.bb => influxdb_2.7.1.bb} | 7 ++-- 3 files changed, 11 insertions(+), 52 deletions(-) delete mode 100644 meta-oe/recipes-dbs/influxdb/influxdb/0001-Use-v2.1.2-xxhash-to-fix-build-with-go-1.17.patch rename meta-oe/recipes-dbs/influxdb/{influxdb_1.8.10.bb => influxdb_2.7.1.bb} (87%)
Quoted 3 lines
Seems that this patch has never been upstreamed. Am I correct?
Is there any reason?
its already in master via 6e9faaa57889b16ff5b4b32a7c48fb8474c39c42
Quoted 129 lines
Thanks & Regards
Quoted 125 lines
meta-oe/recipes-dbs/influxdb/influxdb/0001-Use-v2.1.2-xxhash-to-fix-build-with-go-1.17.patch deleted +0
-39@@ -1,39 +0,0 @@ -From 4ca405e9763fd0ba747ef00edd30648b66992fbb Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Tue, 30 Nov 2021 15:14:39 -0800 -Subject: [PATCH] Use v2.1.2 xxhash to fix build with go 1.17 - -Fixes -| # github.com/cespare/xxhash -| asm: xxhash_amd64.s:120: when dynamic linking, R15 is clobbered by a global variable access and is used here: 000 -92 (/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/influxdb/1.8.10-r0/build/pkg/mod/github.com/cespare/xxhash@ -v1.1.0/xxhash_amd64.s:120) ADDQ R15, AX -| asm: assembly failed - -Upstream-Status: Backport [https://github.com/cespare/xxhash/commit/e7a6b52374f7e2abfb8abb27249d53a1997b09a7] - -Signed-off-by: Khem Raj <[email protected]> ---- - go.mod | 3 ++- - go.sum | 2 ++ - 2 files changed, 4 insertions(+), 1 deletion(-) - ---- a/go.mod -+++ b/go.mod -@@ -55,3 +55,5 @@ require ( - gonum.org/v1/gonum v0.6.0 // indirect - google.golang.org/grpc v1.26.0 - ) -+ -+replace github.com/cespare/xxhash => github.com/kraj/xxhash v1.1.1-0.20211201014032-8254a11eab56 ---- a/go.sum -+++ b/go.sum -@@ -188,6 +188,8 @@ github.com/kr/pretty v0.1.0/go.mod h1:dA - github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= - github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= - github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -+github.com/kraj/xxhash v1.1.1-0.20211201014032-8254a11eab56 h1:hCQ0jTkNInQ7PpNeGlSV9s+QMi6nUyyMuz37Bg3TduE= -+github.com/kraj/xxhash v1.1.1-0.20211201014032-8254a11eab56/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= - github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A= - github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= - github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4=meta-oe/recipes-dbs/influxdb/influxdb/0001-patch-term-module-for-mips-ispeed-ospeed-termios-abs.patch +8
-9@@ -12,20 +12,19 @@ Signed-off-by: Khem Raj <[email protected]> --- a/go.mod +++ b/go.mod -@@ -56,4 +56,5 @@ require ( - google.golang.org/grpc v1.26.0 +@@ -223,3 +223,4 @@ require ( ) + replace github.com/nats-io/nats-streaming-server v0.11.2 => github.com/influxdata/nats-streaming-server v0.11.3-0.20201112040610-c277f7560803 +replace github.com/pkg/term => github.com/kraj/term v0.0.0-20210111231523-7c42fcb0e627 - replace github.com/cespare/xxhash => github.com/kraj/xxhash v1.1.1-0.20211201014032-8254a11eab56 --- a/go.sum +++ b/go.sum -@@ -188,6 +188,8 @@ github.com/kr/pretty v0.1.0/go.mod h1:dA - github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= - github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= +@@ -610,6 +610,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= + github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= + github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kraj/term v0.0.0-20210111231523-7c42fcb0e627 h1:3/XXm86KqrOZEJvEmFlzl3NTFA99n5Pd/cSXl60LmuA= +github.com/kraj/term v0.0.0-20210111231523-7c42fcb0e627/go.mod h1:BYR4E+NOQrH+NhXE71KuBNmyR1lQ+yDvP+O3IIHO5bM= - github.com/kraj/xxhash v1.1.1-0.20211201014032-8254a11eab56 h1:hCQ0jTkNInQ7PpNeGlSV9s+QMi6nUyyMuz37Bg3TduE= - github.com/kraj/xxhash v1.1.1-0.20211201014032-8254a11eab56/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= - github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A= + github.com/labstack/echo/v4 v4.2.1/go.mod h1:AA49e0DZ8kk5jTOOCKNuPR6oTnBS0dYiM4FW1e6jwpg= + github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k= + github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 h1:SOEGU9fKiNWd/HOJuq6+3iTQz8KNCLtVX6idSoTLdUw=meta-oe/recipes-dbs/influxdb/influxdb_2.7.1.bb renamed from meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb +3
-5@@ -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=f39a8d10930fb37bd59adabb3b9d0bd6" +LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=86f93342918318318c795b9999bd8131" RDEPENDS:${PN} = "bash" RDEPENDS:${PN}-dev = "bash"@@ -15,15 +15,14 @@ GO_INSTALL = "\ " SRC_URI = "\ - git://${GO_IMPORT};protocol=https;branch=1.8;destsuffix=${BPN}-${PV}/src/${GO_IMPORT} \ - file://0001-Use-v2.1.2-xxhash-to-fix-build-with-go-1.17.patch;patchdir=src/${GO_IMPORT} \ + git://${GO_IMPORT};protocol=https;branch=2.7;destsuffix=${BPN}-${PV}/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 = "688e697c51fd5353725da078555adbeff0363d01" +SRCREV = "407fa622e9a0a48516dacc7564f7ba59c8307da9" inherit go-mod pkgconfig systemd update-rc.d useradd --2.41.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#103307): https://lists.openembedded.org/g/openembedded-devel/message/103307
Mute This Topic: https://lists.openembedded.org/mt/99550402/4240582
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Hi,
Quoted 17 lines · Khem Raj
Quoted 15 lines · Clément Péron
Hi Khem,
Quoted 10 lines · Khem Raj
Signed-off-by Khem Raj <[email protected]>--- ...1.2-xxhash-to-fix-build-with-go-1.17.patch | 39 ------------------- ...e-for-mips-ispeed-ospeed-termios-abs.patch | 17 ++++---- .../{influxdb_1.8.10.bb => influxdb_2.7.1.bb} | 7 ++-- 3 files changed, 11 insertions(+), 52 deletions(-) delete mode 100644 meta-oe/recipes-dbs/influxdb/influxdb/0001-Use-v2.1.2-xxhash-to-fix-build-with-go-1.17.patch rename meta-oe/recipes-dbs/influxdb/{influxdb_1.8.10.bb => influxdb_2.7.1.bb} (87%)
Quoted 5 lines
Quoted 3 lines
Seems that this patch has never been upstreamed. Am I correct?
Is there any reason?
its already in master via
6e9faaa57889b16ff5b4b32a7c48fb8474c39c42
https://github.com/openembedded/meta-openembedded/commit/6e9faaa57889b16ff5b4b32a7c48fb8474c39c42
is => influxdb: Upgrade to 1.8.10
not: "Upgrade to 2.7.1 release"
Thanks
Quoted 130 lines
Quoted 130 lines
Thanks & Regards
Quoted 125 lines
meta-oe/recipes-dbs/influxdb/influxdb/0001-Use-v2.1.2-xxhash-to-fix-build-with-go-1.17.patch deleted +0
-39@@ -1,39 +0,0 @@ -From 4ca405e9763fd0ba747ef00edd30648b66992fbb Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Tue, 30 Nov 2021 15:14:39 -0800 -Subject: [PATCH] Use v2.1.2 xxhash to fix build with go 1.17 - -Fixes -| # github.com/cespare/xxhash -| asm: xxhash_amd64.s:120: when dynamic linking, R15 is clobbered by a global variable access and is used here: 000 -92 (/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/influxdb/1.8.10-r0/build/pkg/mod/github.com/cespare/xxhash@ -v1.1.0/xxhash_amd64.s:120) ADDQ R15, AX -| asm: assembly failed - -Upstream-Status: Backport [https://github.com/cespare/xxhash/commit/e7a6b52374f7e2abfb8abb27249d53a1997b09a7] - -Signed-off-by: Khem Raj <[email protected]> ---- - go.mod | 3 ++- - go.sum | 2 ++ - 2 files changed, 4 insertions(+), 1 deletion(-) - ---- a/go.mod -+++ b/go.mod -@@ -55,3 +55,5 @@ require ( - gonum.org/v1/gonum v0.6.0 // indirect - google.golang.org/grpc v1.26.0 - ) -+ -+replace github.com/cespare/xxhash => github.com/kraj/xxhash v1.1.1-0.20211201014032-8254a11eab56 ---- a/go.sum -+++ b/go.sum -@@ -188,6 +188,8 @@ github.com/kr/pretty v0.1.0/go.mod h1:dA - github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= - github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= - github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -+github.com/kraj/xxhash v1.1.1-0.20211201014032-8254a11eab56 h1:hCQ0jTkNInQ7PpNeGlSV9s+QMi6nUyyMuz37Bg3TduE= -+github.com/kraj/xxhash v1.1.1-0.20211201014032-8254a11eab56/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= - github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A= - github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= - github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4=meta-oe/recipes-dbs/influxdb/influxdb/0001-patch-term-module-for-mips-ispeed-ospeed-termios-abs.patch +8
-9@@ -12,20 +12,19 @@ Signed-off-by: Khem Raj <[email protected]> --- a/go.mod +++ b/go.mod -@@ -56,4 +56,5 @@ require ( - google.golang.org/grpc v1.26.0 +@@ -223,3 +223,4 @@ require ( ) + replace github.com/nats-io/nats-streaming-server v0.11.2 => github.com/influxdata/nats-streaming-server v0.11.3-0.20201112040610-c277f7560803 +replace github.com/pkg/term => github.com/kraj/term v0.0.0-20210111231523-7c42fcb0e627 - replace github.com/cespare/xxhash => github.com/kraj/xxhash v1.1.1-0.20211201014032-8254a11eab56 --- a/go.sum +++ b/go.sum -@@ -188,6 +188,8 @@ github.com/kr/pretty v0.1.0/go.mod h1:dA - github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= - github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= +@@ -610,6 +610,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= + github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= + github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kraj/term v0.0.0-20210111231523-7c42fcb0e627 h1:3/XXm86KqrOZEJvEmFlzl3NTFA99n5Pd/cSXl60LmuA= +github.com/kraj/term v0.0.0-20210111231523-7c42fcb0e627/go.mod h1:BYR4E+NOQrH+NhXE71KuBNmyR1lQ+yDvP+O3IIHO5bM= - github.com/kraj/xxhash v1.1.1-0.20211201014032-8254a11eab56 h1:hCQ0jTkNInQ7PpNeGlSV9s+QMi6nUyyMuz37Bg3TduE= - github.com/kraj/xxhash v1.1.1-0.20211201014032-8254a11eab56/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= - github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A= + github.com/labstack/echo/v4 v4.2.1/go.mod h1:AA49e0DZ8kk5jTOOCKNuPR6oTnBS0dYiM4FW1e6jwpg= + github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k= + github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 h1:SOEGU9fKiNWd/HOJuq6+3iTQz8KNCLtVX6idSoTLdUw=meta-oe/recipes-dbs/influxdb/influxdb_2.7.1.bb renamed from meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb +3
-5@@ -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=f39a8d10930fb37bd59adabb3b9d0bd6" +LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=86f93342918318318c795b9999bd8131" RDEPENDS:${PN} = "bash" RDEPENDS:${PN}-dev = "bash"@@ -15,15 +15,14 @@ GO_INSTALL = "\ " SRC_URI = "\ - git://${GO_IMPORT};protocol=https;branch=1.8;destsuffix=${BPN}-${PV}/src/${GO_IMPORT} \ - file://0001-Use-v2.1.2-xxhash-to-fix-build-with-go-1.17.patch;patchdir=src/${GO_IMPORT} \ + git://${GO_IMPORT};protocol=https;branch=2.7;destsuffix=${BPN}-${PV}/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 = "688e697c51fd5353725da078555adbeff0363d01" +SRCREV = "407fa622e9a0a48516dacc7564f7ba59c8307da9" inherit go-mod pkgconfig systemd update-rc.d useradd --2.41.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#103307): https://lists.openembedded.org/g/openembedded-devel/message/103307
Mute This Topic: https://lists.openembedded.org/mt/99550402/4240582
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-