From 73a2491b7823420473bb6e0c7ae28031efbb257d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 4 Nov 2023 15:05:23 +0100 Subject: [PATCH] package/freeradius-server: fix redis handling redis handling is wrong since the addition of the package in commit 736c4c1655d93652a9a7e79235bbe726b3d46176. Indeed, freeradius-server needs hiredis, not redis Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 5a8d6014c747b228758b1adc76b3e6519c6e30cc) Signed-off-by: Peter Korsgaard --- package/freeradius-server/freeradius-server.mk | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/package/freeradius-server/freeradius-server.mk b/package/freeradius-server/freeradius-server.mk index af3320eb44..5a560d9153 100644 --- a/package/freeradius-server/freeradius-server.mk +++ b/package/freeradius-server/freeradius-server.mk @@ -71,6 +71,17 @@ FREERADIUS_SERVER_CONF_OPTS += \ --without-rlm_ippool endif +ifeq ($(BR2_PACKAGE_HIREDIS),y) +FREERADIUS_SERVER_CONF_OPTS += \ + --with-rlm_redis \ + --with-rlm_rediswho +FREERADIUS_SERVER_DEPENDENCIES += hiredis +else +FREERADIUS_SERVER_CONF_OPTS += \ + --without-rlm_redis \ + --without-rlm_rediswho +endif + ifeq ($(BR2_PACKAGE_JSON_C)$(BR2_PACKAGE_LIBCURL),yy) FREERADIUS_SERVER_CONF_OPTS += --with-rlm_rest FREERADIUS_SERVER_DEPENDENCIES += json-c libcurl @@ -150,13 +161,6 @@ else FREERADIUS_SERVER_CONF_OPTS += --without-readline endif -ifeq ($(BR2_PACKAGE_REDIS),y) -FREERADIUS_SERVER_CONF_OPTS += --with-rlm_redis --with-rlm_rediswho -FREERADIUS_SERVER_DEPENDENCIES += redis -else -FREERADIUS_SERVER_CONF_OPTS += --without-rlm_redis --without-rlm_rediswho -endif - ifeq ($(BR2_PACKAGE_SQLITE),y) FREERADIUS_SERVER_CONF_OPTS += --with-rlm_sql_sqlite FREERADIUS_SERVER_DEPENDENCIES += sqlite