From b2d245a0b010b8ca254297e00a5a30a632bac9fe Mon Sep 17 00:00:00 2001 From: Emmanuel Vadot Date: Tue, 14 Dec 2021 15:31:30 +0100 Subject: [PATCH] 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 9f0e07f767e..60b80b21375 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 5679a62f7fb..f94fe6e1ef7 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 746e9e8882e..37b05d82f6c 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 c2074bf3cbf..5df10af706e 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 2e764cd43a5..426bd8216ce 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 8eb3e6e7a6d..7bd27c32efb 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 50718e17984..e0e43ac1978 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 5330ae4a5f9..639afd79ced 100644 --- a/lib/libpam/modules/pam_unix/Makefile +++ b/lib/libpam/modules/pam_unix/Makefile @@ -37,6 +37,8 @@ .include .include +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 ca969171409..1499f916cb1 100644 --- a/lib/libpam/pam.d/Makefile +++ b/lib/libpam/pam.d/Makefile @@ -2,6 +2,8 @@ .include +PACKAGE= runtime + NO_OBJ= CONFGROUPS= CONFS diff --git a/lib/libregex/Makefile b/lib/libregex/Makefile index 5bf248801b3..36c8b778d39 100644 --- a/lib/libregex/Makefile +++ b/lib/libregex/Makefile @@ -2,6 +2,8 @@ .include +PACKAGE= runtime + LIB= regex SHLIB_MAJOR= 1 SHLIB_MINOR= 0 diff --git a/lib/librpcsvc/Makefile b/lib/librpcsvc/Makefile index 35669a5e357..7ee85d93b31 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 f45e8f9dda6..71559b17e6a 100644 --- a/lib/libwrap/Makefile +++ b/lib/libwrap/Makefile @@ -4,6 +4,8 @@ .include +PACKAGE= runtime + CONFS= hosts.allow LIB= wrap SHLIB_MAJOR= 6 diff --git a/lib/libypclnt/Makefile b/lib/libypclnt/Makefile index 41a4325e163..c3e6b23249c 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 a65d1d7da98..0296e455f39 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 8120126807c..ffc0a9a65a2 100644 --- a/sbin/devd/Makefile +++ b/sbin/devd/Makefile @@ -3,7 +3,7 @@ .include 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 14c3d4cca3f..f672ce77f4d 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 b227c95509f..b93fdba5bd4 100644 --- a/usr.bin/find/Makefile +++ b/usr.bin/find/Makefile @@ -3,6 +3,8 @@ .include +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 a6f61b4f9f0..661efbd9f0a 100644 --- a/usr.bin/grep/Makefile +++ b/usr.bin/grep/Makefile @@ -4,6 +4,8 @@ .include +PACKAGE= runtime + PROG= grep MAN1= grep.1 zgrep.1 diff --git a/usr.bin/id/Makefile b/usr.bin/id/Makefile index 07cabd05837..f2592aa1ac3 100644 --- a/usr.bin/id/Makefile +++ b/usr.bin/id/Makefile @@ -3,6 +3,8 @@ .include +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 68e540df3a4..b3471cce40e 100644 --- a/usr.bin/limits/Makefile +++ b/usr.bin/limits/Makefile @@ -2,6 +2,8 @@ .include +PACKAGE= runtime + PROG= limits LIBADD= util diff --git a/usr.bin/logger/Makefile b/usr.bin/logger/Makefile index c40baf2e3dc..14663709632 100644 --- a/usr.bin/logger/Makefile +++ b/usr.bin/logger/Makefile @@ -3,6 +3,8 @@ .include +PACKAGE= runtime + PROG= logger .if ${MK_INET6_SUPPORT} != "no" diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile index 2e8b215a449..c876434dcc2 100644 --- a/usr.bin/login/Makefile +++ b/usr.bin/login/Makefile @@ -4,6 +4,8 @@ .include .include +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 76ebee6f360..0e23063431c 100644 --- a/usr.bin/mktemp/Makefile +++ b/usr.bin/mktemp/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +PACKAGE= runtime + PROG= mktemp .include diff --git a/usr.bin/xargs/Makefile b/usr.bin/xargs/Makefile index 04cc44840a6..a795582348c 100644 --- a/usr.bin/xargs/Makefile +++ b/usr.bin/xargs/Makefile @@ -3,6 +3,8 @@ .include +PACKAGE= runtime + PROG= xargs SRCS= xargs.c strnsubst.c diff --git a/usr.bin/xinstall/Makefile b/usr.bin/xinstall/Makefile index 4bc0d006cb9..ce70cb88219 100644 --- a/usr.bin/xinstall/Makefile +++ b/usr.bin/xinstall/Makefile @@ -3,6 +3,8 @@ .include +PACKAGE= runtime + PROG= xinstall PROGNAME= install SRCS= xinstall.c getid.c diff --git a/usr.sbin/service/Makefile b/usr.sbin/service/Makefile index a03714dc6f9..e8432f5aabf 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 78c4f90160b..8177d3fe783 100644 --- a/usr.sbin/utx/Makefile +++ b/usr.sbin/utx/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +PACKAGE= runtime + PROG= utx MAN= utx.8