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

build: prefer -v over -V

This commit is contained in:
Franco Fichtner 2021-02-24 10:33:10 +01:00
parent 0f46176f1a
commit 6e89e3a718
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/base.sh
View File

@ -63,12 +63,12 @@ ${ENV_FILTER} make -s -C${SRCDIR} -j${CPUS} buildworld ${MAKE_ARGS} NO_CLEAN=yes
${ENV_FILTER} make -s -C${SRCDIR}/release obj ${MAKE_ARGS}
# reset the distribution directory
BASE_DISTDIR="$(make -C${SRCDIR}/release -V DISTDIR ${MAKE_ARGS})/${SELF}"
BASE_OBJDIR="$(make -C${SRCDIR}/release -V .OBJDIR ${MAKE_ARGS})"
BASE_DISTDIR="$(make -C${SRCDIR}/release -v DISTDIR ${MAKE_ARGS})/${SELF}"
BASE_OBJDIR="$(make -C${SRCDIR}/release -v .OBJDIR ${MAKE_ARGS})"
setup_stage "${BASE_OBJDIR}/${BASE_DISTDIR}"
# remove older object archives, too
BASE_OBJ=$(make -C${SRCDIR}/release -V .OBJDIR ${MAKE_ARGS})/base.txz
BASE_OBJ=$(make -C${SRCDIR}/release -v .OBJDIR ${MAKE_ARGS})/base.txz
rm -f ${BASE_OBJ}
${ENV_FILTER} make -s -C${SRCDIR}/release base.txz ${MAKE_ARGS}

2
build/common.sh
View File

@ -778,7 +778,7 @@ prune_packages()
grep ^Origin | awk '{ print $3; }')
PKGGLOBS=
for CONFLICTS in CONFLICTS CONFLICTS_INSTALL; do
PKGGLOBS="${PKGGLOBS} $(make -C ${PORTSDIR}/${PKGORIGIN} -V ${CONFLICTS} PHP_DEFAULT=${PRODUCT_PHP})"
PKGGLOBS="${PKGGLOBS} $(make -C ${PORTSDIR}/${PKGORIGIN} -v ${CONFLICTS} PHP_DEFAULT=${PRODUCT_PHP})"
done
for PKGGLOB in ${PKGGLOBS}; do
pkg -c ${1} remove -gy "${PKGGLOB}" || true

8
build/kernel.sh
View File

@ -65,13 +65,13 @@ ${ENV_FILTER} make -s -C${SRCDIR} -j${CPUS} buildkernel ${MAKE_ARGS} NO_KERNELCL
${ENV_FILTER} make -s -C${SRCDIR}/release obj ${MAKE_ARGS}
# reset the distribution directory
KERNEL_DISTDIR="$(make -C${SRCDIR}/release -V DISTDIR ${MAKE_ARGS})/${SELF}"
KERNEL_OBJDIR="$(make -C${SRCDIR}/release -V .OBJDIR ${MAKE_ARGS})"
KERNEL_DISTDIR="$(make -C${SRCDIR}/release -v DISTDIR ${MAKE_ARGS})/${SELF}"
KERNEL_OBJDIR="$(make -C${SRCDIR}/release -v .OBJDIR ${MAKE_ARGS})"
setup_stage "${KERNEL_OBJDIR}/${KERNEL_DISTDIR}"
# remove older object archives, too
KERNEL_OBJ=$(make -C${SRCDIR}/release -V .OBJDIR ${MAKE_ARGS})/kernel.txz
DEBUG_OBJ=$(make -C${SRCDIR}/release -V .OBJDIR ${MAKE_ARGS})/kernel-dbg.txz
KERNEL_OBJ=$(make -C${SRCDIR}/release -v .OBJDIR ${MAKE_ARGS})/kernel.txz
DEBUG_OBJ=$(make -C${SRCDIR}/release -v .OBJDIR ${MAKE_ARGS})/kernel-dbg.txz
rm -f ${KERNEL_OBJ} ${DEBUG_OBJ}
# We used kernel.txz because we did not rewrite it,

6
build/ports.sh
View File

@ -129,7 +129,7 @@ UNAME_r=\$(freebsd-version)
fi
# check whether the package has already been built
PKGFILE=\$(make -C ${PORTSDIR}/\${PORT} -V PKGFILE \${MAKE_ARGS})
PKGFILE=\$(make -C ${PORTSDIR}/\${PORT} -v PKGFILE \${MAKE_ARGS})
if [ -f \${PKGFILE} ]; then
continue
fi
@ -142,13 +142,13 @@ UNAME_r=\$(freebsd-version)
if [ -L \${PKGLINK} ]; then
PKGFILE=\$(readlink -f \${PKGLINK} || true)
if [ -f \${PKGFILE} ]; then
PKGVERS=\$(make -C ${PORTSDIR}/\${PORT} -V PKGVERSION \${MAKE_ARGS})
PKGVERS=\$(make -C ${PORTSDIR}/\${PORT} -v PKGVERSION \${MAKE_ARGS})
echo ">>> Skipped version \${PKGVERS} for \${PORT_ORIGIN}" >> /.pkg-warn
continue
fi
fi
PKGVERS=\$(make -C ${PORTSDIR}/\${PORT} -V PKGVERSION \${MAKE_ARGS})
PKGVERS=\$(make -C ${PORTSDIR}/\${PORT} -v PKGVERSION \${MAKE_ARGS})
if ! make -s -C ${PORTSDIR}/\${PORT} install \
USE_PACKAGE_DEPENDS=yes \${MAKE_ARGS}; then

4
build/skim.sh
View File

@ -125,7 +125,7 @@ while read PORT; do
fi
PORT_MASTER=$(${ENV_FILTER} make -C ${SOURCE}/${PORT} \
-V MASTER_PORT PORTSDIR=${SOURCE} ${MAKE_ARGS})
-v MASTER_PORT PORTSDIR=${SOURCE} ${MAKE_ARGS})
if [ -n "${PORT_MASTER}" ]; then
echo ${PORT_MASTER} >> ${STAGEDIR}/used
fi
@ -137,7 +137,7 @@ rm ${STAGEDIR}/used
echo
if [ -n "${UNUSED}" ]; then
(cd ${PORTSDIR}; mkdir -p $(make -C ${PORTSREFDIR} -V SUBDIR))
(cd ${PORTSDIR}; mkdir -p $(make -C ${PORTSREFDIR} -v SUBDIR))
mkdir ${STAGEDIR}/ref
for ENTRY in ${PORTSDIR}/[a-z]*; do

2
build/xtools.sh
View File

@ -57,7 +57,7 @@ MAKE_ARGS="${MAKE_ARGS} SRCCONF=${CONFIGDIR}/src.conf __MAKE_CONF="
${ENV_FILTER} make -C${SRCDIR} -j${CPUS} native-xtools ${MAKE_ARGS} NO_CLEAN=yes
XTOOLS_DIR=$(make -C${SRCDIR} -f Makefile.inc1 -V OBJTREE ${MAKE_ARGS})/nxb-bin
XTOOLS_DIR=$(make -C${SRCDIR} -f Makefile.inc1 -v OBJTREE ${MAKE_ARGS})/nxb-bin
${ENV_FILTER} make -C${SRCDIR} -j${CPUS} native-xtools-install ${MAKE_ARGS} NO_CLEAN=yes DESTDIR=${XTOOLS_DIR}/..