upstream/opnsense-core
1
0
Fork 0
mirror of https://github.com/opnsense/core.git synced 2026-05-28 04:34:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

make: add merge target for "community" origin (or upstream equivalent)

Browse source 
(cherry picked from commit 28ba22564b)
(cherry picked from commit bf8545b285)
(cherry picked from commit 469b57f3db)
This commit is contained in:
Franco Fichtner 2026-04-14 08:36:34 +02:00
parent 46c3d9f339
commit 1b22d8a1b8
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Mk/defaults.mk
View file

@ -116,3 +116,4 @@ TESTDIR?= ${.CURDIR}/src/opnsense/mvc/tests
CORE_MAINS= master main
CORE_MAIN?= ${CORE_MAINS:[1]}
CORE_STABLE?= stable/${CORE_ABI}
CORE_UPSTREAM?= community

4
Mk/git.mk
View file

@ -134,6 +134,10 @@ push:
@${GIT} push
@${GIT} checkout ${CORE_MAIN}
merge: ${CORE_MAIN}
@${GIT} fetch ${CORE_UPSTREAM}
@${GIT} merge ${CORE_UPSTREAM}/${CORE_MAIN}
checkout:
.for DIR in ${.CURDIR}/src
.if exists(${DIR})