diff options
Diffstat (limited to 'src/share/poudriere')
| -rwxr-xr-x | src/share/poudriere/common.sh | 5 | ||||
| -rwxr-xr-x | src/share/poudriere/testport.sh | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/share/poudriere/common.sh b/src/share/poudriere/common.sh index 17c932ed..d098abc6 100755 --- a/src/share/poudriere/common.sh +++ b/src/share/poudriere/common.sh @@ -773,6 +773,7 @@ log_start() { buildlog_start() { local originspec="$1" + local pkgname="$2" local mnt var portdir local make_vars local wanted_vars=" @@ -799,7 +800,7 @@ buildlog_start() { echo "build started at $(date)" echo "port directory: ${portdir}" - echo "package name: ${PKGNAME}" + echo "package name: ${pkgname}" echo "building for: $(injail uname -a)" echo "maintained by: ${mk_MAINTAINER}" echo "Makefile ident: $(ident -q ${mnt}/${portdir}/Makefile|sed -n '2,2p')" @@ -4089,7 +4090,7 @@ build_pkg() { esac done - buildlog_start "${ORIGINSPEC}" + buildlog_start "${ORIGINSPEC}" "${PKGNAME}" # Ensure /dev/null exists (kern/139014) [ ${JAILED} -eq 0 ] && ! [ -c "${mnt}/dev/null" ] && \ diff --git a/src/share/poudriere/testport.sh b/src/share/poudriere/testport.sh index 0df7fcb1..83da9f40 100755 --- a/src/share/poudriere/testport.sh +++ b/src/share/poudriere/testport.sh @@ -291,7 +291,7 @@ if [ -n "${MAX_MEMORY_BYTES}" -o -n "${MAX_FILES}" ]; then JEXEC_LIMITS=1 fi log_start 1 -buildlog_start "${ORIGINSPEC}" +buildlog_start "${ORIGINSPEC}" "${PKGNAME}" ret=0 # Don't show timestamps in msg() which goes to logs, only job_msg() |