svn commit: r278674 - in projects/release-install-debug: . release/scripts

[Glen Barber]

Author: gjb
Date: Fri Feb 13 14:28:03 2015
New Revision: 278674
URL: https://svnweb.freebsd.org/changeset/base/278674

Log:
  Rename kernel{_*,}_symbols.txz -> kernel{_*,}-dbg.txz.
  Default kernel-dbg.txz to 'on' and kernel_*-dbg.txz to
  'off' in the MANIFEST.
  Add additional string manipulation to properly display
  the description.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-install-debug/Makefile.inc1
  projects/release-install-debug/release/scripts/make-manifest.sh

Modified: projects/release-install-debug/Makefile.inc1
==============================================================================
--- projects/release-install-debug/Makefile.inc1	Fri Feb 13 13:55:38 2015	(r278673)
+++ projects/release-install-debug/Makefile.inc1	Fri Feb 13 14:28:03 2015	(r278674)
@@ -1146,7 +1146,7 @@ packagekernel:
 	    --exclude '*.symbols' \
 	    @${DESTDIR}/${DISTDIR}/kernel.meta
 	cd ${DESTDIR}/${DISTDIR}/kernel; \
-	    tar cvJf ${DESTDIR}/${DISTDIR}/kernel_symbols.txz \
+	    tar cvJf ${DESTDIR}/${DISTDIR}/kernel-dbg.txz \
 	    --include '*/*/*.symbols' \
 	    @${DESTDIR}/${DISTDIR}/kernel.meta
 .for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//}
@@ -1155,7 +1155,7 @@ packagekernel:
 	    --exclude '*.symbols' \
 	    @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta
 	cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
-	    tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}_symbols.txz \
+	    tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}-dbg.txz \
 	    --include '*/*/*.symbols' \
 	    @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta
 .endfor
@@ -1165,7 +1165,7 @@ packagekernel:
 	    --exclude '*.symbols' \
 	    .
 	cd ${DESTDIR}/${DISTDIR}/kernel; \
-	    tar cvJf ${DESTDIR}/${DISTDIR}/kernel_symbols.txz \
+	    tar cvJf ${DESTDIR}/${DISTDIR}/kernel-dbg.txz \
 	    --include '*/*/*.symbols' \
 	    $$(eval find .)
 .for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//}
@@ -1174,7 +1174,7 @@ packagekernel:
 	    --exclude '*.symbols' \
 	    .
 	cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
-	    tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}_symbols.txz \
+	    tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}-dbg.txz \
 	    --include '*/*/*.symbols' \
 	    $$(eval find .)
 .endfor

Modified: projects/release-install-debug/release/scripts/make-manifest.sh
==============================================================================
--- projects/release-install-debug/release/scripts/make-manifest.sh	Fri Feb 13 13:55:38 2015	(r278673)
+++ projects/release-install-debug/release/scripts/make-manifest.sh	Fri Feb 13 14:28:03 2015	(r278674)
@@ -24,8 +24,9 @@ desc_doc="${doc}"
 desc_games="${games}"
 desc_games_dbg="${games} (Debugging)"
 desc_kernel="${kernel} (MANDATORY)"
-desc_kernel_symbols="${kernel} (Debugging symbols)"
+desc_kernel_dbg="${kernel} (Debugging)"
 desc_kernel_alt="Alternate ${kernel}"
+desc_kernel_alt_dbg="Alternate ${kernel} (Debugging)"
 desc_lib32="${lib32}"
 desc_lib32_dbg="${lib32} (Debugging)"
 desc_ports="${ports}"
@@ -39,21 +40,32 @@ default_base_dbg=off
 default_games_dbg=off
 default_lib32_dbg=off
 default_kernel_alt=off
-default_kernel_symbols=on
+default_kernel_dbg=on
+default_kernel_alt_dbg=off
 
 for i in ${*}; do
 	dist="${i}"
 	distname="${i%%.txz}"
-	distname="$(echo ${distname} | sed -E 's/-dbg/_dbg/')"
-	distname="$(echo ${distname} | sed -E 's/kernel\..*/kernel_alt/')"
+	distname="$(echo ${distname} | tr '-' '_')"
+	distname="$(echo ${distname} | tr 'kernel.' 'kernel_')"
 	hash="$(sha256 -q ${i})"
 	nfiles="$(tar tvf ${i} | wc -l | tr -d ' ')"
 	default="$(eval echo \${default_${distname}:-on})"
 	desc="$(eval echo \"\${desc_${distname}}\")"
 
 	case ${i} in
-		kernel.*.*)
-			desc="${desc} \($(echo ${i%%.txz} | cut -f 2 -d '.')\)"
+		kernel-dbg.txz)
+			desc="${desc_kernel_dbg}"
+			;;
+		kernel.*-dbg.txz)
+			desc="$(eval echo \"${desc_kernel_alt_dbg}\")"
+			desc="${desc}: $(eval echo ${i%%-dbg.txz} | cut -f 2 -d '.')"
+			default="$(eval echo \"${default_kernel_alt_dbg}\")"
+			;;
+		kernel.*.txz)
+			desc="$(eval echo \"${desc_kernel_alt}\")"
+			desc="${desc}: $(eval echo ${i%%.txz} | cut -f 2 -d '.')"
+			default="$(eval echo \"${default_kernel_alt}\")"
 			;;
 		*)
 			;;