netbird/plugins
0
0
Fork 0
mirror of https://github.com/netbirdio/plugins.git synced 2026-05-22 18:44:07 -07:00
Code Issues Packages Projects Releases Wiki Activity

Framework: allow MFC from subdir

Browse Source
This commit is contained in:
Franco Fichtner
2022-11-02 11:04:54 +01:00
parent 0319179a35
commit 6a265fb987
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Mk/defaults.mk
+7 -3
View File
@@ -1,4 +1,4 @@
# Copyright (c) 2016-2021 Franco Fichtner <franco@opnsense.org>
# Copyright (c) 2016-2022 Franco Fichtner <franco@opnsense.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -121,18 +121,22 @@ ensure-stable:
git config branch.stable/${PLUGIN_ABI}.remote origin; \
fi
diff_ARGS?= .
diff: ensure-stable
@git diff --stat -p stable/${PLUGIN_ABI} ${.CURDIR}/${diff_ARGS:[1]}
mfc_ARGS?= .
mfc: ensure-stable
.for MFC in ${mfc_ARGS}
.if exists(${MFC})
@git diff --stat -p stable/${PLUGIN_ABI} ${.CURDIR}/${MFC} > /tmp/mfc.diff
@git checkout stable/${PLUGIN_ABI}
@git apply /tmp/mfc.diff
@git add ${.CURDIR}
@git add ${.CURDIR}/${MFC}
@if ! git diff --quiet HEAD; then \
git commit -m "${MFC}: sync with master"; \
git commit -m "${MFC:S/^.$/${PLUGIN_DIR}/}: sync with master"; \
fi
.else
@git checkout stable/${PLUGIN_ABI}
Mk/plugins.mk
+4
View File
@@ -80,6 +80,10 @@ PLUGIN_CONFLICTS+= ${${_PLUGIN_VARIANT}_NAME}
PLUGIN_DEPENDS+= ${${PLUGIN_VARIANT}_DEPENDS}
.endif
.if !empty(PLUGIN_NAME)
PLUGIN_DIR?= ${.CURDIR:S/\// /g:[-2]}/${.CURDIR:S/\// /g:[-1]}
.endif
PLUGIN_PKGNAMES= ${PLUGIN_PREFIX}${PLUGIN_NAME}${PLUGIN_SUFFIX} \
${PLUGIN_PREFIX}${PLUGIN_NAME}
.for CONFLICT in ${PLUGIN_CONFLICTS}