Author: ed
Date: Thu Jan 21 16:56:27 2010
New Revision: 202755
URL: http://svn.freebsd.org/changeset/base/202755
Log:
Remove libulog from the bootstrap again.
libulog now only provides functions that are used by various packages
from the ports tree, namely the libutempter ones. There is no reason to
link it into the crunch/fixit binaries anymore.
Modified:
head/Makefile.inc1
head/lib/Makefile
head/release/i386/fixit_crunch.conf
head/release/pc98/fixit-small_crunch.conf
head/release/pc98/fixit_crunch.conf
head/release/picobsd/bridge/crunch.conf
head/release/picobsd/qemu/crunch.conf
head/rescue/rescue/Makefile
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Thu Jan 21 16:41:13 2010 (r202754)
+++ head/Makefile.inc1 Thu Jan 21 16:56:27 2010 (r202755)
@@ -1114,7 +1114,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1
lib/libkiconv lib/libkvm lib/libmd \
lib/ncurses/ncurses lib/ncurses/ncursesw \
lib/libopie lib/libpam ${_lib_libthr} \
- lib/libradius lib/libsbuf lib/libtacplus lib/libulog \
+ lib/libradius lib/libsbuf lib/libtacplus \
lib/libutil ${_lib_libypclnt} lib/libz lib/msun \
${_secure_lib_libcrypto} ${_secure_lib_libssh} \
${_secure_lib_libssl} lib/libdwarf lib/libproc
Modified: head/lib/Makefile
==============================================================================
--- head/lib/Makefile Thu Jan 21 16:41:13 2010 (r202754)
+++ head/lib/Makefile Thu Jan 21 16:56:27 2010 (r202755)
@@ -21,7 +21,6 @@
# librpcsvc must be built before libpam.
# libsbuf must be built before libcam.
# libtacplus must be built before libpam.
-# libulog must be built before libpam.
# libutil must be built before libpam.
# libypclnt must be built before libpam.
# libgssapi must be built before librpcsec_gss
@@ -31,7 +30,7 @@
SUBDIR= ${_csu} libc libbsm libauditd libcom_err libcrypt libelf libkvm
msun \
libmd \
ncurses ${_libnetgraph} libradius librpcsvc libsbuf \
- libtacplus libulog libutil ${_libypclnt} libalias libarchive \
+ libtacplus libutil ${_libypclnt} libalias libarchive \
${_libatm} libbegemot ${_libbluetooth} ${_libbsnmp} libbz2 \
libcalendar libcam libcompat libdevinfo libdevstat libdisk \
libdwarf libedit libexpat libfetch libftpio libgeom ${_libgpib} \
@@ -39,9 +38,9 @@ SUBDIR= ${_csu} libc libbsm libauditd li
${_libipx} libjail libkiconv libmagic libmemstat ${_libmilter} \
${_libmp} ${_libncp} ${_libngatm} libopie libpam libpcap \
${_libpmc} libproc librt ${_libsdp} ${_libsm} ${_libsmb} \
- ${_libsmdb} \
- ${_libsmutil} libstand ${_libtelnet} ${_libthr} libthread_db libufs \
- libugidfw ${_libusbhid} ${_libusb} ${_libvgl} libwrap liby libz \
+ ${_libsmdb} ${_libsmutil} libstand \
+ ${_libtelnet} ${_libthr} libthread_db libufs libugidfw libulog \
+ ${_libusbhid} ${_libusb} ${_libvgl} libwrap liby libz \
${_bind}
.if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf)
Modified: head/release/i386/fixit_crunch.conf
==============================================================================
--- head/release/i386/fixit_crunch.conf Thu Jan 21 16:41:13 2010
(r202754)
+++ head/release/i386/fixit_crunch.conf Thu Jan 21 16:56:27 2010
(r202755)
@@ -46,4 +46,4 @@ progs chown
progs chroot
ln chown chgrp
-libs -ledit -lgeom -lbsdxml -lsbuf -lkiconv -lkvm -lncurses -lulog -lutil
+libs -ledit -lgeom -lbsdxml -lsbuf -lkiconv -lkvm -lncurses -lutil
Modified: head/release/pc98/fixit-small_crunch.conf
==============================================================================
--- head/release/pc98/fixit-small_crunch.conf Thu Jan 21 16:41:13 2010
(r202754)
+++ head/release/pc98/fixit-small_crunch.conf Thu Jan 21 16:56:27 2010
(r202755)
@@ -40,4 +40,4 @@ srcdirs /usr/src/usr.sbin
progs chown
ln chown chgrp
-libs -lgeom -lbsdxml -lsbuf -lkiconv -lkvm -lncurses -lulog -lutil
+libs -lgeom -lbsdxml -lsbuf -lkiconv -lkvm -lncurses -lutil
Modified: head/release/pc98/fixit_crunch.conf
==============================================================================
--- head/release/pc98/fixit_crunch.conf Thu Jan 21 16:41:13 2010
(r202754)
+++ head/release/pc98/fixit_crunch.conf Thu Jan 21 16:56:27 2010
(r202755)
@@ -44,4 +44,4 @@ srcdirs /usr/src/usr.sbin
progs chown
ln chown chgrp
-libs -ledit -lgeom -lbsdxml -lsbuf -lkiconv -lkvm -lncurses -lulog -lutil
+libs -ledit -lgeom -lbsdxml -lsbuf -lkiconv -lkvm -lncurses -lutil
Modified: head/release/picobsd/bridge/crunch.conf
==============================================================================
--- head/release/picobsd/bridge/crunch.conf Thu Jan 21 16:41:13 2010
(r202754)
+++ head/release/picobsd/bridge/crunch.conf Thu Jan 21 16:56:27 2010
(r202755)
@@ -181,4 +181,3 @@ libs_so -lz
libs_so -lbsdxml
libs_so -lsbuf
libs_so -ljail # used by ifconfig
-libs_so -lulog # used by ifconfig
Modified: head/release/picobsd/qemu/crunch.conf
==============================================================================
--- head/release/picobsd/qemu/crunch.conf Thu Jan 21 16:41:13 2010
(r202754)
+++ head/release/picobsd/qemu/crunch.conf Thu Jan 21 16:56:27 2010
(r202755)
@@ -189,4 +189,3 @@ libs_so -lz
libs_so -lbsdxml
libs_so -lsbuf
libs_so -ljail # used by ifconfig
-libs_so -lulog
Modified: head/rescue/rescue/Makefile
==============================================================================
--- head/rescue/rescue/Makefile Thu Jan 21 16:41:13 2010 (r202754)
+++ head/rescue/rescue/Makefile Thu Jan 21 16:56:27 2010 (r202755)
@@ -72,7 +72,7 @@ CRUNCH_SRCDIRS+= bin
CRUNCH_PROGS_bin= cat chflags chio chmod cp date dd df echo \
ed expr getfacl hostname kenv kill ln ls mkdir mv \
pkill ps pwd realpath rm rmdir setfacl sh stty sync test
-CRUNCH_LIBS+= -lcrypt -ledit -lkvm -ll -ltermcap -lulog -lutil
+CRUNCH_LIBS+= -lcrypt -ledit -lkvm -ll -ltermcap -lutil
# Additional options for specific programs
CRUNCH_ALIAS_test= [
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
