From nobody Tue Aug 27 18:39:02 2024 X-Original-To: dev-commits-src-main@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 4Wtbsz17YYz52cWc; Tue, 27 Aug 2024 18:39:03 +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 4Wtbsz0V60z4gsS; Tue, 27 Aug 2024 18:39:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724783943; 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=FpbAtf2uh7vyXNObJA1skAKFNUuRfZC8BtmqbFv3ZCk=; b=eJu22u579A/VEbToQ9msgKX4egJWCZIkfULIBtRSgqdcAs1GkwHxT7v0a8e6jnFZpunHUi knpsrsZBSXhl12GnjEf12LGMhfJHfyhQk8kioUDxH5UpZIyq6OgqupX5ck6qvqZwE1LURH df1jyYUipxhuduYSZmFebCW0Yo7TtQpgR2NSwxumf8oPg8sMKmMJNbopwI10G48TfDuXK8 C7FvNQtQtEJToh5EjiWOq0Mo8NkFZEMD8I7vbyPsvX9ualkiiCMSIS9hD1Uf8LqKCD4f6p iL8nubWmoMJX+WOcr6GxWBc2BskPqEsyL4o3hN6zUWQPS5keoXK7hTRF9tP7lA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724783943; a=rsa-sha256; cv=none; b=P7vrM+Uir/jfcncH711DADRGo83wU4wf5DZfeIsB9r5Gazy3eHQKc8NR3ZH1OqI9BWdHfn QHsvYnnuQFpFFs57hTmbNaEnlXg0p9/L9yjc+bgdENezB8g107lYLb08oSaZWkW0Q4zIyt 0dMXSGHHrcN+9df9D7emvk7yq7jBmGfUiQhGwxMsT52saluFmwSpu81o3JSBjxNp8zAVTc q859OjYa6jl6le5hv9SQlyut4tkbNrp6vXOXMJadD52Sz6ZbldAibOrWUFnyodwzWFeE0c 1JOEp2OtgIV75Yn3AtqgnNqP+AfGwXaDWzv9TK2Zc4/dlKdsxbBLZegV1dqVNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724783943; 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=FpbAtf2uh7vyXNObJA1skAKFNUuRfZC8BtmqbFv3ZCk=; b=YIenJUN6ad6UC8A2dbReh9wx2+FEBwBkbCdUUIVZS0Q0xF0XcEgz/fe917b4mPqTzHdkeH 26E3gnYM3b8+wr21lA3Rtl17M1leXbVy5Yz1CcqXdFh6JxHMECfQNTViV/URQN8aDEYe46 TkfTCbxLwf4JBt0J1T8NDzqaMlksJPYS3RtYFvpUBKMIH9dPX6FIuSviAQ6XHA1vt5QC6R ZQNZJhtsfQGPvqWHwyXQWoAvUc3ve3N2SGxqqXvsVPDJKelRV2/+Td5y2rZl0x5rPLXc32 2aKxl4koZhOkZLzI31U2oPCBUFf/whDHpnsqh1m/uL7pF+7+rY+wzcVKMDiDXg== 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 4Wtbsy71pPz11BK; Tue, 27 Aug 2024 18:39:02 +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 47RId2GH044812; Tue, 27 Aug 2024 18:39:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47RId2HG044809; Tue, 27 Aug 2024 18:39:02 GMT (envelope-from git) Date: Tue, 27 Aug 2024 18:39:02 GMT Message-Id: <202408271839.47RId2HG044809@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 499c337781bf - main - tools/sdiodevs2h.awk: fix after removal of $FreeBSD$ List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 499c337781bf8df7f97f612b93427b3f53dfd8bb Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=499c337781bf8df7f97f612b93427b3f53dfd8bb commit 499c337781bf8df7f97f612b93427b3f53dfd8bb Author: Bjoern A. Zeeb AuthorDate: 2024-08-27 18:33:14 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-08-27 18:33:14 +0000 tools/sdiodevs2h.awk: fix after removal of $FreeBSD$ The input file used to have a $FreeBSD$ tag on the first line and we recorded that in the generated files to know which versions they were based on. With the removal of $FreeBSD$ the logic was not quite correct anymore; fix that to generate proper header files again. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D46300 --- sys/tools/sdiodevs2h.awk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/tools/sdiodevs2h.awk b/sys/tools/sdiodevs2h.awk index 1cddd6c1f5d0..818bdef58762 100644 --- a/sys/tools/sdiodevs2h.awk +++ b/sys/tools/sdiodevs2h.awk @@ -44,9 +44,6 @@ function header(file) printf("/*\n") > file printf(" * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.\n") \ > file - printf(" *\n") > file - printf(" * generated from:\n") > file - printf(" *\t%s\n", VERSION) > file printf(" */\n") > file } @@ -233,13 +230,10 @@ line=0; while ((getline < srcfile) > 0) { line++; if (line == 1) { - VERSION = $0 - gsub("\\$", "", VERSION) if (dfile) header(dfile) if (hfile) header(hfile) - continue; } if ($1 == "vendor") { vendor(hfile)