git: b2d245a0b010 - stable/13 - pkgbase: Put more binaries/lib in runtime
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 05 Jan 2022 17:24:24 UTC
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=b2d245a0b010b8ca254297e00a5a30a632bac9fe
commit b2d245a0b010b8ca254297e00a5a30a632bac9fe
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2021-12-14 14:31:30 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2022-01-05 17:23:51 +0000
pkgbase: Put more binaries/lib in runtime
Move some needed binaries/libs from FreeBSD-utilities to FreeBSD_runtime.
This is everything needed to boot to multiuser with FreeBSD-rc installed.
MFC after: 2 weeks
Sponsored by: Beckhoff Automation GmbH & Co. KG
Differential Revision: https://reviews.freebsd.org/D33435
(cherry picked from commit 93c43690960274dd3bb67b1ee0f1dd3ca4d13def)
---
lib/libpam/modules/pam_lastlog/Makefile | 2 ++
lib/libpam/modules/pam_login_access/Makefile | 2 ++
lib/libpam/modules/pam_nologin/Makefile | 2 ++
lib/libpam/modules/pam_opie/Makefile | 2 ++
lib/libpam/modules/pam_opieaccess/Makefile | 2 ++
lib/libpam/modules/pam_securetty/Makefile | 2 ++
lib/libpam/modules/pam_self/Makefile | 2 ++
lib/libpam/modules/pam_unix/Makefile | 2 ++
lib/libpam/pam.d/Makefile | 2 ++
lib/libregex/Makefile | 2 ++
lib/librpcsvc/Makefile | 2 ++
lib/libwrap/Makefile | 2 ++
lib/libypclnt/Makefile | 2 +-
libexec/getty/Makefile | 2 ++
sbin/devd/Makefile | 2 +-
usr.bin/env/Makefile | 1 +
usr.bin/find/Makefile | 2 ++
usr.bin/grep/Makefile | 2 ++
usr.bin/id/Makefile | 2 ++
usr.bin/limits/Makefile | 2 ++
usr.bin/logger/Makefile | 2 ++
usr.bin/login/Makefile | 2 ++
usr.bin/mktemp/Makefile | 2 ++
usr.bin/xargs/Makefile | 2 ++
usr.bin/xinstall/Makefile | 2 ++
usr.sbin/service/Makefile | 1 +
usr.sbin/utx/Makefile | 2 ++
27 files changed, 50 insertions(+), 2 deletions(-)
diff --git a/lib/libpam/modules/pam_lastlog/Makefile b/lib/libpam/modules/pam_lastlog/Makefile
index 9f0e07f767ea..60b80b213752 100644
--- a/lib/libpam/modules/pam_lastlog/Makefile
+++ b/lib/libpam/modules/pam_lastlog/Makefile
@@ -24,6 +24,8 @@
#
# $FreeBSD$
+PACKAGE= runtime
+
LIB= pam_lastlog
SRCS= pam_lastlog.c
MAN= pam_lastlog.8
diff --git a/lib/libpam/modules/pam_login_access/Makefile b/lib/libpam/modules/pam_login_access/Makefile
index 5679a62f7fba..f94fe6e1ef7d 100644
--- a/lib/libpam/modules/pam_login_access/Makefile
+++ b/lib/libpam/modules/pam_login_access/Makefile
@@ -24,6 +24,8 @@
#
# $FreeBSD$
+PACKAGE= runtime
+
LIB= pam_login_access
SRCS= pam_login_access.c login_access.c
MAN= login.access.5 pam_login_access.8
diff --git a/lib/libpam/modules/pam_nologin/Makefile b/lib/libpam/modules/pam_nologin/Makefile
index 746e9e8882ee..37b05d82f6ca 100644
--- a/lib/libpam/modules/pam_nologin/Makefile
+++ b/lib/libpam/modules/pam_nologin/Makefile
@@ -24,6 +24,8 @@
#
# $FreeBSD$
+PACKAGE= runtime
+
LIB= pam_nologin
SRCS= pam_nologin.c
MAN= pam_nologin.8
diff --git a/lib/libpam/modules/pam_opie/Makefile b/lib/libpam/modules/pam_opie/Makefile
index c2074bf3cbf3..5df10af706ec 100644
--- a/lib/libpam/modules/pam_opie/Makefile
+++ b/lib/libpam/modules/pam_opie/Makefile
@@ -25,6 +25,8 @@
#
# $FreeBSD$
+PACKAGE= runtime
+
LIB= pam_opie
SRCS= pam_opie.c
MAN= pam_opie.8
diff --git a/lib/libpam/modules/pam_opieaccess/Makefile b/lib/libpam/modules/pam_opieaccess/Makefile
index 2e764cd43a5b..426bd8216ce4 100644
--- a/lib/libpam/modules/pam_opieaccess/Makefile
+++ b/lib/libpam/modules/pam_opieaccess/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= runtime
+
LIB= pam_opieaccess
SRCS= ${LIB}.c
MAN= pam_opieaccess.8
diff --git a/lib/libpam/modules/pam_securetty/Makefile b/lib/libpam/modules/pam_securetty/Makefile
index 8eb3e6e7a6d1..7bd27c32efb7 100644
--- a/lib/libpam/modules/pam_securetty/Makefile
+++ b/lib/libpam/modules/pam_securetty/Makefile
@@ -24,6 +24,8 @@
#
# $FreeBSD$
+PACKAGE= runtime
+
LIB= pam_securetty
SRCS= pam_securetty.c
MAN= pam_securetty.8
diff --git a/lib/libpam/modules/pam_self/Makefile b/lib/libpam/modules/pam_self/Makefile
index 50718e179846..e0e43ac19787 100644
--- a/lib/libpam/modules/pam_self/Makefile
+++ b/lib/libpam/modules/pam_self/Makefile
@@ -24,6 +24,8 @@
#
# $FreeBSD$
+PACKAGE= runtime
+
LIB= pam_self
SRCS= pam_self.c
MAN= pam_self.8
diff --git a/lib/libpam/modules/pam_unix/Makefile b/lib/libpam/modules/pam_unix/Makefile
index 5330ae4a5f98..639afd79cedb 100644
--- a/lib/libpam/modules/pam_unix/Makefile
+++ b/lib/libpam/modules/pam_unix/Makefile
@@ -37,6 +37,8 @@
.include <src.opts.mk>
.include <bsd.init.mk>
+PACKAGE= runtime
+
LIB= pam_unix
SRCS= pam_unix.c
MAN= pam_unix.8
diff --git a/lib/libpam/pam.d/Makefile b/lib/libpam/pam.d/Makefile
index ca9691714091..1499f916cb17 100644
--- a/lib/libpam/pam.d/Makefile
+++ b/lib/libpam/pam.d/Makefile
@@ -2,6 +2,8 @@
.include <src.opts.mk>
+PACKAGE= runtime
+
NO_OBJ=
CONFGROUPS= CONFS
diff --git a/lib/libregex/Makefile b/lib/libregex/Makefile
index 5bf248801b32..36c8b778d394 100644
--- a/lib/libregex/Makefile
+++ b/lib/libregex/Makefile
@@ -2,6 +2,8 @@
.include <src.opts.mk>
+PACKAGE= runtime
+
LIB= regex
SHLIB_MAJOR= 1
SHLIB_MINOR= 0
diff --git a/lib/librpcsvc/Makefile b/lib/librpcsvc/Makefile
index 35669a5e3570..7ee85d93b310 100644
--- a/lib/librpcsvc/Makefile
+++ b/lib/librpcsvc/Makefile
@@ -5,6 +5,8 @@
.PATH: ${SRCTOP}/include/rpcsvc
+PACKAGE= runtime
+
LIB= rpcsvc
RPCSRCS= klm_prot.x mount.x nfs_prot.x nlm_prot.x rex.x rnusers.x \
diff --git a/lib/libwrap/Makefile b/lib/libwrap/Makefile
index f45e8f9dda6b..71559b17e6ad 100644
--- a/lib/libwrap/Makefile
+++ b/lib/libwrap/Makefile
@@ -4,6 +4,8 @@
.include <src.opts.mk>
+PACKAGE= runtime
+
CONFS= hosts.allow
LIB= wrap
SHLIB_MAJOR= 6
diff --git a/lib/libypclnt/Makefile b/lib/libypclnt/Makefile
index 41a4325e163b..c3e6b23249c4 100644
--- a/lib/libypclnt/Makefile
+++ b/lib/libypclnt/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PACKAGE= yp
+PACKAGE= runtime
LIB= ypclnt
SHLIB_MAJOR= 4
SRCS= ypclnt_connect.c \
diff --git a/libexec/getty/Makefile b/libexec/getty/Makefile
index a65d1d7da981..0296e455f398 100644
--- a/libexec/getty/Makefile
+++ b/libexec/getty/Makefile
@@ -1,6 +1,8 @@
# from: @(#)Makefile 8.1 (Berkeley) 6/4/93
# $FreeBSD$
+PACKAGE= runtime
+
CONFS= gettytab
PROG= getty
SRCS= main.c init.c subr.c chat.c
diff --git a/sbin/devd/Makefile b/sbin/devd/Makefile
index 8120126807ce..ffc0a9a65a27 100644
--- a/sbin/devd/Makefile
+++ b/sbin/devd/Makefile
@@ -3,7 +3,7 @@
.include <src.opts.mk>
WARNS?= 3
-PACKAGE=utilities
+PACKAGE=runtime
CONFGROUPS= CONFS DEVD
CONFS= devd.conf
DEVD= devmatch.conf
diff --git a/usr.bin/env/Makefile b/usr.bin/env/Makefile
index 14c3d4cca3f3..f672ce77f4dd 100644
--- a/usr.bin/env/Makefile
+++ b/usr.bin/env/Makefile
@@ -1,6 +1,7 @@
# From: @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
+PACKAGE= runtime
PROG= env
SRCS= env.c envopts.c
diff --git a/usr.bin/find/Makefile b/usr.bin/find/Makefile
index b227c95509f6..b93fdba5bd4f 100644
--- a/usr.bin/find/Makefile
+++ b/usr.bin/find/Makefile
@@ -3,6 +3,8 @@
.include <src.opts.mk>
+PACKAGE= runtime
+
PROG= find
SRCS= find.c function.c ls.c main.c misc.c operator.c option.c \
getdate.y
diff --git a/usr.bin/grep/Makefile b/usr.bin/grep/Makefile
index a6f61b4f9f01..661efbd9f0ac 100644
--- a/usr.bin/grep/Makefile
+++ b/usr.bin/grep/Makefile
@@ -4,6 +4,8 @@
.include <src.opts.mk>
+PACKAGE= runtime
+
PROG= grep
MAN1= grep.1 zgrep.1
diff --git a/usr.bin/id/Makefile b/usr.bin/id/Makefile
index 07cabd05837f..f2592aa1ac33 100644
--- a/usr.bin/id/Makefile
+++ b/usr.bin/id/Makefile
@@ -3,6 +3,8 @@
.include <src.opts.mk>
+PACKAGE= runtime
+
PROG= id
LINKS= ${BINDIR}/id ${BINDIR}/groups
LINKS+= ${BINDIR}/id ${BINDIR}/whoami
diff --git a/usr.bin/limits/Makefile b/usr.bin/limits/Makefile
index 68e540df3a49..b3471cce40ed 100644
--- a/usr.bin/limits/Makefile
+++ b/usr.bin/limits/Makefile
@@ -2,6 +2,8 @@
.include <src.opts.mk>
+PACKAGE= runtime
+
PROG= limits
LIBADD= util
diff --git a/usr.bin/logger/Makefile b/usr.bin/logger/Makefile
index c40baf2e3dc0..14663709632a 100644
--- a/usr.bin/logger/Makefile
+++ b/usr.bin/logger/Makefile
@@ -3,6 +3,8 @@
.include <src.opts.mk>
+PACKAGE= runtime
+
PROG= logger
.if ${MK_INET6_SUPPORT} != "no"
diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile
index 2e8b215a4492..c876434dcc2e 100644
--- a/usr.bin/login/Makefile
+++ b/usr.bin/login/Makefile
@@ -4,6 +4,8 @@
.include <src.opts.mk>
.include <src.tools.mk>
+PACKAGE= runtime
+
CONFS= fbtab login.conf motd.template login.access
PROG= login
SRCS= login.c login_fbtab.c
diff --git a/usr.bin/mktemp/Makefile b/usr.bin/mktemp/Makefile
index 76ebee6f360b..0e23063431c2 100644
--- a/usr.bin/mktemp/Makefile
+++ b/usr.bin/mktemp/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= runtime
+
PROG= mktemp
.include <bsd.prog.mk>
diff --git a/usr.bin/xargs/Makefile b/usr.bin/xargs/Makefile
index 04cc44840a63..a795582348c6 100644
--- a/usr.bin/xargs/Makefile
+++ b/usr.bin/xargs/Makefile
@@ -3,6 +3,8 @@
.include <src.opts.mk>
+PACKAGE= runtime
+
PROG= xargs
SRCS= xargs.c strnsubst.c
diff --git a/usr.bin/xinstall/Makefile b/usr.bin/xinstall/Makefile
index 4bc0d006cb98..ce70cb882190 100644
--- a/usr.bin/xinstall/Makefile
+++ b/usr.bin/xinstall/Makefile
@@ -3,6 +3,8 @@
.include <src.opts.mk>
+PACKAGE= runtime
+
PROG= xinstall
PROGNAME= install
SRCS= xinstall.c getid.c
diff --git a/usr.sbin/service/Makefile b/usr.sbin/service/Makefile
index a03714dc6f91..e8432f5aabf8 100644
--- a/usr.sbin/service/Makefile
+++ b/usr.sbin/service/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE= runtime
SCRIPTS=service.sh
MAN= service.8
diff --git a/usr.sbin/utx/Makefile b/usr.sbin/utx/Makefile
index 78c4f90160be..8177d3fe7832 100644
--- a/usr.sbin/utx/Makefile
+++ b/usr.sbin/utx/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= runtime
+
PROG= utx
MAN= utx.8