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

config: expose PRODUCT_ABI to ports 

Fixup PRODUCT_LUA replacement while here.
This commit is contained in:
Franco Fichtner 2021-01-11 11:39:33 +01:00
parent 2aed984ee6
commit c68563ca3e
4 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -131,6 +131,9 @@ VERBOSE_FLAGS= -x
VERBOSE_HIDDEN= @
.endif
VERSIONS= PRODUCT_ABI=${SETTINGS}
VERSIONS_SED= -e "s:%%ABI%%:${SETTINGS}:g"
.for _VERSION in LUA PERL PHP PYTHON RUBY
VERSIONS+= PRODUCT_${_VERSION}=${${_VERSION}}
VERSIONS_SED+= -e "s:%%${_VERSION}%%:${${_VERSION}}:g"

41
build/common.sh
View File

@ -178,33 +178,34 @@ done
shift $((${OPTIND} - 1))
CHECK_MISSING="
PRODUCT_NAME
PRODUCT_TYPE
PRODUCT_ARCH
PRODUCT_FLAVOUR
PRODUCT_VERSION
PRODUCT_SETTINGS
PRODUCT_MIRROR
PRODUCT_DEVICE_REAL
PRODUCT_SPEED
PRODUCT_SERVER
PRODUCT_PHP
PRODUCT_PERL
PRODUCT_PYTHON
PRODUCT_RUBY
PRODUCT_KERNEL
PRODUCT_GITBASE
COREBRANCH
COREDIR
PLUGINSBRANCH
PLUGINSDIR
PORTSBRANCH
PORTSDIR
PORTSREFDIR
TOOLSBRANCH
TOOLSDIR
COREBRANCH
COREDIR
PRODUCT_ABI
PRODUCT_ARCH
PRODUCT_DEVICE_REAL
PRODUCT_FLAVOUR
PRODUCT_GITBASE
PRODUCT_KERNEL
PRODUCT_MIRROR
PRODUCT_NAME
PRODUCT_PERL
PRODUCT_PHP
PRODUCT_PYTHON
PRODUCT_RUBY
PRODUCT_SERVER
PRODUCT_SETTINGS
PRODUCT_SPEED
PRODUCT_TYPE
PRODUCT_VERSION
SRCBRANCH
SRCDIR
TOOLSBRANCH
TOOLSDIR
"
for MISSING in ${CHECK_MISSING}; do

4
build/ports.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh
# Copyright (c) 2014-2020 Franco Fichtner <franco@opnsense.org>
# Copyright (c) 2014-2021 Franco Fichtner <franco@opnsense.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@ -102,8 +102,10 @@ echo "${PORTS_LIST}" | while read PORT_ORIGIN; do
PORT=\${PORT_ORIGIN%%@*}
MAKE_ARGS="
PACKAGES=${PACKAGESDIR}-cache
PRODUCT_ABI=${PRODUCT_ABI}
PRODUCT_ARCH=${PRODUCT_ARCH}
PRODUCT_FLAVOUR=${PRODUCT_FLAVOUR}
PRODUCT_LUA=${PRODUCT_LUA}
PRODUCT_PERL=${PRODUCT_PERL}
PRODUCT_PHP=${PRODUCT_PHP}
PRODUCT_PYTHON=${PRODUCT_PYTHON}

7
build/skim.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh
# Copyright (c) 2015-2019 Franco Fichtner <franco@opnsense.org>
# Copyright (c) 2015-2021 Franco Fichtner <franco@opnsense.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@ -88,7 +88,10 @@ while read PORT_ORIGIN PORT_BROKEN; do
FLAVOR=${PORT_ORIGIN##*@}
PORT=${PORT_ORIGIN%%@*}
MAKE_ARGS="__MAKE_CONF=${CONFIGDIR}/make.conf"
MAKE_ARGS="
__MAKE_CONF=${CONFIGDIR}/make.conf
PRODUCT_ABI=${PRODUCT_ABI}
"
if [ ${FLAVOR} != ${PORT} ]; then
MAKE_ARGS="${MAKE_ARGS} FLAVOR=${FLAVOR}"