commit 9ebe1228d06a9b800cd03bcdea2ea119fbe0592a Author: Tim Biermann <tbier@posteo.de> Date: Sun Feb 13 11:08:32 2022 +0100 influxdb: 1.8.10 -> 2.1.1; new dependencies: clang, protobuf, rust, yarn diff --git a/influxdb/.footprint b/influxdb/.footprint index 66364808c..de24fada9 100644 --- a/influxdb/.footprint +++ b/influxdb/.footprint @@ -1,12 +1,6 @@ drwxr-xr-x root/root etc/ -drwxr-xr-x root/root etc/influxdb/ --rw-r--r-- root/root etc/influxdb/influxdb.conf drwxr-xr-x root/root etc/rc.d/ -rwxr-xr-x root/root etc/rc.d/influxdb drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/influx --rwxr-xr-x root/root usr/bin/influx_inspect --rwxr-xr-x root/root usr/bin/influx_stress --rwxr-xr-x root/root usr/bin/influx_tools -rwxr-xr-x root/root usr/bin/influxd diff --git a/influxdb/.signature b/influxdb/.signature index f287cd632..58d6bfb62 100644 --- a/influxdb/.signature +++ b/influxdb/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3x1u54x1S41874GGCqTL9lOmXhbjhOI7i1OjLjarY6fhR19kyJFZzBU1rFcFcb6VHWMU7iB4F3oG2nBeS4F/Aw0= -SHA256 (Pkgfile) = 90f53667715308151be7b7a786413ce6b7a2a7aa4d151676be728c063141422d -SHA256 (.footprint) = c22125511c49a756be47487c5306c98b1579039c44fd2b0345c43d1145290d4b -SHA256 (influxdb-1.8.10.tar.gz) = 4f53c61f548bab7cb805af0d02586263d9a348dc18baf90efb142b029e2e7097 -SHA256 (influxdb.service) = 04d4b6e036d771cd2aac0bf218a76c4f497786aa9a7ee242ca21fb336882880e +RWSagIOpLGJF3wNOh84tFWGQwgGpPCtPzW66Q6LgdITKAro4f+xExiWzZ+d1SIs66mbd2V0c5a4+2V+wXk+YXcltH9I209hGHAk= +SHA256 (Pkgfile) = 2ee5f1f509f93d2c4207351c9292f7ed7408069b1a181caabd21544e0f7bbe56 +SHA256 (.footprint) = fb929bf1771ac46715e62afb1d7522614335f884991366e2626b97a9157d1a2a +SHA256 (influxdb-2.1.1.tar.gz) = 0253741b3d2883435f6a49b72ec2647f56bcbbed9281f97c93f93ce3777d4e64 +SHA256 (influxdb.service) = 63011e9fc1fa81681ac5e2127e83f7146670b43ed04df1536043f69d470bcb5a diff --git a/influxdb/Pkgfile b/influxdb/Pkgfile index 7806443eb..9d2a6d902 100644 --- a/influxdb/Pkgfile +++ b/influxdb/Pkgfile @@ -1,14 +1,16 @@ # Description: Scalable datastore for metrics, events, and real-time analytics # URL: https://github.com/InfluxData/influxdb # Maintainer: Tim Biermann, tbier at posteo dot de -# Depends on: go +# Depends on: clang go protobuf rust yarn name=influxdb -version=1.8.10 +version=2.1.1 release=1 source=(https://github.com/influxdata/influxdb/archive/v$version/$name-$version.tar.... influxdb.service) +_commit=657e1839de9e8a734abad1207ca28e7d02444207 + build() { cd $name-$version mkdir -p build @@ -17,20 +19,12 @@ build() { export CGO_CFLAGS="${CFLAGS}" export CGO_CXXFLAGS="${CXXFLAGS}" export CGO_LDFLAGS="${LDFLAGS}" - export GOFLAGS="-trimpath -mod=readonly -modcacherw" - - go build -v -o build ./cmd/... - - ## needs asciidoc - ## and fails when it gets it - #make -C man + export GOFLAGS="-trimpath -mod=readonly -modcacherw -buildmode=pie" + export LDFLAGS="-linkmode external" - # influx_tsm missing - for i in influx influxd influx_inspect influx_stress influx_tools; do - install -Dm755 build/$i $PKG/usr/bin/$i; - done + PATH="$(go env GOPATH)/bin:$PATH" make -j1 VERSION=$version COMMIT=$_commit INFLUXDB_SHA=$_commit - install -Dm644 etc/config.sample.toml $PKG/etc/influxdb/influxdb.conf + install -Dm755 bin/linux/influxd -t $PKG/usr/bin ## install rc file install -Dm 755 $SRC/influxdb.service $PKG/etc/rc.d/influxdb diff --git a/influxdb/influxdb.service b/influxdb/influxdb.service index a61b2194f..24e6e3a16 100755 --- a/influxdb/influxdb.service +++ b/influxdb/influxdb.service @@ -5,7 +5,9 @@ SSD=/sbin/start-stop-daemon PROG=/usr/bin/influxd -OPTS="" +OPTS="--bolt-path /var/lib/influxdb/influxd.bolt --engine-path /var/lib/influxdb/engine" + +INFLUXD_CONFIG_PATH="/etc/influxdb" case $1 in start)