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

diff --git a/lib/libcam/Makefile b/lib/libcam/Makefile
index 24441708b49b04b5f04aba061772a4ab00f03c34..2a5d13ba4f34f2855b1d13c2dee91b986e7fcd51 100644 (file)
--- 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 \

diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile
index 1aa4c66d9cc726064f5cb77198a92b1dab780acf..f222394b45c316c72ffa0481576d44519b60ee71 100644 (file)
--- 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
 

diff --git a/lib/libelf/Makefile b/lib/libelf/Makefile
index f4389da9d1783efc17b824234346f2de014b22ac..f3fd14d1e2b4a297634869558e38fd7b61cd169d 100644 (file)
--- 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                                                   \

diff --git a/lib/libgeom/Makefile b/lib/libgeom/Makefile
index b7877cc56ece693844e516810f7347e838ad3ad4..bdd91b47bf677573b3f23183d94df567b8141a35 100644 (file)
--- 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

diff --git a/lib/libipsec/Makefile b/lib/libipsec/Makefile
index c626830e2e9bcf8a8d66f52cef3d0fa019e3056f..6c710567498d9217c8f7ecee633d161283a4187d 100644 (file)
--- 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

diff --git a/lib/libjail/Makefile b/lib/libjail/Makefile
index 74eb8e1091b2bfbcb8296f60f67b20813995938e..a2ee0c9ac1f73043ea60573c2fe172608da22e0d 100644 (file)
--- 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

diff --git a/lib/libkiconv/Makefile b/lib/libkiconv/Makefile
index 44ec6c0c9d60f6edc2934ac7e0563fb0a5190a37..95b8c11c6057ddba1ec4c3979e7c4af8caa8148f 100644 (file)
--- 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

diff --git a/lib/libkvm/Makefile b/lib/libkvm/Makefile
index d934690d43553ae1e0347109bb7512fd4b024e6c..affd02e06da1d7d857bae561d6ee7356b44748d6 100644 (file)
--- 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}

diff --git a/lib/libmd/Makefile b/lib/libmd/Makefile
index edeb308c82d61a521fb839ce9416d4ddcfab6ff0..9559761aa0026da05fe6cb0b954aca4e4ac4f069 100644 (file)
--- 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 \

diff --git a/lib/libnv/Makefile b/lib/libnv/Makefile
index bf92041d4c87005ad6a31768867aeb4b475904c2..8fa818fb0e1e0131b07b47c6e7b7c229ef8bbaf8 100644 (file)
--- 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
 

diff --git a/lib/libpam/libpam/Makefile b/lib/libpam/libpam/Makefile
index c9d257be90109cf999e6932e736c2694a0f0325a..e925b311636b4eadc932321a12e334ae677729ed 100644 (file)
--- 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 \

diff --git a/lib/libsbuf/Makefile b/lib/libsbuf/Makefile
index ac8be92c8dbd8585b404862e976cea78a51e797c..5d983d6e017e9e8ddbb97e92ce4160e583d393bf 100644 (file)
--- 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

diff --git a/lib/libufs/Makefile b/lib/libufs/Makefile
index a3f4cb3991ed36c4769d623136844f88ba5b3a79..a767546f457fb24d9c0ff95ab95e7c01ce189b16 100644 (file)
--- 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

diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile
index 972fc65c53e54e96c8a4a2cde05bccbc5cd7533a..5ea2addd5d345d4afe2e74dba2860f153f53f3dd 100644 (file)
--- 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

diff --git a/lib/libxo/Makefile b/lib/libxo/Makefile
index 7844332862ade408bff85149b41f328147323094..d33c39dd6c2a15c99f5c28c8727c5f150c517d40 100644 (file)
--- 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

diff --git a/lib/libz/Makefile b/lib/libz/Makefile
index 9d415a8b976c7ec03207f246096ddb1475ca4287..30f80981012c91eaa05e7e8b34aa655a4700f9d0 100644 (file)
--- 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

diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile
index 34e2accbb93da2463004aa69f37c9c747c3d8bad..8fa13ee7e7da68bd533995b88f9ccb963c3ce080 100644 (file)
--- 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

diff --git a/share/termcap/Makefile b/share/termcap/Makefile
index e1faaead62770fa96530595b22bc5a63f8e5de1b..9b1e09c2c1784f98f57508efc909d44a54d5b251 100644 (file)
--- 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

diff --git a/usr.bin/du/Makefile b/usr.bin/du/Makefile
index b9256f3cec30af825dad968fd67476670633cc62..2f16201d171d19aaeb24677dc8198bea730365c5 100644 (file)
--- a/usr.bin/du/Makefile
+++ b/usr.bin/du/Makefile
@@ -3,6 +3,7 @@
 
 .include <src.opts.mk>
 
+PACKAGE=       runtime
 PROG=  du
 LIBADD=        util
 

diff --git a/usr.bin/fsync/Makefile b/usr.bin/fsync/Makefile
index c9bc5249ee6f4c14a0d9dd6414557bb3d9c0155e..e6c1c535dfb0bd794ea39ee95e7113d48028a485 100644 (file)
--- a/usr.bin/fsync/Makefile
+++ b/usr.bin/fsync/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=       runtime
 PROG=  fsync
 
 .include <bsd.prog.mk>

diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
index 1ec051fb3b36c4a7d2976a7915eca1c6023bfe8b..c8eacf577443d92209432e62c194abac32f63158 100644 (file)
--- 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

diff --git a/usr.bin/sed/Makefile b/usr.bin/sed/Makefile
index 2a90fb10153ff8aefba57e3c22bbcbb06f34f667..4cf4550801c6c8fdaef7dfc3713bd6a08fbcfce1 100644 (file)
--- 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
 

diff --git a/usr.bin/tar/Makefile b/usr.bin/tar/Makefile
index bf34cffcdac5c9983a16811b93c42dd7f6fdb66c..b333b2828c437e4c77353a7990a8e4972f0cb451 100644 (file)
--- 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
 

diff --git a/usr.bin/uname/Makefile b/usr.bin/uname/Makefile
index ae634ca09a5bdb55ca988f03f25d827607db26c5..1e01694a44f60851fc3c243b969d0d5aa97777c0 100644 (file)
--- 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>

diff --git a/usr.bin/what/Makefile b/usr.bin/what/Makefile
index 8114290f968dde424f70a1bafa73cd1f190753fa..60164835463600a6422581a25f299bb3436249c7 100644 (file)
--- 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>

diff --git a/usr.sbin/ip6addrctl/Makefile b/usr.sbin/ip6addrctl/Makefile
index cd2510eb0e19ae961b09bf7f709373c2aad8f358..f484461b3ccbf4ed62e8d7c6da7861f6628aeca6 100644 (file)
--- a/usr.sbin/ip6addrctl/Makefile
+++ b/usr.sbin/ip6addrctl/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=       runtime
 PROG=  ip6addrctl
 MAN=   ip6addrctl.8
 

diff --git a/usr.sbin/kldxref/Makefile b/usr.sbin/kldxref/Makefile
index 77436f3e8178d96b9f7ff363b194b766543e4ea8..c22960c54e3a6c5067892ab58ed267f3304869ff 100644 (file)
--- 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

diff --git a/usr.sbin/pwd_mkdb/Makefile b/usr.sbin/pwd_mkdb/Makefile
index f937cddf97b5a7d15aff615a6955ac3749144699..14255fa6ac7f667975886f11c29060834b5a8fde 100644 (file)
--- 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

diff --git a/usr.sbin/services_mkdb/Makefile b/usr.sbin/services_mkdb/Makefile
index a25ab3cd883700d67ebdacabe15df6fcb723cb18..db9c83472d5699fd83ec8beb85ba3578ff5fc71b 100644 (file)
--- 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

diff --git a/usr.sbin/traceroute/Makefile b/usr.sbin/traceroute/Makefile
index ada19698a9a184ac0ef09f3570460314e68bb384..e90019fedb5d15cdf5aff09272f770939cbb489d 100644 (file)
--- 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

diff --git a/usr.sbin/traceroute6/Makefile b/usr.sbin/traceroute6/Makefile
index f0b5c02e5037f850114ec46ad522a5710282672e..a7eaaf5bdaa32a52bffc7c069feb5c95426b0d20 100644 (file)
--- 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