pkgbase: Put a lot of binaries and lib in FreeBSD-runtime

All of them are needed to be able to boot to single user and be able to repair a existing FreeBSD installation so put them directly into FreeBSD-runtime. Reviewed by: bapt, gjb Differential Revision: https://reviews.freebsd.org/D21503
2019-09-05 14:13:08 +00:00 · 2019-09-05 14:13:08 +00:00 · a7b5a3d486
commit a7b5a3d486
parent df347c8a2e
31 changed files with 40 additions and 18 deletions
--- a/lib/libcam/Makefile
+++ b/lib/libcam/Makefile
@ -1,6 +1,7 @@
 # $FreeBSD$

-PACKAGE=	lib${LIB}
+PACKAGE=	runtime
+
 LIB=		cam
 SHLIBDIR?=	/lib
 SRCS=		camlib.c scsi_cmdparse.c scsi_all.c scsi_da.c scsi_sa.c cam.c \
--- a/lib/libcrypt/Makefile
+++ b/lib/libcrypt/Makefile
@ -2,11 +2,12 @@
 # $FreeBSD$
 #

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

 .include <src.opts.mk>

+PACKAGE=	runtime
+
 SHLIB_MAJOR=	5
 LIB=		crypt

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

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

 .include <bsd.own.mk>
@ -10,6 +9,7 @@ SRCDIR=	${ELFTCDIR}/libelf

 .PATH:	${SRCDIR}

+PACKAGE=	runtime
 LIB=	elf

 SRCS=	elf.c							\
--- a/lib/libgeom/Makefile
+++ b/lib/libgeom/Makefile
@ -1,6 +1,7 @@
 # $FreeBSD$

-PACKAGE=lib${LIB}
+PACKAGE=	runtime
+
 LIB=	geom
 SHLIBDIR?= /lib
 SRCS+=	geom_getxml.c
--- a/lib/libipsec/Makefile
+++ b/lib/libipsec/Makefile
@ -27,12 +27,12 @@
 #
 # $FreeBSD$

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

 .include <src.opts.mk>

 LIB=	ipsec
+PACKAGE=	runtime
 SHLIB_MAJOR= 4
 CFLAGS+=-I. -I${.CURDIR}
 CFLAGS+=-DIPSEC_DEBUG -DIPSEC
--- a/lib/libjail/Makefile
+++ b/lib/libjail/Makefile
@ -1,14 +1,12 @@
 # $FreeBSD$

-PACKAGE=lib${LIB}
+PACKAGE=	runtime
 LIB=	jail
 SHLIBDIR?= /lib
 SHLIB_MAJOR= 1
 SRCS=	jail.c jail_getid.c
 INCS=	jail.h

-PACKAGE=jail
-
 MAN=	jail.3

 MLINKS+=jail.3 jail_getid.3
--- a/lib/libkiconv/Makefile
+++ b/lib/libkiconv/Makefile
@ -4,7 +4,7 @@ SHLIBDIR?=	/lib

 .include <src.opts.mk>

-PACKAGE=lib${LIB}
+PACKAGE=	runtime
 LIB=		kiconv
 SRCS=		kiconv_sysctl.c xlat16_iconv.c xlat16_sysctl.c
 SRCS+=		quirks.c
--- a/lib/libkvm/Makefile
+++ b/lib/libkvm/Makefile
@ -1,9 +1,9 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 # $FreeBSD$

-PACKAGE=lib${LIB}
 LIB=	kvm

+PACKAGE=	runtime
 SHLIBDIR?= /lib
 SHLIB_MAJOR=	7
 CFLAGS+=-DNO__SCCSID -I${.CURDIR}
--- a/lib/libmd/Makefile
+++ b/lib/libmd/Makefile
@ -4,7 +4,7 @@ SHLIBDIR?= /lib

 .include <src.opts.mk>

-PACKAGE=lib${LIB}
+PACKAGE=	runtime
 LIB=	md
 SHLIB_MAJOR= 6
 SRCS=	md4c.c md5c.c md4hl.c md5hl.c \
--- a/lib/libnv/Makefile
+++ b/lib/libnv/Makefile
@ -1,10 +1,10 @@
 # $FreeBSD$

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

 .include <src.opts.mk>

+PACKAGE=	runtime
 LIB=	nv
 SHLIB_MAJOR= 0

--- a/lib/libpam/libpam/Makefile
+++ b/lib/libpam/libpam/Makefile
@ -35,7 +35,6 @@
 #
 # $FreeBSD$

-PACKAGE=lib${LIB}
 OPENPAM=	${SRCTOP}/contrib/openpam
 .PATH: ${OPENPAM}/include ${OPENPAM}/lib/libpam ${OPENPAM}/doc/man

@ -44,6 +43,8 @@ OPENPAM=	${SRCTOP}/contrib/openpam
 SHLIB=	pam
 .endif

+PACKAGE=	runtime
+
 MK_PROFILE=no

 SRCS=	openpam_asprintf.c \
--- a/lib/libsbuf/Makefile
+++ b/lib/libsbuf/Makefile
@ -1,6 +1,7 @@
 # $FreeBSD$

-PACKAGE=lib${LIB}
+PACKAGE=	runtime
+
 LIB=		sbuf
 SHLIBDIR?= 	/lib
 SRCS=		subr_prf.c subr_sbuf.c
--- a/lib/libufs/Makefile
+++ b/lib/libufs/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-PACKAGE=lib${LIB}
+PACKAGE=	runtime
 LIB=	ufs
 SHLIBDIR?= /lib
 SHLIB_MAJOR=	7
--- a/lib/libutil/Makefile
+++ b/lib/libutil/Makefile
@ -1,11 +1,12 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 #	$FreeBSD$

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

 .include <src.opts.mk>

+PACKAGE=	runtime
+
 .PATH: ${SRCTOP}/lib/libc/gen # for pw_scan.c

 LIB=	util
--- a/lib/libxo/Makefile
+++ b/lib/libxo/Makefile
@ -1,10 +1,11 @@
 # $FreeBSD$

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

 .include <src.opts.mk>

+PACKAGE=	runtime
+
 LIBXOSRC=	${SRCTOP}/contrib/libxo

 .PATH:	${LIBXOSRC}/libxo
--- a/lib/libz/Makefile
+++ b/lib/libz/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$
 #

-PACKAGE=lib${LIB}
+PACKAGE=	runtime
 LIB=		z
 SHLIBDIR?=	/lib
 SHLIB_MAJOR=	6
--- a/secure/lib/libcrypto/Makefile
+++ b/secure/lib/libcrypto/Makefile
@ -5,6 +5,7 @@ SUBDIR=		engines

 .include <bsd.own.mk>

+PACKAGE=	runtime
 LIB=		crypto
 SHLIB_MAJOR=	111
 VERSION_MAP=	${.CURDIR}/Version.map
--- a/share/termcap/Makefile
+++ b/share/termcap/Makefile
@ -7,6 +7,7 @@
 #
 MAN=	termcap.5

+PACKAGE=	runtime
 FILES=		termcap termcap.db
 FILESDIR=	${BINDIR}/misc
 CLEANFILES+=	termcap.db
--- a/usr.bin/du/Makefile
+++ b/usr.bin/du/Makefile
@ -3,6 +3,7 @@

 .include <src.opts.mk>

+PACKAGE=	runtime
 PROG=	du
 LIBADD=	util

--- a/usr.bin/fsync/Makefile
+++ b/usr.bin/fsync/Makefile
@ -1,5 +1,6 @@
 # $FreeBSD$

+PACKAGE=	runtime
 PROG=	fsync

 .include <bsd.prog.mk>
--- a/usr.bin/passwd/Makefile
+++ b/usr.bin/passwd/Makefile
@ -3,6 +3,7 @@

 .include <src.opts.mk>

+PACKAGE	 = runtime
 PROG	 = passwd
 BINOWN	 = root
 BINMODE	 = 4555
--- a/usr.bin/sed/Makefile
+++ b/usr.bin/sed/Makefile
@ -3,6 +3,7 @@

 .include <src.opts.mk>

+PACKAGE=	runtime
 PROG=	sed
 SRCS=	compile.c main.c misc.c process.c

--- a/usr.bin/tar/Makefile
+++ b/usr.bin/tar/Makefile
@ -3,6 +3,7 @@

 _LIBARCHIVEDIR=	${SRCTOP}/contrib/libarchive

+PACKAGE=	runtime
 PROG=	bsdtar
 BSDTAR_VERSION_STRING=	3.4.0

--- a/usr.bin/uname/Makefile
+++ b/usr.bin/uname/Makefile
@ -1,5 +1,7 @@
+# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93

+PACKAGE=	runtime
 PROG=	uname

 .include <bsd.prog.mk>
--- a/usr.bin/what/Makefile
+++ b/usr.bin/what/Makefile
@ -1,6 +1,7 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$

+PACKAGE=	runtime
 PROG=	what

 .include <bsd.prog.mk>
--- a/usr.sbin/ip6addrctl/Makefile
+++ b/usr.sbin/ip6addrctl/Makefile
@ -1,5 +1,6 @@
 # $FreeBSD$

+PACKAGE=	runtime
 PROG=	ip6addrctl
 MAN=	ip6addrctl.8

--- a/usr.sbin/kldxref/Makefile
+++ b/usr.sbin/kldxref/Makefile
@ -1,5 +1,6 @@
 # $FreeBSD$

+PACKAGE=	runtime
 PROG=	kldxref
 MAN=	kldxref.8
 SRCS=	kldxref.c ef.c ef_obj.c
--- a/usr.sbin/pwd_mkdb/Makefile
+++ b/usr.sbin/pwd_mkdb/Makefile
@ -3,6 +3,7 @@

 .PATH: ${SRCTOP}/lib/libc/gen		# for pw_scan.c

+PACKAGE=	runtime
 PROG=	pwd_mkdb
 MAN=	pwd_mkdb.8
 SRCS=	pw_scan.c pwd_mkdb.c
--- a/usr.sbin/services_mkdb/Makefile
+++ b/usr.sbin/services_mkdb/Makefile
@ -1,5 +1,7 @@
 # $FreeBSD$

+PACKAGE=	runtime
+
 CONFS=	services
 PROG=	services_mkdb
 MAN=	services_mkdb.8
--- a/usr.sbin/traceroute/Makefile
+++ b/usr.sbin/traceroute/Makefile
@ -5,6 +5,7 @@
 TRACEROUTE_DISTDIR?= ${SRCTOP}/contrib/traceroute
 .PATH: ${TRACEROUTE_DISTDIR}

+PACKAGE=	runtime
 PROG=	traceroute
 MAN=	traceroute.8
 SRCS=	as.c version.c traceroute.c ifaddrlist.c findsaddr-udp.c
--- a/usr.sbin/traceroute6/Makefile
+++ b/usr.sbin/traceroute6/Makefile
@ -16,6 +16,7 @@
 TRACEROUTE_DISTDIR?= ${SRCTOP}/contrib/traceroute
 .PATH: ${TRACEROUTE_DISTDIR}

+PACKAGE=	runtime
 PROG=	traceroute6
 MAN=	traceroute6.8
 SRCS=	as.c traceroute6.c