From 84bee0d7fbd96d1e613c4b5a394a5b47ff1d8073 Mon Sep 17 00:00:00 2001 From: Ed Schouten Date: Thu, 21 Jan 2010 16:56:27 +0000 Subject: [PATCH] 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. --- Makefile.inc1 | 2 +- lib/Makefile | 9 ++++----- release/i386/fixit_crunch.conf | 2 +- release/pc98/fixit-small_crunch.conf | 2 +- release/pc98/fixit_crunch.conf | 2 +- release/picobsd/bridge/crunch.conf | 1 - release/picobsd/qemu/crunch.conf | 1 - rescue/rescue/Makefile | 2 +- 8 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 340357d027a..a26884450c8 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1114,7 +1114,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libkrb5} \ 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 diff --git a/lib/Makefile b/lib/Makefile index 07fe026366f..345b2ed31c0 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -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 libcom_err libcrypt libelf libkvm msun \ ${_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) diff --git a/release/i386/fixit_crunch.conf b/release/i386/fixit_crunch.conf index 896d46304a4..703ae847a6e 100644 --- a/release/i386/fixit_crunch.conf +++ b/release/i386/fixit_crunch.conf @@ -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 diff --git a/release/pc98/fixit-small_crunch.conf b/release/pc98/fixit-small_crunch.conf index b9a48cae3c9..111f1cdcda5 100644 --- a/release/pc98/fixit-small_crunch.conf +++ b/release/pc98/fixit-small_crunch.conf @@ -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 diff --git a/release/pc98/fixit_crunch.conf b/release/pc98/fixit_crunch.conf index e1566023fb4..c03db1c1878 100644 --- a/release/pc98/fixit_crunch.conf +++ b/release/pc98/fixit_crunch.conf @@ -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 diff --git a/release/picobsd/bridge/crunch.conf b/release/picobsd/bridge/crunch.conf index fa24f10f766..2a64021fad9 100644 --- a/release/picobsd/bridge/crunch.conf +++ b/release/picobsd/bridge/crunch.conf @@ -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 diff --git a/release/picobsd/qemu/crunch.conf b/release/picobsd/qemu/crunch.conf index 9e72cb14ed2..d6566ae7056 100644 --- a/release/picobsd/qemu/crunch.conf +++ b/release/picobsd/qemu/crunch.conf @@ -189,4 +189,3 @@ libs_so -lz libs_so -lbsdxml libs_so -lsbuf libs_so -ljail # used by ifconfig -libs_so -lulog diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index c5edaf808ec..afb15b09404 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -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= [