From nobody Mon Dec 8 03:16:53 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 4dPnFx3rLdz6Jp6G for ; Mon, 08 Dec 2025 03:16:53 +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 4dPnFx3FL7z3gFx for ; Mon, 08 Dec 2025 03:16:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765163813; 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=wf47KDcoI6K827YRDggGlUmTEmC3PxeERQrofqXAB44=; b=tY52vtJI2xTFE/SGILOCjP65cghfQVVg4ftoEeUUkvrUymGYn7RpjKienjVuHnuTNfjfSa QKqUcTMwvQDE01tAZNVPQQfhwG2DdWmqjjuFaqItGo4H2wsndvvhrMBa3QJsmbR6FE8u+v La880uycPdhHuqs0C0veFdFikUrrfMmIkGjOnC0zcYb4uJt1ZjMnzj5efCteFqlbWIAtfA om+SBv+WF3sOtFiGzxc8IuKu2QtcUrmHTHVSWDc7S6E7TvOStxu3E8F128X58/XylL5oRC stQJ0f/Vqx5k5wHj5fxJWiNw3TWk9IxDUBLM1Zk1GF6bZV6SYHBEoy7dDmckpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765163813; 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=wf47KDcoI6K827YRDggGlUmTEmC3PxeERQrofqXAB44=; b=Fx8PGoqIg/BTYAKKpp02xsWu1W2K64XPlbgCZKnczSeBogKpn3SEj1hbLb8GKzubCRjo/X cHjV2fTcI7CU1bPVOe24+qX6ExNkUtL4fo95wK2b2E0o5oevk46ygr6OPLicY/QX4aJK/S vLPL7HlIBmmopv7c6CSCtS1gf92a2EAawyzG3gAZ6ncvYwKRF9tYWn8uccdX0EDp+QKVyC zzY7YcB6mDyIq+XCHlQiBU6JIg+VXSsbzkHuYeOIYrxXenjidRsMUGTcRN001uNg2lI5Hm LuIQlJLtD4R/LwurnRieNhT1ZnnqmYuDqxEmvF1yq/TtZPkJ2OJ8yXOfSJTEpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765163813; a=rsa-sha256; cv=none; b=D95wM3sdS3R6uRWxOWP8kWkYozr6gBMMMVAoIh2IS+ozvx33kjgucf9VqayR1x80kAcJQY xUtFMco7PRaeD/rk2CjKdvCLZ2EBqhnmel9b5ly3ls5hsKoF57drwA1Zeln4+tcXAwBSZ5 Lc7BEir9S2/ltxAnPMcE6sEDXdmRkS2VpWTnRYpdpkGN6heLjr8rkUtuFpQI5tC8uWY/Kg kFKBdDa4LOmxqGi2DfSs5yhNXZsIVTAx4IcHltLj5wcUZdDPf1UkFKa/mQmIjGD4ijtfVI XM5AeiKbd2z6OI34QYkNgcoMasV4TRe7QwBNNYZ0CnEJ2pyTN9Kw3s9fe/W9AQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dPnFx22gWz19Ss for ; Mon, 08 Dec 2025 03:16:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 327fe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 08 Dec 2025 03:16:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: f0ea85922984 - main - iwmfw(4): fix spelling of the iwm8000C firmware. 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: f0ea859229843affe07ac94db915489756f87096 Auto-Submitted: auto-generated Date: Mon, 08 Dec 2025 03:16:53 +0000 Message-Id: <69364325.327fe.12cdda67@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f0ea859229843affe07ac94db915489756f87096 commit f0ea859229843affe07ac94db915489756f87096 Author: Bjoern A. Zeeb AuthorDate: 2025-12-08 03:03:14 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-12-08 03:16:00 +0000 iwmfw(4): fix spelling of the iwm8000C firmware. When migrating the firmware to be installed as plain firmware files to /boot/firmware the iwm8000C firmware lost its "fw" suffix that iwm(4) expects. The follow-up change to defaults/loader.conf is also consistently missing the "fw". Fix both places, and add the wrongly spelt version to ObsoleteFiles.inc (entirely untested). PR: 291403 Reported by: Augustin Hoffmann (avgwst tutanota.de) Fixes: af0a81b6470aba4af4a24ae9804053722846ded4 Fixes: a0f06dfb0d188966bee7265ec7d9f20093186bb6 MFC after: 3 days --- ObsoleteFiles.inc | 3 +++ share/firmwares/iwm/Makefile | 2 +- stand/defaults/loader.conf | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 96af7d6205b5..1e7271c39385 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20251208: Rename iwm8000C to correct name. +OLD_FILES+=boot/firmware/iwm8000C + # 20251207: removed libuutil and libtpool OLD_LIBS+= lib/libuutil.so.2 OLD_LIBS+= lib/libtpool.so.2 diff --git a/share/firmwares/iwm/Makefile b/share/firmwares/iwm/Makefile index c44f401c315e..0a242513fa3d 100644 --- a/share/firmwares/iwm/Makefile +++ b/share/firmwares/iwm/Makefile @@ -41,7 +41,7 @@ iwm7265DMODE= 644 iwm7265DPACKAGE= firmware-iwm iwm8000C= ${SRCTOP}/sys/contrib/dev/iwm/iwm-8000C-22.fw -iwm8000CNAME= iwm8000C +iwm8000CNAME= iwm8000Cfw iwm8000CDIR= /boot/firmware iwm8000CMODE= 644 iwm8000CPACKAGE= firmware-iwm diff --git a/stand/defaults/loader.conf b/stand/defaults/loader.conf index 036479d22285..71fb052cd21b 100644 --- a/stand/defaults/loader.conf +++ b/stand/defaults/loader.conf @@ -195,5 +195,5 @@ iwm8265fw_type="firmware" iwm9260fw_type="firmware" iwm3168fw_type="firmware" iwm7265Dfw_type="firmware" -iwm8000C_type="firmware" +iwm8000Cfw_type="firmware" iwm9000fw_type="firmware"