zimport.sh: Add configure/make option support
Allow the following environment variables to control the build behavior of the zimport.sh script. This can be useful when you want a debug build or require specific build options. The default values are: CONFIG_OPTIONS="" MAKE_OPTIONS="-s -j$(nproc)" Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
This commit is contained in:
parent
3d8d245fb3
commit
27a19a0d5a
|
@ -73,9 +73,13 @@ COLOR=1
|
||||||
REPO="https://github.com/zfsonlinux"
|
REPO="https://github.com/zfsonlinux"
|
||||||
IMAGES_DIR="$SCRIPTDIR/zfs-images/"
|
IMAGES_DIR="$SCRIPTDIR/zfs-images/"
|
||||||
IMAGES_TAR="https://github.com/zfsonlinux/zfs-images/tarball/master"
|
IMAGES_TAR="https://github.com/zfsonlinux/zfs-images/tarball/master"
|
||||||
CPUS=`grep -c ^processor /proc/cpuinfo`
|
|
||||||
ERROR=0
|
ERROR=0
|
||||||
|
|
||||||
|
CONFIG_LOG="configure.log"
|
||||||
|
CONFIG_OPTIONS=${CONFIG_OPTIONS:-""}
|
||||||
|
MAKE_LOG="make.log"
|
||||||
|
MAKE_OPTIONS=${MAKE_OPTIONS:-"-s -j$(nproc)"}
|
||||||
|
|
||||||
usage() {
|
usage() {
|
||||||
cat << EOF
|
cat << EOF
|
||||||
USAGE:
|
USAGE:
|
||||||
|
@ -405,9 +409,9 @@ for TAG in $SRC_TAGS; do
|
||||||
else
|
else
|
||||||
cd $SPL_DIR
|
cd $SPL_DIR
|
||||||
make distclean &>/dev/null
|
make distclean &>/dev/null
|
||||||
sh ./autogen.sh &>/dev/null || fail 1
|
./autogen.sh >>$CONFIG_LOG 2>&1 || fail 1
|
||||||
./configure &>/dev/null || fail 2
|
./configure $CONFIG_OPTIONS >>$CONFIG_LOG 2>&1 || fail 2
|
||||||
make -s -j$CPUS &>/dev/null || fail 3
|
make ${MAKE_OPTIONS} >>$MAKE_LOG 2>&1 || fail 3
|
||||||
pass_nonewline
|
pass_nonewline
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
@ -425,9 +429,10 @@ for TAG in $SRC_TAGS; do
|
||||||
else
|
else
|
||||||
cd $ZFS_DIR
|
cd $ZFS_DIR
|
||||||
make distclean &>/dev/null
|
make distclean &>/dev/null
|
||||||
sh ./autogen.sh &>/dev/null || fail 1
|
./autogen.sh >>$CONFIG_LOG 2>&1 || fail 1
|
||||||
./configure --with-spl=$SPL_DIR &>/dev/null || fail 2
|
./configure --with-spl=$SPL_DIR $CONFIG_OPTIONS \
|
||||||
make -s -j$CPUS &>/dev/null || fail 3
|
>>$CONFIG_LOG 2>&1 || fail 2
|
||||||
|
make ${MAKE_OPTIONS} >>$MAKE_LOG 2>&1 || fail 3
|
||||||
pass_nonewline
|
pass_nonewline
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
Loading…
Reference in New Issue