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

Mk: previous conflicts with existing var, doh!

Browse source
This commit is contained in:
Franco Fichtner 2026-04-17 09:28:10 +02:00
parent bf8545b285
commit 469b57f3db
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mk/defaults.mk
View file

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

4
Mk/git.mk
View file

@ -135,8 +135,8 @@ push:
@${GIT} checkout ${CORE_MAIN}
merge: ${CORE_MAIN}
@${GIT} fetch ${CORE_ORIGIN}
@${GIT} merge ${CORE_ORIGIN}/${CORE_MAIN}
@${GIT} fetch ${CORE_UPSTREAM}
@${GIT} merge ${CORE_UPSTREAM}/${CORE_MAIN}
checkout:
.for DIR in ${.CURDIR}/src