From nobody Wed Apr 20 14:56:33 2022 X-Original-To: dev-commits-ports-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 259D211E7927; Wed, 20 Apr 2022 14:56:34 +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 4Kk3fB0bcFz3kjk; Wed, 20 Apr 2022 14:56:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650466594; 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=Rb5nb1cQu4tlzSbJTw2dH2/Xu5sAe25HOg50mhYSjm8=; b=oqKnfdTvfkTqfqr1rMTtTtY+HONNVuD9KcuS71hy5+6EvbWWRy1pUEf41zCOIoLplAHhuE VAlAs7tax8dUDtLZeRCcAtZQzsk81VQd2CVsFOi4q2hWxJekxJVoPSUh8huWV5Up+XmXhU 7KDv2ag7CK/vqzT6YXeV7974U+2w5xjowCi05I4OZut0D14o6Ah9IOnFH17ub8UUX4IpcJ COX9xRGZueP53g+G3edUVGd1qGdtVh+ULBg348UDbFNiEg1xCdMrYqAWTR+oiATHO0h4ig rRHQ+0fH4IrD4to4rBWmzyerkkfR6ktS3H4sey5WWwlElNoIkaw2uj4GzgKm6g== 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 E85981619E; Wed, 20 Apr 2022 14:56:33 +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 23KEuXDD053296; Wed, 20 Apr 2022 14:56:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23KEuXMU053295; Wed, 20 Apr 2022 14:56:33 GMT (envelope-from git) Date: Wed, 20 Apr 2022 14:56:33 GMT Message-Id: <202204201456.23KEuXMU053295@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Renato Botelho Subject: git: 30dfe4eba542 - main - emulators/open-vm-tools: Fix build on current List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: garga X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 30dfe4eba542da9acfe9e6a6d738f1a24ec5a5b4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650466594; 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=Rb5nb1cQu4tlzSbJTw2dH2/Xu5sAe25HOg50mhYSjm8=; b=U1L7IsqcbtZgWB9qjphujpT41EEXZhck4b03FG0w9EthGgPpy6Od+N+uRXN+1V/f9otE0z EOKticMjN1gsdpMGiXEklqcd6+dhfvcIP1bGddf+C1Y3qaW8Yd7acUG568xntCS2cbzx85 7cH2HpUrf/ODc/H44D9vnqzTEyDlUcVIGZ9o9VNKx8NvGtqxeuw+2sRat/cWmfq2SVe9NY Ukn1Ze704hy6mMMYXSOKrEkorYO/QIIyzSjcQQe+wOAsDpUaDiRl4Vs/+eUGuY2Q4f20ms 9uTK1LrX6OTe141fU150DzAA5BVc7hFZCDM53IAnifacLxcWoOAb0z9ge7eBKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650466594; a=rsa-sha256; cv=none; b=Ct6p0Bi7AbnNwsa65lPwsqblwONj/q15Kwa4FGNyv8e9jevWba+pcdbaRxlN8+nz3YvZ6j 6UbvK/F0pGLYvrDzvdGLvQhjsM2V0U9ZniEbjX+XybbnA1NHT4zmmQiLj5a8Xd/K/v24zr k9MDY7fdojOSsbCFWNa7uO01NCQ/fZwMPLwg8dTrNVvwPBvmZYIZulp+I79/noY6KI9Irr kkEGWw+KLbfEeKED3+g5fyG2unVtVQEd5TmzW2ovICVlP7c+xBcprnuXExy7y8RMA9knPh mE8bXOi5HIbe+M2ZTnZsE6PRQbEVLhrG+MzeP5TnyJSgR/+8SX3lp/rQJ3Xc+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by garga: URL: https://cgit.FreeBSD.org/ports/commit/?id=30dfe4eba542da9acfe9e6a6d738f1a24ec5a5b4 commit 30dfe4eba542da9acfe9e6a6d738f1a24ec5a5b4 Author: Renato Botelho AuthorDate: 2022-04-20 14:54:12 +0000 Commit: Renato Botelho CommitDate: 2022-04-20 14:54:12 +0000 emulators/open-vm-tools: Fix build on current Since 8b83d7e0ee544, -Wunused-but-set-variable became a fatal error on CURRENT. Remove a couble of set-but-not-used variables and fix the build Sponsored by: Rubicon Communications, LLC ("Netgate") --- .../files/patch-modules_freebsd_vmblock_vfsops.c | 28 ++-------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_vfsops.c b/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_vfsops.c index 64629219c5fa..ba54239caecd 100644 --- a/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_vfsops.c +++ b/emulators/open-vm-tools/files/patch-modules_freebsd_vmblock_vfsops.c @@ -1,18 +1,6 @@ ---- modules/freebsd/vmblock/vfsops.c.orig 2021-09-24 04:19:18 UTC +--- modules/freebsd/vmblock/vfsops.c.orig 2022-03-04 21:01:24 UTC +++ modules/freebsd/vmblock/vfsops.c -@@ -124,6 +124,11 @@ VMBlockVFSMount(struct mount *mp, // IN: mount( - char *pathname; - int len, error = 0; - -+#if __FreeBSD_version >= 800087 -+ struct thread *td; -+ td = curthread; -+#endif -+ - VMBLOCKDEBUG("VMBlockVFSMount(mp = %p)\n", (void *)mp); - - /* -@@ -171,14 +176,22 @@ VMBlockVFSMount(struct mount *mp, // IN: mount( +@@ -171,14 +171,22 @@ VMBlockVFSMount(struct mount *mp, // IN: mount( * Find lower node and lock if not already locked. */ @@ -35,15 +23,3 @@ /* * Check multi VMBlock mount to avoid `lock against myself' panic. -@@ -276,6 +289,11 @@ VMBlockVFSUnmount(struct mount *mp, // IN: filesyst - void *mntdata; - int error; - int flags = 0, removed = 0; -+ -+#if __FreeBSD_version >= 800087 -+ struct thread *td; -+ td = curthread; -+#endif - - VMBLOCKDEBUG("VMBlockVFSUnmount: mp = %p\n", (void *)mp); -