From nobody Sun Nov 5 01:55:02 2023 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 4SNHc649qhz4yGHn; Sun, 5 Nov 2023 01:55:02 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SNHc63M23z3fT4; Sun, 5 Nov 2023 01:55:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699149302; 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=hnFllxxz+sJsJRO7YNVUClYsWCSBFXmZP7Ww5OS+wzc=; b=p5Jnge+W873g6viMIhvT8hJmxxlXWFHyTRCkOZUjvDYsSbNsogeeDFgClrZ4PDoWdlv4Vx G2Yw+1vppueMoxgBJVjB9qRgK3/LkgTS/MLQI+Fw+R94jepq3z+IHsyySnCBI8LQqt4Llr 1n2+LyvSTwTmoeQ/xtKAQjTy+uJ4asfJY3O3GaUx67YL5sofsO5bza5WvZm0Mt0EpNAzH6 Dn561XGCWCT33tBJC+wGvMnsYAUN4w7OwZVMMHvGuk8anbZDx/2OP3FCHOfZSzVZEQwOcb yyfkH5anzTuiJu+JfZrz7rDiqdz0WJ9D403fTB1Dzqlzb+70D6EHgjIvL/rA9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699149302; 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=hnFllxxz+sJsJRO7YNVUClYsWCSBFXmZP7Ww5OS+wzc=; b=aNFZqvIsGuflZSpNodqDvED/dJZwaSGaPkP5mG0gKP9D9tac8Fl5JAmmaa7pNiBjPo1N13 Dsq9OgIEm1shTDnEzt5ZD1wgRHbOaUlJLVbmua0Iq707m3s02nI6gVFj0G/VrpRda1WTuY zqe/nphO8otGS94YDAkRnwSWW/q8tIPoqPbVw1boiOXlMJbXnUFUpICPrCAYJDyFfZf4gJ sBwSpqRnn9f/ysELCyjedph3BXtcr5s8GYFwXLSw2flUh7vxEZblEDHkRCV3OMdoSdKl9P jF6Bspa9LqvEbHeRm1nLruPP/b00jFHhbZhuBDBisCE60fUzPRkG2k7wAFMV8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699149302; a=rsa-sha256; cv=none; b=GFtAgpTN6p+VZqR3KYhrjlNnf3u+zS4AYI03y0QlEWFfbFmbr+oWqTwPn8Zp6GbP3TYKtL MbDYukRnthOfijBbOCFEM9gYovFdJz+rGqZezJOkmsB/95LQbIlpAEJLLSw8ec5ErAivbW ddgsPVibUh109BZ0bTN4gnBc7bZLKsN4DSNsM4CfZWgAqlT3PBs9VbMpon5AKzTxFWAcoQ LND7hY0zyRqPMvvGIbSKzC9bpWvMAQ2SZOAltKHaq5zu4kMHt9VmrP8F739C7EAKYdi8Jg tdputvGPszLukixH0Vcl+Poyjrsf3e+BuIIGIeLFc7IYWlghPgWOt6vvA76HIw== 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 4SNHc62JJfz1KsJ; Sun, 5 Nov 2023 01:55:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A51t20v069959; Sun, 5 Nov 2023 01:55:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A51t22J069956; Sun, 5 Nov 2023 01:55:02 GMT (envelope-from git) Date: Sun, 5 Nov 2023 01:55:02 GMT Message-Id: <202311050155.3A51t22J069956@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 13a974574670 - main - crashinfo: remove unused /usr/bin/gdb support 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 13a974574670cc85a7db60bae6620631ad756f2a Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=13a974574670cc85a7db60bae6620631ad756f2a commit 13a974574670cc85a7db60bae6620631ad756f2a Author: Ed Maste AuthorDate: 2022-03-08 14:32:24 +0000 Commit: Ed Maste CommitDate: 2023-11-05 01:45:15 +0000 crashinfo: remove unused /usr/bin/gdb support We have not had gdb 6.1 in the base system for some time; there is no need to check for it. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D34478 --- usr.sbin/crashinfo/crashinfo.sh | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/usr.sbin/crashinfo/crashinfo.sh b/usr.sbin/crashinfo/crashinfo.sh index 8a6981ba883c..0482d41804f2 100755 --- a/usr.sbin/crashinfo/crashinfo.sh +++ b/usr.sbin/crashinfo/crashinfo.sh @@ -44,19 +44,6 @@ cleanup() [ -e $VMCORE ] && rm -f $VMCORE } -# Find a gdb binary to use and save the value in GDB. -find_gdb() -{ - local binary - - for binary in /usr/local/bin/gdb /usr/libexec/gdb; do - if [ -x ${binary} ]; then - GDB=${binary} - return - fi - done -} - # Run a single gdb command against a kernel file in batch mode. # The kernel file is specified as the first argument and the command # is given in the remaining arguments. @@ -66,11 +53,7 @@ gdb_command() k=$1 ; shift - if [ ${GDB} = /usr/local/bin/gdb ]; then - ${GDB} -batch -ex "$@" $k - else - echo -e "$@" | ${GDB} -x /dev/stdin -batch $k - fi + ${GDB} -batch -ex "$@" $k } find_kernel() @@ -173,8 +156,8 @@ if $BATCH; then exec > $FILE 2>&1 fi -find_gdb -if [ -z "$GDB" ]; then +GDB=/usr/local/bin/gdb +if [ ! -x "$GDB" ]; then echo "Unable to find a kernel debugger." echo "Please install the devel/gdb port or gdb package." exit 1