opensourcemirror
/
opnsense-core
mirror of https://github.com/opnsense/core.git
1
0
Fork 0
Code Issues Releases Wiki Activity

system: support tier here in core as well #5983

This commit is contained in:
Franco Fichtner 2023-01-18 15:02:38 +01:00
parent 46965bfb66
commit 585311cedd
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LICENSE
View File

@ -19,7 +19,7 @@ Copyright (c) 2005 Espen Johansen
Copyright (c) 2016-2019 EURO-LOG AG
Copyright (c) 2017-2019 Fabian Franz
Copyright (c) 2006 Fernando Lemos
Copyright (c) 2014-2022 Franco Fichtner <franco@opnsense.org>
Copyright (c) 2014-2023 Franco Fichtner <franco@opnsense.org>
Copyright (c) 2004 Fred Mol <fredmol@xs4all.nl>
Copyright (c) 2010 Gabriel B. <gnoahb@gmail.com>
Copyright (c) 2016 IT-assistans Sverige AB

6
src/man/man8/opnsense-version.8
View File

@ -1,5 +1,5 @@
.\"
.\" Copyright (c) 2018-2022 Franco Fichtner <franco@opnsense.org>
.\" Copyright (c) 2018-2023 Franco Fichtner <franco@opnsense.org>
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@ -24,7 +24,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
.Dd January 24, 2022
.Dd January 18, 2023
.Dt OPNSENSE-VERSION 8
.Os
.Sh NAME
@ -93,6 +93,8 @@ Return the package name.
Return the raw version data.
.It Fl s
Return the accumulated file size of the package.
.It Fl t
Return the support tier level of the package.
.It Fl V
Return the package series.
.It Fl v

1
src/opnsense/version/core.in
View File

@ -11,6 +11,7 @@
"product_name": "%%CORE_PRODUCT%%",
"product_nickname": "%%CORE_NICKNAME%%",
"product_series": "%%CORE_SERIES%%",
"product_tier": "1",
"product_version": "%%CORE_PKGVERSION%%",
"product_website": "%%CORE_WWW%%"
}

9
src/sbin/opnsense-version
View File

@ -1,6 +1,6 @@
#!/bin/sh
# Copyright (c) 2018-2022 Franco Fichtner <franco@opnsense.org>
# Copyright (c) 2018-2023 Franco Fichtner <franco@opnsense.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
@ -34,7 +34,7 @@ OUTPUT=
DO_CHECK=
DO_ORIGIN=
while getopts AacefHilNnOsVvwx OPT; do
while getopts AacefHilNnOstVvwx OPT; do
case ${OPT} in
A)
OUTPUT="${OUTPUT} \${product_arch}"
@ -72,6 +72,9 @@ while getopts AacefHilNnOsVvwx OPT; do
s)
OUTPUT="${OUTPUT} \${product_size}"
;;
t)
OUTPUT="${OUTPUT} \${product_tier}"
;;
V)
OUTPUT="${OUTPUT} \${product_series}"
;;
@ -130,7 +133,7 @@ fi
case "${TARGET}" in
core)
if [ -z "${OUTPUT}" ]; then
OUTPUT="${DEFAULTS} \(\${product_arch}/\${product_flavour}\)"
OUTPUT="${DEFAULTS}"
fi
if [ -z "${OUTPUT%%*product_flavour*}" -a -f ${OPENSSL} ]; then