From nobody Tue Oct 15 11:40:57 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XSXGy1VdZz5YpZC; Tue, 15 Oct 2024 11:40:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XSXGy0my8z4fpy; Tue, 15 Oct 2024 11:40:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728992458; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MDXv3mzQegL+Z3ktMHNY+Ocy10H4n7hVdbpSSc41Zlc=; b=jfhOFKj8qLHNhusEf/JE8f/AHETbW61oByB/8RI7LobEnjJIDCOXJCyLvgeVKOcAHJb0pK SYtPFUpzO4pv/i6Unx9J5evVrw/kJlBVADWpo6Uv+i5DOf/s5mgqLSip0s8KXdPZ1UANc9 nmkk+2KZlIuO2uB1XLcRYp4FsihzNryhHdkzMD9pCFdF0zxWfloiBU3tjhicl/AiviXGYi 8rdBv7MsHIzgZUMMIryuiqdVrKaCgwuIbtvm1qxW12Lj3g8Krw0LOAkxFL9koEGH6h4RYe RRqjPCqpDbAwHcgBPKtWtsRfDnFWEOMqhQEKw/N+7Eu+UVRA0z+MAKH+SY0cIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728992458; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MDXv3mzQegL+Z3ktMHNY+Ocy10H4n7hVdbpSSc41Zlc=; b=POWsJ3yVaqU0ztnsm13UibyB6VWwhjlQ2FbgMpwfjzx3EFWWnd046wJ/tZMqW+CRP+rCrp bVti3JMt/XaDLhEUdsnHnwr3NKgKhUV4FGesdj5RgStiQsoM+eM7xPcKGpGng6NnDq6lbI FRx7YP8y9Rskd+KGfVWEk8Gq0n8+nPwqRV9NJrp/eCGxTaGsuE+v5u8gVIUOeHVYXU+ECi rt41fU0Jj1qoz0PtQlWTMqoKTONfJZ3EVrVr1Qvcn9ZK4W8piR3GgKEFTtr9wbziHJclSW rv52mZtetnYzeOVLSF9BNGdRqLmBmtusdu7d7YdvVz10D4vY4cYKONE2MqZQug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728992458; a=rsa-sha256; cv=none; b=SIz3sGIyzpaZEKdQx2spGEwep8rDEnfyvlVLyE7SHiy8MB0J753FkkD/YUj/BdPke41YS5 pAsvZQja/lQSOpEBZHLrGatkGn7TKsXGJWvx+ku2r5BGjvJunTKS+3/+okLCiudS1l41/L Y/PL/ULw+kFdxKt7jlzbzxSrVfYNgRlyU5Doute2hjlBX0Nd+IX50h1pIjFAO88LZvQcv8 r2Sbikwh1GOQPFlEpYAy1oXOR/uujfk7iKbD9A/FN+I3z8BVKbzmoi9wn0bRPGa1cgxnXC fjVBATQPGJJxT0kyGcEl93SBE1CnwF2hnkPjZcoZP3Z6y9qeonxx4VjT8ssjJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XSXGy0NT2zLCD; Tue, 15 Oct 2024 11:40:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49FBevuM043305; Tue, 15 Oct 2024 11:40:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49FBevlw043302; Tue, 15 Oct 2024 11:40:57 GMT (envelope-from git) Date: Tue, 15 Oct 2024 11:40:57 GMT Message-Id: <202410151140.49FBevlw043302@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 18b226ea08fb - main - lib/geom: remove redundant libraries and objects List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 18b226ea08fb3a27ab05a2d6b6295e54487cc246 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=18b226ea08fb3a27ab05a2d6b6295e54487cc246 commit 18b226ea08fb3a27ab05a2d6b6295e54487cc246 Author: Robert Clausecker AuthorDate: 2024-10-11 14:48:02 +0000 Commit: Robert Clausecker CommitDate: 2024-10-15 11:34:45 +0000 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