lucaspalomodevelop/opnsense-core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/opnsense-core.git synced 2026-03-13 00:07:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

firmware: make conflicts known, better way for #7195 via #7818

Browse Source
This commit is contained in:
Franco Fichtner 2024-08-27 09:41:06 +02:00
parent ccac4779b7
commit 7dc89a322d
5 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Mk/defaults.mk
View File

@ -1,4 +1,4 @@
# Copyright (c) 2016-2021 Franco Fichtner <franco@opnsense.org>
# Copyright (c) 2016-2024 Franco Fichtner <franco@opnsense.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@ -70,6 +70,7 @@ CORE_SYSLOGNG?= ${_CORE_SYSLOGNG:S/./ /g:[1..2]:tW:S/ /./g}
REPLACEMENTS= CORE_ABI \
CORE_ARCH \
CORE_COMMIT \
CORE_CONFLICTS \
CORE_COPYRIGHT_HOLDER \
CORE_COPYRIGHT_WWW \
CORE_COPYRIGHT_YEARS \

2
Mk/version.mk
View File

@ -30,3 +30,5 @@ CORE_NAME?= opnsense-devel
# adjust src/root/boot/lua/logo-hourglass.lua.in accordingly:
CORE_NICKNAME?= Not Yet
CORE_TYPE?= development
# plugins that were migrated to core are here
CORE_CONFLICTS?=firewall wireguard wireguard-go

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

@ -1,5 +1,5 @@
.\"
.\" Copyright (c) 2018-2023 Franco Fichtner <franco@opnsense.org>
.\" Copyright (c) 2018-2024 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 February 7, 2023
.Dd August 27, 2024
.Dt OPNSENSE-VERSION 8
.Os
.Sh NAME
@ -32,7 +32,7 @@
.Nd OPNsense version utility
.Sh SYNOPSIS
.Nm
.Op Fl AaefHilNnsVvwx
.Op Fl AaCefHilNnsVvwx
.Op Ar package
.Nm
.Fl cO
@ -67,6 +67,8 @@ The options are as follows:
Return the system architecture string.
.It Fl a
Return the firmware ABI string.
.It Fl C
Return a space separated list of known product conficts.
.It Fl c
Exit successfully if the package exists.
Otherwise, exit with an error.

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

@ -1,6 +1,7 @@
{
"product_abi": "%%CORE_ABI%%",
"product_arch": "%%CORE_ARCH%%",
"product_conflicts": "%%CORE_CONFLICTS%%",
"product_copyright_owner": "%%CORE_COPYRIGHT_HOLDER%%",
"product_copyright_url": "%%CORE_COPYRIGHT_WWW%%",
"product_copyright_years": "%%CORE_COPYRIGHT_YEARS%%",

12
src/sbin/opnsense-version
View File

@ -1,6 +1,6 @@
#!/bin/sh
# Copyright (c) 2018-2023 Franco Fichtner <franco@opnsense.org>
# Copyright (c) 2018-2024 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:
@ -33,7 +33,7 @@ OUTPUT=
DO_CHECK=
DO_ORIGIN=
while getopts AaceHilNnOstVvwx OPT; do
while getopts AaCceHilNnOstVvwx OPT; do
case ${OPT} in
A)
OUTPUT="${OUTPUT} \${product_arch}"
@ -41,6 +41,9 @@ while getopts AaceHilNnOstVvwx OPT; do
a)
OUTPUT="${OUTPUT} \${product_abi}"
;;
C)
OUTPUT="${OUTPUT} \${product_conflicts}"
;;
c)
DO_CHECK="-c"
;;
@ -215,4 +218,7 @@ core)
;;
esac
eval echo ${OUTPUT}
OUTPUT=$(eval echo ${OUTPUT})
if [ -n "${OUTPUT}" ]; then
echo "${OUTPUT}"
fi