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

build: filter environment in kernel and ports like base

This commit is contained in:
Franco Fichtner 2016-07-19 16:39:54 +02:00
parent 933ea2d176
commit 7782ef0841
3 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/common.sh
View File

@ -194,7 +194,7 @@ export ENV_FILTER="env -i USER=${USER} LOGNAME=${LOGNAME} HOME=${HOME} \
SHELL=${SHELL} BLOCKSIZE=${BLOCKSIZE} MAIL=${MAIL} PATH=${PATH} \
TERM=${TERM} HOSTTYPE=${HOSTTYPE} VENDOR=${VENDOR} OSTYPE=${OSTYPE} \
MACHTYPE=${MACHTYPE} PWD=${PWD} GROUP=${GROUP} HOST=${HOST} \
EDITOR=${EDITOR} PAGER=${PAGER}"
EDITOR=${EDITOR} PAGER=${PAGER} ABI_FILE=${ABI_FILE}"
# define build and config directories
export CONFIGDIR="${TOOLSDIR}/config/${PRODUCT_SETTINGS}"

6
build/kernel.sh
View File

@ -55,9 +55,9 @@ cp ${CONFIGDIR}/${BUILD_KERNEL} \
MAKE_ARGS="TARGET_ARCH=${PRODUCT_ARCH} TARGET=${PRODUCT_TARGET}"
MAKE_ARGS="${MAKE_ARGS} KERNCONF=${BUILD_KERNEL} __MAKE_CONF="
make -s -C${SRCDIR} -j${CPUS} buildkernel ${MAKE_ARGS} NO_KERNELCLEAN=yes
make -s -C${SRCDIR}/release obj ${MAKE_ARGS}
make -s -C${SRCDIR}/release kernel.txz ${MAKE_ARGS}
${ENV_FILTER} make -s -C${SRCDIR} -j${CPUS} buildkernel ${MAKE_ARGS} NO_KERNELCLEAN=yes
${ENV_FILTER} make -s -C${SRCDIR}/release obj ${MAKE_ARGS}
${ENV_FILTER} make -s -C${SRCDIR}/release kernel.txz ${MAKE_ARGS}
mv $(make -C${SRCDIR}/release -V .OBJDIR)/kernel.txz ${KERNEL_SET}.txz

12
build/ports.sh
View File

@ -74,17 +74,7 @@ fi
# block SIGINT to allow for collecting port progress (use with care)
trap : 2
if ! chroot ${STAGEDIR} /bin/sh -es << EOF; then SELF=; fi
# overwrites the ports tree variable, behaviour is unwanted:
unset STAGEDIR
# clobbers build for pkg(8) at least, since ARCH= is in there:
unset MAKEFLAGS
# Set up environment for target
export TARGET_ARCH=${PRODUCT_ARCH}
export TARGET=${PRODUCT_TARGET}
export ARCH=${PRODUCT_ARCH}
if ! ${ENV_FILTER} chroot ${STAGEDIR} /bin/sh -es << EOF; then SELF=; fi
if pkg -N; then
# no need to rebuild
else