Bug 218393

Summary: Release builds: respect PORTSDIR, fix package paths
Product: Base System Reporter: Johannes Jost Meixner <xmj>
Component: miscAssignee: Glen Barber <gjb>
Status: Closed FIXED    
Severity: Affects Only Me Keywords: patch
Priority: ---    
Version: CURRENT   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
release tweaks none

Description Johannes Jost Meixner freebsd_committer freebsd_triage 2017-04-05 08:15:44 UTC
Created attachment 181503 [details]
release tweaks

release/Makefile currently has limited support for storing PORTSDIR in non-default locations. And while it does check for PORTSDIR being set in the environment and respect it during ports.txz target, this does not get put forward in staging the packages for DVD builds: pkg-stage.sh checks for "/usr/ports".

Fix this, and while there, point the pkg config file shipped with dvd images to the right path.
Comment 1 Glen Barber freebsd_committer freebsd_triage 2017-05-22 14:22:39 UTC
A modified version of the patch has been committed, pending MFC.
Comment 2 commit-hook freebsd_committer freebsd_triage 2017-05-22 14:22:45 UTC
A commit references this bug:

Author: gjb
Date: Mon May 22 14:21:45 UTC 2017
New revision: 318646
URL: https://svnweb.freebsd.org/changeset/base/318646

Log:
  Allow PORTSDIR to be overridden in the pkg-stage target.

  Submitted by:	Johannes Jost Meixner (original)
  PR:		218393
  MFC after:	3 days
  Sponsored by:	The FreeBSD Foundation

Changes:
  head/release/Makefile
  head/release/scripts/pkg-stage.sh
Comment 3 commit-hook freebsd_committer freebsd_triage 2017-05-25 01:46:06 UTC
A commit references this bug:

Author: gjb
Date: Thu May 25 01:45:43 UTC 2017
New revision: 318853
URL: https://svnweb.freebsd.org/changeset/base/318853

Log:
  MFC r318646:
   Allow PORTSDIR to be overridden in the pkg-stage target.

  PR:		218393
  Sponsored by:	The FreeBSD Foundation

Changes:
_U  stable/10/
  stable/10/release/Makefile
  stable/10/release/scripts/pkg-stage.sh
_U  stable/11/
  stable/11/release/Makefile
  stable/11/release/scripts/pkg-stage.sh