Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 29 Mar 2012 12:03:06 +0000 (UTC)
From:      Ken Smith <kensmith@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r233658 - stable/8/release/scripts
Message-ID:  <201203291203.q2TC36Td091809@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kensmith
Date: Thu Mar 29 12:03:06 2012
New Revision: 233658
URL: http://svn.freebsd.org/changeset/base/233658

Log:
  Adjust for the set of packages that will ship with 8.3-RELEASE.  At this
  point only the English documentation package fits on disc1.  All of the
  documentation packages will be provided on the memstick images but no
  other packages.  The DVD image will have enough packages to set up a
  basic graphical workstation.
  
  Reviewed by:	portmgr, re

Modified:
  stable/8/release/scripts/package-split.py

Modified: stable/8/release/scripts/package-split.py
==============================================================================
--- stable/8/release/scripts/package-split.py	Thu Mar 29 11:46:29 2012	(r233657)
+++ stable/8/release/scripts/package-split.py	Thu Mar 29 12:03:06 2012	(r233658)
@@ -23,18 +23,28 @@ if 'PKG_VERBOSE' in os.environ:
 else:
     verbose = 0
 
+if 'PKG_MEMSTICK' in os.environ:
+    doing_memstick = 1
+else:
+    doing_memstick = 0
+
 if 'PKG_DVD' in os.environ:
     doing_dvd = 1
 else:
     doing_dvd = 0
 
-# List of packages for disc1.
+# List of packages.  At this point only the English documentation fits
+# on disc1.  Add in the rest of the documentation for the memstick image.
+# And add in enough packages to make a basic graphical workstation for the
+# dvd image.
 def disc1_packages():
-    pkgs = ['misc/freebsd-doc-bn', 
+    pkgs = ['misc/freebsd-doc-en'] 
+
+    if doing_memstick or doing_dvd:
+        pkgs.extend(['misc/freebsd-doc-bn', 
 	    'misc/freebsd-doc-da',
 	    'misc/freebsd-doc-de',
 	    'misc/freebsd-doc-el',
-	    'misc/freebsd-doc-en',
 	    'misc/freebsd-doc-es',
 	    'misc/freebsd-doc-fr',
 	    'misc/freebsd-doc-hu',
@@ -48,22 +58,24 @@ def disc1_packages():
 	    'misc/freebsd-doc-sr',
 	    'misc/freebsd-doc-tr',
 	    'misc/freebsd-doc-zh_cn',
-	    'misc/freebsd-doc-zh_tw']
+	    'misc/freebsd-doc-zh_tw'])
 
     if doing_dvd:
 	pkgs.extend(['archivers/unzip',
 	    'emulators/linux_base-f10',
-	    'lang/perl5.10',
+	    'lang/perl5.12',
+	    'misc/freebsd-doc-all',
 	    'net/mpd5',
 	    'net/rsync',
-	    'ports-mgmt/p5-FreeBSD-Portindex',
 	    'ports-mgmt/portaudit',
 	    'ports-mgmt/portmaster',
-	    'ports-mgmt/portupgrade',
 	    'shells/bash',
 	    'shells/zsh',
 	    'security/sudo',
 	    'sysutils/screen',
+	    'www/firefox',
+	    'www/links',
+	    'x11-drivers/xf86-video-vmware',
 	    'x11/gnome2',
 	    'x11/kde4',
 	    'x11/xorg'])



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203291203.q2TC36Td091809>