diff --git a/etc/debian/config.mk.in b/etc/debian/config.mk.in index 8bf9776..7c5b348 100644 --- a/etc/debian/config.mk.in +++ b/etc/debian/config.mk.in @@ -1,4 +1,4 @@ -#(@)config.mk for Debian 8 (x86_64) +#(@)config.mk for Debian 8-11 (x86_64, aarch64, armhf) INSTALLDIR = /usr/ CONFIGFILE = /etc/default/ot-recorder @@ -19,8 +19,8 @@ JSON_INDENT ?= no MOSQUITTO_INC = -I/usr/include MOSQUITTO_LIB = -L/usr/lib MORELIBS = # -lssl -LUA_CFLAGS = `pkg-config --cflags lua5.2` -LUA_LIBS = `pkg-config --libs lua5.2` +LUA_CFLAGS = `pkg-config --cflags lua` +LUA_LIBS = `pkg-config --libs lua` SODIUM_CFLAGS = `pkg-config --cflags libsodium` SODIUM_LIBS = `pkg-config --libs libsodium` diff --git a/etc/debian/fpm-make.sh b/etc/debian/fpm-make.sh index e92c305..535e995 100755 --- a/etc/debian/fpm-make.sh +++ b/etc/debian/fpm-make.sh @@ -24,6 +24,7 @@ rm -f "${debfile}" libcurl='libcurl3' libsodium='libsodium13' +liblua='liblua5.2-0' case $(cat /etc/debian_version) in 8.8) ;; 9.*) libsodium="libsodium18" ;; @@ -31,6 +32,11 @@ case $(cat /etc/debian_version) in libsodium="libsodium23" libcurl="libcurl3-gnutls" ;; + 11.*) + libsodium="libsodium23" + libcurl="libcurl4" + liblua="liblua5.4-0" + ;; esac fpm -s dir \ @@ -47,7 +53,7 @@ fpm -s dir \ -p ${debfile} \ -d "${libcurl}" \ -d "libmosquitto1" \ - -d "liblua5.2-0" \ + -d "${liblua}" \ -d "libconfig9" \ -d "${libsodium}" \ -d "liblmdb0" \ diff --git a/etc/raspbian/config.mk.in b/etc/raspbian/config.mk.in index d4936ae..2c1797e 100644 --- a/etc/raspbian/config.mk.in +++ b/etc/raspbian/config.mk.in @@ -1,4 +1,4 @@ -#(@)config.mk for Debian 8 (x86_64) +#(@)config.mk for Debian 8-10 (x86_64) CC = arm-linux-gnueabihf-gcc INSTALLDIR = /usr/ diff --git a/version.h b/version.h index 96f7270..eaab1ac 100644 --- a/version.h +++ b/version.h @@ -1 +1 @@ -#define VERSION "0.8.8" +#define VERSION "0.8.9"