From nobody Tue Jan 24 22:11:31 2023 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 4P1h5H4nspz3bfZt; Tue, 24 Jan 2023 22:11:31 +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 4P1h5H35wYz4Nkr; Tue, 24 Jan 2023 22:11:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598291; 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=5HD9FbCZH0VyVOpqdnvcaMadYhjEFHO02UWvwqdI514=; b=gAclia+vb94vwmh5MgRibI0XkG8lP9lMkqm0VGG35x5LcwXbOl0hxeYGjh3FMMatfZzKm9 rdeDAvo2Uqbh4+Gz5VIOwPio9pV/Cnm/Mo0779hzvLBDayJ3CdXurDp0O3Qq2Ee/WG+lRr GIN/zszX6zFFa60OH0cVuBilKqhOU5VHI7jiwgjSM/QvBVJVpqO4dxrXk8OUBuNhlHpdfx nE36WAMJNSqxOPOJrFAaq3Dq9+LO+2VIOfyniVP5/bLAWfJTyp0Upcsq1NTkKNxPSxuENh Jh6UGJTciW8AMQYTzg52CdO4PGqW9/EP3XKKR3ej0G0lA6mfEZrVOdjbtkt/pQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598291; 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=5HD9FbCZH0VyVOpqdnvcaMadYhjEFHO02UWvwqdI514=; b=Cep0EP7Gflm+KXcC1LrYCNvlbqpul/m7Ic9nyHMDRc+aOnmuV1DuXcSxOfWAAdv+zcvzUs z4X1aUaLEFEUBoMrdHQM7HlbI0IFSR8a07sznbtkrPu+j04VgY/UnicQjTJSW+pfgn+yUK L2mKWod+OGdAmCCdprrycy1tjvdITFh4aCzg6p9Gpaae/F9lpgmPPjvDy5wy7kN4NUiH/a Eqw8VWXMVXfN2+MchAbdXzR35hUKoOhrl6QnzqQyE9v/3i16M+y4tsjU8O/JjQHM1qlGPr zmpA7OEeRImb5RtBwfVJJxu3OnttvvwrSELj1R3A0COp66ubLS6k7gN51BrldQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598291; a=rsa-sha256; cv=none; b=s1UCXIl6K/Hf8ahcWBfI2iGBghhAxOCk0Oxhi/5oLBjQvm6de+QtocjreLtpGHgCGEtfrl 2x4/IOUd6W3tYZSdjSjDYPzQ3676USqr34uhjC2YsvgnRHeJoGPGiD7sjYQpNAfg1POlvn jU515gCqhUkYtlz87vjUhS1tRcaO5x+ZIxZwcf0U/jbO7JGq9Pq9Ia5q1thXN/eUIKxqx3 /Wi1d2LIDiR6CyTQGTDKvRPbBIC+FgPCQ5rBcxleTbEEaXVELIK9DSFKarAWmnxhWVfvA5 ksh15WVfvLjF4o4tNDQXmxEiG/r0VSP8JRL9UBj9DIBkKLfCzvUKehG3k/0HpQ== 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 4P1h5H1wBQzQ1f; Tue, 24 Jan 2023 22:11:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30OMBV5u084836; Tue, 24 Jan 2023 22:11:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMBVC4084835; Tue, 24 Jan 2023 22:11:31 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:11:31 GMT Message-Id: <202301242211.30OMBVC4084835@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 3f43420049bf - stable/13 - stand: tftp.c doesn't need bootinfo.h 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3f43420049bf643f802d8b6c9889a0b9c1a5ade9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3f43420049bf643f802d8b6c9889a0b9c1a5ade9 commit 3f43420049bf643f802d8b6c9889a0b9c1a5ade9 Author: Warner Losh AuthorDate: 2022-07-26 03:45:35 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:27 +0000 stand: tftp.c doesn't need bootinfo.h tftp.c includes bootinfo.h, but doesn't need it. Remove it, and remove the -Istand/common from CFALGS since that's the only reason we had it. Sponsored by: Netflix Reviewed by: tsoome Differential Revision: https://reviews.freebsd.org/D35928 (cherry picked from commit 60cb4f9a8e258e917634d23fb1d589eef38e579c) --- stand/libsa/Makefile | 1 - stand/libsa/tftp.c | 1 - 2 files changed, 2 deletions(-) diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile index 25bb233ebfcd..9fbc9cc91b14 100644 --- a/stand/libsa/Makefile +++ b/stand/libsa/Makefile @@ -182,7 +182,6 @@ CFLAGS.ffs_subr.c+= -DSTANDALONE_SMALL .endif CFLAGS.dosfs.c+= -I${LDRSRC} -CFLAGS.tftp.c+= -I${LDRSRC} CFLAGS.ufs.c+= -I${LDRSRC} CFLAGS.gzipfs.c+= ${ZLIB_CFLAGS} CFLAGS.pkgfs.c+= ${ZLIB_CFLAGS} diff --git a/stand/libsa/tftp.c b/stand/libsa/tftp.c index c520a9e3b3b1..903537b4bbe5 100644 --- a/stand/libsa/tftp.c +++ b/stand/libsa/tftp.c @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #include -#include #include "stand.h" #include "net.h" #include "netif.h"