1999-08-28 00:22:10 +00:00
|
|
|
# $FreeBSD$
|
2001-08-29 07:56:44 +00:00
|
|
|
|
2005-01-06 11:12:43 +00:00
|
|
|
# The include file <bsd.libnames.mk> define library names.
|
|
|
|
|
# Other include files (e.g. bsd.prog.mk, bsd.lib.mk) include this
|
1997-01-12 16:12:40 +00:00
|
|
|
# file where necessary.
|
|
|
|
|
|
2002-04-17 13:49:29 +00:00
|
|
|
.if !target(__<bsd.init.mk>__)
|
|
|
|
|
.error bsd.libnames.mk cannot be included directly.
|
|
|
|
|
.endif
|
|
|
|
|
|
1998-05-31 11:32:38 +00:00
|
|
|
LIBCRT0?= ${DESTDIR}${LIBDIR}/crt0.o
|
1996-09-05 18:05:08 +00:00
|
|
|
|
1998-05-31 11:32:38 +00:00
|
|
|
LIBALIAS?= ${DESTDIR}${LIBDIR}/libalias.a
|
2004-02-13 01:14:38 +00:00
|
|
|
LIBARCHIVE?= ${DESTDIR}${LIBDIR}/libarchive.a
|
2004-01-31 02:51:41 +00:00
|
|
|
LIBASN1?= ${DESTDIR}${LIBDIR}/libasn1.a
|
2014-05-25 12:01:13 +00:00
|
|
|
LIBATF_C?= ${DESTDIR}${LIBPRIVATEDIR}/libatf-c.a
|
|
|
|
|
LIBATF_CXX?= ${DESTDIR}${LIBPRIVATEDIR}/libatf-c++.a
|
1998-09-17 09:35:02 +00:00
|
|
|
LIBATM?= ${DESTDIR}${LIBDIR}/libatm.a
|
Merge OpenBSM alpha 4 from OpenBSM vendor branch to head, both
contrib/openbsm (svn merge) and src/sys/{bsm,security/audit} (manual
merge). Add libauditd build parts and add to auditd's linkage;
force libbsm to build before libauditd.
OpenBSM history for imported revisions below for reference.
MFC after: 1 month
Sponsored by: Apple Inc.
Obtained from: TrustedBSD Project
OpenBSM 1.1 alpha 4
- With the addition of BSM error number mapping, we also need to map the
local error number passed to audit_submit(3) to a BSM error number,
rather than have the caller perform that conversion.
- Reallocate user audit events to avoid collisions with Solaris; adopt a
more formal allocation scheme, and add some events allocated in Solaris
that will be of immediate use on other platforms.
- Add an event for Calife.
- Add au_strerror(3), which allows generating strings for BSM errors
directly, rather than requiring applications to map to the local error
space, which might not be able to entirely represent the BSM error
number space.
- Major auditd rewrite for launchd(8) support. Add libauditd library
that is shared between launchd and auditd.
- Add AUDIT_TRIGGER_INITIALIZE trigger (sent via 'audit -i') for
(re)starting auditing under launchd(8) on Mac OS X.
- Add 'current' symlink to active audit trail.
- Add crash recovery of previous audit trail file when detected on audit
startup that it has not been properly terminated.
- Add the event AUE_audit_recovery to indicated when an audit trail file
has been recovered from not being properly terminated. This event is
stored in the new audit trail file and includes the path of recovered
audit trail file.
- Mac OS X and FreeBSD dependent code in auditd.c is separated into
auditd_darwin.c and auditd_fbsd.c files.
- Add an event for the posix_spawn(2) and fsgetpath(2) Mac OS X system
calls.
- For Mac OS X, we use ASL(3) instead of syslog(3) for logging.
- Add support for NOTICE level logging.
OpenBSM 1.1 alpha 3
- Add two new functions, au_bsm_to_errno() and au_errno_to_bsm(), to map
between BSM error numbers (largely the Solaris definitions) and local
errno(2) values for 32-bit and 64-bit return tokens. This is required
as operating systems don't agree on some of the values of more recent
error numbers.
- Fix a bug how au_to_exec_args(3) and au_to_exec_env(3) calculates the
total size for the token. This buge.
- Deprecated Darwin constants, such as TRAILER_PAD_MAGIC, removed.
2008-12-31 11:12:24 +00:00
|
|
|
LIBAUDITD?= ${DESTDIR}${LIBDIR}/libauditd.a
|
2007-04-06 10:33:06 +00:00
|
|
|
LIBAVL?= ${DESTDIR}${LIBDIR}/libavl.a
|
2004-09-24 22:10:34 +00:00
|
|
|
LIBBEGEMOT?= ${DESTDIR}${LIBDIR}/libbegemot.a
|
2004-01-31 03:09:10 +00:00
|
|
|
LIBBLUETOOTH?= ${DESTDIR}${LIBDIR}/libbluetooth.a
|
2003-07-02 23:54:37 +00:00
|
|
|
LIBBSDXML?= ${DESTDIR}${LIBDIR}/libbsdxml.a
|
2006-02-02 10:04:32 +00:00
|
|
|
LIBBSM?= ${DESTDIR}${LIBDIR}/libbsm.a
|
2003-11-10 09:07:30 +00:00
|
|
|
LIBBSNMP?= ${DESTDIR}${LIBDIR}/libbsnmp.a
|
2001-07-09 22:00:32 +00:00
|
|
|
LIBBZ2?= ${DESTDIR}${LIBDIR}/libbz2.a
|
2011-11-25 20:59:04 +00:00
|
|
|
LIBCXXRT?= ${DESTDIR}${LIBDIR}/libcxxrt.a
|
|
|
|
|
LIBCPLUSPLUS?= ${DESTDIR}${LIBDIR}/libc++.a
|
1998-05-31 11:32:38 +00:00
|
|
|
LIBC?= ${DESTDIR}${LIBDIR}/libc.a
|
Fixed some bitrot:
- the changes that renamed libf2c to libg2c had not reached here
- there were no definitions for LIBDEVINFO, LIBMENU, LIBPANEL, LIBTINFO,
LIBUSB or LIBVGL. LIBUSB was used without it being defined, and
LIBDEVINFO and LIBVGL should have been used.
- the definitions of LIBDESCRYPT, LIBGCC_PIC, LIBGPLUSPLUS, LIBKZHEAD,
LIBKZTAIL, LIBSCRYPT and LIBSCSI were garbage.
Fixed some old bugs:
- LIBC_PIC and LIBCOM_ERR were assigned to using "=" instead of "?=".
- the definition of LIBC_R was disordered.
- LIBFORM was misspelled LIBFORMS (but not actually used).
2001-05-12 14:21:14 +00:00
|
|
|
LIBC_PIC?= ${DESTDIR}${LIBDIR}/libc_pic.a
|
1998-05-31 11:32:38 +00:00
|
|
|
LIBCALENDAR?= ${DESTDIR}${LIBDIR}/libcalendar.a
|
1998-09-15 10:27:20 +00:00
|
|
|
LIBCAM?= ${DESTDIR}${LIBDIR}/libcam.a
|
2013-12-02 08:21:28 +00:00
|
|
|
LIBCAPSICUM?= ${DESTDIR}${LIBDIR}/libcapsicum.a
|
|
|
|
|
LIBCASPER?= ${DESTDIR}${LIBDIR}/libcasper.a
|
Fixed some bitrot:
- the changes that renamed libf2c to libg2c had not reached here
- there were no definitions for LIBDEVINFO, LIBMENU, LIBPANEL, LIBTINFO,
LIBUSB or LIBVGL. LIBUSB was used without it being defined, and
LIBDEVINFO and LIBVGL should have been used.
- the definitions of LIBDESCRYPT, LIBGCC_PIC, LIBGPLUSPLUS, LIBKZHEAD,
LIBKZTAIL, LIBSCRYPT and LIBSCSI were garbage.
Fixed some old bugs:
- LIBC_PIC and LIBCOM_ERR were assigned to using "=" instead of "?=".
- the definition of LIBC_R was disordered.
- LIBFORM was misspelled LIBFORMS (but not actually used).
2001-05-12 14:21:14 +00:00
|
|
|
LIBCOM_ERR?= ${DESTDIR}${LIBDIR}/libcom_err.a
|
1998-05-31 11:32:38 +00:00
|
|
|
LIBCOMPAT?= ${DESTDIR}${LIBDIR}/libcompat.a
|
2014-01-18 14:47:34 +00:00
|
|
|
LIBCOMPILER_RT?=${DESTDIR}${LIBDIR}/libcompiler_rt.a
|
1998-05-31 11:32:38 +00:00
|
|
|
LIBCRYPT?= ${DESTDIR}${LIBDIR}/libcrypt.a
|
2004-01-31 02:51:41 +00:00
|
|
|
LIBCRYPTO?= ${DESTDIR}${LIBDIR}/libcrypto.a
|
2008-05-22 01:14:43 +00:00
|
|
|
LIBCTF?= ${DESTDIR}${LIBDIR}/libctf.a
|
1998-05-31 11:32:38 +00:00
|
|
|
LIBCURSES?= ${DESTDIR}${LIBDIR}/libcurses.a
|
Fixed some bitrot:
- the changes that renamed libf2c to libg2c had not reached here
- there were no definitions for LIBDEVINFO, LIBMENU, LIBPANEL, LIBTINFO,
LIBUSB or LIBVGL. LIBUSB was used without it being defined, and
LIBDEVINFO and LIBVGL should have been used.
- the definitions of LIBDESCRYPT, LIBGCC_PIC, LIBGPLUSPLUS, LIBKZHEAD,
LIBKZTAIL, LIBSCRYPT and LIBSCSI were garbage.
Fixed some old bugs:
- LIBC_PIC and LIBCOM_ERR were assigned to using "=" instead of "?=".
- the definition of LIBC_R was disordered.
- LIBFORM was misspelled LIBFORMS (but not actually used).
2001-05-12 14:21:14 +00:00
|
|
|
LIBDEVINFO?= ${DESTDIR}${LIBDIR}/libdevinfo.a
|
1998-09-15 10:27:20 +00:00
|
|
|
LIBDEVSTAT?= ${DESTDIR}${LIBDIR}/libdevstat.a
|
1998-05-31 11:32:38 +00:00
|
|
|
LIBDIALOG?= ${DESTDIR}${LIBDIR}/libdialog.a
|
2004-09-21 19:01:48 +00:00
|
|
|
LIBDNS?= ${DESTDIR}${LIBDIR}/libdns.a
|
2008-05-22 01:14:43 +00:00
|
|
|
LIBDTRACE?= ${DESTDIR}${LIBDIR}/libdtrace.a
|
|
|
|
|
LIBDWARF?= ${DESTDIR}${LIBDIR}/libdwarf.a
|
1998-05-31 11:32:38 +00:00
|
|
|
LIBEDIT?= ${DESTDIR}${LIBDIR}/libedit.a
|
2008-02-21 16:29:31 +00:00
|
|
|
LIBELF?= ${DESTDIR}${LIBDIR}/libelf.a
|
2013-09-03 15:22:04 +00:00
|
|
|
LIBEXECINFO?= ${DESTDIR}${LIBDIR}/libexecinfo.a
|
2001-03-20 20:21:08 +00:00
|
|
|
LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a
|
1996-09-05 18:05:08 +00:00
|
|
|
LIBFL?= "don't use LIBFL, use LIBL"
|
Fixed some bitrot:
- the changes that renamed libf2c to libg2c had not reached here
- there were no definitions for LIBDEVINFO, LIBMENU, LIBPANEL, LIBTINFO,
LIBUSB or LIBVGL. LIBUSB was used without it being defined, and
LIBDEVINFO and LIBVGL should have been used.
- the definitions of LIBDESCRYPT, LIBGCC_PIC, LIBGPLUSPLUS, LIBKZHEAD,
LIBKZTAIL, LIBSCRYPT and LIBSCSI were garbage.
Fixed some old bugs:
- LIBC_PIC and LIBCOM_ERR were assigned to using "=" instead of "?=".
- the definition of LIBC_R was disordered.
- LIBFORM was misspelled LIBFORMS (but not actually used).
2001-05-12 14:21:14 +00:00
|
|
|
LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a
|
|
|
|
|
LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a
|
2003-03-21 14:31:51 +00:00
|
|
|
LIBGEOM?= ${DESTDIR}${LIBDIR}/libgeom.a
|
1998-05-31 11:32:38 +00:00
|
|
|
LIBGNUREGEX?= ${DESTDIR}${LIBDIR}/libgnuregex.a
|
2004-01-31 02:51:41 +00:00
|
|
|
LIBGSSAPI?= ${DESTDIR}${LIBDIR}/libgssapi.a
|
2008-05-07 13:53:12 +00:00
|
|
|
LIBGSSAPI_KRB5?= ${DESTDIR}${LIBDIR}/libgssapi_krb5.a
|
2004-01-31 02:51:41 +00:00
|
|
|
LIBHDB?= ${DESTDIR}${LIBDIR}/libhdb.a
|
2012-03-22 08:48:42 +00:00
|
|
|
LIBHEIMBASE?= ${DESTDIR}${LIBDIR}/libheimbase.a
|
2013-09-10 18:40:43 +00:00
|
|
|
LIBHEIMIPCC?= ${DESTDIR}${LIBPRIVATEDIR}/libheimipcc.a
|
|
|
|
|
LIBHEIMIPCS?= ${DESTDIR}${LIBPRIVATEDIR}/libheimipcs.a
|
2008-05-07 13:53:12 +00:00
|
|
|
LIBHEIMNTLM?= ${DESTDIR}${LIBDIR}/libheimntlm.a
|
2012-03-22 08:48:42 +00:00
|
|
|
LIBHEIMSQLITE?= ${DESTDIR}${LIBDIR}/libheimsqlite.a
|
2008-05-07 13:53:12 +00:00
|
|
|
LIBHX509?= ${DESTDIR}${LIBDIR}/libhx509.a
|
2000-02-27 18:41:27 +00:00
|
|
|
LIBIPSEC?= ${DESTDIR}${LIBDIR}/libipsec.a
|
2009-06-24 18:18:35 +00:00
|
|
|
LIBJAIL?= ${DESTDIR}${LIBDIR}/libjail.a
|
2004-01-31 02:51:41 +00:00
|
|
|
LIBKADM5CLNT?= ${DESTDIR}${LIBDIR}/libkadm5clnt.a
|
|
|
|
|
LIBKADM5SRV?= ${DESTDIR}${LIBDIR}/libkadm5srv.a
|
|
|
|
|
LIBKAFS5?= ${DESTDIR}${LIBDIR}/libkafs5.a
|
2012-03-22 08:48:42 +00:00
|
|
|
LIBKDC?= ${DESTDIR}${LIBDIR}/libkdc.a
|
2002-10-04 16:25:08 +00:00
|
|
|
LIBKEYCAP?= ${DESTDIR}${LIBDIR}/libkeycap.a
|
2003-09-26 20:26:25 +00:00
|
|
|
LIBKICONV?= ${DESTDIR}${LIBDIR}/libkiconv.a
|
2004-01-31 02:51:41 +00:00
|
|
|
LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a
|
1998-05-31 11:32:38 +00:00
|
|
|
LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a
|
|
|
|
|
LIBL?= ${DESTDIR}${LIBDIR}/libl.a
|
2013-09-08 10:04:26 +00:00
|
|
|
LIBLDNS?= ${DESTDIR}${LIBPRIVATEDIR}/libldns.a
|
2000-09-16 04:35:51 +00:00
|
|
|
LIBLN?= "don't use LIBLN, use LIBL"
|
2010-05-10 06:59:50 +00:00
|
|
|
LIBLZMA?= ${DESTDIR}${LIBDIR}/liblzma.a
|
1998-05-31 11:32:38 +00:00
|
|
|
LIBM?= ${DESTDIR}${LIBDIR}/libm.a
|
2004-08-09 08:48:28 +00:00
|
|
|
LIBMAGIC?= ${DESTDIR}${LIBDIR}/libmagic.a
|
1998-05-31 11:32:38 +00:00
|
|
|
LIBMD?= ${DESTDIR}${LIBDIR}/libmd.a
|
2005-07-17 18:38:40 +00:00
|
|
|
LIBMEMSTAT?= ${DESTDIR}${LIBDIR}/libmemstat.a
|
Fixed some bitrot:
- the changes that renamed libf2c to libg2c had not reached here
- there were no definitions for LIBDEVINFO, LIBMENU, LIBPANEL, LIBTINFO,
LIBUSB or LIBVGL. LIBUSB was used without it being defined, and
LIBDEVINFO and LIBVGL should have been used.
- the definitions of LIBDESCRYPT, LIBGCC_PIC, LIBGPLUSPLUS, LIBKZHEAD,
LIBKZTAIL, LIBSCRYPT and LIBSCSI were garbage.
Fixed some old bugs:
- LIBC_PIC and LIBCOM_ERR were assigned to using "=" instead of "?=".
- the definition of LIBC_R was disordered.
- LIBFORM was misspelled LIBFORMS (but not actually used).
2001-05-12 14:21:14 +00:00
|
|
|
LIBMENU?= ${DESTDIR}${LIBDIR}/libmenu.a
|
2002-02-17 22:01:40 +00:00
|
|
|
LIBMILTER?= ${DESTDIR}${LIBDIR}/libmilter.a
|
1998-05-31 11:32:38 +00:00
|
|
|
LIBMP?= ${DESTDIR}${LIBDIR}/libmp.a
|
|
|
|
|
LIBNCURSES?= ${DESTDIR}${LIBDIR}/libncurses.a
|
2007-03-09 12:11:58 +00:00
|
|
|
LIBNCURSESW?= ${DESTDIR}${LIBDIR}/libncursesw.a
|
1999-10-21 09:06:11 +00:00
|
|
|
LIBNETGRAPH?= ${DESTDIR}${LIBDIR}/libnetgraph.a
|
2003-10-27 13:51:28 +00:00
|
|
|
LIBNGATM?= ${DESTDIR}${LIBDIR}/libngatm.a
|
2013-11-12 19:39:14 +00:00
|
|
|
LIBNV?= ${DESTDIR}${LIBDIR}/libnv.a
|
2007-04-06 01:45:23 +00:00
|
|
|
LIBNVPAIR?= ${DESTDIR}${LIBDIR}/libnvpair.a
|
1998-05-31 11:32:38 +00:00
|
|
|
LIBOPIE?= ${DESTDIR}${LIBDIR}/libopie.a
|
1999-01-20 21:48:56 +00:00
|
|
|
|
|
|
|
|
# The static PAM library doesn't know its secondary dependencies,
|
2014-04-24 21:18:22 +00:00
|
|
|
# so we have to specify them explicitly. Ths is an unfortunate,
|
|
|
|
|
# but necessary departure from testing MK_ flags to define
|
|
|
|
|
# values here.
|
2000-04-30 01:33:37 +00:00
|
|
|
LIBPAM?= ${DESTDIR}${LIBDIR}/libpam.a
|
2004-02-03 09:37:12 +00:00
|
|
|
MINUSLPAM= -lpam
|
2002-11-26 09:00:02 +00:00
|
|
|
.if defined(LDFLAGS) && !empty(LDFLAGS:M-static)
|
2006-03-17 18:54:44 +00:00
|
|
|
.if ${MK_KERBEROS} != "no"
|
2008-05-07 13:53:12 +00:00
|
|
|
LIBPAM+= ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} \
|
2004-02-03 09:37:12 +00:00
|
|
|
${LIBROKEN} ${LIBCOM_ERR}
|
2008-05-07 13:53:12 +00:00
|
|
|
MINUSLPAM+= -lkrb5 -lhx509 -lasn1 -lcrypto -lcrypt -lroken -lcom_err
|
1999-01-20 21:48:56 +00:00
|
|
|
.endif
|
2004-02-03 09:37:12 +00:00
|
|
|
LIBPAM+= ${LIBRADIUS} ${LIBTACPLUS} ${LIBCRYPT} \
|
2004-11-13 20:40:32 +00:00
|
|
|
${LIBUTIL} ${LIBOPIE} ${LIBMD}
|
2004-02-03 09:37:12 +00:00
|
|
|
MINUSLPAM+= -lradius -ltacplus -lcrypt \
|
2004-11-13 20:40:32 +00:00
|
|
|
-lutil -lopie -lmd
|
2006-03-17 18:54:44 +00:00
|
|
|
.if ${MK_OPENSSH} != "no"
|
2004-02-03 09:37:12 +00:00
|
|
|
LIBPAM+= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT}
|
|
|
|
|
MINUSLPAM+= -lssh -lcrypto -lcrypt
|
2002-01-23 15:54:17 +00:00
|
|
|
.endif
|
2006-03-17 18:54:44 +00:00
|
|
|
.if ${MK_NIS} != "no"
|
2004-11-13 20:40:32 +00:00
|
|
|
LIBPAM+= ${LIBYPCLNT}
|
|
|
|
|
MINUSLPAM+= -lypclnt
|
|
|
|
|
.endif
|
1999-01-20 21:48:56 +00:00
|
|
|
.endif
|
|
|
|
|
|
Fixed some bitrot:
- the changes that renamed libf2c to libg2c had not reached here
- there were no definitions for LIBDEVINFO, LIBMENU, LIBPANEL, LIBTINFO,
LIBUSB or LIBVGL. LIBUSB was used without it being defined, and
LIBDEVINFO and LIBVGL should have been used.
- the definitions of LIBDESCRYPT, LIBGCC_PIC, LIBGPLUSPLUS, LIBKZHEAD,
LIBKZTAIL, LIBSCRYPT and LIBSCSI were garbage.
Fixed some old bugs:
- LIBC_PIC and LIBCOM_ERR were assigned to using "=" instead of "?=".
- the definition of LIBC_R was disordered.
- LIBFORM was misspelled LIBFORMS (but not actually used).
2001-05-12 14:21:14 +00:00
|
|
|
LIBPANEL?= ${DESTDIR}${LIBDIR}/libpanel.a
|
1998-05-31 11:32:38 +00:00
|
|
|
LIBPCAP?= ${DESTDIR}${LIBDIR}/libpcap.a
|
2013-12-01 09:41:06 +00:00
|
|
|
LIBPJDLOG?= ${DESTDIR}${LIBDIR}/libpjdlog.a
|
2005-04-19 04:01:25 +00:00
|
|
|
LIBPMC?= ${DESTDIR}${LIBDIR}/libpmc.a
|
2008-05-22 01:14:43 +00:00
|
|
|
LIBPROC?= ${DESTDIR}${LIBDIR}/libproc.a
|
2012-05-19 04:57:37 +00:00
|
|
|
LIBPROCSTAT?= ${DESTDIR}${LIBDIR}/libprocstat.a
|
2007-10-01 18:15:11 +00:00
|
|
|
LIBPTHREAD?= ${DESTDIR}${LIBDIR}/libpthread.a
|
1998-11-18 01:53:56 +00:00
|
|
|
LIBRADIUS?= ${DESTDIR}${LIBDIR}/libradius.a
|
2004-01-31 02:51:41 +00:00
|
|
|
LIBROKEN?= ${DESTDIR}${LIBDIR}/libroken.a
|
1998-05-31 11:32:38 +00:00
|
|
|
LIBRPCSVC?= ${DESTDIR}${LIBDIR}/librpcsvc.a
|
2010-02-25 14:42:26 +00:00
|
|
|
LIBRPCSEC_GSS?= ${DESTDIR}${LIBDIR}/librpcsec_gss.a
|
|
|
|
|
LIBRT?= ${DESTDIR}${LIBDIR}/librt.a
|
2010-07-31 14:32:54 +00:00
|
|
|
LIBRTLD_DB?= ${DESTDIR}${LIBDIR}/librtld_db.a
|
Rewrite of the CAM error recovery code.
Some of the major changes include:
- The SCSI error handling portion of cam_periph_error() has
been broken out into a number of subfunctions to better
modularize the code that handles the hierarchy of SCSI errors.
As a result, the code is now much easier to read.
- String handling and error printing has been significantly
revamped. We now use sbufs to do string formatting instead
of using printfs (for the kernel) and snprintf/strncat (for
userland) as before.
There is a new catchall error printing routine,
cam_error_print() and its string-based counterpart,
cam_error_string() that allow the kernel and userland
applications to pass in a CCB and have errors printed out
properly, whether or not they're SCSI errors. Among other
things, this helped eliminate a fair amount of duplicate code
in camcontrol.
We now print out more information than before, including
the CAM status and SCSI status and the error recovery action
taken to remedy the problem.
- sbufs are now available in userland, via libsbuf. This
change was necessary since most of the error printing code
is shared between libcam and the kernel.
- A new transfer settings interface is included in this checkin.
This code is #ifdef'ed out, and is primarily intended to aid
discussion with HBA driver authors on the final form the
interface should take. There is example code in the ahc(4)
driver that implements the HBA driver side of the new
interface. The new transfer settings code won't be enabled
until we're ready to switch all HBA drivers over to the new
interface.
src/Makefile.inc1,
lib/Makefile: Add libsbuf. It must be built before libcam,
since libcam uses sbuf routines.
libcam/Makefile: libcam now depends on libsbuf.
libsbuf/Makefile: Add a makefile for libsbuf. This pulls in the
sbuf sources from sys/kern.
bsd.libnames.mk: Add LIBSBUF.
camcontrol/Makefile: Add -lsbuf. Since camcontrol is statically
linked, we can't depend on the dynamic linker
to pull in libsbuf.
camcontrol.c: Use cam_error_print() instead of checking for
CAM_SCSI_STATUS_ERROR on every failed CCB.
sbuf.9: Change the prototypes for sbuf_cat() and
sbuf_cpy() so that the source string is now a
const char *. This is more in line wth the
standard system string functions, and helps
eliminate warnings when dealing with a const
source buffer.
Fix a typo.
cam.c: Add description strings for the various CAM
error status values, as well as routines to
look up those strings.
Add new cam_error_string() and
cam_error_print() routines for userland and
the kernel.
cam.h: Add a new CAM flag, CAM_RETRY_SELTO.
Add enumerated types for the various options
available with cam_error_print() and
cam_error_string().
cam_ccb.h: Add new transfer negotiation structures/types.
Change inq_len in the ccb_getdev structure to
be "reserved". This field has never been
filled in, and will be removed when we next
bump the CAM version.
cam_debug.h: Fix typo.
cam_periph.c: Modularize cam_periph_error(). The SCSI error
handling part of cam_periph_error() is now
in camperiphscsistatuserror() and
camperiphscsisenseerror().
In cam_periph_lock(), increase the reference
count on the periph while we wait for our lock
attempt to succeed so that the periph won't go
away while we're sleeping.
cam_xpt.c: Add new transfer negotiation code. (ifdefed
out)
Add a new function, xpt_path_string(). This
is a string/sbuf analog to xpt_print_path().
scsi_all.c: Revamp string handing and error printing code.
We now use sbufs for much of the string
formatting code. More of that code is shared
between userland the kernel.
scsi_all.h: Get rid of SS_TURSTART, it wasn't terribly
useful in the first place.
Add a new error action, SS_REQSENSE. (Send a
request sense and then retry the command.)
This is useful when the controller hasn't
performed autosense for some reason.
Change the default actions around a bit.
scsi_cd.c,
scsi_da.c,
scsi_pt.c,
scsi_ses.c: SF_RETRY_SELTO -> CAM_RETRY_SELTO. Selection
timeouts shouldn't be covered by a sense flag.
scsi_pass.[ch]: SF_RETRY_SELTO -> CAM_RETRY_SELTO.
Get rid of the last vestiges of a read/write
interface.
libkern/bsearch.c,
sys/libkern.h,
conf/files: Add bsearch.c, which is needed for some of the
new table lookup routines.
aic7xxx_freebsd.c: Define AHC_NEW_TRAN_SETTINGS if
CAM_NEW_TRAN_CODE is defined.
sbuf.h,
subr_sbuf.c: Add the appropriate #ifdefs so sbufs can
compile and run in userland.
Change sbuf_printf() to use vsnprintf()
instead of kvprintf(), which is only available
in the kernel.
Change the source string for sbuf_cpy() and
sbuf_cat() to be a const char *.
Add __BEGIN_DECLS and __END_DECLS around
function prototypes since they're now exported
to userland.
kdump/mkioctls: Include stdio.h before cam.h since cam.h now
includes a function with a FILE * argument.
Submitted by: gibbs (mostly)
Reviewed by: jdp, marcel (libsbuf makefile changes)
Reviewed by: des (sbuf changes)
Reviewed by: ken
2001-03-27 05:45:52 +00:00
|
|
|
LIBSBUF?= ${DESTDIR}${LIBDIR}/libsbuf.a
|
2004-01-31 03:09:10 +00:00
|
|
|
LIBSDP?= ${DESTDIR}${LIBDIR}/libsdp.a
|
2013-06-28 21:00:08 +00:00
|
|
|
LIBSMB?= ${DESTDIR}${LIBDIR}/libsmb.a
|
2013-09-08 10:04:26 +00:00
|
|
|
LIBSSH?= ${DESTDIR}${LIBPRIVATEDIR}/libssh.a
|
2004-01-31 02:51:41 +00:00
|
|
|
LIBSSL?= ${DESTDIR}${LIBDIR}/libssl.a
|
2004-02-06 21:58:32 +00:00
|
|
|
LIBSTAND?= ${DESTDIR}${LIBDIR}/libstand.a
|
1998-05-31 11:32:38 +00:00
|
|
|
LIBSTDCPLUSPLUS?= ${DESTDIR}${LIBDIR}/libstdc++.a
|
1998-11-18 01:53:56 +00:00
|
|
|
LIBTACPLUS?= ${DESTDIR}${LIBDIR}/libtacplus.a
|
1998-05-31 11:32:38 +00:00
|
|
|
LIBTERMCAP?= ${DESTDIR}${LIBDIR}/libtermcap.a
|
1996-09-05 18:05:08 +00:00
|
|
|
LIBTERMLIB?= "don't use LIBTERMLIB, use LIBTERMCAP"
|
Fixed some bitrot:
- the changes that renamed libf2c to libg2c had not reached here
- there were no definitions for LIBDEVINFO, LIBMENU, LIBPANEL, LIBTINFO,
LIBUSB or LIBVGL. LIBUSB was used without it being defined, and
LIBDEVINFO and LIBVGL should have been used.
- the definitions of LIBDESCRYPT, LIBGCC_PIC, LIBGPLUSPLUS, LIBKZHEAD,
LIBKZTAIL, LIBSCRYPT and LIBSCSI were garbage.
Fixed some old bugs:
- LIBC_PIC and LIBCOM_ERR were assigned to using "=" instead of "?=".
- the definition of LIBC_R was disordered.
- LIBFORM was misspelled LIBFORMS (but not actually used).
2001-05-12 14:21:14 +00:00
|
|
|
LIBTINFO?= "don't use LIBTINFO, use LIBNCURSES"
|
2014-02-23 21:49:21 +00:00
|
|
|
LIBUCL?= ${DESTDIR}${LIBPRIVATEDIR}/libucl.a
|
2003-01-23 08:15:05 +00:00
|
|
|
LIBUFS?= ${DESTDIR}${LIBDIR}/libufs.a
|
2002-08-02 13:37:57 +00:00
|
|
|
LIBUGIDFW?= ${DESTDIR}${LIBDIR}/libugidfw.a
|
2007-04-06 01:45:23 +00:00
|
|
|
LIBUMEM?= ${DESTDIR}${LIBDIR}/libumem.a
|
2013-09-17 07:41:08 +00:00
|
|
|
LIBUNBOUND?= ${DESTDIR}${LIBPRIVATEDIR}/libunbound.a
|
2002-03-28 18:44:25 +00:00
|
|
|
LIBUSBHID?= ${DESTDIR}${LIBDIR}/libusbhid.a
|
2010-01-09 18:55:29 +00:00
|
|
|
LIBUSB?= ${DESTDIR}${LIBDIR}/libusb.a
|
Add a new library: libulog.
One of the things I really want to do, is to get rid of the limitations
of our current utmp(5) mechanism:
- It only allows 8 byte TTY device names.
- The hostname only allows 16 bytes of storage.
I'm not a big fan of <utmpx.h>, but I think we should at least try to
add parts of it. Unfortunately we cannot implement <utmpx.h>, because we
miss various fields, such as ut_id, ut_pid, etc. The API provided by
libulog shares some similarities with <utmpx.h>, so it shouldn't be too
hard to port these applications eventually. In most simple cases, it
should just be a matter of removing the ulog_ prefix everywhere.
As a bonus, it also implements a function called ulog_login_pseudo(),
which allows unprivileged applications to write log entries, provided
they have a valid file descriptor to a pseudo-terminal master device.
libulog will allow a smoother transition to a new file format by adding
a library interface to deal with utmp/wtmp/lastlog files. I initially
thought about adding the functionality to libutil, but because I'm not
planning on keeping this library around forever, we'd better keep it
separated.
Next items on the todo list:
1. Port applications in the base system (and ports) to libulog, instead
of letting them use <utmp.h>.
2. Remove <utmp.h>, implement <utmpx.h> and reimplement this library on
top.
3. Port as many applications as possible back to <utmpx.h>.
2009-12-03 15:48:24 +00:00
|
|
|
LIBULOG?= ${DESTDIR}${LIBDIR}/libulog.a
|
2002-10-04 16:25:08 +00:00
|
|
|
LIBUTIL?= ${DESTDIR}${LIBDIR}/libutil.a
|
2007-04-06 01:45:23 +00:00
|
|
|
LIBUUTIL?= ${DESTDIR}${LIBDIR}/libuutil.a
|
Fixed some bitrot:
- the changes that renamed libf2c to libg2c had not reached here
- there were no definitions for LIBDEVINFO, LIBMENU, LIBPANEL, LIBTINFO,
LIBUSB or LIBVGL. LIBUSB was used without it being defined, and
LIBDEVINFO and LIBVGL should have been used.
- the definitions of LIBDESCRYPT, LIBGCC_PIC, LIBGPLUSPLUS, LIBKZHEAD,
LIBKZTAIL, LIBSCRYPT and LIBSCSI were garbage.
Fixed some old bugs:
- LIBC_PIC and LIBCOM_ERR were assigned to using "=" instead of "?=".
- the definition of LIBC_R was disordered.
- LIBFORM was misspelled LIBFORMS (but not actually used).
2001-05-12 14:21:14 +00:00
|
|
|
LIBVGL?= ${DESTDIR}${LIBDIR}/libvgl.a
|
2011-05-13 04:54:01 +00:00
|
|
|
LIBVMMAPI?= ${DESTDIR}${LIBDIR}/libvmmapi.a
|
2012-03-22 08:48:42 +00:00
|
|
|
LIBWIND?= ${DESTDIR}${LIBDIR}/libwind.a
|
1999-03-14 20:45:05 +00:00
|
|
|
LIBWRAP?= ${DESTDIR}${LIBDIR}/libwrap.a
|
1998-05-31 11:32:38 +00:00
|
|
|
LIBXPG4?= ${DESTDIR}${LIBDIR}/libxpg4.a
|
|
|
|
|
LIBY?= ${DESTDIR}${LIBDIR}/liby.a
|
2002-04-13 07:23:25 +00:00
|
|
|
LIBYPCLNT?= ${DESTDIR}${LIBDIR}/libypclnt.a
|
1998-05-31 11:32:38 +00:00
|
|
|
LIBZ?= ${DESTDIR}${LIBDIR}/libz.a
|
2007-04-06 01:45:23 +00:00
|
|
|
LIBZFS?= ${DESTDIR}${LIBDIR}/libzfs.a
|
2013-03-05 08:09:53 +00:00
|
|
|
LIBZFS_CORE?= ${DESTDIR}${LIBDIR}/libzfs_core.a
|
2007-04-06 01:45:23 +00:00
|
|
|
LIBZPOOL?= ${DESTDIR}${LIBDIR}/libzpool.a
|
