From da52594639ac9c096c58d385310db81b2d28dd13 Mon Sep 17 00:00:00 2001
From: nwhitehorn <nwhitehorn@FreeBSD.org>
Date: Sun, 13 Mar 2011 17:15:31 +0000
Subject: Add generation of an installation manifest containing SHA256
 checksums as well as package descriptions and add code in the installer to
 check the checksums.

---
 release/Makefile.bsdinstall      |  8 +++++---
 release/scripts/make-manifest.sh | 25 +++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100755 release/scripts/make-manifest.sh

(limited to 'release')

diff --git a/release/Makefile.bsdinstall b/release/Makefile.bsdinstall
index a2d350f..bda97a4 100644
--- a/release/Makefile.bsdinstall
+++ b/release/Makefile.bsdinstall
@@ -112,7 +112,8 @@ system: packagesystem
 	-rm ${.OBJDIR}/release/boot/kernel/*.symbols
 # Copy distfiles
 	mkdir ${.OBJDIR}/release/usr/freebsd-dist
-	cp ${.OBJDIR}/*.txz ${.OBJDIR}/release/usr/freebsd-dist
+	cp ${.OBJDIR}/*.txz ${.OBJDIR}/MANIFEST \
+	    ${.OBJDIR}/release/usr/freebsd-dist
 # Copy documentation, if generated
 .if !defined(NODOC)
 	cp ${.OBJDIR}/reldoc/* ${.OBJDIR}/release
@@ -134,13 +135,14 @@ memstick: system
 	sh ${.CURDIR}/${TARGET}/make-memstick.sh ${.OBJDIR}/release ${.OBJDIR}/memstick
 
 packagesystem: base.txz kernel.txz ${EXTRA_PACKAGES}
+	sh ${.CURDIR}/${TARGET}/make-manifest.sh ${DISTDIR}/*.txz > ${.OBJDIR}/MANIFEST
 	touch ${.OBJDIR}/${.TARGET}
 
 cdrom: release.iso
 ftp: packagesystem
 	rm -rf ${.OBJDIR}/ftp
 	mkdir ${.OBJDIR}/ftp
-	cp ${.OBJDIR}/*.txz ${.OBJDIR}/ftp
+	cp ${.OBJDIR}/*.txz ${.OBJDIR}/MANIFEST ${.OBJDIR}/ftp
 
 release: ${RELEASE_TARGETS}
 
@@ -148,7 +150,7 @@ clean:
 	chflags -R noschg ${.OBJDIR}
 	rm -rf ${.OBJDIR}/dist ${.OBJDIR}/ftp
 	rm -f packagesystem
-	rm -f ${.OBJDIR}/*.txz
+	rm -f ${.OBJDIR}/*.txz ${.OBJDIR}/MANIFEST
 	rm -f system
 	rm -rf ${.OBJDIR}/release
 	rm -f ${.OBJDIR}/release.iso ${.OBJDIR}/memstick
diff --git a/release/scripts/make-manifest.sh b/release/scripts/make-manifest.sh
new file mode 100755
index 0000000..352d27a
--- /dev/null
+++ b/release/scripts/make-manifest.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+# make-manifest.sh: create checksums and package descriptions for the installer
+#
+#  Usage: make-manifest.sh foo1.txz foo2.txz ...
+#
+# The output file looks like this (tab-delimited):
+#  foo1.txz SHA256-checksu Number-of-files foo1 Description Install-by-default
+#
+# $FreeBSD$
+
+desc_base="Base system (MANDATORY)"
+desc_kernel="Kernel (MANDATORY)"
+desc_doc="Additional documentation"
+doc_default=off
+desc_games="Games (fortune, etc.)"
+desc_lib32="32-bit compatibility libraries"
+desc_ports="Ports tree"
+desc_src="System source code"
+src_default=off
+
+for i in $*; do
+	echo "`basename $i`	`sha256 -q $i`	`tar tvf $i | wc -l | tr -d ' '`	`basename $i .txz`	\"`eval echo \\\$desc_$(basename $i .txz)`\"	`eval echo \\\${$(basename $i .txz)_default:-on}`"
+done
+
-- 
cgit v1.1