From nobody Mon Apr 18 14:47:51 2022 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 5998011DA873; Mon, 18 Apr 2022 14:47:51 +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 4KhqY31xhcz4f3J; Mon, 18 Apr 2022 14:47:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650293271; 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=3tKJZMlNlpZ8sKq6I/EVhFPtsPhAc6FS58RhRcAMo0Y=; b=qNFDBJXllhMk/OmYddo28V0LW5md+WW/Fs3hrZOaF5X3Aa2I7mKafPFPTHMJSBPY9SQUh1 /nKB42+mqld9ZjSoRYyKGdEnzhXdR4uX/9XFNJmJaJOPXfxwd0BgrqlueJRj6cm8TMhdDJ TE2I8AyrZAgXENSzf3xsq+EQe8ssxT/oes8prKRONMae77AeA71NIPM39Po5Va9pSIv9tk GJlosGjFuuBPPD11iRx9zo9Pe6MsSDFGblUSuxIfqbgVN5We9SSPLYJfxfbFhPtJuCn0GC v3w5n3svgx/lPBYlOLGEr4wZXImMoLCjdlCyo4cMXexTsVJBt07/9G+AjmFWMg== 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 2003114B1E; Mon, 18 Apr 2022 14:47:51 +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 23IElpib036993; Mon, 18 Apr 2022 14:47:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23IElpnv036992; Mon, 18 Apr 2022 14:47:51 GMT (envelope-from git) Date: Mon, 18 Apr 2022 14:47:51 GMT Message-Id: <202204181447.23IElpnv036992@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Stefan E=C3=9Fer?= Subject: git: 879a6b7b6280 - stable/12 - bin/df: add back linking with getmntops.c from sbin/mount 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: se X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 879a6b7b628060a85a0f1787aa30ab6efbf1e0c1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650293271; 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=3tKJZMlNlpZ8sKq6I/EVhFPtsPhAc6FS58RhRcAMo0Y=; b=wIhb8lEG9rZEa9cylXfgDRZt32g0qJpjclToBqT/bXIclGvJHqh9qVB77fAowLTtx1sdsE o3IABZkFyoC5GOn740gOPk9cLBPXfaMqtEw4ICKS3dj+Ka7za98qZsVzQiM8ksKMAu1ty/ 3OhyT86cUtu1O3TrLvG8Kaw/wgAgwOkbaQYC+FP+vILeeW+b9jzJhaIgKcv2pLHvL75Ju6 5r9kH7DZh3eSrRRukyRGfPw1FR/+hA4sTa95dGdBcRs285QtgBRbTXEHRgoNOSuU6ecEeB z/3eHwDFfLJYW+1CocbpnorDrGJqrcdnTMkNE17yeRGnRhxaCSir7VewAdkLSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650293271; a=rsa-sha256; cv=none; b=tY+1QfjR5FWd6IzWpWlLR2syr2EvI1xjq/6nECXg3HqbENZqWCkhF+1piiRx9kEUQ/H0fd RXWf4Kf/OGGdr0+CcIsDdHlvXJjOE/r/RwMHzNL3tJB6BV+adcW7GTRF7/Ib0GWIMYcA+w 36WquYZQmoIxFjL8pe+TLGcUG+iCnEXbvSYgw847rP46mQq9yx79KfNasHmF4xzhK5OObi K6r/9193U52bYSarUIFHiEa+G4OLs+U97UZszM7GKh3sIr4QOwP0Y1aONn++KXz9lYiFe+ ADHdRZYGlsbd9z2KANFRdXYeO6oljz9NXFBx8FZUXS337VQmMq4SkTRu0ySE1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by se: URL: https://cgit.FreeBSD.org/src/commit/?id=879a6b7b628060a85a0f1787aa30ab6efbf1e0c1 commit 879a6b7b628060a85a0f1787aa30ab6efbf1e0c1 Author: Stefan Eßer AuthorDate: 2022-04-18 14:44:30 +0000 Commit: Stefan Eßer CommitDate: 2022-04-18 14:44:30 +0000 bin/df: add back linking with getmntops.c from sbin/mount A last minute clean-up of the Makefile erroneously removed the definitions required to link against sbin/mount/getmntops.c which defines the iovec handling functions used for the unmounted device case (that has been removed from -CURRENT and 13-STABLE). Put back the definitions to make the build with MOUNT_CHAR_DEVS defined succeed. --- bin/df/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/df/Makefile b/bin/df/Makefile index bf1c72b884ac..b8e0ffc8c263 100644 --- a/bin/df/Makefile +++ b/bin/df/Makefile @@ -3,12 +3,14 @@ PACKAGE=runtime MOUNT= ${.CURDIR}/../../sbin/mount +.PATH: ${MOUNT} PROG= df SRCS= df.c CFLAGS+= -I${MOUNT} CFLAGS+= -DMOUNT_CHAR_DEVS +SRCS+= getmntopts.c LIBADD= xo util