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

build: pkg-warn is more of a pkg-msg anyway

This commit is contained in:
Franco Fichtner 2022-06-08 12:39:12 +02:00
parent c1874043f9
commit a4e7af0253
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build/common.sh
View File

@ -809,7 +809,7 @@ search_packages()
if [ -L ${PKGLINK} ]; then
PKGFILE=$(readlink -f ${PKGLINK} || true)
if [ -f ${PKGFILE} ]; then
echo ">>> Skipped version ${PKGVERS} for ${PKGNAME}" >> ${BASEDIR}/.pkg-warn
echo ">>> Skipped version ${PKGVERS} for ${PKGNAME}" >> ${BASEDIR}/.pkg-msg
return 0
fi
fi
@ -956,7 +956,7 @@ EOF
)
if [ -n "${PRODUCT_REBUILD}" ]; then
echo ">>> Rebuilt version ${5} for ${4}" >> ${1}/.pkg-warn
echo ">>> Rebuilt version ${5} for ${4}" >> ${1}/.pkg-msg
fi
}
@ -1036,9 +1036,9 @@ bundle_packages()
(cd ${SETSDIR}; ls -lah packages-${PACKAGEVER}.*)
if [ -f ${BASEDIR}/.pkg-warn ]; then
echo ">>> WARNING: The build may have integrity issues!"
cat ${BASEDIR}/.pkg-warn
if [ -f ${BASEDIR}/.pkg-msg ]; then
echo ">>> WARNING: The build provided additional info."
cat ${BASEDIR}/.pkg-msg
fi
if [ -f ${BASEDIR}/.pkg-err ]; then

2
build/packages.sh
View File

@ -66,7 +66,7 @@ for AUX in ${AUXLIST}; do
if [ "${AUX}" = "${PKGORIGIN}" ]; then
echo ">>> Removing auxiliary package ${AUX}" \
>> ${STAGEDIR}/.pkg-warn
>> ${STAGEDIR}/.pkg-msg
rm -f ${STAGEDIR}/${PKG}
break;
fi

6
build/ports.sh
View File

@ -150,7 +150,7 @@ UNAME_r=\$(freebsd-version)
PKGFILE=\$(readlink -f \${PKGLINK} || true)
if [ -f \${PKGFILE} ]; then
PKGVERS=\$(make -C ${PORTSDIR}/\${PORT} -v PKGVERSION \${MAKE_ARGS})
echo ">>> Skipped version \${PKGVERS} for \${PORT_ORIGIN}" >> /.pkg-warn
echo ">>> Skipped version \${PKGVERS} for \${PORT_ORIGIN}" >> /.pkg-msg
continue
fi
fi
@ -176,11 +176,11 @@ UNAME_r=\$(freebsd-version)
make -C ${PORTSDIR}/\${PORT} clean \${MAKE_ARGS}
continue
elif ! make -C ${PORTSDIR}/\${PORT} check-plist \${MAKE_ARGS}; then
echo ">>> Package list inconsistency for \${PORT_ORIGIN}" >> /.pkg-warn
echo ">>> Package list inconsistency for \${PORT_ORIGIN}" >> /.pkg-msg
fi
if [ -n "${PRODUCT_REBUILD}" ]; then
echo ">>> Rebuilt version \${PKGVERS} for \${PORT_ORIGIN}" >> /.pkg-warn
echo ">>> Rebuilt version \${PKGVERS} for \${PORT_ORIGIN}" >> /.pkg-msg
fi
for PKGNAME in \$(pkg query %n); do