From 18b226ea08fb3a27ab05a2d6b6295e54487cc246 Mon Sep 17 00:00:00 2001 From: Robert Clausecker Date: Fri, 11 Oct 2024 16:48:02 +0200 Subject: [PATCH] lib/geom: remove redundant libraries and objects Do not link lib/geom/raid with libmd, it is not required for the module. Do not include the sha256/sha512 code in lib/geom/eli, it is provided by libmd. Remove ${.CURDIR:H:H}/misc from .PATH for all modules. This path has stopped being valid when the GEOM modules were moved from sbin/geom to lib/geom. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D47061 --- lib/geom/cache/Makefile | 1 - lib/geom/concat/Makefile | 1 - lib/geom/eli/Makefile | 4 +--- lib/geom/journal/Makefile | 1 - lib/geom/label/Makefile | 1 - lib/geom/mirror/Makefile | 1 - lib/geom/mountver/Makefile | 1 - lib/geom/multipath/Makefile | 1 - lib/geom/nop/Makefile | 1 - lib/geom/part/Makefile | 1 - lib/geom/raid/Makefile | 3 --- lib/geom/raid3/Makefile | 1 - lib/geom/shsec/Makefile | 1 - lib/geom/stripe/Makefile | 1 - lib/geom/union/Makefile | 1 - lib/geom/virstor/Makefile | 2 +- 16 files changed, 2 insertions(+), 20 deletions(-) diff --git a/lib/geom/cache/Makefile b/lib/geom/cache/Makefile index 850a237d6827..e307351c1de5 100644 --- a/lib/geom/cache/Makefile +++ b/lib/geom/cache/Makefile @@ -1,5 +1,4 @@ PACKAGE=geom -.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= cache diff --git a/lib/geom/concat/Makefile b/lib/geom/concat/Makefile index e30eeb247569..c9f9d0e38c75 100644 --- a/lib/geom/concat/Makefile +++ b/lib/geom/concat/Makefile @@ -1,5 +1,4 @@ PACKAGE=geom -.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= concat diff --git a/lib/geom/eli/Makefile b/lib/geom/eli/Makefile index f4a0e6f5ad9f..a22eacb9d7e8 100644 --- a/lib/geom/eli/Makefile +++ b/lib/geom/eli/Makefile @@ -1,13 +1,11 @@ PACKAGE=geom -.PATH: ${.CURDIR:H:H}/misc ${SRCTOP}/sys/geom/eli ${SRCTOP}/sys/crypto/sha2 +.PATH: ${SRCTOP}/sys/geom/eli GEOM_CLASS= eli SRCS= g_eli_crypto.c SRCS+= g_eli_hmac.c SRCS+= g_eli_key.c SRCS+= pkcs5v2.c -SRCS+= sha256c.c -SRCS+= sha512c.c LIBADD= md crypto diff --git a/lib/geom/journal/Makefile b/lib/geom/journal/Makefile index 7d5282ff762a..b87e8283225b 100644 --- a/lib/geom/journal/Makefile +++ b/lib/geom/journal/Makefile @@ -1,5 +1,4 @@ PACKAGE=geom -.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= journal SRCS+= geom_journal_ufs.c diff --git a/lib/geom/label/Makefile b/lib/geom/label/Makefile index ed35777cf479..823d5816be64 100644 --- a/lib/geom/label/Makefile +++ b/lib/geom/label/Makefile @@ -1,5 +1,4 @@ PACKAGE=geom -.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= label diff --git a/lib/geom/mirror/Makefile b/lib/geom/mirror/Makefile index 2e86b099fea8..cf0174ee0766 100644 --- a/lib/geom/mirror/Makefile +++ b/lib/geom/mirror/Makefile @@ -1,5 +1,4 @@ PACKAGE=geom -.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= mirror diff --git a/lib/geom/mountver/Makefile b/lib/geom/mountver/Makefile index b60e355bed65..6ea3705261c2 100644 --- a/lib/geom/mountver/Makefile +++ b/lib/geom/mountver/Makefile @@ -1,5 +1,4 @@ PACKAGE=geom -.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= mountver diff --git a/lib/geom/multipath/Makefile b/lib/geom/multipath/Makefile index 805ac93dfcbd..1c7341145017 100644 --- a/lib/geom/multipath/Makefile +++ b/lib/geom/multipath/Makefile @@ -1,5 +1,4 @@ PACKAGE=geom -.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= multipath diff --git a/lib/geom/nop/Makefile b/lib/geom/nop/Makefile index d7d1329697ba..294eeb4e7002 100644 --- a/lib/geom/nop/Makefile +++ b/lib/geom/nop/Makefile @@ -1,5 +1,4 @@ PACKAGE=geom -.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= nop diff --git a/lib/geom/part/Makefile b/lib/geom/part/Makefile index a8f0c6ac5f7f..58390e299d6f 100644 --- a/lib/geom/part/Makefile +++ b/lib/geom/part/Makefile @@ -1,5 +1,4 @@ PACKAGE=geom -.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= part diff --git a/lib/geom/raid/Makefile b/lib/geom/raid/Makefile index 338a305b7ab9..b84121126ca1 100644 --- a/lib/geom/raid/Makefile +++ b/lib/geom/raid/Makefile @@ -1,8 +1,5 @@ PACKAGE=geom -.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= raid -LIBADD= md - .include diff --git a/lib/geom/raid3/Makefile b/lib/geom/raid3/Makefile index f6e5e5ef92fa..f2d9a9233c16 100644 --- a/lib/geom/raid3/Makefile +++ b/lib/geom/raid3/Makefile @@ -1,5 +1,4 @@ PACKAGE=geom -.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= raid3 diff --git a/lib/geom/shsec/Makefile b/lib/geom/shsec/Makefile index 47981da7df9d..493ea5d15acd 100644 --- a/lib/geom/shsec/Makefile +++ b/lib/geom/shsec/Makefile @@ -1,5 +1,4 @@ PACKAGE=geom -.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= shsec diff --git a/lib/geom/stripe/Makefile b/lib/geom/stripe/Makefile index a63568ae35ef..762df5f3c872 100644 --- a/lib/geom/stripe/Makefile +++ b/lib/geom/stripe/Makefile @@ -1,5 +1,4 @@ PACKAGE=geom -.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= stripe diff --git a/lib/geom/union/Makefile b/lib/geom/union/Makefile index 7dfe3be205ae..e2027125c6d1 100644 --- a/lib/geom/union/Makefile +++ b/lib/geom/union/Makefile @@ -1,5 +1,4 @@ PACKAGE=geom -.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= union diff --git a/lib/geom/virstor/Makefile b/lib/geom/virstor/Makefile index e596e83ec186..63ea8e5ad31c 100644 --- a/lib/geom/virstor/Makefile +++ b/lib/geom/virstor/Makefile @@ -1,5 +1,5 @@ PACKAGE=geom -.PATH: ${.CURDIR:H:H}/misc ${SRCTOP}/sys/geom/virstor +.PATH: ${SRCTOP}/sys/geom/virstor GEOM_CLASS= virstor