From nobody Sat Jan 06 19:25:26 2024 X-Original-To: dev-commits-src-all@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 4T6qzW0BKpz5718V; Sat, 6 Jan 2024 19:25:27 +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 4T6qzV64k3z3wb2; Sat, 6 Jan 2024 19:25:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704569126; 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=npmYXiJ9/D+33o/KQ1/Z92kgmAu3HmfkWXtZUV1L4l0=; b=OoYT/6SOGUQg+tf7RF651B67zyezRmcgxdRs2Ppy1zp0WtPzSWWvVpqFPQiyZv8ZbBLrwg tbVIciD+398HzUU4oZ8OXLAnoojnpauWPQ7gHduAtFANn4ffbQfg7WQzdaMZ1djFolwQt6 DIgUriXY79x+tKoTmG1l6s97zgxGTV8l/I0/aqm/NSryTrhpw8qSCCVypJtDAE6fIC5IfV OL3xyfv3OnV/qwu4cU+N3EGAog4n/DKT70GbR7LXvoLwb9gAYlKtVjWolrsQG+htdQCRDL tTGImQJHP0rH7Y8q0BbHsujnlpcoxX7g3GjMTsSVaU4X7rafK5EhHSVlrNL7rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704569126; 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=npmYXiJ9/D+33o/KQ1/Z92kgmAu3HmfkWXtZUV1L4l0=; b=QfLANkZ9huLypHIILXFCjRk8Rke2Bvk3+eJZ17O+BddW7YeD2SS8jftqxw/7DrTII4zkek dWyajlBTT/z/Znj0VHFt8/6vLGzWewnz04+CC11QQZoc9xUqH7PlBYlXCSTriZrcuZ13BI pE+UpFlgtWZSRb28DNqG20FMtRQnN55aLHIZCIm/tzctnHwYX1nHGWQPzs/CFLnfFjMEIm xQciy0HN3r4oFjDnRiS8i1G7cDSkHeofYd/aALVIivae5NeWcOhZMivocyF7KJ6/+xbFQy bD6E9cnG3tBOoNdovZ/Z0Uy1f458tlvudMBzH4SbN6O/O3b1n2dtyae2RFxwiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704569126; a=rsa-sha256; cv=none; b=sWPc1OIEMAaWAcYR8mcYmL6kO0ix1wLNUZnXzm29wsJiD9ed68lgajP1feLKVU4R9vCKgQ aONbeiwKMZLB2S1Mq2BdF20gytHz6ZxGGgS4xGSW3kRt+w9jpp2ZzXp45eeFyk2pz5ahEq HZlantIy6cBN7hayjVR6FPrQ5i+gZicmClok/11kv2FdGURKsQwKud6E1Ts2kIWYaZxfIz kJ9aLYTUvu4EPRso8WCXiLx5isMZ0wXfYEVSn3us39sQS9N3s4D4KHcw8bw6pbjlYPeuuj 4eWotTS+tosE4EqKPXUPy+DrmqSpEYj+pFzVxt5xPof5k3zSCfWw7vW5qNOp3w== 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 4T6qzV5BWZztSv; Sat, 6 Jan 2024 19:25:26 +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 406JPQJC064947; Sat, 6 Jan 2024 19:25:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 406JPQfm064944; Sat, 6 Jan 2024 19:25:26 GMT (envelope-from git) Date: Sat, 6 Jan 2024 19:25:26 GMT Message-Id: <202401061925.406JPQfm064944@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marius Strobl Subject: git: f35b3d1171f6 - stable/13 - mergemaster(8): Remove support for sparc64 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f35b3d1171f69ae76b6c1dad7da547cc33006eb6 Auto-Submitted: auto-generated The branch stable/13 has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=f35b3d1171f69ae76b6c1dad7da547cc33006eb6 commit f35b3d1171f69ae76b6c1dad7da547cc33006eb6 Author: Marius Strobl AuthorDate: 2023-08-06 20:07:29 +0000 Commit: Marius Strobl CommitDate: 2024-01-05 21:58:23 +0000 mergemaster(8): Remove support for sparc64 (cherry picked from commit 9ec7a595ed2c7631ef916d9f5818ccd5c5d327c8) --- usr.sbin/mergemaster/mergemaster.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index b22affc4c343..9220cfd38b47 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -780,7 +780,7 @@ CONFIRMED_UMASK=${NEW_UMASK:-0022} # Warn users who still have old rc files # for file in atm devfs diskless1 diskless2 network network6 pccard \ - serial syscons sysctl alpha amd64 i386 sparc64; do + serial syscons sysctl alpha amd64 i386; do if [ -f "${DESTDIR}/etc/rc.${file}" ]; then OLD_RC_PRESENT=1 break @@ -806,7 +806,7 @@ case "${OLD_RC_PRESENT}" in *) mkdir -p /var/tmp/mergemaster/old_rc for file in atm devfs diskless1 diskless2 network network6 pccard \ - serial syscons sysctl alpha amd64 i386 sparc64; do + serial syscons sysctl alpha amd64 i386; do if [ -f "${DESTDIR}/etc/rc.${file}" ]; then mv ${DESTDIR}/etc/rc.${file} /var/tmp/mergemaster/old_rc/ fi