From 0bf688786f7d5508b43b50c62f50f022e33b1352 Mon Sep 17 00:00:00 2001 From: Emmanuel Vadot Date: Fri, 22 Jul 2022 10:19:07 +0200 Subject: [PATCH] pkgbase: Put geom utilities in their own package For most users it's not needed to boot and they are also available in the FreeBSD-rescue package in case an update break and FreeBSD-geom package isn't updated correctly. Differential Revision: https://reviews.freebsd.org/D36224 --- lib/geom/cache/Makefile | 2 +- lib/geom/concat/Makefile | 2 +- lib/geom/eli/Makefile | 2 +- lib/geom/journal/Makefile | 2 +- lib/geom/label/Makefile | 2 +- lib/geom/mirror/Makefile | 2 +- lib/geom/mountver/Makefile | 2 +- lib/geom/multipath/Makefile | 2 +- lib/geom/nop/Makefile | 2 +- lib/geom/part/Makefile | 2 +- lib/geom/raid/Makefile | 2 +- lib/geom/raid3/Makefile | 2 +- lib/geom/shsec/Makefile | 2 +- lib/geom/stripe/Makefile | 2 +- lib/geom/union/Makefile | 2 +- lib/geom/virstor/Makefile | 2 +- release/packages/Makefile.package | 2 ++ sbin/gbde/Makefile | 2 +- sbin/geom/Makefile | 2 +- sbin/gvinum/Makefile | 2 +- 20 files changed, 21 insertions(+), 19 deletions(-) diff --git a/lib/geom/cache/Makefile b/lib/geom/cache/Makefile index e1ba031c9ffe..2aee7212dfda 100644 --- a/lib/geom/cache/Makefile +++ b/lib/geom/cache/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PACKAGE=runtime +PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= cache diff --git a/lib/geom/concat/Makefile b/lib/geom/concat/Makefile index 3c370520a624..9d5cfb8b3893 100644 --- a/lib/geom/concat/Makefile +++ b/lib/geom/concat/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PACKAGE=runtime +PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= concat diff --git a/lib/geom/eli/Makefile b/lib/geom/eli/Makefile index e36eece7a6e2..49f34908f917 100644 --- a/lib/geom/eli/Makefile +++ b/lib/geom/eli/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PACKAGE=runtime +PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc ${SRCTOP}/sys/geom/eli ${SRCTOP}/sys/crypto/sha2 GEOM_CLASS= eli diff --git a/lib/geom/journal/Makefile b/lib/geom/journal/Makefile index 3be15a13a81e..e789793a68b8 100644 --- a/lib/geom/journal/Makefile +++ b/lib/geom/journal/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PACKAGE=runtime +PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= journal diff --git a/lib/geom/label/Makefile b/lib/geom/label/Makefile index 767924b78b61..9f2b9c5e24f8 100644 --- a/lib/geom/label/Makefile +++ b/lib/geom/label/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PACKAGE=runtime +PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= label diff --git a/lib/geom/mirror/Makefile b/lib/geom/mirror/Makefile index 553e44787d8b..0fd7a7bcd13b 100644 --- a/lib/geom/mirror/Makefile +++ b/lib/geom/mirror/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PACKAGE=runtime +PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= mirror diff --git a/lib/geom/mountver/Makefile b/lib/geom/mountver/Makefile index 36c1e01e112a..7924df1a074d 100644 --- a/lib/geom/mountver/Makefile +++ b/lib/geom/mountver/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PACKAGE=runtime +PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= mountver diff --git a/lib/geom/multipath/Makefile b/lib/geom/multipath/Makefile index 5a753e42d76d..4364e382ba75 100644 --- a/lib/geom/multipath/Makefile +++ b/lib/geom/multipath/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PACKAGE=runtime +PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= multipath diff --git a/lib/geom/nop/Makefile b/lib/geom/nop/Makefile index 9d8b69117466..51a535a3b9e1 100644 --- a/lib/geom/nop/Makefile +++ b/lib/geom/nop/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PACKAGE=runtime +PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= nop diff --git a/lib/geom/part/Makefile b/lib/geom/part/Makefile index e9631caf4d84..077bc6c64b1d 100644 --- a/lib/geom/part/Makefile +++ b/lib/geom/part/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PACKAGE=runtime +PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= part diff --git a/lib/geom/raid/Makefile b/lib/geom/raid/Makefile index 75d2ac7e25b7..2e3d4083492a 100644 --- a/lib/geom/raid/Makefile +++ b/lib/geom/raid/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PACKAGE=runtime +PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= raid diff --git a/lib/geom/raid3/Makefile b/lib/geom/raid3/Makefile index 2fdf4e8f8167..29aeb9d595b5 100644 --- a/lib/geom/raid3/Makefile +++ b/lib/geom/raid3/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PACKAGE=runtime +PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= raid3 diff --git a/lib/geom/shsec/Makefile b/lib/geom/shsec/Makefile index f86df6c9af42..e6acbf24577c 100644 --- a/lib/geom/shsec/Makefile +++ b/lib/geom/shsec/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PACKAGE=runtime +PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= shsec diff --git a/lib/geom/stripe/Makefile b/lib/geom/stripe/Makefile index bbea1901749e..9fc24db55d65 100644 --- a/lib/geom/stripe/Makefile +++ b/lib/geom/stripe/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PACKAGE=runtime +PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= stripe diff --git a/lib/geom/union/Makefile b/lib/geom/union/Makefile index cb8b09dc7eca..384d1fbf8ca5 100644 --- a/lib/geom/union/Makefile +++ b/lib/geom/union/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PACKAGE=runtime +PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= union diff --git a/lib/geom/virstor/Makefile b/lib/geom/virstor/Makefile index dfbe0aeddc47..24b4e508af18 100644 --- a/lib/geom/virstor/Makefile +++ b/lib/geom/virstor/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PACKAGE=runtime +PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc ${SRCTOP}/sys/geom/virstor GEOM_CLASS= virstor diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package index 99a06ec727bf..ccaba970489c 100644 --- a/release/packages/Makefile.package +++ b/release/packages/Makefile.package @@ -56,6 +56,8 @@ ftpd_COMMENT= FTP Daemon ftpd_DESC= FTP Daemon gdb_COMMENT= GDB Utilities gdb_DESC= GDB Utilities +geom_COMMENT= GEOM Utilitites +geom_DESC= GEOM Utilitites ggate_COMMENT= GEOM Gate Utilities ggate_DESC= GEOM Gate Utilities groff_COMMENT= Groff Utilities diff --git a/sbin/gbde/Makefile b/sbin/gbde/Makefile index dcc034fd7564..867a7f8e9b55 100644 --- a/sbin/gbde/Makefile +++ b/sbin/gbde/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PACKAGE=runtime +PACKAGE=geom PROG= gbde SRCS= gbde.c template.c SRCS+= rijndael-alg-fst.c diff --git a/sbin/geom/Makefile b/sbin/geom/Makefile index 0c6e6e2b95c8..4424c757371f 100644 --- a/sbin/geom/Makefile +++ b/sbin/geom/Makefile @@ -4,7 +4,7 @@ .PATH: ${.CURDIR}/core ${.CURDIR}/misc -PACKAGE=runtime +PACKAGE=geom PROG= geom SRCS= geom.c subr.c MAN= geom.8 diff --git a/sbin/gvinum/Makefile b/sbin/gvinum/Makefile index 18550053228a..88d6b7242580 100644 --- a/sbin/gvinum/Makefile +++ b/sbin/gvinum/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PACKAGE=runtime +PACKAGE=geom PROG= gvinum SRCS= gvinum.c gvinum.h geom_vinum_share.c MAN= gvinum.8