From nobody Wed Jan 31 14:29:25 2024 X-Original-To: dev-commits-src-branches@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 4TQ4DP3rtWz58dHD; Wed, 31 Jan 2024 14:29:25 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TQ4DP3MzHz4rkr; Wed, 31 Jan 2024 14:29:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706711365; 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=Y2tuCG/Ehlcm+3woNsBMHwABUZc6JUFVCiy7Sqik02Y=; b=Dk1J08knXuSTK6fQjg6P8n9+mChFeTZytuXxACK1aP2LYDquuFMIUSUZ+iBcDwy9h4V+yf gPPiFvdmfknJevzEZDzru0mQyZLNYDv3Me+QoCq98jWe03nmvkmpfqC3BuZCATWHF/SJAF QoE5s6I5TRg/w20HwYfHuB63HYQckcaKrBmt5c4wCcDeDFrpQAYRWTGSJMcoDVHSB9S7rK G3+e2pK2cM7k6D4D09nOu7LXhbF4j0cmbzbcm0KH0qTb9yyAu0Uw1W+EJeO7/Je/nOsqwD pFAUjIbk19z3dtKiKCf2HpowO1AXSXlDIoMVZA4B8FnlS2iAgUwLAKAEoMxsKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706711365; 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=Y2tuCG/Ehlcm+3woNsBMHwABUZc6JUFVCiy7Sqik02Y=; b=lTIvyS1tIPwUvfhdr4UEDBxHoQRy7R8Ojx586CD+OarnmR9h2JMyquZqt7MoRyXn+5foaD k0Zz5cXi09T0FSWJImQi0XyuK3xJC/Ggj2q1/VXQ/+BPngCc8MahsgPQ/nJ2tCPXZpNXmr EjEGQ9mBxwwVOlOhwDAT+lKmqhWOJMg9onVnI30TGmhLgPo/APxrutFec+ehbRuFxcpQj0 PckcrTr8dvPaP8JpKEtS9yZmtMlbmAoWeSfqvlQYYW3t2O4TF3c+IiKKex7X1arZ9lN99C tjzSeLMA8BlcLvkjJAjnc8yt64WnLvRMxeRNkS179iqv5d/3Jgxxz/wxEPZ6ZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706711365; a=rsa-sha256; cv=none; b=NDiOPcxdjLi5f7WQgJOzdkjCaSiHM1PwpzZzuTID1aG29G/SJbVzo/syVpPoEJVR7yOm45 s78GpW8yVUxY3vdL7VORnRfmEDHT88r5yRxMrI2n99Siwna071lzmL7n8AsnA+axYmZRoq dSVGjUac2W8Dd0MsTfKDsD1kzStyDCsZJ/7eu5Pf5NGM8iDv0Lzx2V+LHg+mELYR9zpDQj eVRBelHzjg5jdMMs+n+TYDL0mu72QGpGrjYurFOLmmR3G3flIo0irbuvbKM07T4gmGiy1o 8EUGg5lY9G7Qc+sgzOCxmixlsNR2r8a7mlXUwBZcYO6Jkwo7iUgWaSwE1qZCsg== 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 4TQ4DP2RqxzM4F; Wed, 31 Jan 2024 14:29:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40VETPwn042539; Wed, 31 Jan 2024 14:29:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40VETP08042536; Wed, 31 Jan 2024 14:29:25 GMT (envelope-from git) Date: Wed, 31 Jan 2024 14:29:25 GMT Message-Id: <202401311429.40VETP08042536@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: d2f3bcf90ae0 - stable/14 - mpsutil: Clean up libutil deps List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d2f3bcf90ae09448d690d7c95455da5965dd170d Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d2f3bcf90ae09448d690d7c95455da5965dd170d commit d2f3bcf90ae09448d690d7c95455da5965dd170d Author: Mark Johnston AuthorDate: 2024-01-24 19:47:56 +0000 Commit: Mark Johnston CommitDate: 2024-01-31 14:16:23 +0000 mpsutil: Clean up libutil deps mpsutil doesn't use libutil, so doesn't need to include libutil.h. See commit 76103694a051335bec1da318f9c6e3a676dc0145. No functional change intended. MFC after: 1 week (cherry picked from commit d56ce5915c41517ccc7de2510daec200e100ef68) --- usr.sbin/mpsutil/Makefile | 4 ---- usr.sbin/mpsutil/mps_debug.c | 1 - usr.sbin/mpsutil/mps_set.c | 1 - usr.sbin/mpsutil/mps_show.c | 1 - 4 files changed, 7 deletions(-) diff --git a/usr.sbin/mpsutil/Makefile b/usr.sbin/mpsutil/Makefile index a19c2f310167..aa59d8cddf76 100644 --- a/usr.sbin/mpsutil/Makefile +++ b/usr.sbin/mpsutil/Makefile @@ -1,17 +1,13 @@ - PROG= mpsutil SRCS= mps_cmd.c mps_debug.c mps_flash.c mps_set.c mps_show.c mps_slot.c mpsutil.c MAN= mpsutil.8 WARNS?= 3 -#LIBADD= cam util LINKS= ${BINDIR}/mpsutil ${BINDIR}/mprutil MLINKS= mpsutil.8 mprutil.8 CFLAGS+= -I${SRCTOP}/sys -I. -DUSE_MPT_IOCTLS -# Avoid dirdep dependency on libutil -CFLAGS+= -I${SRCTOP}/lib/libutil # Here be dragons .ifdef DEBUG diff --git a/usr.sbin/mpsutil/mps_debug.c b/usr.sbin/mpsutil/mps_debug.c index a3297b4176cd..7fabd41ab00b 100644 --- a/usr.sbin/mpsutil/mps_debug.c +++ b/usr.sbin/mpsutil/mps_debug.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include diff --git a/usr.sbin/mpsutil/mps_set.c b/usr.sbin/mpsutil/mps_set.c index b75f327cb993..8dd42a0acb41 100644 --- a/usr.sbin/mpsutil/mps_set.c +++ b/usr.sbin/mpsutil/mps_set.c @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include diff --git a/usr.sbin/mpsutil/mps_show.c b/usr.sbin/mpsutil/mps_show.c index 6efa9b76dd3d..15c88f72ad0b 100644 --- a/usr.sbin/mpsutil/mps_show.c +++ b/usr.sbin/mpsutil/mps_show.c @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include