Skip to content

Commit

Permalink
pkgbase: Create a FreeBSD-utilities package and make it the default one
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
@evadot
evadot committed Sep 5, 2019
1 parent 3c88680 commit 4c1a82c
Show file tree
Hide file tree
Showing 47 changed files with 11 additions and 48 deletions.
1 change: 0 additions & 1 deletion bin/uuidgen/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# $FreeBSD$

PACKAGE=runtime
PROG= uuidgen

.include <bsd.prog.mk>
1 change: 0 additions & 1 deletion lib/libalias/libalias/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
.PATH: ${SRCTOP}/sys/netinet/libalias

CONFS= libalias.conf
PACKAGE=lib${LIB}
LIB= alias
SHLIBDIR?= /lib
SHLIB_MAJOR= 7
Expand Down
1 change: 0 additions & 1 deletion lib/libauditd/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# $FreeBSD$
#

PACKAGE=lib${LIB}
OPENBSMDIR= ${SRCTOP}/contrib/openbsm
_LIBAUDITDDIR= ${OPENBSMDIR}/libauditd
_LIBBSMDIR= ${OPENBSMDIR}/libbsm
Expand Down
1 change: 0 additions & 1 deletion lib/libbe/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ SHLIBDIR?= /lib

.include <src.opts.mk>

PACKAGE= lib${LIB}
LIB= be
SHLIB_MAJOR= 1
SHLIB_MINOR= 0
Expand Down
1 change: 0 additions & 1 deletion lib/libcalendar/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# $FreeBSD$

PACKAGE= lib${LIB}
LIB= calendar

SRCS= calendar.c easter.c
Expand Down
2 changes: 0 additions & 2 deletions lib/libcapsicum/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# $FreeBSD$

PACKAGE=lib${LIB}

INCS= capsicum_helpers.h

MAN+= capsicum_helpers.3
Expand Down
1 change: 0 additions & 1 deletion lib/libcom_err/Makefile
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion lib/libdevctl/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# $FreeBSD$

PACKAGE=lib${LIB}
LIB= devctl
SRCS= devctl.c
INCS= devctl.h
Expand Down
1 change: 0 additions & 1 deletion lib/libdevinfo/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# $FreeBSD$

PACKAGE=lib${LIB}
LIB= devinfo
SRCS= devinfo.c
INCS= devinfo.h
Expand Down
1 change: 0 additions & 1 deletion lib/libdevstat/Makefile
View file
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
1 change: 0 additions & 1 deletion lib/libfetch/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 0 additions & 1 deletion lib/libgpio/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# $FreeBSD$

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

Expand Down
1 change: 0 additions & 1 deletion lib/libgssapi/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# $FreeBSD$

PACKAGE=lib${LIB}
LIB= gssapi
SHLIB_MAJOR= 10
VERSION_DEF= ${SRCTOP}/lib/libc/Versions.def
Expand Down
1 change: 0 additions & 1 deletion lib/libmemstat/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# $FreeBSD$

PACKAGE=lib${LIB}
WARNS?= 3
LIB= memstat
SHLIB_MAJOR= 3
Expand Down
1 change: 0 additions & 1 deletion lib/libmp/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

.include <src.opts.mk>

PACKAGE=lib${LIB}
LIB= mp
SHLIB_MAJOR= 7
LIBADD= crypto
Expand Down
1 change: 0 additions & 1 deletion lib/libmt/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# $FreeBSD$

PACKAGE=lib${LIB}
LIB= mt
SHLIBDIR?= /lib
SRCS= mtlib.c
Expand Down
1 change: 0 additions & 1 deletion lib/libnetgraph/Makefile
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion lib/libngatm/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
#
# Author: Harti Brandt <[email protected]>
#
PACKAGE=lib${LIB}
LIB= ngatm
SHLIB_MAJOR= 4
MAN= libngatm.3 uniaddr.3 unifunc.3 unimsg.3 unisap.3 unistruct.3
Expand Down
1 change: 0 additions & 1 deletion lib/libpcap/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ SHLIBDIR?= /lib

.include <src.opts.mk>

PACKAGE=lib${LIB}
LIB= pcap

SRCS= bpf_dump.c \
Expand Down
1 change: 0 additions & 1 deletion lib/libpjdlog/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# $FreeBSD$
#

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

.include <bsd.own.mk>
Expand Down
1 change: 0 additions & 1 deletion lib/libpmc/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# $FreeBSD$

PACKAGE=lib${LIB}
LIB= pmc

SRCS= libpmc.c pmclog.c libpmc_pmu_util.c libpmc_json.cc
Expand Down
1 change: 0 additions & 1 deletion lib/libproc/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

.include <src.opts.mk>

PACKAGE=lib${LIB}
LIB= proc

SRCS= crc32.c \
Expand Down
1 change: 0 additions & 1 deletion lib/libprocstat/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

.include <src.opts.mk>

PACKAGE=lib${LIB}
LIB= procstat

SRCS= cd9660.c \
Expand Down
1 change: 0 additions & 1 deletion lib/libradius/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@

.include <src.opts.mk>

PACKAGE=lib${LIB}
LIB= radius
SRCS= radlib.c
INCS= radlib.h radlib_vs.h
Expand Down
1 change: 0 additions & 1 deletion lib/librpcsvc/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 0 additions & 1 deletion lib/librt/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

.include <src.opts.mk>

PACKAGE=lib${LIB}
LIB=rt
SHLIB_MAJOR= 1
CFLAGS+=-I${SRCTOP}/lib/libc/include -I${.CURDIR}
Expand Down
1 change: 0 additions & 1 deletion lib/librtld_db/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

.include <bsd.own.mk>

PACKAGE=lib${LIB}
LIB= rtld_db
SHLIB_MAJOR= 2
MAN= librtld_db.3
Expand Down
1 change: 0 additions & 1 deletion lib/libsysdecode/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion lib/libtacplus/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#
# $FreeBSD$

PACKAGE=lib${LIB}
LIB= tacplus
SRCS= taclib.c
INCS= taclib.h
Expand Down
1 change: 0 additions & 1 deletion lib/libugidfw/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# $FreeBSD$

PACKAGE=lib${LIB}
LIB= ugidfw
SHLIB_MAJOR= 5
SRCS= ugidfw.c
Expand Down
1 change: 0 additions & 1 deletion lib/libulog/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# $FreeBSD$

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

.include <src.opts.mk>
Expand Down
1 change: 0 additions & 1 deletion lib/libusb/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
# Makefile for the FreeBSD specific LibUSB 2.0
#

PACKAGE=lib${LIB}
LIB= usb
SHLIB_MAJOR= 3
SHLIB_MINOR= 0
Expand Down
1 change: 0 additions & 1 deletion lib/libusbhid/Makefile
View file
Original file line number Diff line number Diff line change
@@ -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

Expand Down
1 change: 0 additions & 1 deletion lib/libwrap/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
.include <src.opts.mk>

CONFS= hosts.allow
PACKAGE=lib${LIB}
LIB= wrap
SHLIB_MAJOR= 6
INCS= tcpd.h
Expand Down
1 change: 0 additions & 1 deletion lib/libypclnt/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# $FreeBSD$

PACKAGE=lib${LIB}
LIB= ypclnt
SHLIB_MAJOR= 4
SRCS= ypclnt_connect.c \
Expand Down
2 changes: 2 additions & 0 deletions release/packages/Makefile.package
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion sbin/devd/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
.include <src.opts.mk>

WARNS?= 3
PACKAGE=runtime
PACKAGE=utilities
CONFGROUPS= CONFS DEVD
CONFS= devd.conf
DEVD= devmatch.conf
Expand Down
1 change: 0 additions & 1 deletion sbin/nfsiod/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# $FreeBSD$

PACKAGE=runtime
PROG= nfsiod
MAN= nfsiod.8

Expand Down
1 change: 0 additions & 1 deletion sbin/nos-tun/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# $FreeBSD$

PACKAGE=runtime
PROG= nos-tun
MAN= nos-tun.8
WARNS?= 3
Expand Down
1 change: 0 additions & 1 deletion sbin/setkey/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@

.include <src.opts.mk>

PACKAGE=runtime
PROG= setkey
MAN= setkey.8
SRCS= setkey.c parse.y token.l
Expand Down
4 changes: 2 additions & 2 deletions share/mk/bsd.confs.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion share/mk/bsd.dirs.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion share/mk/bsd.doc.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion share/mk/bsd.files.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion share/mk/bsd.incs.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion share/mk/bsd.lib.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion share/mk/bsd.prog.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 4c1a82c

Please sign in to comment.