Commit Graph

13 Commits

Author SHA1 Message Date
Glen Barber
8bf3303aa0 Move OPTIONS_UNSET outside of the PBUILD_FLAGS variable, otherwise the
textproc/docproj port build fails.

Pointyhat:	gjb
MFC after:	3 days
X-Before-RC1:	yes
Sponsored by:	The FreeBSD Foundation
2013-11-30 23:56:26 +00:00
Glen Barber
98e83c53af 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'.

MFC after:	3 days
X-MFC-With:	r258305, r258307
Sponsored by:	The FreeBSD Foundation
2013-11-18 16:04:04 +00:00
Glen Barber
20dc9c67c4 Since the doc/ toolchain conversion to docbook 5.0, JADETEX
is no longer a valid option, so remove 'WITHOUT_JADETEX=yes'
from PBUILD_FLAGS.

While here, also remove 'WITHOUT_X11=yes', since it will
cause a dependency conflict by requiring both print/ghostscript9
and print/ghostscript9-nox11.

Switch to OPTIONSNG format (WITHOUT_* -> OPTIONS_UNSET='FOO'),
and unset the FOP option, which requires Java (although it is
disabled by default).  Also unset the 'IGOR' option, since
textproc/igor is a validation tool, not necessarily a dependency
of the doc/ build itself.

While here, reduce the line length of PBUILD_FLAGS.

MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
2013-11-13 17:49:07 +00:00
Glen Barber
456685fbfb Fix a few style nits.
MFC after:	3 days
X-MFC-After:	10.0-RELEASE
Sponsored by:	The FreeBSD Foundation
2013-11-11 03:30:14 +00:00
Glen Barber
1997c2ef26 When building the textproc/docproj port, the ports-mgmt/pkg port
needs /var/run/ld-elf*.so.hints, which is not automatically created.

Fix reldoc build by running the ldconfig(8) startup script in the
chroot directory before starting the port build phase.

MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
2013-11-04 16:28:29 +00:00
Glen Barber
8fdf27c6d7 Remove hash generation from release.sh, as it is run as part of
the 'install' target in the release/Makefile.

MFC after:	3 days
Submitted by:	jhb
Approved by:	re (hrs)
Sponsored by:	The FreeBSD Foundation
2013-10-09 22:00:03 +00:00
Glen Barber
8a9c704b40 Remove extra 'MAKE_FLAGS' line.
Submitted by:	jhb
Approved by:	re (marius)
Sponsored by:	The FreeBSD Foundation
2013-09-19 19:49:31 +00:00
Glen Barber
4756295ebb Remove get_rev_branch(), functionality exists in the release/Makefile.
Submitted by:	hrs
2013-08-13 21:01:23 +00:00
Glen Barber
a1020436ea - Only set ARCH_FLAGS (TARGET/TARGET_ARCH) if specified, otherwise
allow the toolchain to detect the correct values.

- Remove {SRC,DOC,PORT}REVISION variables, and use 'branch@rNNNNNN'
  as the {SRC,DOC,PORT}BRANCH variables.

- Only set default KERNEL_FLAGS and WORLD_FLAGS make(1) jobs if the
  number of CPUs is greater than 1.

Submitted by:	hrs
2013-08-13 20:16:14 +00:00
Glen Barber
74e0b3f151 - Add SRC_FORCE_CHECKOUT configuration option to force svn to checkout
the src/ tree into a directory that contains files/directories, such
  as a case where a custom kernel configuration file is specified.

- Allow specification of multiple KERNCONFs to pass to 'make release'.

- Move evaluation of NODOCS/NOPORTS earlier, and set based on how the
  release process expects these options to be evaluated.

- Wrap KERNCONF specification in double quotes, and use 'eval' so multiple
  kernel configurations do not cause the build to fail in strange ways.

- Set WITHOUT_X11 for the port build flags for the documentation toolchain
  build.  Also run 'clean distclean' targets during port build.

PR:		180192
Submitted by:	Anes Mukhametov
MFC after:	3 days
Approved by:	kib (mentor, implicit)
2013-07-05 22:04:49 +00:00
Glen Barber
13f8962353 If MAKE_CONF and/or SRC_CONF are set and not character devices,
copy to chroot to use with release build.

Submitted by:	Garrett Cooper (original version)
Approved by:	kib (mentor)
MFC after:	1 week
2013-06-22 22:12:24 +00:00
Glen Barber
00af300751 Fix OSVERSION variable within PBUILD_FLAGS.
Submitted by:	Garrett Cooper (in part)
Approved by:	kib (mentor)
MFC After:	1 week
X-MFC-With:	r251652
X-MFC-To:	stable/9 only
2013-06-16 17:54:56 +00:00
Glen Barber
62fed16cb9 Add new script to run release builds. The script is heavily based upon
the release/generate-release.sh script by nwhitehorn.

This script can use optional configuration file to override defaults,
making running multiple serialzied builds with different specific
configurations or architecture-specific tunings quite easy.

Sample overrideable options are included in the release.conf.sample
file.

Approved by:	kib (mentor)
MFC After:	2 weeks
X-MFC-To:	stable/9 only
2013-06-12 13:15:28 +00:00