From b31937c1ab717ebab1a5e084a88c16af55b8ebf8 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Thu, 23 Oct 2025 18:05:44 +0200 Subject: [PATCH] make: allow multiple stable pull here too --- Mk/defaults.mk | 6 ++++-- Mk/git.mk | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Mk/defaults.mk b/Mk/defaults.mk index 5142592ea..77a93b13a 100644 --- a/Mk/defaults.mk +++ b/Mk/defaults.mk @@ -46,11 +46,13 @@ VERSIONBIN= ${LOCALBASE}/sbin/opnsense-version .if exists(${VERSIONBIN}) _PLUGIN_ABI!= ${VERSIONBIN} -a -PLUGIN_ABI?= ${_PLUGIN_ABI} +PLUGIN_ABIS?= ${_PLUGIN_ABI} .else -PLUGIN_ABI?= 25.7 +PLUGIN_ABIS?= 25.7 .endif +PLUGIN_ABI?= ${PLUGIN_ABIS:[1]} + PLUGIN_MAINS= master main PLUGIN_MAIN?= ${PLUGIN_MAINS:[1]} PLUGIN_STABLE?= stable/${PLUGIN_ABI} diff --git a/Mk/git.mk b/Mk/git.mk index 5ef0bcd1f..4aded1e18 100644 --- a/Mk/git.mk +++ b/Mk/git.mk @@ -23,6 +23,8 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. +CORE_ABI= ${PLUGIN_ABI} +CORE_ABIS= ${PLUGIN_ABIS} CORE_MAIN= ${PLUGIN_MAIN} CORE_MAINS= ${PLUGIN_MAINS} CORE_STABLE= ${PLUGIN_STABLE}