summaryrefslogtreecommitdiff
path: root/Makefile.inc1
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2016-01-27 21:24:45 +0000
committerGlen Barber <gjb@FreeBSD.org>2016-01-27 21:24:45 +0000
commitf61b169160594ee9c9540bbccd08cc08e6f62850 (patch)
treecbb9483d03b386eada28ba9af8083f602d59fec3 /Makefile.inc1
parent3d98f473dcef044a211c9f4b6cd2dbe807487f7c (diff)
downloadsrc-test2-f61b169160594ee9c9540bbccd08cc08e6f62850.tar.gz
src-test2-f61b169160594ee9c9540bbccd08cc08e6f62850.zip
Fix naming for multiple kernels when building/packaging more than one.
Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/projects/release-pkg/; revision=294955
Diffstat (limited to 'Makefile.inc1')
-rw-r--r--Makefile.inc16
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index 5d53736f947e..e49ed4015505 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1452,9 +1452,9 @@ create-kernel-packages: _pkgbootstrap
cap_arg=`cd ${SRCDIR}/etc ; ${MAKE} -VCAP_MKDB_ENDIAN` ; \
pwd_arg=`cd ${SRCDIR}/etc ; ${MAKE} -VPWD_MKDB_ENDIAN` ; \
sed -e "s/%VERSION%/${PKG_VERSION}/" \
- -e "s/%PKGNAME%/kernel-${flavor}/" \
- -e "s/%COMMENT%/FreeBSD ${INSTKERNNAME} kernel ${flavor}/" \
- -e "s/%DESC%/FreeBSD ${INSTKERNNAME} kernel ${flavor}/" \
+ -e "s/%PKGNAME%/kernel-${_kernel:tl}-${flavor}/" \
+ -e "s/%COMMENT%/FreeBSD ${_kernel} kernel ${flavor}/" \
+ -e "s/%DESC%/FreeBSD ${_kernel} kernel ${flavor}/" \
-e "s/%CAP_MKDB_ENDIAN%/$${cap_arg}/g" \
-e "s/%PWD_MKDB_ENDIAN%/$${pwd_arg}/g" \
${SRCDIR}/release/packages/kernel.ucl \