Date: Tue, 2 Dec 2014 17:08:24 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275413 - in projects/building-blocks: etc etc/rc.d lib lib/libpam/modules share/mk tools/build/mk tools/build/options usr.sbin Message-ID: <201412021708.sB2H8OET028634@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Tue Dec 2 17:08:24 2014 New Revision: 275413 URL: https://svnweb.freebsd.org/changeset/base/275413 Log: Add knob, MK_MAC_SUPPORT for building items with mac(9) support, like libugidfw, ugidfw, etc Added: projects/building-blocks/tools/build/options/WITHOUT_MAC_SUPPORT (contents, props changed) Modified: projects/building-blocks/etc/Makefile projects/building-blocks/etc/rc.d/Makefile projects/building-blocks/lib/Makefile projects/building-blocks/lib/libpam/modules/modules.inc projects/building-blocks/share/mk/src.opts.mk projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc projects/building-blocks/usr.sbin/Makefile Modified: projects/building-blocks/etc/Makefile ============================================================================== --- projects/building-blocks/etc/Makefile Tue Dec 2 16:22:08 2014 (r275412) +++ projects/building-blocks/etc/Makefile Tue Dec 2 17:08:24 2014 (r275413) @@ -38,7 +38,6 @@ BIN1= crontab \ profile \ protocols \ rc \ - rc.bsdextended \ rc.initdiskless \ rc.shutdown \ rc.subr \ @@ -114,6 +113,10 @@ BIN1+= libmap32.conf BIN1+= hosts.lpd printcap .endif +.if ${MK_MAC_SUPPORT} != "no" +BIN1+= rc.bsdextended +.endif + .if ${MK_MAIL} != "no" BIN1+= ${.CURDIR}/../usr.bin/mail/misc/mail.rc .endif Modified: projects/building-blocks/etc/rc.d/Makefile ============================================================================== --- projects/building-blocks/etc/rc.d/Makefile Tue Dec 2 16:22:08 2014 (r275412) +++ projects/building-blocks/etc/rc.d/Makefile Tue Dec 2 17:08:24 2014 (r275413) @@ -93,7 +93,6 @@ FILES= DAEMON \ syslogd \ tmp \ ${_ubthidhci} \ - ugidfw \ ${_unbound} \ ${_utx} \ var \ @@ -223,6 +222,10 @@ FILES+= syscons FILES+= lpd .endif +.if ${MK_MAC_SUPPORT} != "no" +FILES+= ugidfw +.endif + .if ${MK_NS_CACHING} != "no" _nscd= nscd .endif Modified: projects/building-blocks/lib/Makefile ============================================================================== --- projects/building-blocks/lib/Makefile Tue Dec 2 16:22:08 2014 (r275412) +++ projects/building-blocks/lib/Makefile Tue Dec 2 17:08:24 2014 (r275413) @@ -101,7 +101,7 @@ SUBDIR= ${SUBDIR_ORDERED} \ libthread_db \ libucl \ libufs \ - libugidfw \ + ${_libugidfw} \ libulog \ ${_libunbound} \ ${_libusbhid} \ @@ -236,6 +236,10 @@ _libcplusplus= libc++ _libthr= libthr .endif +.if ${MK_MAC_SUPPORT} != "no" +_libugidfw= libugidfw +.endif + .if ${MK_NAND} != "no" _libnandfs= libnandfs .endif Modified: projects/building-blocks/lib/libpam/modules/modules.inc ============================================================================== --- projects/building-blocks/lib/libpam/modules/modules.inc Tue Dec 2 16:22:08 2014 (r275412) +++ projects/building-blocks/lib/libpam/modules/modules.inc Tue Dec 2 17:08:24 2014 (r275413) @@ -23,7 +23,7 @@ MODULES += pam_opie MODULES += pam_opieaccess MODULES += pam_passwdqc MODULES += pam_permit -.if ${MK_RADIUS_SUPPORT} != "no +.if ${MK_RADIUS_SUPPORT} != "no" MODULES += pam_radius .endif MODULES += pam_rhosts Modified: projects/building-blocks/share/mk/src.opts.mk ============================================================================== --- projects/building-blocks/share/mk/src.opts.mk Tue Dec 2 16:22:08 2014 (r275412) +++ projects/building-blocks/share/mk/src.opts.mk Tue Dec 2 17:08:24 2014 (r275413) @@ -121,6 +121,7 @@ __DEFAULT_YES_OPTIONS = \ LPR \ LS_COLORS \ LZMA_SUPPORT \ + MAC_SUPPORT \ MAIL \ MAILWRAPPER \ MAKE \ Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Tue Dec 2 16:22:08 2014 (r275412) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Tue Dec 2 17:08:24 2014 (r275413) @@ -4055,6 +4055,36 @@ OLD_FILES+=usr/share/man/man8/lpd.8.gz OLD_FILES+=usr/share/man/man8/pac.8.gz .endif +.if ${MK_MAC_SUPPORT} == no +OLD_FILES+=etc/rc.d/ugidfw +OLD_FILES+=usr/include/ugidfw.h +OLD_FILES+=usr/lib/libugidfw.a +OLD_LIBS+=usr/lib/libugidfw.so.4 +OLD_FILES+=usr/lib/libugidfw_p.a +OLD_FILES+=usr/sbin/getfmac +OLD_FILES+=usr/sbin/getpmac +OLD_FILES+=usr/sbin/setfmac +OLD_FILES+=usr/sbin/setfsmac +OLD_FILES+=usr/sbin/setpmac +OLD_FILES+=usr/sbin/ugidfw +OLD_FILES+=usr/share/man/man3/bsde_add_rule.3.gz +OLD_FILES+=usr/share/man/man3/bsde_delete_rule.3.gz +OLD_FILES+=usr/share/man/man3/bsde_get_rule.3.gz +OLD_FILES+=usr/share/man/man3/bsde_get_rule_count.3.gz +OLD_FILES+=usr/share/man/man3/bsde_get_rule_slots.3.gz +OLD_FILES+=usr/share/man/man3/bsde_parse_rule.3.gz +OLD_FILES+=usr/share/man/man3/bsde_parse_rule_string.3.gz +OLD_FILES+=usr/share/man/man3/bsde_rule_to_string.3.gz +OLD_FILES+=usr/share/man/man3/bsde_set_rule.3.gz +OLD_FILES+=usr/share/man/man3/libugidfw.3.gz +OLD_FILES+=usr/share/man/man8/getfmac.8.gz +OLD_FILES+=usr/share/man/man8/getpmac.8.gz +OLD_FILES+=usr/share/man/man8/setfmac.8.gz +OLD_FILES+=usr/share/man/man8/setfsmac.8.gz +OLD_FILES+=usr/share/man/man8/setpmac.8.gz +OLD_FILES+=usr/share/man/man8/ugidfw.8.gz +.endif + .if ${MK_MAIL} == no OLD_FILES+=etc/pam.d/imap OLD_FILES+=etc/pam.d/pop3 Added: projects/building-blocks/tools/build/options/WITHOUT_MAC_SUPPORT ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/tools/build/options/WITHOUT_MAC_SUPPORT Tue Dec 2 17:08:24 2014 (r275413) @@ -0,0 +1,6 @@ +.\" $FreeBSD$ +Set to build libraries, programs, and kernel modules without +.Xr mac 9 +support. Also, do not compile +.Xr libugidfw 8 +and associated applications. Modified: projects/building-blocks/usr.sbin/Makefile ============================================================================== --- projects/building-blocks/usr.sbin/Makefile Tue Dec 2 16:22:08 2014 (r275412) +++ projects/building-blocks/usr.sbin/Makefile Tue Dec 2 17:08:24 2014 (r275413) @@ -26,8 +26,6 @@ SUBDIR= adduser \ extattrctl \ fifolog \ fwcontrol \ - getfmac \ - getpmac \ gstat \ i2c \ ifmcstat \ @@ -65,8 +63,6 @@ SUBDIR= adduser \ service \ services_mkdb \ setfib \ - setfmac \ - setpmac \ smbmsg \ snapinfo \ spray \ @@ -76,7 +72,6 @@ SUBDIR= adduser \ traceroute \ trpt \ tzsetup \ - ugidfw \ vipw \ wake \ watch \ @@ -216,6 +211,14 @@ SUBDIR+= nscd .if ${MK_LPR} != "no" SUBDIR+= lpr .endif + +.if ${MK_MAC_SUPPORT} != "no" +SUBDIR+= getfmac +SUBDIR+= getpmac +SUBDIR+= setfmac +SUBDIR+= setpmac +SUBDIR+= ugidfw +.endif .if ${MK_MAN_UTILS} != "no" SUBDIR+= manctl
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412021708.sB2H8OET028634>