Date: Mon, 2 Jul 2012 15:28:50 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r237997 - in head: tools/build/mk tools/build/options usr.sbin Message-ID: <201207021528.q62FSoot078093@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Mon Jul 2 15:28:50 2012 New Revision: 237997 URL: http://svn.freebsd.org/changeset/base/237997 Log: New build KNOB: WITHOUT_PKGBOOTSTRAP to condition building of usr.sbin/pkg Do not condition usr.sbin/pkg building on WITHOUT_PKGTOOLS anymore, so that users can remove the old pkg_* tools without removing the pkgng boostrap Approved by: des (mentor) MFC after: 1 month Added: head/tools/build/options/WITHOUT_PKGBOOSTRAP (contents, props changed) Modified: head/tools/build/mk/OptionalObsoleteFiles.inc head/usr.sbin/Makefile Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Jul 2 14:03:19 2012 (r237996) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Jul 2 15:28:50 2012 (r237997) @@ -3482,6 +3482,10 @@ OLD_FILES+=usr/share/man/man8/pflogd.8.g OLD_FILES+=usr/share/man/man8/tftp-proxy.8.gz .endif +.if ${MK_PKGBOOTSTRAP} == no +OLD_FILES+=usr/sbin/pkg +.endif + .if ${MK_PKGTOOLS} == no OLD_FILES+=etc/periodic/daily/490.status-pkg-changes OLD_FILES+=etc/periodic/security/460.chkportsum Added: head/tools/build/options/WITHOUT_PKGBOOSTRAP ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITHOUT_PKGBOOSTRAP Mon Jul 2 15:28:50 2012 (r237997) @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build +.Xr pkg +bootstrap tool Modified: head/usr.sbin/Makefile ============================================================================== --- head/usr.sbin/Makefile Mon Jul 2 14:03:19 2012 (r237996) +++ head/usr.sbin/Makefile Mon Jul 2 15:28:50 2012 (r237997) @@ -259,9 +259,12 @@ SUBDIR+= keyserv SUBDIR+= ftp-proxy .endif +.if ${PK_PKGBOOTSTRAP} != "no" +SUBDIR+= pkg +.endif + .if ${MK_PKGTOOLS} != "no" SUBDIR+= pkg_install -SUBDIR+= pkg .endif # XXX MK_TOOLCHAIN?
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207021528.q62FSoot078093>