Author: kensmith
Date: Fri Sep 11 13:46:28 2009
New Revision: 197088
URL: http://svn.freebsd.org/changeset/base/197088
Log:
MFC r196942:
> Bring the layout of package-split.py more in line with where we're going
> with packages on the release media. It looks like we'll be putting just
> the doc packages on the new "memory stick" image as well as disc1. There
> will be no other packages on the CDROM-sized media. The DVD sized media
> will include the doc packages plus whatever other packages we decide to
> make part of the release.
>
> This commit just brings the basic structure in line with being able to
> do this. We still need to discuss with various people exactly which
> packages will be included on the DVD.
>
> If the environement variable "PKG_DVD" is set a tree suitable for the
> DVD media is generated. Otherwise a tree suitable for the "memory stick"
> and disc1 is generated.
Approved by: re (kib)
Modified:
stable/8/release/ (props changed)
stable/8/release/doc/ (props changed)
stable/8/release/scripts/package-split.py
Modified: stable/8/release/scripts/package-split.py
==============================================================================
--- stable/8/release/scripts/package-split.py Fri Sep 11 12:56:13 2009
(r197087)
+++ stable/8/release/scripts/package-split.py Fri Sep 11 13:46:28 2009
(r197088)
@@ -23,71 +23,14 @@ if 'PKG_VERBOSE' in os.environ:
else:
verbose = 0
-# List of packages for disc1. This just includes packages sysinstall can
-# install as a distribution
-def disc1_packages():
- pkgs = ['lang/perl5.8']
- pkgs.extend(['x11/xorg',
- 'devel/imake'])
- if arch == 'i386':
- pkgs.append('emulators/linux_base-fc4')
- return pkgs
-
-# List of packages for disc2. This includes packages that the X desktop
-# menu depends on (if it still exists) and other "nice to have" packages.
-# For architectures that use a separate livefs, this is actually disc3.
-def disc2_packages():
- # X Desktops
- if arch == 'ia64':
- pkgs = ['x11/gnome2-lite',
- 'x11/kde-lite']
- else:
- pkgs = ['x11/gnome2',
- 'x11/kde3']
- pkgs.extend(['x11-wm/afterstep',
- 'x11-wm/windowmaker',
- 'x11-wm/fvwm2',
- # "Nice to have"
- 'archivers/unzip',
- 'astro/xearth',
- 'devel/gmake',
- 'editors/emacs',
- 'editors/vim-lite',
- 'emulators/mtools',
- 'graphics/png',
- 'graphics/xv',
- 'irc/xchat',
- 'mail/exim',
- 'mail/fetchmail',
- 'mail/mutt',
- 'mail/pine4',
- 'mail/popd',
- 'mail/xfmail',
- 'mail/postfix',
- 'net/cvsup-without-gui',
- 'net/rsync',
- 'net/samba3',
- 'news/slrn',
- 'news/tin',
- 'ports-mgmt/portupgrade',
- 'print/a2ps-letter',
- 'print/apsfilter',
- 'print/ghostscript-gnu-nox11',
- 'print/gv',
- 'print/psutils-letter',
- 'shells/bash',
- 'shells/pdksh',
- 'shells/zsh',
- 'security/sudo',
- 'www/links',
- 'www/lynx',
- 'x11/rxvt',
- # Formerly on disc3
- 'ports-mgmt/portaudit'])
- return pkgs
+if 'PKG_DVD' in os.environ:
+ doing_dvd = 1
+else:
+ doing_dvd = 0
-def docs_packages():
- pkgs = ['misc/freebsd-doc-bn',
+# List of packages for disc1.
+def disc1_packages():
+ pkgs = ['misc/freebsd-doc-bn',
'misc/freebsd-doc-da',
'misc/freebsd-doc-de',
'misc/freebsd-doc-el',
@@ -106,14 +49,58 @@ def docs_packages():
'misc/freebsd-doc-tr',
'misc/freebsd-doc-zh_cn',
'misc/freebsd-doc-zh_tw']
+
+ if doing_dvd:
+ pkgs.extend(['lang/perl5.8',
+ 'x11/xorg',
+ 'devel/imake',
+ 'emulators/linux_base-fc4',
+ 'x11/gnome2',
+ 'x11/kde4',
+ 'x11-wm/afterstep',
+ 'x11-wm/windowmaker',
+ 'x11-wm/fvwm2',
+ 'archivers/unzip',
+ 'astro/xearth',
+ 'devel/gmake',
+ 'editors/emacs',
+ 'editors/vim-lite',
+ 'emulators/mtools',
+ 'graphics/png',
+ 'graphics/xv',
+ 'irc/xchat',
+ 'mail/exim',
+ 'mail/fetchmail',
+ 'mail/mutt',
+ 'mail/alpine',
+ 'mail/popd',
+ 'mail/xfmail',
+ 'mail/postfix',
+ 'net/cvsup-without-gui',
+ 'net/rsync',
+ 'net/samba3',
+ 'news/slrn',
+ 'news/tin',
+ 'ports-mgmt/portupgrade',
+ 'print/a2ps-letter',
+ 'print/apsfilter',
+ 'print/ghostscript7-nox11',
+ 'print/gv',
+ 'print/psutils-letter',
+ 'shells/bash',
+ 'shells/pdksh',
+ 'shells/zsh',
+ 'security/sudo',
+ 'www/links',
+ 'www/lynx',
+ 'x11/rxvt',
+ 'ports-mgmt/portaudit'])
return pkgs
# The list of desired packages
def desired_packages():
disc1 = disc1_packages()
- disc2 = disc2_packages()
- docs = docs_packages()
- return [disc1, disc2, docs]
+ return [disc1]
# Suck the entire INDEX file into a two different dictionaries. The first
# dictionary maps port names (origins) to package names. The second
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
