From 2085c5e4af86209a8e35ead7e8e195ee03bf7f89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= Date: Fri, 19 Aug 2022 22:35:54 +0200 Subject: [PATCH] fff-babel: Use bird2 implementation by default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The bird2 babel implementation has proven to be the more reliable option over babeld, especially on low-end hardware. It has been working flawlessly on many test installations. Use bird2 instead of babeld, if no implementation is specified via uci. While at it, use the automatically incrementing $(COMMITCOUNT) for PKG_RELEASE. Signed-off-by: Fabian Bläse Reviewed-by: Christian Dresel --- src/packages/fff/fff-babel-bird2/Makefile | 2 +- src/packages/fff/fff-babel/Makefile | 2 +- src/packages/fff/fff-babel/files/lib/functions/fff/babel | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/packages/fff/fff-babel-bird2/Makefile b/src/packages/fff/fff-babel-bird2/Makefile index b0591ccc..9672d18a 100644 --- a/src/packages/fff/fff-babel-bird2/Makefile +++ b/src/packages/fff/fff-babel-bird2/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-babel-bird2 -PKG_RELEASE:=1 +PKG_RELEASE:=$(COMMITCOUNT) include $(INCLUDE_DIR)/package.mk diff --git a/src/packages/fff/fff-babel/Makefile b/src/packages/fff/fff-babel/Makefile index abae858c..87bca24d 100644 --- a/src/packages/fff/fff-babel/Makefile +++ b/src/packages/fff/fff-babel/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-babel -PKG_RELEASE:=1 +PKG_RELEASE:=$(COMMITCOUNT) include $(INCLUDE_DIR)/package.mk diff --git a/src/packages/fff/fff-babel/files/lib/functions/fff/babel b/src/packages/fff/fff-babel/files/lib/functions/fff/babel index a6fdf3b0..eb327c57 100644 --- a/src/packages/fff/fff-babel/files/lib/functions/fff/babel +++ b/src/packages/fff/fff-babel/files/lib/functions/fff/babel @@ -1,6 +1,6 @@ implementation=$(uci -q get babelimpl.impl.impl) -[ -z "$implementation" ] && implementation=babeld +[ -z "$implementation" ] && implementation=bird2 . /lib/functions/fff/babeldaemon/$implementation