From e6eba7f021de471cecb84afe5717a7c8d4a93e0c Mon Sep 17 00:00:00 2001 From: dkwo Date: Mon, 24 Apr 2023 11:45:46 -0400 Subject: [PATCH 1/2] chronograf: update to 1.10.1, makedepends on nodejs, python3 --- srcpkgs/chronograf/template | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template index 01947c93feb7..8ee50a360b6e 100644 --- a/srcpkgs/chronograf/template +++ b/srcpkgs/chronograf/template @@ -1,35 +1,33 @@ # Template file for 'chronograf' pkgname=chronograf -version=1.9.4 -revision=2 +version=1.10.1 +revision=1 build_style=go go_import_path="github.com/influxdata/${pkgname}" go_package="${go_import_path}/cmd/chronograf" go_ldflags="-X main.version=${version}" -hostmakedepends="dep go-bindata nodejs-lts yarn" +hostmakedepends="dep go-bindata nodejs yarn python3" short_desc="Open source monitoring and visualization UI for the TICK stack" maintainer="Michael Aldridge " license="AGPL-3.0-or-later" homepage="https://www.influxdata.com/time-series-platform/chronograf/" -distfiles="https://github.com/influxdata/${pkgname}/archive/${version}.tar.gz" -checksum=ff294f25a9de57140024b9953992c1a4d79ec88167ad28435645d888a0096c27 - +changelog="https://raw.githubusercontent.com/influxdata/chronograf/master/CHANGELOG.md" +distfiles="https://github.com/influxdata/chronograf/archive/${version}.tar.gz" +checksum=d2fb4759f4f94d81dcde5c50fece46febd7f610ee7d9373fd000d7a9986a52d8 system_accounts="_chronograf" _chronograf_homedir="/var/lib/${pkgname}" make_dirs="${_chronograf_homedir} 0755 _chronograf _chronograf" +# nocross="see https://github.com/nodejs/node-gyp/issues/2817" case "$XBPS_TARGET_MACHINE" in i686*) broken="yarn not available" ;; ppc*) broken="ftbfs in some js module" ;; + aarch64*) export npm_config_arch=arm64 ;; esac pre_build() { - cd $wrksrc/ui - yarn install - export PATH=$PATH:${wrksrc}/ui/node_modules/.bin - - cd $wrksrc - make assets + CFLAGS="$CFLAGS -fPIC" CXXFLAGS="$CXXFLAGS -fPIC" make .jsdep assets + # npm_config_target_arch=arm64 npm_config_target_platform=linux npm_config_target_libc=glibc } post_install() { @@ -38,3 +36,4 @@ post_install() { vmkdir usr/share/chronograf/ vcopy ${wrksrc}/${build_wrksrc}/canned usr/share/chronograf/canned } + From c33953611717911bcdb9affbda3f500aeec0797c Mon Sep 17 00:00:00 2001 From: dkwo Date: Tue, 9 May 2023 13:40:08 -0400 Subject: [PATCH 2/2] chronograf: experiment --- srcpkgs/chronograf/patches/lmdb.patch | 11 +++++++++++ srcpkgs/chronograf/patches/lmdb2.patch | 11 +++++++++++ srcpkgs/chronograf/patches/noscripts.patch | 19 +++++++++++++++++++ srcpkgs/chronograf/template | 11 ++++++----- 4 files changed, 47 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/chronograf/patches/lmdb.patch create mode 100644 srcpkgs/chronograf/patches/lmdb2.patch create mode 100644 srcpkgs/chronograf/patches/noscripts.patch diff --git a/srcpkgs/chronograf/patches/lmdb.patch b/srcpkgs/chronograf/patches/lmdb.patch new file mode 100644 index 000000000000..50dad7564246 --- /dev/null +++ b/srcpkgs/chronograf/patches/lmdb.patch @@ -0,0 +1,11 @@ +--- a/ui/package.json 2023-05-11 09:48:30.474868174 -0400 ++++ b/ui/package.json 2023-05-11 09:54:26.175543653 -0400 +@@ -163,5 +163,8 @@ + "reselect": "^3.0.1", + "rome": "^2.1.22", + "uuid": "^3.2.1" ++ }, ++ "resolutions": { ++ "lmdb": "^2.8.0" + } + } diff --git a/srcpkgs/chronograf/patches/lmdb2.patch b/srcpkgs/chronograf/patches/lmdb2.patch new file mode 100644 index 000000000000..f79ff3fb11ac --- /dev/null +++ b/srcpkgs/chronograf/patches/lmdb2.patch @@ -0,0 +1,11 @@ +--- a/package.json 2023-05-11 10:30:54.448958871 -0400 ++++ b/package.json 2023-05-11 10:31:44.786945716 -0400 +@@ -32,5 +32,8 @@ + "process": "^0.11.10", + "querystring-es3": "^0.2.1", + "util": "^0.12.4" ++ }, ++ "resolutions": { ++ "lmdb": "^2.8.0" + } + } diff --git a/srcpkgs/chronograf/patches/noscripts.patch b/srcpkgs/chronograf/patches/noscripts.patch new file mode 100644 index 000000000000..cd633de59cd9 --- /dev/null +++ b/srcpkgs/chronograf/patches/noscripts.patch @@ -0,0 +1,19 @@ +--- a/Makefile 2023-05-09 14:10:03.975291850 -0400 ++++ b/Makefile 2023-05-09 14:13:17.400831107 -0400 +@@ -59,7 +59,7 @@ + @touch .bindata + + .jssrc: $(UISOURCES) +- cd ui && yarn run clean && yarn run build ++ cd ui && yarn run clean && yarn --ignore-scripts run build + @touch .jssrc + + dep: .jsdep .godep +@@ -72,7 +72,7 @@ + ifndef YARN + $(error Please install yarn 1.19.1+) + else +- cd ui && yarn --no-progress --no-emoji ++ cd ui && yarn --no-progress --no-emoji --ignore-scripts + @touch .jsdep + endif diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template index 8ee50a360b6e..3396750a3bd2 100644 --- a/srcpkgs/chronograf/template +++ b/srcpkgs/chronograf/template @@ -17,17 +17,19 @@ checksum=d2fb4759f4f94d81dcde5c50fece46febd7f610ee7d9373fd000d7a9986a52d8 system_accounts="_chronograf" _chronograf_homedir="/var/lib/${pkgname}" make_dirs="${_chronograf_homedir} 0755 _chronograf _chronograf" -# nocross="see https://github.com/nodejs/node-gyp/issues/2817" case "$XBPS_TARGET_MACHINE" in i686*) broken="yarn not available" ;; ppc*) broken="ftbfs in some js module" ;; - aarch64*) export npm_config_arch=arm64 ;; esac pre_build() { - CFLAGS="$CFLAGS -fPIC" CXXFLAGS="$CXXFLAGS -fPIC" make .jsdep assets - # npm_config_target_arch=arm64 npm_config_target_platform=linux npm_config_target_libc=glibc + export CFLAGS="$CFLAGS -fPIC" + export CXXFLAGS="$CXXFLAGS -fPIC" + # npm_config_target_arch=arm64 + # export npm_config_target_platform=linux + # export npm_config_target_libc=musl + make .jsdep assets } post_install() { @@ -36,4 +38,3 @@ post_install() { vmkdir usr/share/chronograf/ vcopy ${wrksrc}/${build_wrksrc}/canned usr/share/chronograf/canned } -