aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2016-03-08 19:35:30 +0000
committerGlen Barber <gjb@FreeBSD.org>2016-03-08 19:35:30 +0000
commitb0bdd78348d85294a359c160c307b608b2dc45f0 (patch)
treeae12a5a78b1701fd57a5131171bcd9777400e74a
parent44d81980edb511ed6e49c3dcd673931179f6c8aa (diff)
downloadsrc-b0bdd78348d85294a359c160c307b608b2dc45f0.tar.gz
src-b0bdd78348d85294a359c160c307b608b2dc45f0.zip
Avoid adding the '-release' suffix to non-debug kernel packages.
Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/projects/release-pkg/; revision=296545
-rw-r--r--Makefile.inc124
-rw-r--r--release/scripts/mtree-to-plist.awk2
2 files changed, 13 insertions, 13 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index ec1ff5f06093..f2ba7a735223 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1443,7 +1443,7 @@ create-world-packages: _pkgbootstrap
create-kernel-packages: _pkgbootstrap
.if exists(${DESTDIR}/kernel.meta)
-.for flavor in release debug
+.for flavor in "" -debug
@cd ${DESTDIR}/${DISTDIR} ; \
awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \
-v kernel=yes -v _kernconf=${INSTALLKERNEL} \
@@ -1451,20 +1451,20 @@ 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-${INSTALLKERNEL:tl}-${flavor}/" \
+ -e "s/%PKGNAME%/kernel-${INSTALLKERNEL:tl}${flavor}/" \
-e "s/%COMMENT%/FreeBSD ${INSTALLKERNEL} kernel ${flavor}/" \
-e "s/%DESC%/FreeBSD ${INSTALLKERNEL} kernel ${flavor}/" \
-e "s/%CAP_MKDB_ENDIAN%/$${cap_arg}/g" \
-e "s/%PWD_MKDB_ENDIAN%/$${pwd_arg}/g" \
${SRCDIR}/release/packages/kernel.ucl \
- > ${DESTDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}-${flavor}.ucl ; \
+ > ${DESTDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl ; \
awk -F\" ' \
/name/ { printf("===> Creating %s-", $$2); next } \
/version/ {print $$2; next } ' \
- ${DESTDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}-${flavor}.ucl ; \
+ ${DESTDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl ; \
pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh -o ALLOW_BASE_SHLIBS=yes \
- create -M ${DESTDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}-${flavor}.ucl \
- -p ${DESTDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}-${flavor}.plist \
+ create -M ${DESTDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl \
+ -p ${DESTDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.plist \
-r ${DESTDIR}/${DISTDIR} \
-o ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION}
.endfor
@@ -1472,7 +1472,7 @@ create-kernel-packages: _pkgbootstrap
.if ${BUILDKERNELS:[#]} > 1 && !defined(NO_INSTALLEXTRAKERNELS)
.for _kernel in ${BUILDKERNELS:[2..-1]}
.if exists(${DESTDIR}/kernel.${_kernel}.meta)
-.for flavor in release debug
+.for flavor in "" -debug
@cd ${DESTDIR}/kernel.${_kernel} ; \
awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \
-v kernel=yes -v _kernconf=${_kernel} \
@@ -1480,20 +1480,20 @@ 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-${_kernel:tl}-${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 \
- > ${DESTDIR}/kernel.${_kernel}/kernel.${_kernel}-${flavor}.ucl ; \
+ > ${DESTDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl ; \
awk -F\" ' \
/name/ { printf("===> Creating %s-", $$2); next } \
/version/ {print $$2; next } ' \
- ${DESTDIR}/kernel.${_kernel}/kernel.${_kernel}-${flavor}.ucl ; \
+ ${DESTDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl ; \
pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh -o ALLOW_BASE_SHLIBS=yes \
- create -M ${DESTDIR}/kernel.${_kernel}/kernel.${_kernel}-${flavor}.ucl \
- -p ${DESTDIR}/kernel.${_kernel}/kernel.${_kernel}-${flavor}.plist \
+ create -M ${DESTDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl \
+ -p ${DESTDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.plist \
-r ${DESTDIR}/kernel.${_kernel} \
-o ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION}
.endfor
diff --git a/release/scripts/mtree-to-plist.awk b/release/scripts/mtree-to-plist.awk
index a499b94f5f3c..d3157ecad0c2 100644
--- a/release/scripts/mtree-to-plist.awk
+++ b/release/scripts/mtree-to-plist.awk
@@ -70,7 +70,7 @@
if ($1 ~ /^\/usr\/lib\/debug\/boot/) {
output=output"-debug.plist"
} else {
- output=output"-release.plist"
+ output=output".plist"
}
} else {
output=pkgname".plist"