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

build: use new make.conf target to simplify patches; closes #210

This commit is contained in:
Franco Fichtner 2021-01-26 20:13:41 +01:00
parent 89d9d02ca4
commit 91eab2adcf
4 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/common.sh
View File

@ -191,6 +191,7 @@ PRODUCT_DEVICE_REAL
PRODUCT_FLAVOUR
PRODUCT_GITBASE
PRODUCT_KERNEL
PRODUCT_LUA
PRODUCT_MIRROR
PRODUCT_NAME
PRODUCT_PERL

15
build/distfiles.sh
View File

@ -70,15 +70,11 @@ setup_distfiles ${STAGEDIR}
git_describe ${PORTSDIR}
echo ">>> Fetching distfiles..."
MAKE_CONF="${CONFIGDIR}/make.conf"
if [ -f ${MAKE_CONF} ]; then
cp ${MAKE_CONF} ${STAGEDIR}/etc/make.conf
fi
sh ./make.conf.sh > ${STAGEDIR}/etc/make.conf
echo "CLEAN_FETCH_ENV=yes" >> ${STAGEDIR}/etc/make.conf
echo ">>> Fetching distfiles..."
# block SIGINT to allow for collecting port progress (use with care)
trap : 2
@ -87,11 +83,6 @@ echo "${PORTS_LIST}" | while read PORT_ORIGIN; do
MAKE_ARGS="
PRODUCT_ABI=${PRODUCT_ABI}
PRODUCT_FLAVOUR=${PRODUCT_FLAVOUR}
PRODUCT_LUA=${PRODUCT_LUA}
PRODUCT_PERL=${PRODUCT_PERL}
PRODUCT_PHP=${PRODUCT_PHP}
PRODUCT_PYTHON=${PRODUCT_PYTHON}
PRODUCT_RUBY=${PRODUCT_RUBY}
UNAME_r=\$(freebsd-version)
"
echo ">>> Fetching \${PORT_ORIGIN}..."

10
build/ports.sh
View File

@ -85,10 +85,7 @@ if extract_packages ${STAGEDIR}; then
prune_packages ${STAGEDIR}
fi
MAKE_CONF="${CONFIGDIR}/make.conf"
if [ -f ${MAKE_CONF} ]; then
cp ${MAKE_CONF} ${STAGEDIR}/etc/make.conf
fi
sh ./make.conf.sh > ${STAGEDIR}/etc/make.conf
cat > ${STAGEDIR}/bin/echotime <<EOF
#!/bin/sh
@ -116,11 +113,6 @@ 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}
PRODUCT_RUBY=${PRODUCT_RUBY}
UNAME_r=\$(freebsd-version)
"
if pkg -N 2> /dev/null; then

12
build/skim.sh
View File

@ -77,26 +77,22 @@ for ARG in ${@}; do
esac
done
echo -n ">>> Gathering dependencies: 0%"
echo "${PORTS_LIST}" > ${STAGEDIR}/skim
sh ./make.conf.sh > ${STAGEDIR}/make.conf
PORTS_COUNT=$(wc -l ${STAGEDIR}/skim | awk '{ print $1 }')
PORTS_NUM=0
echo -n ">>> Gathering dependencies: 0%"
while read PORT_ORIGIN PORT_BROKEN; do
FLAVOR=${PORT_ORIGIN##*@}
PORT=${PORT_ORIGIN%%@*}
MAKE_ARGS="
__MAKE_CONF=${CONFIGDIR}/make.conf
__MAKE_CONF=${STAGEDIR}/make.conf
PRODUCT_ABI=${PRODUCT_ABI}
PRODUCT_FLAVOUR=${PRODUCT_FLAVOUR}
PRODUCT_LUA=${PRODUCT_LUA}
PRODUCT_PERL=${PRODUCT_PERL}
PRODUCT_PHP=${PRODUCT_PHP}
PRODUCT_PYTHON=${PRODUCT_PYTHON}
PRODUCT_RUBY=${PRODUCT_RUBY}
"
if [ ${FLAVOR} != ${PORT} ]; then