From nobody Wed Oct 9 23:13:43 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 4XP7x34GtHz5Z6kV; Wed, 09 Oct 2024 23:13:43 +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 4XP7x33js3z4jSX; Wed, 9 Oct 2024 23:13:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728515623; 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=wp8gHbtP3IeA/7GjB3DVnGOkdQuE46gdtHjSd/GTvbo=; b=QvkeTzdgePxXMEKPCwgEicCySBF/POYY32Pc+sjhV+kYSrn+1eep0moM2NHeaW9WCSDs0m ezQ8mjiF7I6xYXJaZ+ql88V9BZW5b34g/BP4+URGqScwyuJ9PZWJyANnI8GSB5gaxsVKGV dGUJALa5O5hHuYIDRJo4AQiK/pqZ9IcxzcYB1BXfUfKunGRrZHmsyPfqTUQqPIfjsyFDV2 9BXdZnbeer4U/a54e/BUIMq5Wa9N+an8wngO+9Qi03XfHUNz1AUH0QBTXFuHC1tZ1v1ABv fIY1H+CqcZ7uUbdLQIsTuFBU550WPoR4eOqQy81jkNAk/Kpb6VPJKGBpZpjHBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728515623; 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=wp8gHbtP3IeA/7GjB3DVnGOkdQuE46gdtHjSd/GTvbo=; b=WOpFEWFRU5dP0LaqYFqhdeiuGAFMyPKkQsfPmT/87XWx6xozAvtnJ6fluzN5t+NDaMHbbz +9oy23Xm04N5mBxCkh3JU6JFIPMsdYu75LtnT62xmrU7mYdTyDYu2onWj5UVILmVG5CTtd ZkUXD/vYQNDlaPl02uiI+lyXlVlaoIn3GyTPI6xVt1dsJri+VTFZ8zRKuRQVb6TiEYPI7b YQYnBA6Dd/euPyBVcKs46wEDMBjHGyOhSfSA97NKVYPlCjjWwQ7r9NwTRTMKvBGwu3gag7 zpo21WqASHlKilGn8dICSvMT+u0Uh+5/ZYmXQJvNPhw2oSY/2KIpZ9fOaLugog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728515623; a=rsa-sha256; cv=none; b=gNWAUaajqWGW12I+olttkTnywn46cPhbKRh37lu82gnZjsBFeyBeqtCHhNj4ycnrCxesi+ 3nrwQVEUBBYtR/ph9NVUT/hmwq0vxKStMHMY2Hi/VJi12tpP6VsrCnhFtDiUhIwQet0TGo E3ooldI1TZ1Bpq97XcvDcHM9PrDcPF69Lk/zs7eN34nJmcRXhtDb0KzS9KyeuWL2eI4EBD 1LZ8dJH36sGZm8ooxSDM5rA+0jqvdjSqoYu/n2lXCj9yYDI5jbM96O2y5MeGBPRoBUIrda uQWsi97WVoeons1nJVDrb9VqIPoG0pQ44tLDsoMWkNuHWphk+RSPQ4Xl6TWfhA== 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 4XP7x33JtpzZJX; Wed, 9 Oct 2024 23:13:43 +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 499NDhU1044648; Wed, 9 Oct 2024 23:13:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 499NDhOt044644; Wed, 9 Oct 2024 23:13:43 GMT (envelope-from git) Date: Wed, 9 Oct 2024 23:13:43 GMT Message-Id: <202410092313.499NDhOt044644@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 87b32aa4d409 - stable/14 - tools/sdiodevs2h.awk: fix after removal of $FreeBSD$ 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 87b32aa4d40974d1fc87a21ed457b067b95d248c Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=87b32aa4d40974d1fc87a21ed457b067b95d248c commit 87b32aa4d40974d1fc87a21ed457b067b95d248c Author: Bjoern A. Zeeb AuthorDate: 2024-08-27 18:33:14 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-10-09 19:18:20 +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 Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D46300 (cherry picked from commit 499c337781bf8df7f97f612b93427b3f53dfd8bb) --- 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)