git: 01db7f820e8e - stable/13 - pkgbase: Put ufs related tools and lib in their own package
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 02 Feb 2023 09:33:14 UTC
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=01db7f820e8ee3e901b81ecd4551d4b37b62026f
commit 01db7f820e8ee3e901b81ecd4551d4b37b62026f
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-07-22 11:22:29 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 09:32:55 +0000
pkgbase: Put ufs related tools and lib in their own package
It's not really useful in a jail or in a mdroot or even if a users
wants to do a full zfs machine.
Reviewed by: mckusick
Differential Revision: https://reviews.freebsd.org/D36227
(cherry picked from commit a7ffc948497e04354fa512915f7e383ee04ae269)
---
lib/libufs/Makefile | 2 +-
release/packages/Makefile.package | 2 ++
sbin/clri/Makefile | 2 +-
sbin/dump/Makefile | 2 +-
sbin/dumpfs/Makefile | 2 +-
sbin/ffsinfo/Makefile | 2 +-
sbin/fsck_ffs/Makefile | 2 +-
sbin/fsdb/Makefile | 2 +-
sbin/fsirand/Makefile | 2 +-
sbin/growfs/Makefile | 2 +-
sbin/mksnap_ffs/Makefile | 2 +-
sbin/newfs/Makefile | 1 +
sbin/restore/Makefile | 2 +-
sbin/tunefs/Makefile | 2 +-
usr.sbin/snapinfo/Makefile | 1 +
15 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/lib/libufs/Makefile b/lib/libufs/Makefile
index a767546f457f..755722880484 100644
--- a/lib/libufs/Makefile
+++ b/lib/libufs/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PACKAGE= runtime
+PACKAGE= ufs
LIB= ufs
SHLIBDIR?= /lib
SHLIB_MAJOR= 7
diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package
index af4a1ed3f49f..b924026aa64d 100644
--- a/release/packages/Makefile.package
+++ b/release/packages/Makefile.package
@@ -134,6 +134,8 @@ telnet_COMMENT= Telnet and telnetd
telnet_DESC= Telnet and telnetd
tests_COMMENT= Test Suite
tests_DESC= Test Suite
+ufs_COMMENT= UFS Libraries and Utilities
+ufs_DESC= UFS Libraries and Utilities
unbound_COMMENT= Unbound DNS Resolver
unbound_DESC= Unbound DNS Resolver
utilities_COMMENT= Non-vital programs and libraries
diff --git a/sbin/clri/Makefile b/sbin/clri/Makefile
index 5f8777f30391..77a7933f8cdd 100644
--- a/sbin/clri/Makefile
+++ b/sbin/clri/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# $FreeBSD$
-PACKAGE=runtime
+PACKAGE=ufs
PROG= clri
MAN= clri.8
LIBADD= ufs
diff --git a/sbin/dump/Makefile b/sbin/dump/Makefile
index f611d6b1ab47..0977a969609b 100644
--- a/sbin/dump/Makefile
+++ b/sbin/dump/Makefile
@@ -13,7 +13,7 @@
# DEBUG use local directory to find ddate and dumpdates
# TDEBUG trace out the process forking
-PACKAGE=runtime
+PACKAGE=ufs
PROG= dump
CONFS= /dev/null
CONFSGRP= operator
diff --git a/sbin/dumpfs/Makefile b/sbin/dumpfs/Makefile
index 03e1aae03b87..c90644dd0186 100644
--- a/sbin/dumpfs/Makefile
+++ b/sbin/dumpfs/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# $FreeBSD$
-PACKAGE=runtime
+PACKAGE=ufs
PROG= dumpfs
WARNS?= 2
LIBADD= ufs
diff --git a/sbin/ffsinfo/Makefile b/sbin/ffsinfo/Makefile
index 19aa71ab89c4..37837d182a91 100644
--- a/sbin/ffsinfo/Makefile
+++ b/sbin/ffsinfo/Makefile
@@ -7,7 +7,7 @@
GROWFS= ${.CURDIR:H}/growfs
.PATH: ${GROWFS}
-PACKAGE=runtime
+PACKAGE=ufs
PROG= ffsinfo
SRCS= ffsinfo.c debug.c
MAN= ffsinfo.8
diff --git a/sbin/fsck_ffs/Makefile b/sbin/fsck_ffs/Makefile
index ba8a39a87e1f..351ec432095d 100644
--- a/sbin/fsck_ffs/Makefile
+++ b/sbin/fsck_ffs/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
# @(#)Makefile 8.2 (Berkeley) 4/27/95
-PACKAGE=runtime
+PACKAGE=ufs
PROG= fsck_ffs
LINKS+= ${BINDIR}/fsck_ffs ${BINDIR}/fsck_ufs
LINKS+= ${BINDIR}/fsck_ffs ${BINDIR}/fsck_4.2bsd
diff --git a/sbin/fsdb/Makefile b/sbin/fsdb/Makefile
index a2e280420479..37be6845fa78 100644
--- a/sbin/fsdb/Makefile
+++ b/sbin/fsdb/Makefile
@@ -2,7 +2,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# $FreeBSD$
-PACKAGE=runtime
+PACKAGE=ufs
PROG= fsdb
MAN= fsdb.8
SRCS= fsdb.c fsdbutil.c \
diff --git a/sbin/fsirand/Makefile b/sbin/fsirand/Makefile
index 1fc54ff44687..7c9475b95251 100644
--- a/sbin/fsirand/Makefile
+++ b/sbin/fsirand/Makefile
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.1 1997/01/26 02:23:20 millert Exp $
# $FreeBSD$
-PACKAGE=runtime
+PACKAGE=ufs
PROG= fsirand
MAN= fsirand.8
LIBADD= ufs
diff --git a/sbin/growfs/Makefile b/sbin/growfs/Makefile
index 8aeb9d77509e..9c0704193446 100644
--- a/sbin/growfs/Makefile
+++ b/sbin/growfs/Makefile
@@ -8,7 +8,7 @@
.PATH: ${.CURDIR:H}/mount
-PACKAGE=runtime
+PACKAGE=ufs
PROG= growfs
SRCS= growfs.c getmntopts.c
MAN= growfs.8
diff --git a/sbin/mksnap_ffs/Makefile b/sbin/mksnap_ffs/Makefile
index a79ae2f73417..53690a39805f 100644
--- a/sbin/mksnap_ffs/Makefile
+++ b/sbin/mksnap_ffs/Makefile
@@ -2,7 +2,7 @@
.PATH: ${.CURDIR:H}/mount
-PACKAGE=runtime
+PACKAGE=ufs
PROG= mksnap_ffs
SRCS= mksnap_ffs.c getmntopts.c
MAN= mksnap_ffs.8
diff --git a/sbin/newfs/Makefile b/sbin/newfs/Makefile
index 9e3ea13b6e5c..2723c42e575c 100644
--- a/sbin/newfs/Makefile
+++ b/sbin/newfs/Makefile
@@ -3,6 +3,7 @@
.PATH: ${SRCTOP}/sys/geom
+PACKAGE= ufs
PROG= newfs
LIBADD= ufs util
SRCS= newfs.c mkfs.c geom_bsd_enc.c
diff --git a/sbin/restore/Makefile b/sbin/restore/Makefile
index d6c1e6202693..38134903ee46 100644
--- a/sbin/restore/Makefile
+++ b/sbin/restore/Makefile
@@ -3,7 +3,7 @@
.PATH: ${.CURDIR:H}/dump
-PACKAGE=runtime
+PACKAGE=ufs
PROG= restore
LINKS= ${BINDIR}/restore ${BINDIR}/rrestore
MAN= restore.8
diff --git a/sbin/tunefs/Makefile b/sbin/tunefs/Makefile
index 9d0754edca89..cdb2f313c5f7 100644
--- a/sbin/tunefs/Makefile
+++ b/sbin/tunefs/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# $FreeBSD$
-PACKAGE=runtime
+PACKAGE=ufs
PROG= tunefs
SRCS= tunefs.c getmntopts.c
LIBADD= ufs
diff --git a/usr.sbin/snapinfo/Makefile b/usr.sbin/snapinfo/Makefile
index 76013744e988..3aded69e2fb7 100644
--- a/usr.sbin/snapinfo/Makefile
+++ b/usr.sbin/snapinfo/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
#
+PACKAGE= ufs
PROG= snapinfo
MAN= snapinfo.8