diff options
| author | matusita <matusita@FreeBSD.org> | 2004-01-19 13:35:46 +0000 |
|---|---|---|
| committer | matusita <matusita@FreeBSD.org> | 2004-01-19 13:35:46 +0000 |
| commit | 67527434e212a470aadd6539b04c5a27480366d5 (patch) | |
| tree | 6bb8c1040d43eed4b52dec922bf0d99297eccdf3 /release/Makefile | |
| parent | 792ce201497bcc38d9d4ba8ab48f22760c9f03a2 (diff) | |
| download | FreeBSD-src-67527434e212a470aadd6539b04c5a27480366d5.zip FreeBSD-src-67527434e212a470aadd6539b04c5a27480366d5.tar.gz | |
Fix "5.x release on 4.x box" support.
It is required to check /etc/rc.d/ldconfig before use, because
${CHROOT} sandbox is sometimes 4.x world. If /etc/rc.d/ldconfig
is not there, run ldconfig(8) directly.
Discussed with: imp, obrien, ru
Diffstat (limited to 'release/Makefile')
| -rw-r--r-- | release/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/release/Makefile b/release/Makefile index d07116e..4ea1851 100644 --- a/release/Makefile +++ b/release/Makefile @@ -458,7 +458,11 @@ release rerelease: # NB: these may fail if the host is running w/o devfs echo "umount /dev >/dev/null 2>&1 || true" >> ${_MK} echo "mount -t devfs devfs /dev >/dev/null 2>&1 || true" >> ${_MK} - echo "/etc/rc.d/ldconfig start" >> ${_MK} + echo "if [ -x /etc/rc.d/ldconfig ]; then" >> ${_MK} + echo " /etc/rc.d/ldconfig start" >> ${_MK} + echo "else" >> ${_MK} + echo " ldconfig /lib /usr/lib /usr/local/lib || true" >> ${_MK} + echo "fi" >> ${_MK} echo "if [ ! -f /tmp/.world_done ]; then" >> ${_MK} echo " cd /usr/src" >> ${_MK} echo " ${CROSSMAKE} ${WORLD_FLAGS} -DNOCLEAN buildworld && \\" >> ${_MK} |
