mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-09 18:45:54 +02:00
make.sh: Use enterchroot function in ipfiredist
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
@@ -705,30 +705,13 @@ ipfiremake() {
|
||||
ipfiredist() {
|
||||
lfsmakecommoncheck $*
|
||||
[ $? == 1 ] && return 0
|
||||
|
||||
# Install QEMU helper, if needed
|
||||
qemu_install_helper
|
||||
|
||||
local PKG_TIME_START=`date +%s`
|
||||
chroot $LFS /tools/bin/env -i HOME=/root \
|
||||
TERM=$TERM PS1='\u:\w\$ ' \
|
||||
PATH=/tools/ccache/bin:/bin:/usr/bin:/sbin:/usr/sbin \
|
||||
VERSION=$VERSION \
|
||||
CONFIG_ROOT=$CONFIG_ROOT \
|
||||
NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
|
||||
CFLAGS="${CFLAGS} ${HARDENING_CFLAGS}" \
|
||||
CXXFLAGS="${CXXFLAGS} ${HARDENING_CFLAGS}" \
|
||||
CCACHE_DIR=/usr/src/ccache \
|
||||
CCACHE_COMPRESS="${CCACHE_COMPRESS}" \
|
||||
CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \
|
||||
KVER=$KVER \
|
||||
BUILDTARGET="$BUILDTARGET" \
|
||||
CROSSTARGET="${CROSSTARGET}" \
|
||||
BUILD_ARCH="${BUILD_ARCH}" \
|
||||
$(qemu_environ) \
|
||||
$(fake_environ) \
|
||||
/bin/bash -x -c "cd /usr/src/lfs && \
|
||||
make -f $1 LFS_BASEDIR=/usr/src dist" >>$LOGFILE 2>&1
|
||||
local PS1='\u:\w$ '
|
||||
|
||||
enterchroot \
|
||||
bash -x -c "cd /usr/src/lfs && make -f $* LFS_BASEDIR=/usr/src dist" \
|
||||
>> ${LOGFILE} 2>&1
|
||||
|
||||
local COMPILE_SUCCESS=$?
|
||||
local PKG_TIME_END=`date +%s`
|
||||
|
||||
Reference in New Issue
Block a user