From nobody Fri Sep 5 05:52:12 2025 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 4cJ58Y16HHz677k1; Fri, 05 Sep 2025 05:52:13 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJ58Y0YSsz3ndR; Fri, 05 Sep 2025 05:52:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757051533; 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=ycYaa8XhcmrExr10JswDhMkLlEKOGOC+ubWdfJh72nA=; b=IgykUaFq8ryrvZ+mm9wZe5c9JsCJRW649Zi1Qp71egdkrLm65G0pa9ONKK7LaSy1UTtaE6 RfnTZ1jkujZIL3cJ7ZbGscgSCdEJLKMP3XBzubbz66nPLKjSu+4Af7boNGH/6r5vCfWp7K /S7FqD34LE6rdqGMusipnGE2LN8sf0ehEXalhhXlnRzBlIxQq+AMOESXtYhe6MMv0JD7am FqTNVx7ezOdl7OTYsxy5qh6l11rgbMjavYA1tD+xVqbT7uQBXqg3Po9KE9w6vxQC5ThdXc t82GFkeK6yud8RpOsv7DuMyJ/5Tc1L1pTBZ2XCW2VljNj7QL02aLwGG/N5E2RQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757051533; 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=ycYaa8XhcmrExr10JswDhMkLlEKOGOC+ubWdfJh72nA=; b=UWXdmMd3P71LDZ64DO451e7xLpmnbeIVOWhSBduG9gma25rz2+HEJhDLkKyOfYPvBMD8tu 9w7gaBECMnTUjjgkQ83iJR+pp1LpLpbfj1kpynv5Mh5pz3x+XrvC4YOYAxSx3jj2MihqZJ ROkJ3Dp9tTBcyvD3O0KIMMYWC4bP95R+JGaboVZQ8M/zHMr6Fs7JfWcos2FKetOYhjl38u 5HzEaeMzFhZ8gXkI7SHIsdgisJ79jlwuQP1uA8uKVIoy3zv3D3c7TSWWiAw2Yv5/i//icZ Sxs0rLxjS7+9pqPc4WKu1sawmaxxnYXrjoAmNehWZx7DOR/bt6bIlnfgvd71mA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757051533; a=rsa-sha256; cv=none; b=Shl6+D/Zyy4ErJBzjTY6/bhfAIO36HrtxgufnpnqpHUF7zM4qpYLefO55cjkleMJmbmFMV 36aq/0BnPNJbVF53FgOVlIKJAT5Xky5/cL0ZxGBXcYBsWt09+P7TOVJXLWkD5HoPq9nTVU uKt8Hr/GjFppi+Rp6wsL2EP49n2vFEQb67+Vjvfhn+HsU4kLt7TBhvDXgJccZ/I25cqURZ JSyD0jxho6IS0459bw9AFoE08zFfaFH+bhWSHOWkyLJ5n9bajjR+TQqV8kzRAhqAL9zBHo yO8UKRQvahXMWxbiyHPM+CnZpYCdS24TnimG16Pp84XoHdm7ZA+3ppbjs1eQVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cJ58X723LzcTY; Fri, 05 Sep 2025 05:52:12 +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 5855qCdB049789; Fri, 5 Sep 2025 05:52:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5855qCYt049786; Fri, 5 Sep 2025 05:52:12 GMT (envelope-from git) Date: Fri, 5 Sep 2025 05:52:12 GMT Message-Id: <202509050552.5855qCYt049786@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: f20d12595718 - main - devd: Remove gross hack 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f20d12595718c56a718d34e1e42cd34a3317121d Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f20d12595718c56a718d34e1e42cd34a3317121d commit f20d12595718c56a718d34e1e42cd34a3317121d Author: Warner Losh AuthorDate: 2025-09-05 04:39:43 +0000 Commit: Warner Losh CommitDate: 2025-09-05 05:52:03 +0000 devd: Remove gross hack Remove hack from FreeBSD 14 that mapped kern->kernel for name. Fixes: 8b4e4c273730 MFC: Never Sponsored by: Netflix --- sbin/devd/devd.cc | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/sbin/devd/devd.cc b/sbin/devd/devd.cc index 1ff405244cde..ee38fbb2ccee 100644 --- a/sbin/devd/devd.cc +++ b/sbin/devd/devd.cc @@ -1208,27 +1208,6 @@ new_action(const char *cmd) eps * new_match(const char *var, const char *re) { - /* - * In FreeBSD 14, we changed the system=kern to system=kernel for the - * resume message to match all the other 'kernel' messages. Generate a - * warning for the life of 14.x that we've 'fixed' the file on the fly, - * but make it a fatal error in 15.x and newer. - */ - if (strcmp(var, "kern") == 0) { -#if __FreeBSD_version < 1500000 - devdlog(LOG_WARNING, - "Changing deprecated system='kern' to new name 'kernel' in %s line %d.", - curr_cf, lineno); - free(const_cast(var)); - var = strdup("kernel"); -#elif __FreeBSD_version < 1600000 - errx(1, "Encountered deprecated system=\"kern\" rule in %s line %d", - curr_cf, lineno); -#else -#error "Remove this gross hack" -#endif - } - eps *e = new match(cfg, var, re); free(const_cast(var)); free(const_cast(re));