From nobody Thu Nov 14 01:53:53 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 4Xpjqj68qnz5ctZ3; Thu, 14 Nov 2024 01:53: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xpjqj30hXz44rY; Thu, 14 Nov 2024 01:53:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731549233; 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=wfnO1MWX5hkg9VvJXhmshYKHQAzN37tCZrDvQf59rEM=; b=v4np3c4IdFORJH34D67COYXFdEHbES8q93p70qFnLFAXAGqVQL/Y9M1EBNtsiXHe8sfkzg 632rI+eWVGQb3W+Y5hAzjCoXIo507o3LOAMmSeCu9K5eese9bB+tKA4zEfwHp4DT9lnWi4 aqaZhGGcEGEuxA6EaFkep472bvCC//0BWRE+NC9LsExYOsI2mCMY0bF3Grxfzi+caVCz0I Ssfj4UipbSndop9LQ6aRZFZfu0KGJ3WRIxDmImjJT2xHiJKv8TH773wGBzC3ZJZnxCeMPu 9E5xTW0VfZZ5fUwfwVYlcwy6BPEFCr0s54DcWYyJldCyefSvuBACEc+IMpuquQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731549233; 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=wfnO1MWX5hkg9VvJXhmshYKHQAzN37tCZrDvQf59rEM=; b=haqQdYk/uQ8sAxn0UNrW/K6C9FoZ6zaC55MIZ7p7edG+CBYDDxFthXugrB2w6ovxL1+gIJ AfZ98DrB0FqmGvY/q9JPDOEEQg4nS9Q83UCweRrFsSLeIe8MkmsiEa8nkcJhHUhDumz19Y UCuKvBCcfNHK83FzKCGxH/2HwJ8YpiGTk5xtrAGNXiYgJZjX1eaLac2bK7zKG/nG603c8F Q5X2MyFonqZ1j6E/zjDx9isRf8w3uQ19KxGWpT2sqQF5d3M28Qq69ge4ueqn02reXW70W+ YPCVWGFzELF1Vz5F6E+mr8522zabtSA4aSh0zN1BHqyeG9nQasSsVHMN1lY6sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731549233; a=rsa-sha256; cv=none; b=rQi241942ZZm/LDfJpmElF7mODawVWzXVfbKkvizzq1hTA8klheczpOjZ3Bpa3JNS42m9F 9ITo/lO89CSdgXgzSSiqvkIEXo/HoGjouoCRkXIKar6WwKf2zy9eS7T9brUt7eU4VgV/OT Xl6bVTlKQsaiMCGi+swLUcxv/PmD6BxO7O0irsrOUmS9Foo2v9YdycnzkcpWRt1VJTovnS DjSyHCotWWLJrGhY1hJwWMWTs5ZFf48OA8NoMdgfMZRyntsLkgko8M48b0AG+b8sKFnHaU DrhLsoFQD9yPb6GgyJ2BA6Pd/jwF0GhFEfSx1/HjzyNbgjElUDvf/auwnDZnLg== 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 4Xpjqj2HrgzK00; Thu, 14 Nov 2024 01:53:53 +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 4AE1rr6A055077; Thu, 14 Nov 2024 01:53:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AE1rrsO055074; Thu, 14 Nov 2024 01:53:53 GMT (envelope-from git) Date: Thu, 14 Nov 2024 01:53:53 GMT Message-Id: <202411140153.4AE1rrsO055074@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: 814a49d65ace - stable/14 - fwget: add -q for quiet output 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: 814a49d65ace83b7a955cca32ff243f4abe7cd50 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=814a49d65ace83b7a955cca32ff243f4abe7cd50 commit 814a49d65ace83b7a955cca32ff243f4abe7cd50 Author: Bjoern A. Zeeb AuthorDate: 2024-11-04 23:59:58 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-11-14 01:53:00 +0000 fwget: add -q for quiet output Introduce -q to quieten other output (unless -v is also given). pkg-install(8) currently has no option to allow skipping unavail packages but it will just fail. We would realy want to try to install as much firmware found as possible from the installer. Work around this by doing one firmware package at a time. For that it is highly helpful to be able to query (or possibly re-query) all outstanding fimrware packages. -q together with -n only shows each package to be installed one by line. Once https://github.com/freebsd/pkg/issues/2195 will be implemented we could undo this part of the change and future changes to the installer and use the new option for pkg-install(8) there. While here switch to getopts so -qn works and not just -q -n. Sponsored by: The FreeBSD Foundation Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D47445 (cherry picked from commit 1eb3f15c149b9a2e5b6f5e10aed454fc85945bbd) --- usr.sbin/fwget/fwget.sh | 48 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 15 deletions(-) diff --git a/usr.sbin/fwget/fwget.sh b/usr.sbin/fwget/fwget.sh old mode 100644 new mode 100755 index 154fb7dc92e1..3e2181e53b73 --- a/usr.sbin/fwget/fwget.sh +++ b/usr.sbin/fwget/fwget.sh @@ -38,7 +38,8 @@ Supported subsystems pci Options: - -n -- Do not install package, only print the results + -n -- Do not install packages, only print the results + -q -- Quiet mode. If used with -n only prints a package a line -v -- More verbose EOF exit 1 @@ -75,22 +76,27 @@ addpkg() } DRY_RUN=n +QUIET=n VERBOSE=n -while [ $# -gt 0 ]; do - case $1 in - -n) - DRY_RUN=y - ;; - -v) - VERBOSE=y - ;; - *) - subsystems="${subsystems} $1" - ;; +while getopts ":nqv" _arg; do + case ${_arg} in + n) + DRY_RUN=y + ;; + q) + QUIET=y + ;; + v) + VERBOSE=y + ;; + ?) + usage + ;; esac - shift done +shift $(($OPTIND - 1)) +subsystems="$@" # Default searching PCI subsystem if [ -z "${subsystems}" ]; then @@ -112,13 +118,25 @@ done case "${packages}" in ""|^[[:space:]]*$) - echo "No firmware packages to install." + if [ "${QUIET}" != "y" ]; then + echo "No firmware packages to install." + fi exit 0 ;; esac -echo "Needed firmware packages: '${packages}'" +if [ "${QUIET}" != "y" ]; then + echo "Needed firmware packages: '${packages}'" +fi if [ "${DRY_RUN}" = "y" ]; then + if [ "${QUIET}" = "y" ]; then + for pkg in ${packages}; do + case "${pkg}" in + ""|^[[:space:]]*$) continue ;; + esac + echo "${pkg}" + done + fi exit 0 fi