Commit Graph

6577 Commits

Author SHA1 Message Date
gjb
f240b29444 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.

MFC after:	3 days
X-MFC-With:	r258305, r258307, r258308, r258309
Sponsored by:	The FreeBSD Foundation
2013-11-18 16:25:56 +00:00
gjb
9f5a779e22 Set the PKG_CACHEDIR directory to 'dvd/' instead of 'release/'
in preparation of adding a 'dvd1.iso' target.

MFC after:	3 days
X-MFC-With:	r258305, r258307, r258308
Sponsored by:	The FreeBSD Foundation
2013-11-18 16:11:19 +00:00
gjb
5c3fff5c5f 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
gjb
fa17320479 Add a script and configuration files to fetch pre-built packages
from pkg.FreeBSD.org for inclusion on release medium (dvd1.iso).

The script sources ${.CURDIR}/${TARGET}/pkg-stage.conf, which sets
several environment variables, such as the pkg(8) ABI, PACKAGESITE,
PKG_DBDIR, and PKG_CACHEDIR.  PKG_CACHEDIR is set to the directory
on the release medium used by bsdconfig(8) (/packages/${ABI}).  ABI
is determined by output of 'make -C /usr/src/release -V REVISION'.
See pkg.conf(5) for descripton on other variables set here.

The list of packages to include are set within the configuration
file.

The script and configuration files are intended to be run by the
'make dvd' target within the release directory, and assume the
release is built within a chroot environment (such as by using
release.sh).

Relevant updates to release/Makefile will follow.

Sponsored by:	The FreeBSD Foundation
2013-11-18 15:22:55 +00:00
gjb
1c46d4842f Use the IMAGES variable to determine which image files to remove
as part of 'make -C /usr/src/release clean'.

MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
2013-11-18 15:11:13 +00:00
gjb
a1d0c0dabb 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
pluknet
f54ff2f69e Update log message. Picobsd stopped using kgzip a while ago. 2013-11-11 10:54:06 +00:00
gjb
190bdc75e8 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
gjb
0e176e0b9e Remove generate-release.sh from head/.
The release.sh (based heavily on generate-release.sh) has been
used for the 9.2-RELEASE and 10.0-RELEASE cycles, so make sure
there is no confusion on what is currently being used by having
two similar scripts.

A big "thank you" to Nathan Whitehorn, the author of the
generate-release.sh script, for writing this utility.

No objection:	nwhitehorn
MFC after:	never
Sponsored by:	The FreeBSD Foundation
2013-11-08 17:27:38 +00:00
gjb
e34cfa1b16 Remove extra target from 'memstick' that I forgot to remove before
previous commit.

MFC after:	1 week
X-MFC-After:	10.0-RELEASE
X-MFC-With:	r257805
Sponsored by:	The FreeBSD Foundation
2013-11-07 18:59:06 +00:00
gjb
d03c16de07 Add a 'mini-memstick.img' release target, which will use the
'bootonly.iso' components to create a smaller memory stick image.

This is useful for system recovery, where a full memstick.img image
is not necessarily needed (or wanted).  In addition, it is possible to
do bootonly-style installation, where the base.txz, kernel.txz, etc.
are fetched from a remote source.

Provide backwards-compatible target (mini-memstick), to keep in sync
with the targets documented in release/Makefile.

Prompted by:	wblock
MFC after:	1 week
X-MFC-after:	10.0-RELEASE
Sponsored by:	The FreeBSD Foundation
2013-11-07 18:53:55 +00:00
gabor
826765db27 - Update release noted to DocBook 5.0 so that they work with the new tree 2013-11-07 16:42:28 +00:00
luigi
c78dc87cdc bmake does not have a -v option so remove it 2013-11-04 23:46:20 +00:00
gjb
0b050e8ff3 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
luigi
03bfda952a small cleanup for building picobsd-head without CLANG.
Note that svn 257268 gnu/usr.bin/binutils/ld/Makefile
seems to break the "toolchain" target when building HEAD
on RELENG_9, so until this is solved you may want to

    svn update -r 257267 gnu/usr.bin/binutils/ld/Makefile

before building picobsd
2013-11-01 18:29:27 +00:00
luigi
36f75b57a3 help running sshd on picobsd 2013-10-16 16:53:00 +00:00
luigi
c3d3ffef19 update the picobsd script to build with GCC and not CLANG 2013-10-16 16:46:15 +00:00
gjb
05dba22165 Reduce disc1.iso image size by installing the userland with
the WITHOUT_PROFILE=1 option set, trimming 56MB from the image.

Approved by:	re (glebius)
MFC after:	1 week
Sponsored by:	The FreeBSD Foundation
2013-10-13 15:49:50 +00:00
gjb
627feb6294 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
des
aa2e4b623c Remove BIND.
Approved by:	re (gjb)
2013-09-30 17:23:45 +00:00
gjb
d60e48989e 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
nwhitehorn
549591b6f0 CDs are not partitioned, so this is not correct syntax for loading from
ISO 9660. Omit the partition ID.

Approved by:	re (kib)
MFC after:	2 weeks
2013-09-17 17:30:49 +00:00
luigi
baf6916d29 comment out some stale loader configurations. 2013-09-06 17:19:57 +00:00
luigi
0c8c98d14e generate multiple host keys and do that unconditionally 2013-09-06 17:18:43 +00:00
luigi
1393045356 r253616 nuked BINMAKE so we need to adapt to the new definition 2013-09-06 17:16:33 +00:00
will
710718d2fa Fix 'make release' on older hosts: use buildworld legacy utilities.
Newer FreeBSD installs require an install(1) that supports the new flags.

This adds ${MAKEOBJDIRPREFIX}${.CURDIR}/tmp/legacy/{bin,usr/{bin,sbin}}
to the PATH while generating an mtree database for 'make release'.

Note that the problem only exists here because mm-mtree.sh generates
its own object tree to avoid mucking with the existing one, which
results in a PATH containing legacy utility dirs that are empty.
2013-08-27 04:42:42 +00:00
gjb
9a09e7fb6b Remove get_rev_branch(), functionality exists in the release/Makefile.
Submitted by:	hrs
2013-08-13 21:01:23 +00:00
gjb
cfc7739bb4 - 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
marcel
8910432c4a Fix the bootable CD:
o   We need wait a bit before attempting the root mount. The CD drives
    on HP machines (typical) go through the management controller so
    that it can be virtualized. In practice what this means is that it
    is slow to detect and attach.
o   Tell the kernel what to use as the root file system. The /etc/fstab
    trick doesn't work, because we're on the EFI-compatble file system.
2013-08-03 20:14:29 +00:00
marius
eb8dc560e4 - Once we have shifted arguments thrice, base-bits-dir is $1 rather than $4.
Introduce $BASEBITSDIR for clarity and in order to avoid repeating this
  mistake in the future. Fixing this ensures that we pick up the newly built
  boot code and loader native to the target, which is especially relevant
  when cross-building release images.
- It is pointless to specify an endianess for ISO 9660 images so strip that.

MFC after:	3 days
2013-07-26 14:23:25 +00:00
gjb
50d0b7bd21 For consistency with previous releases, name the cdrom install
cd 'disc1.iso'.

Discussed with:	re@ team
Approved by:	kib (mentor)
MFC after:	3 days
X-MFC-To:	stable/9 only
2013-07-22 12:07:57 +00:00
gjb
25c503b103 Create memstick images with the '.img' filename extension.
Requested by:	many
Approved by:	kib (mentor)
MFC after:	3 days
X-MFC-To:	stable/9 only
2013-07-21 05:23:34 +00:00
gjb
3d6c89b2d6 - 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
gjb
0234e19d96 Revert r252126, r252124, r252121.
Submitted by:	hrs
2013-06-24 09:18:41 +00:00
gjb
bf797f2d79 Trim copyright years, and add the current year. 2013-06-23 20:24:43 +00:00
gjb
4d4ec64569 Rewrap after previous commit. 2013-06-23 20:20:34 +00:00
gjb
1d469469ea Add a new macro, release.current.release, to denote the head/ branch
with the -RELEASE suffix.  This fixes the incorrect text on the -CURRENT
errata page from showing '10.0-CURRENT' followed by 'until 9.1-RELEASE is
released.'
2013-06-23 20:19:00 +00:00
gjb
4499991b91 Add missing copyright years. 2013-06-23 19:47:59 +00:00
gjb
e08b36714d 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
gjb
9241c8f59f 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
gjb
ceed11ef6c 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
nwhitehorn
f1ebf2df2f Add missing copyright notice. 2013-06-12 12:38:12 +00:00
tijl
960738a3a8 Convert old make variable modifiers :U and :L to bmake :tu and :tl.
Reviewed by:	sjg
2013-06-02 11:44:23 +00:00
gjb
184ed59394 Fix typo introduced in r251084.
MFC after:	1 month
X-MFC-With:	r251084
2013-05-28 23:46:13 +00:00
gjb
515cfc581f r245757 introduced warning output if update method is set to CVS_UPDATE
or SUP_UPDATE.

CVS exporter for head/ is turned off for nearly one month now.

It is finally time to swing the ax at these update methods.

Reviewed by:	eadler
MFC after:	1 month
2013-05-28 23:43:47 +00:00
hrs
64eb3d00e4 Fix build after doc/projects/xml-tools integration. 2013-05-19 05:49:21 +00:00
gabor
2e6e8075ee - Update the release notes to DocBook 4.5 XML to build with the
updated documentation tree
2013-05-17 18:53:29 +00:00
luigi
9e0ab53d2e use a plain 'make toolchain' to build toolchain, and
support parallel make on this stage.
2013-05-05 20:59:22 +00:00
luigi
c546a54503 remove a leftover comment 2013-05-05 18:54:25 +00:00
luigi
30e9f694de support for sshd (newer config file location) 2013-04-30 13:20:11 +00:00