| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
and adjust the path in the Makefile for the upgrade_checks target.
These checks are really feature upgrade checks that should be fast
and just find out whether we need to build a new make before
proceeding with other targets like buildworld. This makes the
place free for a real regression test suite in the old place.
|
|
|
|
|
|
| |
target of the same name from src/etc/Makefile with a proper
environment, suitable to be used during upgrades and cross-
builds.
|
|
|
|
|
|
|
| |
CAVEAT: if you run tcsh(1) from within this target, this will
reset your PATH making this target mostly useless. Careful!
Submitted by: jmg, ru
|
| |
|
|
|
|
| |
OK'ed by: core
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
testing for variables that are always defined (e.g.,
"make -V CC") would still print a false warning. Fix
this by only passing a submake the MAKEOBJDIRPREFIX=*
argument if it was present. As a result, we loose
the check for -DMAKEOBJDIRPREFIX, or an esoteric
"MAKEOBJDIRPREFIX = foo" (with embedded spaces), but
these are unorthodox enough to not care about them.
The make(1) bug mentioned in the previous revision
was just fixed in make/main.c,v 1.109.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When make flags are passed to make in the environment, the string is
chopped up in an (argc,argv) vector. This happens in brk_string() and
the chopped up string is stored in static buffer. When this includes
something like "-V BINMAKE", then a pointer into the static buffer is
put on the variables list for evaluation later. However, brk_string()
is used for more than just chopping up the MAKEFLAGS env. variable, so
it's very likely that the static buffer is clobbered. In fact, this is
exactly what happens.
The result is that _MAKEOBJDIRPREFIX gets assigned whatever garbage
the child make happens to emit, causing the test to fail. Like this:
pluto2% cd /usr/src
pluto2% make -V BINMAKE
"/q/6.x/src/Makefile", line 94: MAKEOBJDIRPREFIX can only be set in environment, not as a global (in /etc/make.conf) or command-line variable.
pluto2% make -dv -V BINMAKE | & grep _MAKEOBJDIRPREFIX
Global:_MAKEOBJDIRPREFIX = }
The fix is to not use MAKEFLAGS for this, but simple pass the flags
as arguments. Ideally make(1) should be fixed but that's beyond the
scope of my attention span.
This fixes release.
|
|
|
|
|
|
|
|
| |
by forcing the creation of an object directory for the make regression
tests. Let make handle the tracking of the dependency and installation
of test_shell script.
Submitted by: ru
|
|
|
|
|
|
|
|
|
|
|
|
| |
rates pretty high on the "hack!" scale, but it works for me. Adding
-DWANT_LIB32 to the world build command line, or 'WANT_LIB32=yes' to
/etc/make.conf will include the 32 bit libraries with the build.
I have not made this default behavior. Cross compiling this stuff is an
adventure I have not investigated.
This is still a WIP. We needed this at work so that we could install from
a readonly obj tree - lib32/build.sh wasn't up to that.
|
|
|
|
| |
binary is not in PATH, as is the case with installworld, etc.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
built in parallel. Examples:
make universe
Build worlds sequentially, each world sequentially.
make universe JFLAG=-j4
Build worlds sequentially, each world in parallel.
make -j4 universe
make -j4 universe JFLAG=-j2
Build four worlds in parallel, each world will be
built in parallel too. World parallelization is
set to four in the first synopsis, and to two in
the second.
make -j4 universe JFLAG=-B
Build worlds in parallel, each world sequentially.
("world" == buildworld followed by buildkernels.)
Prayers: obrien, phk
|
|
|
|
|
| |
to suppress warnings with installworld and distributeworld when
env(1) cannot be found in the PATH.
|
|
|
|
|
|
|
|
|
| |
two -n flags. If only one -n flag is given the old behaviour
is retained (POLA). In order to make this working for installworld
change the IMAKEENV in this case so that the tools are found
(we have no temporary installation environment in this case).
Submitted by: ru (IMAKEENV part)
|
|
|
|
|
| |
rebuild things, further discouraging 'make world'. The title of
that section is now changed...
|
|
|
|
|
|
|
|
| |
more professional. While here, write a few lines of explanatory
text to explain what its for.
Discussed with: rwatson
With hat: core
|
| |
|
|
|
|
|
| |
enough this only seems to cause problems with -jX so went unnoticed
until now.
|
|
|
|
|
|
|
|
|
|
|
| |
trying to upgrade their system with make world instead of following
the preferred and suggested sequence of commands. The fact remains
that make world does not upgrade the kernel.
Allow make world when DESTDIR has been specified, including when
DESTDIR specifies the root file system. Otherwise, print a useful
warning and fail.
Reviewed, tested and scrutinized by: gad@
|
|
|
|
| |
make universe JFLAG=-j12
|
|
|
|
|
|
|
| |
a kernel. This is essentially the same as the toolchain target, except
that it does not build headers and libraries.
Submitted by: ru
|
|
|
|
|
|
|
| |
buildworld, up to and including libraries, except for actually
building the world.
Requested by: many
|
| |
|
|
|
|
| |
Approved by: peter
|
|
|
|
|
|
| |
targets like buildworld, installworld.
Suggested by: obrien
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
but the biggest issue is that there are situatons when
${.OBJDIR} == ${.SRCDIR}, and in those situations the previous version
would happily remove all your /usr/src while it was cleaning out the objects.
Not that *you* would be happy about it... Thanks to bde for immediately
noticing this serious possibility.
More improvements will be made to this target, but I wanted to commit this
safer version right now, before anyone lost their /usr/src due to it.
Reviewed by: bde
MFC after: 10 days
|
|
|
|
|
|
|
|
|
|
| |
that was built in previous 'make buildworld' and 'make buildkernel'. The
target knows enough to run a 'chflags -R 0' and a second 'rm' if the first
'rm' ran into any errors while removing files.
Suggested by: email with Richard Coleman Re: upcoming 64b-time_t changes.
Reviewed by: imp, marcel, and others on -hackers
MFC after: 1 week
|
|
|
|
|
|
|
|
|
|
| |
Makefile.inc1 underscore targets with a big warning that they are
intentionally undocumented, subject to change without notice and
might poison your dog etc. If you don't know what they are, then they
are not meant for you to use.
I've added these by hand to so many many trees that I've lost count. I
find them rather useful.
|
|
|
|
|
|
| |
to become confused by a file called 'make' in /usr/src
Submitted by: ru
|
|
|
|
|
|
|
| |
do not have a chance to work nowadays as we have a lot of
internal libraries in lib/.
Discussed with: marcel, wollman
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
buildworld targets by default, but allow it to be done for all user
targets by introducing a boolean option, named ALWAYS_CHECK_MAKE.
This change is by no means perfect and I don't even want to claim
this to be a solution. It does however address the fact that not
everybody likes to see make(1) rebuilt simply because the regression
test failed for some reason or other, including pilot error. It
therefore serves the purpose of keeping the crowd happy until we
have something better or simply reached a compromise.
The reasons for changing the default behaviour are:
o It avoids a negative, possibly non-intuitive option,
o It's according to POLA and fond of feet,
o Only buildworld is documented to do its best to be
successful at reasonably cost.
Reviewed by: gad, imp, obrien, peter
|
|
|
|
|
|
| |
removed).
- Avoid using printf(1) where a simple shell's built-in echo is enough.
|
| |
|
|
|
|
|
|
|
|
|
| |
one is already available. This avoids sometimes unnecessary
step of attempting to rebuild the make binary again which may
fail at all if, for example, one has removed his /usr/include
before doing an installworld (to keep /usr/include tidied up).
Pointed out by: kris, marcel
|
|
|
|
|
|
|
|
|
|
|
| |
comprised of the path to a make(1) binary (possibly the one
built by the "make" target in this Makefile), and a path to
a fresh share/mk. The idea is to allow "make release" pick
up the right "make" binary, if one exists.
This fixes release.5 I broke with the last commit here; the
second PATH here was overriding the right one from WMAKEENV
while rebuilding the "build-tools" for crunched binaries.
|
|
|
|
|
|
|
| |
Submitted by: bde
Fixed nearby bug: propagate the root Makefile's idea of
the appropriate "make" binary down to release/Makefile.
|
| |
|
| |
|
|
|
|
| |
Submitted by: ru
|
|
|
|
|
|
|
|
|
|
|
|
| |
# If -DWANT_AOUT is specified, a `make world' with OBJFORMAT=elf will
# update the legacy support for aout. This includes all libraries, ld.so
# and boot objects. This part of build should be regarded as
# deprecated and you should _not_ expect to be able to do this past the
# release of 4.0. You have exactly one major release to move entirely
# to elf.
Now that we're past 5.0, these aren't needed at all anymore and it is
well past its freshness date.
|
|
|
|
|
| |
And this is probably what you expect when you say
"make -jX buildworld buildkernel".
|
|
|
|
| |
Submitted by: johan
|
|
|
|
|
| |
Folded pc98 into the common case.
Retired ${JFLAG} (``make -jX universe'' should work).
|
|
|
|
| |
and TARGET_ARCH.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When we call "distributeworld" as part of "make release", we set
MACHINE and MACHINE_ARCH to point to TARGET and TARGET_ARCH; this
confused src/Makefile's idea of what ${MAKEPATH}, and consequently
${MAKE}, is (well, it still confuses ${MAKEPATH}, but see below).
To overcome this problem, we now take the following approach:
- We preserve the make(1)'s idea of its argv[0], ${MAKE}.
- We check to see if ${MAKE} passes the regression tests.
- If it does, we use it. Otherwise, we build and use an
up-to-date make(1).
This fix is still not quite right, in a situation where a single
/usr/obj is shared between different architecture machines, but
it is less critical and I hope to fix that soon.
|
| |
|
|
|
|
|
|
|
| |
one space to make the dates line up for easy mental math.
# Too bad only i386 and pc98 are the only parts of the universe
# currently buildable on my box :-(
|
|
|
|
|
|
|
| |
rev. 1.270 more accurately.
Reviewed by: ru
Approved by: re (jhb)
|
|
|
|
|
|
|
|
|
|
| |
be suitable for building. The old action here was to upgrade the
make in /usr/bin. This is both bogus and does not work under non
root. So, rather than overwriting the existing /usr/bin/make, we
now install it into a safe location, and use it from there.
Reviewed by: imp, marcel
Approved by: re (rwatson)
|
|
|
|
|
|
|
| |
belong (src/tools/regression/usr.bin/make), and use the latter
to test if make(1) is adequate for building the world.
Approved by: re
|