where the target is not valid (stable/10), instead of doing
per-branch evaluation on if xdev-links needs to be invoked.
Sponsored by: The FreeBSD Foundation
r269549, r269551, r269552, r269553, r269554, r269555, r269558, r269559,
r269560, r269561, r269628, r269629, r269630, r269635, r269637:
r269549:
Create a new project branch, release-noxdev, for
a sandbox workspace outside of head/ to update the
release bits for arm builds since the deprecation of
the XDEV and XDEV_ARCH make(1) variables.
r269551:
Define load_chroot_env() and load_target_env()
prototypes.
r269552:
Call load_chroot_env() and load_target_env() where
they can be mutually conflicting with regard to
TARGET, TARGET_ARCH, XDEV, and XDEV_ARCH.
r269553:
Add shebang line to arm/*.conf files since these
should be considered to be executable (albeit not
on their own) shell scripts.
r269554:
Redefine load_chroot_env() and load_target_env() in
the arm/*.conf files, and reindent.
r269555:
Simplify where load_chroot_env() and load_target_env() are
called.
r269558:
Provide example in release.conf.sample for overriding the
load_chroot_env() and load_target_env() prototypes.
r269559:
Remove a gratuitous newline.
r269560:
Unset potentially conflicting variables in load_chroot_env()
and load_target_env().
r269561:
Make global variables global, and accessible outside of
the functions within which they were once defined.
r269628:
Remove XDEV/XDEV_ARCH evaluation if EMBEDDEDBUILD is set.
r269629:
In arm/release.sh, switch TARGET/TARGET_ARCH back to the
original XDEV/XDEV_ARCH make(1) variables.
In theory, this should have been a no-op, but the TARGET and
TARGET_ARCH are now unset in load_target_env() to avoid
collision with the chroot userland.
r269630:
Export variables in the arm/*.conf files because they
need to be passed through release.sh to arm/release.sh.
Set MK_TESTS=no for the xdev target.
r269635:
As part of the XDEV/XDEV_ARCH deprecation, the
'xdev-links' target was intentionally no longer
invoked automatically.
Invoke the xdev-links target after xdev, which
creates, for example, /usr/bin/armv6-freebsd-cc
symlink to /usr/armv6-freebsd/usr/bin/cc.
r269637:
Set TARGET and TARGET_ARCH to the XDEV and XDEV_ARCH
counterparts for the xdev and xdev-links make(1)
targets.
Sponsored by: The FreeBSD Foundation
continuing to use the variables in the configuration
file, but switch XDEV= and XDEV_ARCH= to TARGET= and
TARGET_ARCH= appropriately.
Sponsored by: The FreeBSD Foundation
This includes:
o All directories named *ia64*
o All files named *ia64*
o All ia64-specific code guarded by __ia64__
o All ia64-specific makefile logic
o Mention of ia64 in comments and documentation
This excludes:
o Everything under contrib/
o Everything under crypto/
o sys/xen/interface
o sys/sys/elf_common.h
Discussed at: BSDcan
example, explicitly hard-code gcc(1) as the compiler.
Partially revert r264703, which did a post-chroot install
of gcc(1). This was initially removed because gcc(1) fails
to build usr.bin/dtc/ causing the xdev target to fail. So
this time, move the gcc(1) installation after xdev is built.
This change is likely applicable to stable/10 arm build
failures, as well.
MFC after: 3 days
Sponsored by: The FreeBSD Foundation
r262491, r262493, r262516, r267345, r267397:
r262491:
Add DEBUG_DISTRIBUTIONS, and set it to include base and
EXTRA_DISTRIBUTIONS, excluding 'doc', since the documentation
distribution does not have corresponding debug information.
Use DEBUG_DISTRIBUTIONS in the 'distributeworld installworld'
and 'packageworld' targets, to reduce the number of occurances
of excluding distributions that do not have .debug files.
r262493:
In release/Makefile, explicitly set WITHOUT_DEBUG_FILES=1
for dvdrom and cdrom targets. (Later reverted.)
Exclude the *.debug.txz distributions from dvdrom and
cdrom images, but include them for ftp distribution.
r262516:
Rename ${dist}.debug.txz to ${dist}-dbg.txz to prevent the
following output:
eval: ${base....}: Bad substitution
eval: ${doc....}: Bad substitution
eval: ${games....}: Bad substitution
eval: ${lib32....}: Bad substitution
This also follows other naming conventions seen in the
wild.
r267345:
Explicitly set MK_DEBUG_FILES=no, which overrides the
WITH_DEBUG_FILES=1 and WITHOUT_DEBUG_FILES=1 collisions
previously experienced.
This change allows us to create the {base,kernel}_debug.txz
distributions without accidentally installing the *.debug
files on the medium itself.
r267397:
Remove evaluations of MK_DEBUG_FILES where not needed.
If DEBUG_DISTRIBUTIONS is empty, which is true if
MK_DEBUG_FILES evaluates to 'no' above, the loop does
nothing.
MFC after: 1 month
Tested on: head@r267801
Reviewed by: brooks [1], emaste, imp [1]
[1] earlier version
Sponsored by: The FreeBSD Foundation
This allows greater granular control over the release
build, and avoids WITH_FOO=1 and WITHOUT_FOO=1 collision.
This change was verified to produce correct results
compared to an earlier build by diffing find(1) output
of the resulting bootonly/, dvd/, and release/ directories.
Tested on: head@r267449
MFC after: 1 month
X-MFC-Note: Requires commits not yet MFC'd, so likely
longer than 1 month.
Sponsored by: The FreeBSD Foundation
remove the now-redundant checks for RELEASE_CRUNCH. This originally
was defined for building smaller sysinstall images, but was later also
used by picobsd builds for a similar purpose. Now that we've moved
away from sysinstall, picobsd is the only remaining consumer of this
interface. Adding these two options reduces the RELEASE_CRUNCH
special cases in the tree by half.
add a -j option so we can tune the amount of parallel make,
the default we used (-j 8) is large and was giving problems
with SUBDIR_PARALLEL due to some missing dependencies.
- Use ASSUME_ALWAYS_YES=YES instead of ASSUME_ALWAYS_YES=1
since pkg-1.3 expects "yes" or "true" values.
- Before exporting PKG_ABI, strip extra characters from what
is parsed from 'pkg -vv'. This causes problems further down
when creating the packages directory for inclusion on the
dvd1.iso. Previously PKG_ABI would be 'freebsd:9:x86:64',
but now is '"freebsd:9:x86:64";' in pkg-1.3
Tested on: stable/9@r265858 with ports-mgmt/pkg-devel
MFC After: 3 days
Sponsored by: The FreeBSD Foundation
The FreeBSD Foundation and Google, Inc.[1]
Since this was dual-sponsored, the sponsorurl needs
to be empty.
Add Google to the sponsor.ent file.
Reminded by: rwatson [1]
Sponsored by: The FreeBSD Foundation
sponsored and/or contributed works.
This works similarly to how the subversion revision is
suffixed in release notes entries when 'revision="NNNNNN"'
is set.
The <para> tag in relnotes/article.xml can now take the
following new elements:
- contrib: defined to what type of contribution the change
is. Right now, only 'vendor' or 'sponsor' are used.
'vendor' is intended for vendor-contributed code, such as
driver updates, etc. 'sponsor' is intended for sponsored
work (the 'Sponsored by:' in the commit template).
- vendor: The canonical name of the vendor.
- sponsor: The canonical name of the sponsor.
- vendorurl: The URL for the vendor website, if applicable.
- sponsorurl: The URL for the sponsor website, if applicable.
If 'vendor' or 'sponsor' are set, but 'contrib' is not, nothing
is rendered. If 'contrib' is set, but no 'vendor' or 'sponsor'
are defined, nothing is printed. If 'vendorurl' or 'sponsorurl'
are set, the 'vendor' or 'sponsor' text is link, otherwise is
non-clickable text.
Sponsored by: The FreeBSD Foundation
'Relnotes:' tag in case 'yes' is not explicitly
the first string value following the tab.
As it turns out, a number of commits have bypassed
my filters (both email and 'svn log --search'), and
this script returns the results I want when doing
these searches.
Sponsored by: The FreeBSD Foundation
On head/, or more specifically, when WITNESS is in
the kernel config, the console is spammed excessively
with lock order reversal between isofs and devfs.
Set debug.witness.trace=0 in the installer sysctl.conf
to avoid printing the full KDB stack backtrace. This
does not prevent printing the lock order reversal has
happened, only lessens the console spam.
Sponsored by: The FreeBSD Foundation
and working on QEMU. Actually using this script as the regular image
generator, like with the memstick one, will require that the kernel support
EFI too. In particular, the following two things are required:
1. vt(9) be the default console driver
2. vt_efifb and vt_vga be able to coexist usefully in the same kernel
One other note here is that this requires newfs_msdos and mdconfig, which is
really ugly. NetBSD's makefs at least seems to support FAT now. If that
actually works, it should be imported and we can get rid of the mdconfig mess.
mini-memstick.img with UEFI support.
As the comments in the file suggest, 1) there must
be existing ${.OBJDIR}/usr/src/release/{release,bootonly};
2) TARGET/TARGET_ARCH must be amd64; and 3) it must be
a vt(4)-enabled kernel with vt_efifb (*not* vt_vga).
This script is not hooked into release/Makefile in any way
until further testing is complete.
Sponsored by: The FreeBSD Foundation
Restore make-memstick.sh back to its original state to
unbreak booting for machines that do not support GPT.
I have in-progress work to keep the MBR layout and add
the EFI partition, but it is not yet ready, and does
need at least one full release build to be certain it
does not break.
Sponsored by: The FreeBSD Foundation
- Indent 1 full tab where needed
- Use $() for shell exec
- Insert a space between '$(( ))' parens
MFC After: 1 week
X-MFC-With: r264907
Sponsored by: The FreeBSD Foundation
dedicated' partition scheme, reported to cause the memstick.img
to fail to boot.
Similar to how make-memstick.sh worked on stable/8, use makefs(8)
to create the actual filesystem. Then calculate the size of the
resulting image file, create the GPT partition scheme, then dd(1)
the filesystem created with makefs(8) to the freebsd-ufs GPT
partition.
This was tested on a known-working machine[1] for regression, and
a known-not-working machine[2] to ensure the boot issue has been
resolved.
Testers: myself [1], db [2]
MFC After: 1 week
Sponsored by: The FreeBSD Foundation
XDEV_FLAGS variable in ${KERNCONF}.conf file.
MFC after: 3 days
X-MFC-Note: fix stable/10 XDEV_FLAGS local for branch
Sponsored by: The FreeBSD Foundation
For stable/10, r264703 sets the correct WITH/WITHOUT
knobs to get xdev built with the arm-freebsd-gcc binary
installed. Unfortunately, the same fix does not work on
head/.
Also, quite to my amazement, WITH_GCC=1 and WITH_GNUCXX=1
causes xdev to fail spectactularly at least on r264791.
The situation as it stands is:
- gcc(1) is needed for the u-boot build.
- cc(1) *cannot* be clang(1)
To shoe-horn the toolchain to make 'xdev' give what is
needed, remove WITH_GNUCXX=1 and add WITH_GCC_BOOTSTRAP=1.
MFC After: 1 week
X-MFC-To: stable/10 only
X-MFC-Note: after stable/10 is broken in this way...
Sponsored by: The FreeBSD Foundation
- gcc(1) fails to build usr.bin/dtc
- lack of WITH_GNUCXX=1 causes cc1plus(1) calls to fail
- u-boot fails to build with clang (hard-coded gcc(1) calls)
Implement the proper incantation of WITH_/WITHOUT_ knobs
to get arm snapshot builds working again.
Since the cc(1) binary is no longer expected to be clang(1),
remove the chroot(8) post-install cc(1) overwrite.
MFC After: 3 days
X-MFC-With: r264518,r264697,r264698
Tested on: stable/10@r264677 RPI-B
Sponsored by: The FreeBSD Foundation
WITHOUT_CLANG_IS_CC=1, it appears WITHOUT_CLANG=1 must
also be set.
While here, reorder the lines to put the WITH_* and
WITHOUT_* entries on the same line.
MFC After: 3 days
X-MFC-With: r264518
Tested on: stable/10@r264677
Sponsored by: The FreeBSD Foundation
and finish the job. ncurses is now the only Makefile in the tree that
uses it since it wasn't a simple mechanical change, and will be
addressed in a future commit.
variables. These are intended to allow bypassing the
'svn co /usr/{src,doc,ports}' step in the chroot when the
tree exists from external means.
The use case here is that /usr/src, /usr/doc, and /usr/ports
in the chroot exist as result of zfs dataset clones, so it
is possible (and happens quite often) that the included
distributions may not be consistent. (This is not the case
for -RELEASE builds, but does happen for snapshot builds.)
Tested on: stable/9@r264319
MFC After: 3 days
Sponsored by: The FreeBSD Foundation
when WITH_COMPRESSED_IMAGES is used.
Requested by: delphij, brooks, Nikolai Lifanov
MFC After: 1 week
X-MFC-With: r264027,r264028,r264029,r264030
Sponsored by: The FreeBSD Foundation
