pkg: add series and nickname to metadata
This commit is contained in:
parent
26c8fbb267
commit
61ca8a7b68
4
Makefile
4
Makefile
|
@ -29,6 +29,7 @@ all:
|
||||||
.include "Mk/defaults.mk"
|
.include "Mk/defaults.mk"
|
||||||
|
|
||||||
CORE_MESSAGE?= Carry on my wayward son
|
CORE_MESSAGE?= Carry on my wayward son
|
||||||
|
CORE_NICKNAME?= Not Yet
|
||||||
CORE_NAME?= opnsense-devel
|
CORE_NAME?= opnsense-devel
|
||||||
CORE_TYPE?= development
|
CORE_TYPE?= development
|
||||||
|
|
||||||
|
@ -75,6 +76,9 @@ 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]}
|
||||||
|
|
||||||
|
_CORE_SERIES= ${CORE_VERSION:S/./ /g}
|
||||||
|
CORE_SERIES?= ${_CORE_SERIES:[1]}.${_CORE_SERIES:[2]}
|
||||||
|
|
||||||
.if "${CORE_REVISION}" != "" && "${CORE_REVISION}" != "0"
|
.if "${CORE_REVISION}" != "" && "${CORE_REVISION}" != "0"
|
||||||
CORE_PKGVERSION= ${CORE_VERSION}_${CORE_REVISION}
|
CORE_PKGVERSION= ${CORE_VERSION}_${CORE_REVISION}
|
||||||
.else
|
.else
|
||||||
|
|
|
@ -85,12 +85,13 @@ REPLACEMENTS= CORE_ABI \
|
||||||
CORE_HASH \
|
CORE_HASH \
|
||||||
CORE_MAINTAINER \
|
CORE_MAINTAINER \
|
||||||
CORE_NAME \
|
CORE_NAME \
|
||||||
CORE_NEXT \
|
CORE_NICKNAME \
|
||||||
CORE_PACKAGESITE \
|
CORE_PACKAGESITE \
|
||||||
CORE_PKGVERSION \
|
CORE_PKGVERSION \
|
||||||
CORE_PRODUCT \
|
CORE_PRODUCT \
|
||||||
CORE_PYTHON_DOT \
|
CORE_PYTHON_DOT \
|
||||||
CORE_REPOSITORY \
|
CORE_REPOSITORY \
|
||||||
|
CORE_SERIES \
|
||||||
CORE_SYSLOGNG \
|
CORE_SYSLOGNG \
|
||||||
CORE_VERSION \
|
CORE_VERSION \
|
||||||
CORE_WWW
|
CORE_WWW
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||||
.\" SUCH DAMAGE.
|
.\" SUCH DAMAGE.
|
||||||
.\"
|
.\"
|
||||||
.Dd February 5, 2021
|
.Dd April 9, 2021
|
||||||
.Dt OPNSENSE-VERSION 8
|
.Dt OPNSENSE-VERSION 8
|
||||||
.Os
|
.Os
|
||||||
.Sh NAME
|
.Sh NAME
|
||||||
|
@ -32,7 +32,7 @@
|
||||||
.Nd OPNsense version utility
|
.Nd OPNsense version utility
|
||||||
.Sh SYNOPSIS
|
.Sh SYNOPSIS
|
||||||
.Nm
|
.Nm
|
||||||
.Op Fl AaefHNnsvw
|
.Op Fl AaefHiNnsVvw
|
||||||
.Op Ar package
|
.Op Ar package
|
||||||
.Nm
|
.Nm
|
||||||
.Fl c
|
.Fl c
|
||||||
|
@ -79,12 +79,16 @@ binary, or from package metadata if the binary could
|
||||||
not be found.
|
not be found.
|
||||||
.It Fl H
|
.It Fl H
|
||||||
Return the package commit hash.
|
Return the package commit hash.
|
||||||
|
.It Fl i
|
||||||
|
Return the package nickname.
|
||||||
.It Fl N
|
.It Fl N
|
||||||
Return the product name.
|
Return the product name.
|
||||||
.It Fl n
|
.It Fl n
|
||||||
Return the package name.
|
Return the package name.
|
||||||
.It Fl s
|
.It Fl s
|
||||||
Return the accumulated file size of the package.
|
Return the accumulated file size of the package.
|
||||||
|
.It Fl V
|
||||||
|
Return the package series.
|
||||||
.It Fl v
|
.It Fl v
|
||||||
Return the package version.
|
Return the package version.
|
||||||
.It Fl w
|
.It Fl w
|
||||||
|
|
|
@ -9,6 +9,8 @@
|
||||||
"product_hash": "%%CORE_HASH%%",
|
"product_hash": "%%CORE_HASH%%",
|
||||||
"product_id": "%%CORE_NAME%%",
|
"product_id": "%%CORE_NAME%%",
|
||||||
"product_name": "%%CORE_PRODUCT%%",
|
"product_name": "%%CORE_PRODUCT%%",
|
||||||
|
"product_nickname": "%%CORE_NICKNAME%%",
|
||||||
|
"product_series": "%%CORE_SERIES%%",
|
||||||
"product_version": "%%CORE_PKGVERSION%%",
|
"product_version": "%%CORE_PKGVERSION%%",
|
||||||
"product_website": "%%CORE_WWW%%"
|
"product_website": "%%CORE_WWW%%"
|
||||||
}
|
}
|
||||||
|
|
|
@ -50,7 +50,7 @@
|
||||||
s" @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@" logo+
|
s" @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@" logo+
|
||||||
s" @@@@@@@@@@@@@@@@@@@@@@@@@@@@ " logo+
|
s" @@@@@@@@@@@@@@@@@@@@@@@@@@@@ " logo+
|
||||||
s" #[m " logo+
|
s" #[m " logo+
|
||||||
s" %%CORE_NEXT%% ``The Road Ahead'' #[m" logo+
|
s" %%CORE_SERIES%% ``The Road Ahead'' #[m" logo+
|
||||||
|
|
||||||
2drop
|
2drop
|
||||||
;
|
;
|
||||||
|
|
|
@ -32,7 +32,7 @@ OUTPUT=
|
||||||
|
|
||||||
DO_CHECK=
|
DO_CHECK=
|
||||||
|
|
||||||
while getopts AacefHNnsvw OPT; do
|
while getopts AacefHiNnsVvw OPT; do
|
||||||
case ${OPT} in
|
case ${OPT} in
|
||||||
A)
|
A)
|
||||||
OUTPUT="${OUTPUT} \${product_arch}"
|
OUTPUT="${OUTPUT} \${product_arch}"
|
||||||
|
@ -52,6 +52,9 @@ while getopts AacefHNnsvw OPT; do
|
||||||
H)
|
H)
|
||||||
OUTPUT="${OUTPUT} \${product_hash}"
|
OUTPUT="${OUTPUT} \${product_hash}"
|
||||||
;;
|
;;
|
||||||
|
i)
|
||||||
|
OUTPUT="${OUTPUT} \${product_nickname}"
|
||||||
|
;;
|
||||||
N)
|
N)
|
||||||
OUTPUT="${OUTPUT} \${product_name}"
|
OUTPUT="${OUTPUT} \${product_name}"
|
||||||
;;
|
;;
|
||||||
|
@ -61,6 +64,9 @@ while getopts AacefHNnsvw OPT; do
|
||||||
s)
|
s)
|
||||||
OUTPUT="${OUTPUT} \${product_size}"
|
OUTPUT="${OUTPUT} \${product_size}"
|
||||||
;;
|
;;
|
||||||
|
V)
|
||||||
|
OUTPUT="${OUTPUT} \${product_series}"
|
||||||
|
;;
|
||||||
v)
|
v)
|
||||||
OUTPUT="${OUTPUT} \${product_version}"
|
OUTPUT="${OUTPUT} \${product_version}"
|
||||||
;;
|
;;
|
||||||
|
|
Loading…
Reference in New Issue