netbird/plugins
0
0
Fork 0
mirror of https://github.com/netbirdio/plugins.git synced 2026-05-22 18:44:07 -07:00
Code Issues Packages Projects Releases Wiki Activity

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
Download Patch File Download Diff File Expand all files Collapse all files
Mk/plugins.mk
+15 -4
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