diff options
| author | gjb <gjb@FreeBSD.org> | 2013-11-21 02:45:36 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2013-11-21 02:45:36 +0000 |
| commit | a2ed0ef7f6d3effa506eee672d738f5ec99b5254 (patch) | |
| tree | 070bb5de1784384e98befaf097fe1d73e4c93e3e /release/i386 | |
| parent | f3237abb84118cd7a02056d37a0f085c420862fe (diff) | |
| download | FreeBSD-src-a2ed0ef7f6d3effa506eee672d738f5ec99b5254.zip FreeBSD-src-a2ed0ef7f6d3effa506eee672d738f5ec99b5254.tar.gz | |
MFC r258305, r258307, r258308, r258309, r258310, r258314, r258317,
r258319, r258320:
r258305:
Use the IMAGES variable to determine which image files to remove
as part of 'make -C /usr/src/release clean'.
r258307:
Add a script and configuration files to fetch pre-built packages
from pkg.FreeBSD.org for inclusion on release medium (dvd1.iso).
r258308:
Unconditionally copy the build host /etc/resolv.conf into
the chroot directory, since hostname resolution may be
needed in the case of building a dvd image (with packages)
and also setting 'NOPORTS=1'.
r258309:
Set the PKG_CACHEDIR directory to 'dvd/' instead of 'release/'
in preparation of adding a 'dvd1.iso' target.
r258310:
Add the 'dvd1.iso' target. This mimics the 'release.iso' target,
with the additional step of fetching packages for inclusion on the
dvd image.
The 'pkg-stage' target is used to run 'scripts/pkg-stage.sh' if
the '${TARGET}/pkg-stage.conf' configuration file exists (currently
only amd64 and i386).
Allow dvd1.iso to be skipped if NODVD=1.
r258314:
Fix how ABI is evaluated so it matches more than a dot-zero
case.
r258317:
Document the 'dvdrom' target.
r258319:
Remove WITHOUT_PROFILE=1 for the dvd1.iso medium.
r258320:
Simplify PKG_ABI for pkg-stage.sh.
Approved by: re (hrs)
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'release/i386')
| -rwxr-xr-x | release/i386/pkg-stage.conf | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/release/i386/pkg-stage.conf b/release/i386/pkg-stage.conf new file mode 100755 index 0000000..6d9e8ef --- /dev/null +++ b/release/i386/pkg-stage.conf @@ -0,0 +1,36 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +export PKG_ABI="freebsd:${REVISION%.[0-9]*}:x86:32" +export ASSUME_ALWAYS_YES=1 +export __PKG_CONF="/etc/pkg/FreeBSD.conf" +export PACKAGESITE="http://pkg.FreeBSD.org/${PKG_ABI}/latest" +export MIRROR_TYPE="SRV" +export REPO_AUTOUPDATE="NO" +export PKG_DBDIR="/tmp/pkg" +export PKG_CACHEDIR="dvd/packages/${PKG_ABI}" +export PERMISSIVE="YES" +export PKGCMD="/usr/sbin/pkg -d -C ${__PKG_CONF}" + +DVD_PACKAGES="archivers/unzip +devel/subversion +devel/subversion-static +emulators/linux_base-f10 +misc/freebsd-doc-all +net/mpd5 +net/rsync +ports-mgmt/pkg +ports-mgmt/portaudit +ports-mgmt/portmaster +shells/bash +shells/zsh +security/sudo +sysutils/screen +www/firefox +www/links +x11-drivers/xf86-video-vmware +x11/gnome2 +x11/kde4 +x11/xorg" |
