diff --git a/bbfdm/Makefile b/bbfdm/Makefile index b8b0d6f179dbce55e7a478f6d74d794a25f0e4fe..ffdd40c0dc6709db27debf33a613db5934fe7283 100644 --- a/bbfdm/Makefile +++ b/bbfdm/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bbfdm -PKG_VERSION:=1.12.23 +PKG_VERSION:=1.12.24 USE_LOCAL:=0 ifneq ($(USE_LOCAL),1) @@ -16,6 +16,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz PKG_MIRROR_HASH:=skip endif +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE diff --git a/bbfdm/tools/bbfdm.sh b/bbfdm/tools/bbfdm.sh index 43115a86091c87f7b71708de25188db10de2d2b0..f0a42760de7817ea56aa2977b3c3e5d25e46334f 100755 --- a/bbfdm/tools/bbfdm.sh +++ b/bbfdm/tools/bbfdm.sh @@ -163,11 +163,15 @@ else if [ "${PLUGIN}" -eq "1" ]; then priority="${DATA:-0}" install_dir ${DEST}/${BBFDM_BASE_DM_PATH}/plugins + if [ "${priority}" -gt "0" ]; then # install with priority if defined bbfdm_install_dm ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/plugins/${priority}_$(basename ${SRC}) - else + elif [ "${priority}" -eq "0" ]; then bbfdm_install_dm ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/plugins/$(basename ${SRC}) + else + echo "# Priority should be an unsigned integer" + exit 1 fi fi fi diff --git a/bbfdm/tools/validate_plugins.py b/bbfdm/tools/validate_plugins.py index aff4f5da4202fdc04069947ee355247422556ca5..ba171e47365cb167b943e038cce9e7c9e3cc9f21 100755 --- a/bbfdm/tools/validate_plugins.py +++ b/bbfdm/tools/validate_plugins.py @@ -228,6 +228,7 @@ event_schema = { "protocols_t": { "type": "string", "enum": [ + "none", "usp" ] } @@ -255,6 +256,7 @@ command_schema = { "protocols_t": { "type": "string", "enum": [ + "none", "usp" ] }