d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct a bitrotted comment about installworld order requirements.

Browse Source 
The case of make(1) using a new /bin/sh issue was fixed in r173219 when ITOOLS
was introduced.

There are still issues with mid-install errors leaving a system unusable that
are currently non-trivial to solve.  The safest ordering requires installing
rtld, libc and libthr (in that order) before anything else.  We don't do that
now though.  Much improvement is needed here still.

Discussed with:	kip and kan (rtld/library ordering)
MFC after:	1 week
Sponsored by:	EMC / Isilon Storage Division
This commit is contained in:
Bryan Drewery 2015-10-16 21:09:15 +00:00
parent e07b2be5e9
commit 7e81b832a3
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile.inc1
View File

@ -50,11 +50,14 @@
.include <bsd.arch.inc.mk> .include <bsd.arch.inc.mk>
.include <bsd.compiler.mk> .include <bsd.compiler.mk>
# We must do lib/ and libexec/ before bin/, because if installworld # We must do lib/ and libexec/ before bin/ in case of a mid-install error to
# installs a new /bin/sh, the 'make' command will *immediately* # keep the users system reasonably usable. For static->dynamic root upgrades,
# use that new version. And the new (dynamically-linked) /bin/sh # we don't want to install a dynamic binary without rtld and the needed
# will expect to find appropriate libraries in /lib and /libexec. # libraries. More commonly, for dynamic root, we don't want to install a
# # binary that requires a newer library version that hasn't been installed yet.
# This ordering is not a guarantee though. The only guarantee of a working
# system here would require fine-grained ordering of all components based
# on their dependencies.
SRCDIR?= ${.CURDIR} SRCDIR?= ${.CURDIR}
.if defined(SUBDIR_OVERRIDE) .if defined(SUBDIR_OVERRIDE)
SUBDIR= ${SUBDIR_OVERRIDE} SUBDIR= ${SUBDIR_OVERRIDE}