From 4c1a82cea504df7a79f5bd8f7d0a41cacccff16e Mon Sep 17 00:00:00 2001 From: Emmanuel Vadot Date: Thu, 5 Sep 2019 14:15:47 +0000 Subject: [PATCH] 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 --- bin/uuidgen/Makefile | 1 - lib/libalias/libalias/Makefile | 1 - lib/libauditd/Makefile | 1 - lib/libbe/Makefile | 1 - lib/libcalendar/Makefile | 1 - lib/libcapsicum/Makefile | 2 -- lib/libcom_err/Makefile | 1 - lib/libdevctl/Makefile | 1 - lib/libdevinfo/Makefile | 1 - lib/libdevstat/Makefile | 1 - lib/libfetch/Makefile | 1 - lib/libgpio/Makefile | 1 - lib/libgssapi/Makefile | 1 - lib/libmemstat/Makefile | 1 - lib/libmp/Makefile | 1 - lib/libmt/Makefile | 1 - lib/libnetgraph/Makefile | 1 - lib/libngatm/Makefile | 1 - lib/libpcap/Makefile | 1 - lib/libpjdlog/Makefile | 1 - lib/libpmc/Makefile | 1 - lib/libproc/Makefile | 1 - lib/libprocstat/Makefile | 1 - lib/libradius/Makefile | 1 - lib/librpcsvc/Makefile | 1 - lib/librt/Makefile | 1 - lib/librtld_db/Makefile | 1 - lib/libsysdecode/Makefile | 1 - lib/libtacplus/Makefile | 1 - lib/libugidfw/Makefile | 1 - lib/libulog/Makefile | 1 - lib/libusb/Makefile | 1 - lib/libusbhid/Makefile | 1 - lib/libwrap/Makefile | 1 - lib/libypclnt/Makefile | 1 - release/packages/Makefile.package | 2 ++ sbin/devd/Makefile | 2 +- sbin/nfsiod/Makefile | 1 - sbin/nos-tun/Makefile | 1 - sbin/setkey/Makefile | 1 - share/mk/bsd.confs.mk | 4 ++-- share/mk/bsd.dirs.mk | 2 +- share/mk/bsd.doc.mk | 2 +- share/mk/bsd.files.mk | 2 +- share/mk/bsd.incs.mk | 2 +- share/mk/bsd.lib.mk | 2 +- share/mk/bsd.prog.mk | 2 +- 47 files changed, 11 insertions(+), 48 deletions(-) diff --git a/bin/uuidgen/Makefile b/bin/uuidgen/Makefile index 8cd15982405..0b27d20e980 100644 --- a/bin/uuidgen/Makefile +++ b/bin/uuidgen/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PACKAGE=runtime PROG= uuidgen .include diff --git a/lib/libalias/libalias/Makefile b/lib/libalias/libalias/Makefile index bfbd523aa0b..1078e6d46b7 100644 --- 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 diff --git a/lib/libauditd/Makefile b/lib/libauditd/Makefile index c29c32ceb12..bd3b5a5ee11 100644 --- 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 diff --git a/lib/libbe/Makefile b/lib/libbe/Makefile index 9d2dc04918d..3a02f22e69a 100644 --- a/lib/libbe/Makefile +++ b/lib/libbe/Makefile @@ -4,7 +4,6 @@ SHLIBDIR?= /lib .include -PACKAGE= lib${LIB} LIB= be SHLIB_MAJOR= 1 SHLIB_MINOR= 0 diff --git a/lib/libcalendar/Makefile b/lib/libcalendar/Makefile index d217a10a7f5..b0ae002fd5e 100644 --- a/lib/libcalendar/Makefile +++ b/lib/libcalendar/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PACKAGE= lib${LIB} LIB= calendar SRCS= calendar.c easter.c diff --git a/lib/libcapsicum/Makefile b/lib/libcapsicum/Makefile index 3aa4eac4413..b30bb599087 100644 --- a/lib/libcapsicum/Makefile +++ b/lib/libcapsicum/Makefile @@ -1,7 +1,5 @@ # $FreeBSD$ -PACKAGE=lib${LIB} - INCS= capsicum_helpers.h MAN+= capsicum_helpers.3 diff --git a/lib/libcom_err/Makefile b/lib/libcom_err/Makefile index ca65c091387..89fed48e1dd 100644 --- 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 diff --git a/lib/libdevctl/Makefile b/lib/libdevctl/Makefile index ed56b25dc37..74687ecc2bd 100644 --- a/lib/libdevctl/Makefile +++ b/lib/libdevctl/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PACKAGE=lib${LIB} LIB= devctl SRCS= devctl.c INCS= devctl.h diff --git a/lib/libdevinfo/Makefile b/lib/libdevinfo/Makefile index 4849c7acd5d..8b67ab4c372 100644 --- a/lib/libdevinfo/Makefile +++ b/lib/libdevinfo/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PACKAGE=lib${LIB} LIB= devinfo SRCS= devinfo.c INCS= devinfo.h diff --git a/lib/libdevstat/Makefile b/lib/libdevstat/Makefile index df5d44ec30d..dcda3c2bdac 100644 --- 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. diff --git a/lib/libfetch/Makefile b/lib/libfetch/Makefile index 6990e7b1bb8..e3c4533aed1 100644 --- a/lib/libfetch/Makefile +++ b/lib/libfetch/Makefile @@ -2,7 +2,6 @@ .include -PACKAGE=lib${LIB} LIB= fetch CFLAGS+= -I. SRCS= fetch.c common.c ftp.c http.c file.c \ diff --git a/lib/libgpio/Makefile b/lib/libgpio/Makefile index fc163e90efd..94118d6eb00 100644 --- a/lib/libgpio/Makefile +++ b/lib/libgpio/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PACKAGE=lib${LIB} LIB= gpio SHLIB_MAJOR= 0 diff --git a/lib/libgssapi/Makefile b/lib/libgssapi/Makefile index 052bf73a12f..3094631e853 100644 --- 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 diff --git a/lib/libmemstat/Makefile b/lib/libmemstat/Makefile index 8554eb0482e..597dc6db160 100644 --- a/lib/libmemstat/Makefile +++ b/lib/libmemstat/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PACKAGE=lib${LIB} WARNS?= 3 LIB= memstat SHLIB_MAJOR= 3 diff --git a/lib/libmp/Makefile b/lib/libmp/Makefile index 9f001f52151..6f63cb56aa0 100644 --- a/lib/libmp/Makefile +++ b/lib/libmp/Makefile @@ -2,7 +2,6 @@ .include -PACKAGE=lib${LIB} LIB= mp SHLIB_MAJOR= 7 LIBADD= crypto diff --git a/lib/libmt/Makefile b/lib/libmt/Makefile index c67130ecc57..6fe59201a87 100644 --- a/lib/libmt/Makefile +++ b/lib/libmt/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PACKAGE=lib${LIB} LIB= mt SHLIBDIR?= /lib SRCS= mtlib.c diff --git a/lib/libnetgraph/Makefile b/lib/libnetgraph/Makefile index 3f80ee84f47..fa760479f71 100644 --- 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 diff --git a/lib/libngatm/Makefile b/lib/libngatm/Makefile index afda4fb3e59..47dc716b800 100644 --- a/lib/libngatm/Makefile +++ b/lib/libngatm/Makefile @@ -2,7 +2,6 @@ # # Author: Harti Brandt # -PACKAGE=lib${LIB} LIB= ngatm SHLIB_MAJOR= 4 MAN= libngatm.3 uniaddr.3 unifunc.3 unimsg.3 unisap.3 unistruct.3 diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile index 86896340c55..89e31c6ac48 100644 --- a/lib/libpcap/Makefile +++ b/lib/libpcap/Makefile @@ -5,7 +5,6 @@ SHLIBDIR?= /lib .include -PACKAGE=lib${LIB} LIB= pcap SRCS= bpf_dump.c \ diff --git a/lib/libpjdlog/Makefile b/lib/libpjdlog/Makefile index 4fcfe028d9f..ead5619afb6 100644 --- a/lib/libpjdlog/Makefile +++ b/lib/libpjdlog/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ # -PACKAGE=lib${LIB} SHLIBDIR?= /lib .include diff --git a/lib/libpmc/Makefile b/lib/libpmc/Makefile index d515f25d4c9..35af606a722 100644 --- 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 diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile index cd78eb335ec..a20dd69ef34 100644 --- a/lib/libproc/Makefile +++ b/lib/libproc/Makefile @@ -2,7 +2,6 @@ .include -PACKAGE=lib${LIB} LIB= proc SRCS= crc32.c \ diff --git a/lib/libprocstat/Makefile b/lib/libprocstat/Makefile index 9d80d17e16a..d55a02b46b7 100644 --- a/lib/libprocstat/Makefile +++ b/lib/libprocstat/Makefile @@ -2,7 +2,6 @@ .include -PACKAGE=lib${LIB} LIB= procstat SRCS= cd9660.c \ diff --git a/lib/libradius/Makefile b/lib/libradius/Makefile index 3ce1435aa2d..42f5def20ef 100644 --- a/lib/libradius/Makefile +++ b/lib/libradius/Makefile @@ -26,7 +26,6 @@ .include -PACKAGE=lib${LIB} LIB= radius SRCS= radlib.c INCS= radlib.h radlib_vs.h diff --git a/lib/librpcsvc/Makefile b/lib/librpcsvc/Makefile index 80c253d0c54..35669a5e357 100644 --- 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 \ diff --git a/lib/librt/Makefile b/lib/librt/Makefile index 3c0973db1d7..389e0280a6b 100644 --- a/lib/librt/Makefile +++ b/lib/librt/Makefile @@ -2,7 +2,6 @@ .include -PACKAGE=lib${LIB} LIB=rt SHLIB_MAJOR= 1 CFLAGS+=-I${SRCTOP}/lib/libc/include -I${.CURDIR} diff --git a/lib/librtld_db/Makefile b/lib/librtld_db/Makefile index 704140397f5..f3d97753fe9 100644 --- a/lib/librtld_db/Makefile +++ b/lib/librtld_db/Makefile @@ -2,7 +2,6 @@ .include -PACKAGE=lib${LIB} LIB= rtld_db SHLIB_MAJOR= 2 MAN= librtld_db.3 diff --git a/lib/libsysdecode/Makefile b/lib/libsysdecode/Makefile index c96a39e0ffa..d58858086bc 100644 --- a/lib/libsysdecode/Makefile +++ b/lib/libsysdecode/Makefile @@ -2,7 +2,6 @@ .include -PACKAGE=lib${LIB} LIB= sysdecode SRCS= errno.c flags.c ioctl.c signal.c syscallnames.c utrace.c diff --git a/lib/libtacplus/Makefile b/lib/libtacplus/Makefile index 73d8e766da0..01345e175a6 100644 --- a/lib/libtacplus/Makefile +++ b/lib/libtacplus/Makefile @@ -24,7 +24,6 @@ # # $FreeBSD$ -PACKAGE=lib${LIB} LIB= tacplus SRCS= taclib.c INCS= taclib.h diff --git a/lib/libugidfw/Makefile b/lib/libugidfw/Makefile index 2fe63846380..9da8907cb5d 100644 --- a/lib/libugidfw/Makefile +++ b/lib/libugidfw/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PACKAGE=lib${LIB} LIB= ugidfw SHLIB_MAJOR= 5 SRCS= ugidfw.c diff --git a/lib/libulog/Makefile b/lib/libulog/Makefile index 7c793e9a0e7..65700b65822 100644 --- a/lib/libulog/Makefile +++ b/lib/libulog/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PACKAGE=lib${LIB} SHLIBDIR?=/lib .include diff --git a/lib/libusb/Makefile b/lib/libusb/Makefile index 397c1816226..2a97f5f1adb 100644 --- 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 diff --git a/lib/libusbhid/Makefile b/lib/libusbhid/Makefile index 6efe9ccbe61..7dba7ffc911 100644 --- 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 diff --git a/lib/libwrap/Makefile b/lib/libwrap/Makefile index 1326b43bad2..f45e8f9dda6 100644 --- a/lib/libwrap/Makefile +++ b/lib/libwrap/Makefile @@ -5,7 +5,6 @@ .include CONFS= hosts.allow -PACKAGE=lib${LIB} LIB= wrap SHLIB_MAJOR= 6 INCS= tcpd.h diff --git a/lib/libypclnt/Makefile b/lib/libypclnt/Makefile index c043d6381fd..636c9b6c81b 100644 --- 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 \ diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package index 03c7815231a..ee48bdb4753 100644 --- 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 diff --git a/sbin/devd/Makefile b/sbin/devd/Makefile index 0d6c54f24f2..ed61b5ee801 100644 --- a/sbin/devd/Makefile +++ b/sbin/devd/Makefile @@ -3,7 +3,7 @@ .include WARNS?= 3 -PACKAGE=runtime +PACKAGE=utilities CONFGROUPS= CONFS DEVD CONFS= devd.conf DEVD= devmatch.conf diff --git a/sbin/nfsiod/Makefile b/sbin/nfsiod/Makefile index ea66a6dfb1e..47cd290ec78 100644 --- 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 diff --git a/sbin/nos-tun/Makefile b/sbin/nos-tun/Makefile index 480141ec6b6..9f1024f41e8 100644 --- 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 diff --git a/sbin/setkey/Makefile b/sbin/setkey/Makefile index a4d5b1201b7..12f258158db 100644 --- a/sbin/setkey/Makefile +++ b/sbin/setkey/Makefile @@ -29,7 +29,6 @@ .include -PACKAGE=runtime PROG= setkey MAN= setkey.8 SRCS= setkey.c parse.y token.l diff --git a/share/mk/bsd.confs.mk b/share/mk/bsd.confs.mk index 0820ac5d7b4..eb87ba49caa 100644 --- 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 diff --git a/share/mk/bsd.dirs.mk b/share/mk/bsd.dirs.mk index cdd8b09b1bc..fc51bf5fb71 100644 --- 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 diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk index 5b88ae5d9f0..725b8033444 100644 --- 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 diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk index ec84adfdac8..0bbbdfe29c3 100644 --- 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 diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk index 10bfe7721fe..cb5c800b62b 100644 --- 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 diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 22655768cc6..01078373113 100644 --- 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 diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 46eb6bda4ca..d2631452bed 100644 --- 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