upstream/opnsense-plugins
1
0
Fork 0
mirror of https://github.com/opnsense/plugins.git synced 2026-06-04 14:26:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Framwork: allow package conflicts

Browse source 
"make upgrade" will do the right thing now always.
This commit is contained in:
Franco Fichtner 2018-01-08 22:56:38 +01:00
parent 713647379a
commit 129acfd8ed
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Mk/plugins.mk
View file

@ -51,11 +51,20 @@ check:
PLUGIN_DEVEL?= yes
PLUGIN_PREFIX?= os-
.if "${PLUGIN_DEVEL}" != ""
PLUGIN_SUFFIX?= -devel
.endif
PLUGIN_PKGNAMES= ${PLUGIN_PREFIX}${PLUGIN_NAME}${PLUGIN_SUFFIX} \
${PLUGIN_PREFIX}${PLUGIN_NAME}
.for CONFLICT in ${PLUGIN_CONFLICTS}
PLUGIN_PKGNAMES+= ${PLUGIN_PREFIX}${CONFLICT}${PLUGIN_SUFFIX} \
${PLUGIN_PREFIX}${CONFLICT}
.endfor
.if "${PLUGIN_DEVEL}" != ""
PLUGIN_PKGNAME= ${PLUGIN_PREFIX}${PLUGIN_NAME}${PLUGIN_SUFFIX}
.else
PLUGIN_PKGNAME= ${PLUGIN_PREFIX}${PLUGIN_NAME}
.endif
.if "${PLUGIN_REVISION}" != "" && "${PLUGIN_REVISION}" != "0"
PLUGIN_PKGVERSION= ${PLUGIN_VERSION}_${PLUGIN_REVISION}
@ -222,9 +231,11 @@ upgrade-check: check
@rm -rf ${PKGDIR}
upgrade: upgrade-check package
@if ${PKG} info ${PLUGIN_PKGNAME} > /dev/null; then \
${PKG} delete -fy ${PLUGIN_PKGNAME}; \
.for NAME in ${PLUGIN_PKGNAMES}
@if ${PKG} info ${NAME} > /dev/null; then \
${PKG} delete -fy ${NAME}; \
fi
.endfor
@${PKG} add ${PKGDIR}/*.txz
mount: check