From 58c1ae78b5a6ee9bb05ab009ec0f88179708296f Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Fri, 17 Apr 2026 09:30:58 +0200 Subject: [PATCH] make: add proper merge target origin --- Mk/defaults.mk | 1 + Mk/git.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/Mk/defaults.mk b/Mk/defaults.mk index e2eefeb48..cee9d75b1 100644 --- a/Mk/defaults.mk +++ b/Mk/defaults.mk @@ -56,6 +56,7 @@ PLUGIN_ABI?= ${PLUGIN_ABIS:[1]} PLUGIN_MAINS= master main PLUGIN_MAIN?= ${PLUGIN_MAINS:[1]} PLUGIN_STABLE?= stable/${PLUGIN_ABI} +PLUGIN_ORIGIN?= community PHPBIN= ${LOCALBASE}/bin/php diff --git a/Mk/git.mk b/Mk/git.mk index 4aded1e18..5caf19bb1 100644 --- a/Mk/git.mk +++ b/Mk/git.mk @@ -28,5 +28,6 @@ CORE_ABIS= ${PLUGIN_ABIS} CORE_MAIN= ${PLUGIN_MAIN} CORE_MAINS= ${PLUGIN_MAINS} CORE_STABLE= ${PLUGIN_STABLE} +CORE_UPSTREAM= ${PLUGIN_UPSTREAM} .-include "${PLUGINSDIR}/../core/Mk/git.mk"