pkgbase: Create a FreeBSD-utilities package and make it the default one

The default package use to be FreeBSD-runtime but it should only contain binaries and libs enough to boot to single user and repair the system, it is also very handy to have a package that can be tranform to a small mfsroot. So create a new package named FreeBSD-utilities and make it the default one. Also move a few binaries and lib into this package when it make sense. Reviewed by: bapt, gjb Differential Revision: https://reviews.freebsd.org/D21506
2019-09-05 14:15:47 +00:00 · 2019-09-05 14:15:47 +00:00 · 4c1a82cea5
commit 4c1a82cea5
parent 3c8868056c
47 changed files with 11 additions and 48 deletions
--- a/bin/uuidgen/Makefile
+++ b/bin/uuidgen/Makefile
@ -1,6 +1,5 @@
 # $FreeBSD$

-PACKAGE=runtime
 PROG=	uuidgen

 .include <bsd.prog.mk>
--- a/lib/libalias/libalias/Makefile
+++ b/lib/libalias/libalias/Makefile
@ -3,7 +3,6 @@
 .PATH: ${SRCTOP}/sys/netinet/libalias

 CONFS=	libalias.conf
-PACKAGE=lib${LIB}
 LIB=	alias
 SHLIBDIR?= /lib
 SHLIB_MAJOR= 7
--- a/lib/libauditd/Makefile
+++ b/lib/libauditd/Makefile
@ -2,7 +2,6 @@
 # $FreeBSD$
 #

-PACKAGE=lib${LIB}
 OPENBSMDIR=		${SRCTOP}/contrib/openbsm
 _LIBAUDITDDIR=		${OPENBSMDIR}/libauditd
 _LIBBSMDIR=		${OPENBSMDIR}/libbsm
--- a/lib/libbe/Makefile
+++ b/lib/libbe/Makefile
@ -4,7 +4,6 @@ SHLIBDIR?=	/lib

 .include <src.opts.mk>

-PACKAGE=	lib${LIB}
 LIB=		be
 SHLIB_MAJOR=	1
 SHLIB_MINOR=	0
--- a/lib/libcalendar/Makefile
+++ b/lib/libcalendar/Makefile
@ -1,6 +1,5 @@
 # $FreeBSD$

-PACKAGE=	lib${LIB}
 LIB=	calendar

 SRCS=	calendar.c easter.c
--- a/lib/libcapsicum/Makefile
+++ b/lib/libcapsicum/Makefile
@ -1,7 +1,5 @@
 # $FreeBSD$

-PACKAGE=lib${LIB}
-
 INCS=	capsicum_helpers.h

 MAN+=	capsicum_helpers.3
--- a/lib/libcom_err/Makefile
+++ b/lib/libcom_err/Makefile
@ -1,6 +1,5 @@
 # $FreeBSD$

-PACKAGE=lib${LIB}
 LIB=	com_err
 SRCS=	com_err.c error.c
 INCS=	${COM_ERRDIR}/com_err.h ${COM_ERRDIR}/com_right.h
--- a/lib/libdevctl/Makefile
+++ b/lib/libdevctl/Makefile
@ -1,6 +1,5 @@
 # $FreeBSD$

-PACKAGE=lib${LIB}
 LIB=	devctl
 SRCS=	devctl.c
 INCS=	devctl.h
--- a/lib/libdevinfo/Makefile
+++ b/lib/libdevinfo/Makefile
@ -1,6 +1,5 @@
 # $FreeBSD$

-PACKAGE=lib${LIB}
 LIB=	devinfo
 SRCS=	devinfo.c
 INCS=	devinfo.h
--- a/lib/libdevstat/Makefile
+++ b/lib/libdevstat/Makefile
@ -1,6 +1,5 @@
 # $FreeBSD$

-PACKAGE=lib${LIB}
 LIB=	devstat
 SHLIBDIR?= /lib
 # Bump DEVSTAT_USER_API_VER in devstat.h every time this is incremented.
--- a/lib/libfetch/Makefile
+++ b/lib/libfetch/Makefile
@ -2,7 +2,6 @@

 .include <src.opts.mk>

-PACKAGE=lib${LIB}
 LIB=		fetch
 CFLAGS+=	-I.
 SRCS=		fetch.c common.c ftp.c http.c file.c \
--- a/lib/libgpio/Makefile
+++ b/lib/libgpio/Makefile
@ -1,6 +1,5 @@
 # $FreeBSD$

-PACKAGE=lib${LIB}
 LIB=	gpio
 SHLIB_MAJOR= 0

--- a/lib/libgssapi/Makefile
+++ b/lib/libgssapi/Makefile
@ -1,6 +1,5 @@
 # $FreeBSD$

-PACKAGE=lib${LIB}
 LIB=		gssapi
 SHLIB_MAJOR=	10
 VERSION_DEF=	${SRCTOP}/lib/libc/Versions.def
--- a/lib/libmemstat/Makefile
+++ b/lib/libmemstat/Makefile
@ -1,6 +1,5 @@
 # $FreeBSD$

-PACKAGE=lib${LIB}
 WARNS?=		3
 LIB=		memstat
 SHLIB_MAJOR=	3
--- a/lib/libmp/Makefile
+++ b/lib/libmp/Makefile
@ -2,7 +2,6 @@

 .include <src.opts.mk>

-PACKAGE=lib${LIB}
 LIB=		mp
 SHLIB_MAJOR=	7
 LIBADD=		crypto
--- a/lib/libmt/Makefile
+++ b/lib/libmt/Makefile
@ -1,6 +1,5 @@
 # $FreeBSD$

-PACKAGE=lib${LIB}
 LIB=		mt
 SHLIBDIR?=	/lib
 SRCS=		mtlib.c
--- a/lib/libnetgraph/Makefile
+++ b/lib/libnetgraph/Makefile
@ -1,7 +1,6 @@
 # $FreeBSD$
 # $Whistle: Makefile,v 1.4 1999/01/17 03:41:02 julian Exp $

-PACKAGE=lib${LIB}
 LIB=		netgraph
 WARNS?=		3
 MAN=		netgraph.3
--- a/lib/libngatm/Makefile
+++ b/lib/libngatm/Makefile
@ -2,7 +2,6 @@
 #
 # Author: Harti Brandt <harti@freebsd.org>
 #
-PACKAGE=lib${LIB}
 LIB=	ngatm
 SHLIB_MAJOR= 4
 MAN=	libngatm.3 uniaddr.3 unifunc.3 unimsg.3 unisap.3 unistruct.3
--- a/lib/libpcap/Makefile
+++ b/lib/libpcap/Makefile
@ -5,7 +5,6 @@ SHLIBDIR?= /lib

 .include <src.opts.mk>

-PACKAGE=lib${LIB}
 LIB=	pcap

 SRCS=	bpf_dump.c \
--- a/lib/libpjdlog/Makefile
+++ b/lib/libpjdlog/Makefile
@ -2,7 +2,6 @@
 # $FreeBSD$
 #

-PACKAGE=lib${LIB}
 SHLIBDIR?=	/lib

 .include <bsd.own.mk>
--- a/lib/libpmc/Makefile
+++ b/lib/libpmc/Makefile
@ -1,6 +1,5 @@
 # $FreeBSD$

-PACKAGE=lib${LIB}
 LIB=	pmc

 SRCS=	libpmc.c pmclog.c libpmc_pmu_util.c libpmc_json.cc
--- a/lib/libproc/Makefile
+++ b/lib/libproc/Makefile
@ -2,7 +2,6 @@

 .include <src.opts.mk>

-PACKAGE=lib${LIB}
 LIB=	proc

 SRCS=	crc32.c			\
--- a/lib/libprocstat/Makefile
+++ b/lib/libprocstat/Makefile
@ -2,7 +2,6 @@

 .include <src.opts.mk>

-PACKAGE=lib${LIB}
 LIB=	procstat

 SRCS=	cd9660.c	\
--- a/lib/libradius/Makefile
+++ b/lib/libradius/Makefile
@ -26,7 +26,6 @@

 .include <src.opts.mk>

-PACKAGE=lib${LIB}
 LIB=		radius
 SRCS=		radlib.c
 INCS=		radlib.h radlib_vs.h
--- a/lib/librpcsvc/Makefile
+++ b/lib/librpcsvc/Makefile
@ -5,7 +5,6 @@

 .PATH: ${SRCTOP}/include/rpcsvc

-PACKAGE=lib${LIB}
 LIB=    rpcsvc

 RPCSRCS= klm_prot.x mount.x nfs_prot.x nlm_prot.x rex.x rnusers.x \
--- a/lib/librt/Makefile
+++ b/lib/librt/Makefile
@ -2,7 +2,6 @@

 .include <src.opts.mk>

-PACKAGE=lib${LIB}
 LIB=rt
 SHLIB_MAJOR= 1
 CFLAGS+=-I${SRCTOP}/lib/libc/include -I${.CURDIR}
--- a/lib/librtld_db/Makefile
+++ b/lib/librtld_db/Makefile
@ -2,7 +2,6 @@

 .include <bsd.own.mk>

-PACKAGE=lib${LIB}
 LIB=		rtld_db
 SHLIB_MAJOR= 	2
 MAN=		librtld_db.3
--- a/lib/libsysdecode/Makefile
+++ b/lib/libsysdecode/Makefile
@ -2,7 +2,6 @@

 .include <src.opts.mk>

-PACKAGE=lib${LIB}
 LIB=	sysdecode

 SRCS=	errno.c flags.c ioctl.c signal.c syscallnames.c utrace.c
--- a/lib/libtacplus/Makefile
+++ b/lib/libtacplus/Makefile
@ -24,7 +24,6 @@
 #
 #	$FreeBSD$

-PACKAGE=lib${LIB}
 LIB=		tacplus
 SRCS=		taclib.c
 INCS=		taclib.h
--- a/lib/libugidfw/Makefile
+++ b/lib/libugidfw/Makefile
@ -1,6 +1,5 @@
 # $FreeBSD$

-PACKAGE=lib${LIB}
 LIB=		ugidfw
 SHLIB_MAJOR=	5
 SRCS=		ugidfw.c
--- a/lib/libulog/Makefile
+++ b/lib/libulog/Makefile
@ -1,6 +1,5 @@
 # $FreeBSD$

-PACKAGE=lib${LIB}
 SHLIBDIR?=/lib

 .include <src.opts.mk>
--- a/lib/libusb/Makefile
+++ b/lib/libusb/Makefile
@ -4,7 +4,6 @@
 # Makefile for the FreeBSD specific LibUSB 2.0
 #

-PACKAGE=lib${LIB}
 LIB=		usb
 SHLIB_MAJOR=	3
 SHLIB_MINOR=	0
--- a/lib/libusbhid/Makefile
+++ b/lib/libusbhid/Makefile
@ -1,7 +1,6 @@
 #	$NetBSD: Makefile,v 1.5 1999/07/23 09:44:38 mrg Exp $
 #	$FreeBSD$

-PACKAGE=lib${LIB}
 LIB=	usbhid
 MAN=	usbhid.3

--- a/lib/libwrap/Makefile
+++ b/lib/libwrap/Makefile
@ -5,7 +5,6 @@
 .include <src.opts.mk>

 CONFS=	hosts.allow
-PACKAGE=lib${LIB}
 LIB=	wrap
 SHLIB_MAJOR= 6
 INCS=	tcpd.h
--- a/lib/libypclnt/Makefile
+++ b/lib/libypclnt/Makefile
@ -1,6 +1,5 @@
 # $FreeBSD$

-PACKAGE=lib${LIB}
 LIB=	ypclnt
 SHLIB_MAJOR= 4
 SRCS=	ypclnt_connect.c \
--- a/release/packages/Makefile.package
+++ b/release/packages/Makefile.package
@ -84,6 +84,8 @@ tests_COMMENT= 		Test Suite
 tests_DESC= 		Test Suite
 unbound_COMMENT= 	Unbound DNS Resolver
 unbound_DESC= 		Unbound DNS Resolver
+utilities_COMMENT=	Non-vital programs and librairies
+utilities_DESC=		Non-vital programs and librairies
 vi_COMMENT= 		Vi Editor
 vi_DESC= 		Vi Editor
 wpa_COMMENT=		802.11 Supplicant
--- a/sbin/devd/Makefile
+++ b/sbin/devd/Makefile
@ -3,7 +3,7 @@
 .include <src.opts.mk>

 WARNS?= 3
-PACKAGE=runtime
+PACKAGE=utilities
 CONFGROUPS=	CONFS DEVD
 CONFS=	devd.conf
 DEVD=	devmatch.conf
--- a/sbin/nfsiod/Makefile
+++ b/sbin/nfsiod/Makefile
@ -1,7 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 # $FreeBSD$

-PACKAGE=runtime
 PROG=	nfsiod
 MAN=	nfsiod.8

--- a/sbin/nos-tun/Makefile
+++ b/sbin/nos-tun/Makefile
@ -1,6 +1,5 @@
 # $FreeBSD$

-PACKAGE=runtime
 PROG=	nos-tun
 MAN=	nos-tun.8
 WARNS?=	3
--- a/sbin/setkey/Makefile
+++ b/sbin/setkey/Makefile
@ -29,7 +29,6 @@

 .include <src.opts.mk>

-PACKAGE=runtime
 PROG=	setkey
 MAN=	setkey.8
 SRCS=	setkey.c parse.y token.l
--- a/share/mk/bsd.confs.mk
+++ b/share/mk/bsd.confs.mk
@ -44,9 +44,9 @@ STAGE_SETS+=	${group:C,[/*],_,g}
 .      if defined(NO_ROOT)
 .        if !defined(${group}TAGS) || ! ${${group}TAGS:Mpackage=*}
 .          if defined(${group}PACKAGE)
-${group}TAGS+=		package=${${group}PACKAGE:Uruntime}
+${group}TAGS+=		package=${${group}PACKAGE:Uutilities}
 .          else
-${group}TAGS+=		package=${PACKAGE:Uruntime}
+${group}TAGS+=		package=${PACKAGE:Uutilities}
 .          endif
 .        endif
 ${group}TAGS+=		config
--- a/share/mk/bsd.dirs.mk
+++ b/share/mk/bsd.dirs.mk
@ -21,7 +21,7 @@ ${dir}_FLAG=	-f ${${dir}_FLAGS}

 .      if defined(NO_ROOT)
 .        if !defined(${dir}TAGS) || ! ${${dir}TAGS:Mpackage=*}
-${dir}TAGS+=		package=${${dir}PACKAGE:Uruntime}
+${dir}TAGS+=		package=${${dir}PACKAGE:Uutilities}
 .        endif
 ${dir}TAG_ARGS=	-T ${${dir}TAGS:[*]:S/ /,/g}
 .      endif
--- a/share/mk/bsd.doc.mk
+++ b/share/mk/bsd.doc.mk
@ -83,7 +83,7 @@ TRFLAGS+=	-t

 .if defined(NO_ROOT)
 .if !defined(TAGS) || ! ${TAGS:Mpackage=*}
-TAGS+=		package=${PACKAGE:Uruntime}
+TAGS+=		package=${PACKAGE:Uutilities}
 .endif
 TAG_ARGS=	-T ${TAGS:[*]:S/ /,/g}
 .endif
--- a/share/mk/bsd.files.mk
+++ b/share/mk/bsd.files.mk
@ -40,7 +40,7 @@ STAGE_SETS+=	${group:C,[/*],_,g}

 .if defined(NO_ROOT)
 .if !defined(${group}TAGS) || ! ${${group}TAGS:Mpackage=*}
-${group}TAGS+=		package=${${group}PACKAGE:Uruntime}
+${group}TAGS+=		package=${${group}PACKAGE:Uutilities}
 .endif
 ${group}TAG_ARGS=	-T ${${group}TAGS:[*]:S/ /,/g}
 .endif
--- a/share/mk/bsd.incs.mk
+++ b/share/mk/bsd.incs.mk
@ -10,7 +10,7 @@ INCSGROUPS?=	INCS

 .if defined(NO_ROOT)
 .if !defined(TAGS) || ! ${TAGS:Mpackage=*}
-TAGS+=		package=${PACKAGE:Uruntime}
+TAGS+=		package=${PACKAGE:Uutilities}
 .endif
 TAG_ARGS=	-T ${TAGS:[*]:S/ /,/g}
 .endif
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@ -66,7 +66,7 @@ TAGS+=	lib32

 .if defined(NO_ROOT)
 .if !defined(TAGS) || ! ${TAGS:Mpackage=*}
-TAGS+=		package=${PACKAGE:Uruntime}
+TAGS+=		package=${PACKAGE:Uutilities}
 .endif
 TAG_ARGS=	-T ${TAGS:[*]:S/ /,/g}
 .endif
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@ -73,7 +73,7 @@ STRIP?=	-s

 .if defined(NO_ROOT)
 .if !defined(TAGS) || ! ${TAGS:Mpackage=*}
-TAGS+=		package=${PACKAGE:Uruntime}
+TAGS+=		package=${PACKAGE:Uutilities}
 .endif
 TAG_ARGS=	-T ${TAGS:[*]:S/ /,/g}
 .endif