Skip to content

Commit

Permalink
pkgbase: Put a lot of binaries and lib in FreeBSD-runtime
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
@evadot
evadot committed Sep 5, 2019
1 parent 6322544 commit 5fc6208
Show file tree
Hide file tree
Showing 31 changed files with 40 additions and 18 deletions.
3 changes: 2 additions & 1 deletion lib/libcam/Makefile
View file
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
3 changes: 2 additions & 1 deletion lib/libcrypt/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
# $FreeBSD$
#

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

.include <src.opts.mk>

PACKAGE= runtime

SHLIB_MAJOR= 5
LIB= crypt

Expand Down
2 changes: 1 addition & 1 deletion lib/libelf/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# $FreeBSD$

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

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

.PATH: ${SRCDIR}

PACKAGE= runtime
LIB= elf

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

PACKAGE=lib${LIB}
PACKAGE= runtime

LIB= geom
SHLIBDIR?= /lib
SRCS+= geom_getxml.c
Expand Down
2 changes: 1 addition & 1 deletion lib/libipsec/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions lib/libjail/Makefile
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/libkiconv/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/libkvm/Makefile
View file
Original file line number Diff line number Diff line change
@@ -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}
Expand Down
2 changes: 1 addition & 1 deletion lib/libmd/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion lib/libnv/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# $FreeBSD$

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

.include <src.opts.mk>

PACKAGE= runtime
LIB= nv
SHLIB_MAJOR= 0

Expand Down
3 changes: 2 additions & 1 deletion lib/libpam/libpam/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
#
# $FreeBSD$

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

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

PACKAGE= runtime

MK_PROFILE=no

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

PACKAGE=lib${LIB}
PACKAGE= runtime

LIB= sbuf
SHLIBDIR?= /lib
SRCS= subr_prf.c subr_sbuf.c
Expand Down
2 changes: 1 addition & 1 deletion lib/libufs/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# $FreeBSD$

PACKAGE=lib${LIB}
PACKAGE= runtime
LIB= ufs
SHLIBDIR?= /lib
SHLIB_MAJOR= 7
Expand Down
3 changes: 2 additions & 1 deletion lib/libutil/Makefile
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion lib/libxo/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
# $FreeBSD$

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

.include <src.opts.mk>

PACKAGE= runtime

LIBXOSRC= ${SRCTOP}/contrib/libxo

.PATH: ${LIBXOSRC}/libxo
Expand Down
2 changes: 1 addition & 1 deletion lib/libz/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# $FreeBSD$
#

PACKAGE=lib${LIB}
PACKAGE= runtime
LIB= z
SHLIBDIR?= /lib
SHLIB_MAJOR= 6
Expand Down
1 change: 1 addition & 0 deletions secure/lib/libcrypto/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ SUBDIR= engines

.include <bsd.own.mk>

PACKAGE= runtime
LIB= crypto
SHLIB_MAJOR= 111
VERSION_MAP= ${.CURDIR}/Version.map
Expand Down
1 change: 1 addition & 0 deletions share/termcap/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#
MAN= termcap.5

PACKAGE= runtime
FILES= termcap termcap.db
FILESDIR= ${BINDIR}/misc
CLEANFILES+= termcap.db
Expand Down
1 change: 1 addition & 0 deletions usr.bin/du/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

.include <src.opts.mk>

PACKAGE= runtime
PROG= du
LIBADD= util

Expand Down
1 change: 1 addition & 0 deletions usr.bin/fsync/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# $FreeBSD$

PACKAGE= runtime
PROG= fsync

.include <bsd.prog.mk>
1 change: 1 addition & 0 deletions usr.bin/passwd/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

.include <src.opts.mk>

PACKAGE = runtime
PROG = passwd
BINOWN = root
BINMODE = 4555
Expand Down
1 change: 1 addition & 0 deletions usr.bin/sed/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

.include <src.opts.mk>

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

Expand Down
1 change: 1 addition & 0 deletions usr.bin/tar/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

_LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive

PACKAGE= runtime
PROG= bsdtar
BSDTAR_VERSION_STRING= 3.4.0

Expand Down
2 changes: 2 additions & 0 deletions usr.bin/uname/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$
# @(#)Makefile 8.1 (Berkeley) 6/6/93

PACKAGE= runtime
PROG= uname

.include <bsd.prog.mk>
1 change: 1 addition & 0 deletions usr.bin/what/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# From: @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$

PACKAGE= runtime
PROG= what

.include <bsd.prog.mk>
1 change: 1 addition & 0 deletions usr.sbin/ip6addrctl/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# $FreeBSD$

PACKAGE= runtime
PROG= ip6addrctl
MAN= ip6addrctl.8

Expand Down
1 change: 1 addition & 0 deletions usr.sbin/kldxref/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# $FreeBSD$

PACKAGE= runtime
PROG= kldxref
MAN= kldxref.8
SRCS= kldxref.c ef.c ef_obj.c
Expand Down
1 change: 1 addition & 0 deletions usr.sbin/pwd_mkdb/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions usr.sbin/services_mkdb/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# $FreeBSD$

PACKAGE= runtime

CONFS= services
PROG= services_mkdb
MAN= services_mkdb.8
Expand Down
1 change: 1 addition & 0 deletions usr.sbin/traceroute/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions usr.sbin/traceroute6/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
TRACEROUTE_DISTDIR?= ${SRCTOP}/contrib/traceroute
.PATH: ${TRACEROUTE_DISTDIR}

PACKAGE= runtime
PROG= traceroute6
MAN= traceroute6.8
SRCS= as.c traceroute6.c
Expand Down

0 comments on commit 5fc6208

Please sign in to comment.