pkg: useless overrides ARCH and FLAVOUR
This commit is contained in:
parent
7b0bd24771
commit
072d9673b9
3
Makefile
3
Makefile
|
@ -39,9 +39,6 @@ CORE_PKGVERSION= ${CORE_VERSION}
|
|||
.endif
|
||||
|
||||
CORE_ABI?= 20.1
|
||||
CORE_ARCH?= ${ARCH}
|
||||
CORE_FLAVOUR?= ${FLAVOUR}
|
||||
|
||||
CORE_PHP?= 72
|
||||
CORE_PYTHON?= 37
|
||||
CORE_RADVD?= # empty
|
||||
|
|
|
@ -28,7 +28,6 @@ PAGER?= less
|
|||
|
||||
PKG!= which pkg || echo true
|
||||
GIT!= which git || echo true
|
||||
ARCH!= uname -p
|
||||
|
||||
GITVERSION= ${.CURDIR}/Scripts/version.sh
|
||||
|
||||
|
@ -38,6 +37,9 @@ CORE_COMMIT!= ${GITVERSION}
|
|||
CORE_COMMIT= unknown 0 undefined
|
||||
.endif
|
||||
|
||||
_CORE_ARCH!= uname -p
|
||||
CORE_ARCH?= ${_CORE_ARCH}
|
||||
|
||||
.if exists(${PKG})
|
||||
_CORE_UPDATE!= ${PKG} query -g %n 'opnsense-update*'
|
||||
CORE_UPDATE?= ${_CORE_UPDATE:S/opnsense-update//g}
|
||||
|
@ -48,11 +50,14 @@ CORE_SYSLOGD?= ${_CORE_SYSLOGD:S/syslogd//g}
|
|||
|
||||
OPENSSL= ${LOCALBASE}/bin/openssl
|
||||
|
||||
.if ! defined(CORE_FLAVOUR)
|
||||
.if exists(${OPENSSL})
|
||||
_FLAVOUR!= ${OPENSSL} version
|
||||
FLAVOUR?= ${_FLAVOUR:[1]}
|
||||
_CORE_FLAVOUR!= ${OPENSSL} version
|
||||
CORE_FLAVOUR?= ${_CORE_FLAVOUR:[1]}
|
||||
.else
|
||||
FLAVOUR?= Base # not supported without OpenSSL port
|
||||
.warning "Detected 'Base' flavour is not currently supported"
|
||||
CORE_FLAVOUR?= Base
|
||||
.endif
|
||||
.endif
|
||||
|
||||
PHPBIN= ${LOCALBASE}/bin/php
|
||||
|
|
|
@ -61,7 +61,7 @@ Several OPTIONS exist to customise the package, e.g.:
|
|||
* CORE_DEPENDS: a list of required dependencies for the package
|
||||
* CORE_DEPENDS_ARCH: a list of special <ARCH>-required packages
|
||||
* CORE_ORIGIN: sets a HardenedBSD compatible package/ports origin
|
||||
* FLAVOUR: can be set to "OpenSSL" (default) or "LibreSSL"
|
||||
* CORE_FLAVOUR: can be set to "OpenSSL" or "LibreSSL"
|
||||
* CORE_COMMENT: a short description of the package
|
||||
* CORE_MAINTAINER: email of the package maintainer
|
||||
* CORE_WWW: web url of the package
|
||||
|
@ -71,6 +71,9 @@ Options are passed in the following form:
|
|||
|
||||
# make package CORE_NAME=my_new_name
|
||||
|
||||
In general, options are either set to sane defaults or automatically
|
||||
detected at runtime.
|
||||
|
||||
make update
|
||||
-----------
|
||||
|
||||
|
|
Loading…
Reference in New Issue