svn commit: r262878 - in stable/9/release: . scripts

[Glen Barber]

Author: gjb
Date: Fri Mar  7 00:28:11 2014
New Revision: 262878
URL: http://svnweb.freebsd.org/changeset/base/262878

Log:
  MFC r258305, r258770, r259400, r259426:
  
  r258305:
    Use the IMAGES variable to determine which image files to
    remove as part of 'make -C /usr/src/release clean'.
  
  r258770 (hrs):
    Add NOPKG to disable pkg-stage.
  
  r259400:
    Reduce disc1.iso size by 74MB by removing lib32 libraries,
    sendmail, and atf.
  
  r259426:
    Add a pkg(8) repository configuration file for cdrom-based
    package installation.
  
    As part of the 'pkg-stage' target, copy the configuration
    file to the 'packages/repos/' directory on the DVD filesystem.
  
  Sponsored by:	The FreeBSD Foundation

Added:
  stable/9/release/scripts/FreeBSD_install_cdrom.conf
     - copied unchanged from r259426, head/release/scripts/FreeBSD_install_cdrom.conf
Modified:
  stable/9/release/Makefile
Directory Properties:
  stable/9/release/   (props changed)

Modified: stable/9/release/Makefile
==============================================================================
--- stable/9/release/Makefile	Fri Mar  7 00:25:23 2014	(r262877)
+++ stable/9/release/Makefile	Fri Mar  7 00:28:11 2014	(r262878)
@@ -16,6 +16,7 @@
 #            (by default, the directory above this one) 
 #  PORTSDIR: location of ports tree to distribute (default: /usr/ports)
 #  DOCDIR:   location of doc tree (default: /usr/doc)
+#  NOPKG:    if set, do not distribute third-party packages
 #  NOPORTS:  if set, do not distribute ports tree
 #  NOSRC:    if set, do not distribute source tree
 #  NODOC:    if set, do not generate release documentation
@@ -143,7 +144,7 @@ system: packagesystem
 	mkdir -p release
 	cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \
 		DESTDIR=${.OBJDIR}/release WITHOUT_RESCUE=1 WITHOUT_KERNEL_SYMBOLS=1 \
-		WITHOUT_PROFILE=1
+		WITHOUT_PROFILE=1 WITHOUT_SENDMAIL=1 WITHOUT_ATF=1 WITHOUT_LIB32=1
 # Copy distfiles
 	mkdir -p release/usr/freebsd-dist
 	cp *.txz MANIFEST release/usr/freebsd-dist
@@ -232,10 +233,14 @@ packagesystem: base.txz kernel.txz ${EXT
 	touch ${.TARGET}
 
 pkg-stage:
-.if(exists(${.CURDIR}/${TARGET}/pkg-stage.conf))
+.if !defined(NOPKG) && exists(${.CURDIR}/${TARGET}/pkg-stage.conf)
 	sh ${.CURDIR}/scripts/pkg-stage.sh ${.CURDIR}/${TARGET}/pkg-stage.conf \
 		${REVISION}
+	mkdir -p ${.OBJDIR}/dvd/packages/repos/
+	cp ${.CURDIR}/scripts/FreeBSD_install_cdrom.conf \
+		${.OBJDIR}/dvd/packages/repos/
 .endif
+	touch ${.TARGET}
 
 cdrom: disc1.iso bootonly.iso
 dvdrom: dvd1.iso

Copied: stable/9/release/scripts/FreeBSD_install_cdrom.conf (from r259426, head/release/scripts/FreeBSD_install_cdrom.conf)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/9/release/scripts/FreeBSD_install_cdrom.conf	Fri Mar  7 00:28:11 2014	(r262878, copy of r259426, head/release/scripts/FreeBSD_install_cdrom.conf)
@@ -0,0 +1,12 @@
+#
+# $FreeBSD$
+#
+# The pkg(8) repository configuration file for the installation DVD.
+#
+
+FreeBSD_install_cdrom: {
+  url: "file:///dist/packages/${ABI}",
+  mirror_type: "none",
+  enabled: yes
+}
+