build: pass FLAVOUR instead of poisoning the variable via env
This commit is contained in:
parent
157a4116bc
commit
9746b57855
|
@ -1,6 +1,6 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
# Copyright (c) 2014-2019 Franco Fichtner <franco@opnsense.org>
|
# Copyright (c) 2014-2020 Franco Fichtner <franco@opnsense.org>
|
||||||
#
|
#
|
||||||
# Redistribution and use in source and binary forms, with or without
|
# Redistribution and use in source and binary forms, with or without
|
||||||
# modification, are permitted provided that the following conditions
|
# modification, are permitted provided that the following conditions
|
||||||
|
@ -48,7 +48,7 @@ for BRANCH in ${DEVELBRANCH} ${COREBRANCH}; do
|
||||||
setup_copy ${STAGEDIR} ${COREDIR}
|
setup_copy ${STAGEDIR} ${COREDIR}
|
||||||
git_reset ${STAGEDIR}${COREDIR} ${BRANCH}
|
git_reset ${STAGEDIR}${COREDIR} ${BRANCH}
|
||||||
|
|
||||||
CORE_ARGS="CORE_ARCH=${PRODUCT_ARCH} ${COREENV}"
|
CORE_ARGS="CORE_ARCH=${PRODUCT_ARCH} CORE_FLAVOUR=${PRODUCT_FLAVOUR} ${COREENV}"
|
||||||
|
|
||||||
CORE_NAME=$(make -C ${STAGEDIR}${COREDIR} ${CORE_ARGS} name)
|
CORE_NAME=$(make -C ${STAGEDIR}${COREDIR} ${CORE_ARGS} name)
|
||||||
CORE_DEPS=$(make -C ${STAGEDIR}${COREDIR} ${CORE_ARGS} depends)
|
CORE_DEPS=$(make -C ${STAGEDIR}${COREDIR} ${CORE_ARGS} depends)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
# Copyright (c) 2015-2019 Franco Fichtner <franco@opnsense.org>
|
# Copyright (c) 2015-2020 Franco Fichtner <franco@opnsense.org>
|
||||||
#
|
#
|
||||||
# Redistribution and use in source and binary forms, with or without
|
# Redistribution and use in source and binary forms, with or without
|
||||||
# modification, are permitted provided that the following conditions
|
# modification, are permitted provided that the following conditions
|
||||||
|
@ -74,7 +74,7 @@ for BRANCH in ${DEVELBRANCH} ${PLUGINSBRANCH}; do
|
||||||
setup_copy ${STAGEDIR} ${PLUGINSDIR}
|
setup_copy ${STAGEDIR} ${PLUGINSDIR}
|
||||||
git_reset ${STAGEDIR}${PLUGINSDIR} ${BRANCH}
|
git_reset ${STAGEDIR}${PLUGINSDIR} ${BRANCH}
|
||||||
|
|
||||||
PLUGIN_ARGS="PLUGIN_ARCH=${PRODUCT_ARCH} ${PLUGINSENV}"
|
PLUGIN_ARGS="PLUGIN_ARCH=${PRODUCT_ARCH} PLUGIN_FLAVOUR=${PRODUCT_FLAVOUR} ${PLUGINSENV}"
|
||||||
|
|
||||||
for PLUGIN in ${PLUGINS_LIST}; do
|
for PLUGIN in ${PLUGINS_LIST}; do
|
||||||
PLUGIN_NAME=$(make -C ${STAGEDIR}${PLUGINSDIR}/${PLUGIN} ${PLUGIN_ARGS} name)
|
PLUGIN_NAME=$(make -C ${STAGEDIR}${PLUGINSDIR}/${PLUGIN} ${PLUGIN_ARGS} name)
|
||||||
|
|
Loading…
Reference in New Issue