- exist in a release [1]
- do not have a corresponding revision class
[1] This is done to make ensure for 11.0-RELEASE, we do not end
up with entries from older releases, like happened with 10.0-R.
Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation
that were needed to fix 10.0-RELEASE release notes.
This corresponds to r43586 through r43593 of the doc/
repository. There are no corresponding changes to the src/
repository tracking these.
Sponsored by: The FreeBSD Foundation
set up for the amd64/amd64 TARGET/TARGET_ARCH combination.
Some of the build tools used here (u-boot in particular) require
use of gcc(1). The lang/gcc* from ports/ will install as 'gccNN'
instead of 'gcc', so they cannot be used without extra hacks.
Add an EMBEDDED_WORLD_FLAGS variable to be used to properly set
up the build chroot. For the RPI-B case, EMBEDDED_WORLD_FLAGS
is set to 'WITH_GCC=1', which is used to set up the build chroot.
While here, in followup to r260895, do not rely on the necessary
configuration files and/or scripts to exist in the build target
src/ tree.
To work around cases where files do not exist, copy (from the
local release/ checkout) the tools/${XDEV}/crochet-${KERNEL}.conf
to ${CHROOTDIR}/tmp/external/crochet-${KERNEL}.conf to make them
accessible to the external utilities that need them (i.e., crochet).
Sponsored by: The FreeBSD Foundation
In general, the workflow used for the latest releases has been
to checkout head/release/ to a directory outside of any build
environments, modify the release.conf accordingly, and run:
# ./release.sh -c ./release.conf
By moving tools/release/${XDEV}/ (for RPI-B build testing, in
this case), any dependency on a different branch of the source
tree can be removed. In particular, release.sh expects the
tools/release/${XDEV}/crochet-${KERNEL}.conf file to exist, so
by moving the crochet configuration file to a directory in
release/, it becomes possible to build images for branches that
do not yet have the necessary configuration files and/or scripts.
Sponsored by: The FreeBSD Foundation
- 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
MFC after: 3 days
X-Insta-MFC: possibly
Sponsored by: The FreeBSD Foundation
previous releases' paragraph since all supported version of FreeBSD
now support binary upgrades
Remove 'of course,' from foot note reminding to create a backup
before attempting a binary update
Approved by: hrs (mentor)
release.sh:
- Modify release/release.sh to recognize an 'EMBEDDEDBUILD'
variable. When set, release/release.sh will build the chroot
userland as is done for big-iron builds.
- Instead of running the 'buildworld', 'buildkernel', and
'release' targets in the chroot, a separate script is run.
The script tools/release/${XDEV}/release.sh sets up the rest
of the chroot workspace, such as installing ports that will
be needed, and building the 'xdev' target.
- crochet (by kientzle@) is checked out from the upstream
repository (and if needed, u-boot, in the case of Raspberry
Pi).
- tools/release/${XDEV}/release.sh then runs crochet with
a configuration file specific to the ${KERNCONF} being built.
Note that this is effectively a first-pass attempt to integrate
this into the release process.
Tested against: head@r259961
Sponsored by: The FreeBSD Foundation
When building the system from outside the chroot as part of the release
process, ensure the objdir is within the chroot so that the whole output
of the release.sh script is self-contained in a single directory.
Use CHROOTDIR/tmp/obj instead of CHROOTDIR/usr/obj to minimize possible
interferences with the output of the build itself.
Reviewed by: gjb
Approved by: rpaulo (mentor)
With an unpopulated chroot dir, release building was failing because
the script was attempting to copy resolv.conf into a non-existent /etc
directory of the chroot. Fix this by copying the file only after the
installworld has happened, which will create this directory.
Reviewed by: gjb
Approved by: rpaulo (mentor)
to what is done for mergemaster(8). This allows etcupdate(8)
to work out-of-box after the first upgrade of a system.
Submitted by: jhb
MFC after: 3 days
Sponsored by: The FreeBSD Foundation
location of /etc/rc.local on the install media is more appropriate as it
knows serial vs. non-serial and can also do the change earlier (so that
even the initial Install dialog can benefit from the change).
MFC after: 3 days
installation.
As part of the 'pkg-stage' target, copy the configuration file
to the 'packages/repos/' directory on the DVD filesystem.
MFC after: 3 days
X-MFC-Before: -RC3
Sponsored by: The FreeBSD Foundation
specifying 'WITH_DVD=1' during 'make release'.
This caused some problems during the freebsd-update builds for
10.0-BETA4.
MFC after: 3 days
Sponsored by: The FreeBSD Foundation
instead of using pkg-bootstrap.
This should resolve a problem that was discovered during 10.0-BETA4
freebsd-update(8) builds,
Reported by: secteam (delphij)
MFC after: 3 days
X-MFC-to-10: possibly immediately, pending freebsd-update(8) builds
Sponsored by: The FreeBSD Foundation
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
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
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
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
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
'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
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
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
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.
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
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.
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
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)
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.'
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
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
- Use ln -fs to create a symlink.
- Remove pkgadd for docports.
- Use WITHOUT_JADETEX=yes instead of WITH_JADETEX=no.
- Add {WORLD,KERNEL}_FLAGS to [BTWK]MAKE.
- Use makefs(8) and gpart(8) for sparc64 ISO image[2].
- Add publisher option to makefs(8)[2].
Based on work by: gjb[1]
Discussed with: marius, nwhitehorn[2]
Volume Descriptor (section 7.4). In short, upper-case alphanumeric + some
symbols only. While the makefs utility automatically converts the characters,
$LABEL should be consistent in the scripts.
distribution. This can happen if the src/ tree checkout is
within its own ZFS dataset, and the 'snapdir' ZFS property
is set to 'visible.'
Approved by: hrs
MFC after: 3 days
X-MFC-To: stable/9 only
is set by specifying '-a <arch>'. (Only supported for i386 on amd64
and powerpc on powerpc64 currently).
- Change how textproc/docproj is installed:
o Attempt to install from pkg(8);
o Fall back to pkg_add(1) if pkg(8) installation is not
successful;
o Fall back to installing from ports as last resort.
- Ensure the script is run by root[1].
- Get OSVERSION from param.h[1].
Provided by: glebius [1]
Reviewed by: nwhitehorn, kensmith
Approved by: kensmith
MFC After: 2 weeks
X-Needs-MFC: r240586, r240587, r240588
This structure is not part of POSIX. According to POSIX, gettimeofday()
has the following prototype:
int gettimeofday(struct timeval *restrict tp, void *restrict tzp);
Also, POSIX states that gettimeofday() shall return 0 (as long as tzp is
not used). Remove dead error handling code. Also use NULL for a
nul-pointer instead of integer 0.
While there, change all pieces of code that only use tv_sec to use
time(3), as this provides less overhead.
- Add ${IMAGE} for the supported image files. This fixes the install target
on FreeBSD/pc98.
- Use "mkdir -p" instead of "-mkdir" consistently.
Reviewed by: nwhitehorn
installer on a VTY with no kernel messages (VTY 2), show the installer
log in real time on VTY 3, and spawn a shell on VTY 4.
PR: bin/161047, bin/161048
MFC after: 2 weeks
kernels specified by KERNCONF are built and packed into release.
The first one is packed into kernel.txz, all others to
kernel.CONFIG.txz.
The first one is installed on bootables in /boot.
The fix involved adding a proper build of ld-elf.so.1 ,
and also replacing ldd with objdump (suggested by Garrett Cooper)
to build the list of shared libraries needed by the binaries
and libraries on the target.
improve support for multi-arch and cross-arch builds, by adding
a suffix to the kernel config file and build_directory.
(cross builds not clean yet, a cross-built kernel boots
but fails when starting /sbin/init)
machines.
- Mention that V480 with broken centerplanes have a chance of working with
the WAR in the upcoming 8.3-RELEASE and 9.0-RELEASE.
MFC after: 3 days
- mvs.4 uses nested '.Bl' tags which appears to confuse man2hwnotes.pl
for hardware note generation
- mps.4 also breaks the build, but I haven't yet identified why
digit beyond your time.
Various sysinstall dependencies (e.g. libftpio, libdisk, libodialog, etc.)
will be cleaned up in coming days. Some will take longer than others due to
a few other consumers (tzsetup and sade).
not configure the host's networking if netbooted [1]. Also fix FTP
installations behind some firewalls [2].
PR: bin/159583 [2]
Reported by: stas [1]
Approved by: re (kib)
the normal distfile mechanism. Thanks to Marc Fonvieille for the patch and
for putting up with me taking entirely too long to commit this!
Submitted by: blackend
o boot/mfsroot.gz is no more. Copy it only when it exists so as still
to be compatible with Makefile.sysinstall.
o while here, make ispfw.ko optional as well.
o '-b bootimage' is not a valid argument for makefs. What was meant
was '-o bootimage'.
o create the boot image in the current directory so that makefs can
find the file. Previously it had to be created under $BASE because
that's how mkisofs wanted it.
so that running make release causes make obj to be run before doing
anything. This fixes a bug wherein, when run for the first time, and
without -DNOSRC, make release would attempt to recursively tar up the src
directory including its own output and enter an infinite loop.
While here, make the cross-building stuff work a little more the way it
should if only one of TARGET/TARGET_ARCH is specified.
Some files keep the SUN4V tags as a code reference, for the future,
if any rewamped sun4v support wants to be added again.
Reviewed by: marius
Tested by: sbruno
Approved by: re
systems. In principle, FreeBSD should run on at least some of these
already, and support for the remainder will hopefully show up eventually,
so add this while I'm thinking about it.
changes, and backport the new logic (ISO images are TARGET dependant, not
TARGET_CPUARCH dependant) to Makefile.sysinstall. While modifying ISO
image scripts, change several archs to use makefs (from base) instead of
mkisofs (from ports) which makes release CD generation both faster and
self-hosting.
in hybrid image generation in cdrtools. This produces a small HFS partition
containing loader, mapped in by an oddly-formed APM table using a new
feature in makefs. This does not appear to work yet on early-model G3
systems, which will be fixed later, but produces bootable CDs on
everything else.
to be a meta-target, and having it do this avoids it spewing files all
over the source tree by default (and possible recursive tarring if
distributing a src tarball).
