]> CyberLeo.Net >> Repos - FreeBSD/stable/10.git/commit
MFC r260772:
authorgjb <gjb@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Thu, 16 Jan 2014 16:44:23 +0000 (16:44 +0000)
committergjb <gjb@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Thu, 16 Jan 2014 16:44:23 +0000 (16:44 +0000)
commitb4aa9438ac8bda53d8e69001cf3e191e79747aad
treeda0cea44fd801280f0f0ea39f9c1300ef674e4b9
parentf817454b1547ace08e4995b8ca7c0a5ccb295768
MFC r260772:
  Update the pkg-stage target to be more compatible with pkg-1.2:

 - Add a release-dvd.conf pkg(8) configuration file to override
   the default FreeBSD.conf configuration.
 - Remove architecture-specific pkg-stage.conf files, consolidate,
   and move their contents to scripts/pkg-stage.sh.
 - Use 'pkg -vv' to determine the ABI, which is used as the
   cache directory.

  Prior to these changes, it would be possible for pkg-stage to fetch
  conflicting binary packages from multiple repositories.

Tested against: head@r260522, stable/10@r260522

Sponsored by: The FreeBSD Foundation

git-svn-id: svn://svn.freebsd.org/base/stable/10@260781 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
release/Makefile
release/amd64/pkg-stage.conf [deleted file]
release/i386/pkg-stage.conf [deleted file]
release/pkg_repos/release-dvd.conf [new file with mode: 0644]
release/scripts/pkg-stage.sh