diff options
author | bapt <bapt@FreeBSD.org> | 2012-07-02 15:28:50 +0000 |
---|---|---|
committer | bapt <bapt@FreeBSD.org> | 2012-07-02 15:28:50 +0000 |
commit | 1903f68f13384640bd9d1f121ab7d94f0ef8c527 (patch) | |
tree | eb67168c133607cc4dd4f75b6353d52e6bb12035 /tools/build | |
parent | 180d34b93e2d4611ce0c747c39d1be10b217d19d (diff) | |
download | FreeBSD-src-1903f68f13384640bd9d1f121ab7d94f0ef8c527.zip FreeBSD-src-1903f68f13384640bd9d1f121ab7d94f0ef8c527.tar.gz |
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
Diffstat (limited to 'tools/build')
-rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 4 | ||||
-rw-r--r-- | tools/build/options/WITHOUT_PKGBOOSTRAP | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 4351a2b..7863814 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -3482,6 +3482,10 @@ OLD_FILES+=usr/share/man/man8/pflogd.8.gz 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 diff --git a/tools/build/options/WITHOUT_PKGBOOSTRAP b/tools/build/options/WITHOUT_PKGBOOSTRAP new file mode 100644 index 0000000..8d4ae45 --- /dev/null +++ b/tools/build/options/WITHOUT_PKGBOOSTRAP @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build +.Xr pkg +bootstrap tool |