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

pkg: move FLAVOUR to defaults

This commit is contained in:
Franco Fichtner 2020-02-12 12:34:18 +01:00
parent 877361d3c0
commit cf19e0ca8f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -53,9 +53,6 @@ CORE_SURICATA?= -devel
CORE_SYSLOGD?= # empty
CORE_SYSLOGNG?= 3.25
_FLAVOUR!= if [ -f ${OPENSSL} ]; then ${OPENSSL} version; fi
FLAVOUR?= ${_FLAVOUR:[1]}
.if "${FLAVOUR}" == OpenSSL || "${FLAVOUR}" == ""
CORE_REPOSITORY?= ${CORE_ABI}/latest
.elif "${FLAVOUR}" == LibreSSL

5
Mk/defaults.mk
View File

@ -1,4 +1,4 @@
# Copyright (c) 2016-2018 Franco Fichtner <franco@opnsense.org>
# Copyright (c) 2016-2020 Franco Fichtner <franco@opnsense.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@ -28,6 +28,9 @@ PAGER?= less
OPENSSL?= ${LOCALBASE}/bin/openssl
_FLAVOUR!= if [ -f ${OPENSSL} ]; then ${OPENSSL} version; fi
FLAVOUR?= ${_FLAVOUR:[1]}
PKG!= which pkg || echo true
GIT!= which git || echo true
ARCH!= uname -p