d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New build KNOB: WITHOUT_PKGBOOTSTRAP to condition building of usr.sbin/pkg

Browse Source 
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
This commit is contained in:
Baptiste Daroussin 2012-07-02 15:28:50 +00:00
parent 87e5ba0b54
commit 2f3a9ba57f
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/build/mk/OptionalObsoleteFiles.inc
View File

@ -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

4
tools/build/options/WITHOUT_PKGBOOSTRAP Normal file
View File

@ -0,0 +1,4 @@
.\" $FreeBSD$
Set to not build
.Xr pkg
bootstrap tool

5
usr.sbin/Makefile
View File

@ -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?