From owner-svn-src-stable-8@FreeBSD.ORG Thu Mar 29 12:03:07 2012 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 60B52106566C; Thu, 29 Mar 2012 12:03:07 +0000 (UTC) (envelope-from kensmith@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 316538FC0C; Thu, 29 Mar 2012 12:03:07 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2TC36C9091811; Thu, 29 Mar 2012 12:03:06 GMT (envelope-from kensmith@svn.freebsd.org) Received: (from kensmith@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2TC36Td091809; Thu, 29 Mar 2012 12:03:06 GMT (envelope-from kensmith@svn.freebsd.org) Message-Id: <201203291203.q2TC36Td091809@svn.freebsd.org> From: Ken Smith Date: Thu, 29 Mar 2012 12:03:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233658 - stable/8/release/scripts X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Mar 2012 12:03:07 -0000 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'])