pkg: treat version numbers correctly
Also see: https://github.com/opnsense/tools/commit/84e5ec467a
This commit is contained in:
parent
1da0a432a4
commit
8ca1deb9c9
26
Makefile
26
Makefile
|
@ -28,6 +28,24 @@ all:
|
||||||
|
|
||||||
.include "Mk/defaults.mk"
|
.include "Mk/defaults.mk"
|
||||||
|
|
||||||
|
CORE_ABI?= 20.1
|
||||||
|
CORE_PHP?= 72
|
||||||
|
CORE_PYTHON?= 37
|
||||||
|
CORE_SURICATA?= -devel
|
||||||
|
CORE_SYSLOGD?= # empty
|
||||||
|
CORE_SYSLOGNG?= 3.27
|
||||||
|
CORE_UPDATE?= # empty
|
||||||
|
|
||||||
|
.if exists(${GIT}) && exists(${GITVERSION})
|
||||||
|
. if ${CORE_ABI} == "20.1"
|
||||||
|
CORE_COMMIT!= ${GITVERSION} --exclude=20.7.r\*
|
||||||
|
. else
|
||||||
|
CORE_COMMIT!= ${GITVERSION}
|
||||||
|
. endif
|
||||||
|
.else
|
||||||
|
CORE_COMMIT= unknown 0 undefined
|
||||||
|
.endif
|
||||||
|
|
||||||
CORE_VERSION?= ${CORE_COMMIT:[1]}
|
CORE_VERSION?= ${CORE_COMMIT:[1]}
|
||||||
CORE_REVISION?= ${CORE_COMMIT:[2]}
|
CORE_REVISION?= ${CORE_COMMIT:[2]}
|
||||||
CORE_HASH?= ${CORE_COMMIT:[3]}
|
CORE_HASH?= ${CORE_COMMIT:[3]}
|
||||||
|
@ -38,14 +56,6 @@ CORE_PKGVERSION= ${CORE_VERSION}_${CORE_REVISION}
|
||||||
CORE_PKGVERSION= ${CORE_VERSION}
|
CORE_PKGVERSION= ${CORE_VERSION}
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
CORE_ABI?= 20.1
|
|
||||||
CORE_PHP?= 72
|
|
||||||
CORE_PYTHON?= 37
|
|
||||||
CORE_SURICATA?= -devel
|
|
||||||
CORE_SYSLOGD?= # empty
|
|
||||||
CORE_SYSLOGNG?= 3.27
|
|
||||||
CORE_UPDATE?= # empty
|
|
||||||
|
|
||||||
CORE_PYTHON_DOT= ${CORE_PYTHON:C/./&./1}
|
CORE_PYTHON_DOT= ${CORE_PYTHON:C/./&./1}
|
||||||
|
|
||||||
.if "${CORE_FLAVOUR}" == OpenSSL
|
.if "${CORE_FLAVOUR}" == OpenSSL
|
||||||
|
|
|
@ -31,12 +31,6 @@ GIT!= which git || echo true
|
||||||
|
|
||||||
GITVERSION= ${.CURDIR}/Scripts/version.sh
|
GITVERSION= ${.CURDIR}/Scripts/version.sh
|
||||||
|
|
||||||
.if exists(${GIT}) && exists(${GITVERSION})
|
|
||||||
CORE_COMMIT!= ${GITVERSION}
|
|
||||||
.else
|
|
||||||
CORE_COMMIT= unknown 0 undefined
|
|
||||||
.endif
|
|
||||||
|
|
||||||
_CORE_ARCH!= uname -p
|
_CORE_ARCH!= uname -p
|
||||||
CORE_ARCH?= ${_CORE_ARCH}
|
CORE_ARCH?= ${_CORE_ARCH}
|
||||||
|
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
VERSION=$(git describe --abbrev=0 --always)
|
VERSION=$(git describe --abbrev=0 --always ${1})
|
||||||
REVISION=$(git rev-list ${VERSION}.. --count)
|
REVISION=$(git rev-list ${VERSION}.. --count)
|
||||||
HASH=$(git rev-list HEAD --max-count=1 | cut -c1-9)
|
HASH=$(git rev-list HEAD --max-count=1 | cut -c1-9)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue