Framwork: allow package conflicts

(cherry picked from commit 129acfd8ed)
(cherry picked from commit 23035f1955)
This commit is contained in:
Franco Fichtner 2018-01-08 22:56:38 +01:00
parent ef5661cd8e
commit 20d124737f

View file

@ -49,11 +49,20 @@ check:
.endfor
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}
@ -220,9 +229,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} 2> /dev/null > /dev/null; then \
${PKG} delete -fy ${NAME}; \
fi
.endfor
@${PKG} add ${PKGDIR}/*.txz
mount: check