From nobody Sun Aug 06 20:29:59 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 4RJrfb4f8Rz4mMpR; Sun, 6 Aug 2023 20:29:59 +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 4RJrfb44GHz4XsP; Sun, 6 Aug 2023 20:29:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691353799; 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=jodfHncsINWXkntFBqZOL19AEKr/b4cwzjvDsfsX7aI=; b=l+iixkoD2oEugPY7JjJFSzpj/vgukPcu5dxU81Z3SKY3qAL6BEk0fZJLQ+oWVqQ09JbAkp /yP3t89P+sG0XgiEKYEGXSYvfwfsGDM5jDMFrnrw918ok4iiL+hhuTvVdA22wZljpM54I0 jrzns5oVn8rq9mClbFhFersb2wi6D/zQf16SP9GGB7yf2No+K34UV/hFTsi97rpcKzlR5l Gb06QPQfcautGI6m25btv1SAMLWLNIOtJjIB7WR6CNgPNuGMm7fdq5MrghntoZuhcGa/Mk hseRJsk8/Y2GHwyKsZqf2FL3R0GGDMaKdVrstx+QnzQw1Hwae2cUDmZluKB1PA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691353799; 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=jodfHncsINWXkntFBqZOL19AEKr/b4cwzjvDsfsX7aI=; b=ncqtzg8bOsoo27RWvooFVz1RI5WvuPvEkhfveocaaEQV3lBnfPo6rfZlR2hvyxiJTDIdbD YUji5/c03LT8YwuLZE+oWQz0fD3BDNeXVD2N7PeevI97LLGnNl8oiqtunqAPHUqICkIrxI DJjyX9Xv3FR9T3mFwF5IfswLRzLJ6+VNfFCbSgjFqdh3Ijp8B5fM+4ajA/tpSoebn/QPlV 2Y/rBvFWA4BBqJVVRik+0Jl2Nla25O5Z8gPiS8tCej00lEC36hyMCgfcWNoVC04tzoaTqM YI4yi1iG90BFEmhC54vJdMaXgdR9RHZg0Nm0dY1C4smh7ewaoEmxNBEcUF8z+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691353799; a=rsa-sha256; cv=none; b=WR/eCMP8mvEIOpArDFFNRG1/GUBSn9AR9SE+D/8mdlsFAJIoaMYcpV0QE5q78QHpbkI0Bs hdrAP26aB+h9KBTmkFDM+cROrfFJAoWUO9N9jte8qckXCI7tBfwdAqBNifXZ09UAQV9WEH gyj4PVlPqOE77ao8TZaTYViQuPtKixpdLAWYIGyBK5zWu277PZ8eJiGCMvZtfQtTxBRhvq 1HA+7xdQmrRDmo8f2LY9IiPta0dTs5BVGwUNl7+DKoM/Szr5h84F8WGEmCnFolzXcj393P +3RdjeVrtdJnM5NeElovxG564DXeWmUTTG8fJap+A1BFkI58VkRBC5btkVctNQ== 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 4RJrfb36wKz8nq; Sun, 6 Aug 2023 20:29:59 +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 376KTxjh025852; Sun, 6 Aug 2023 20:29:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 376KTxGw025851; Sun, 6 Aug 2023 20:29:59 GMT (envelope-from git) Date: Sun, 6 Aug 2023 20:29:59 GMT Message-Id: <202308062029.376KTxGw025851@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Marius Strobl Subject: git: 9ec7a595ed2c - main - mergemaster(8): Remove support for sparc64 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: marius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9ec7a595ed2c7631ef916d9f5818ccd5c5d327c8 Auto-Submitted: auto-generated The branch main has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=9ec7a595ed2c7631ef916d9f5818ccd5c5d327c8 commit 9ec7a595ed2c7631ef916d9f5818ccd5c5d327c8 Author: Marius Strobl AuthorDate: 2023-08-06 20:07:29 +0000 Commit: Marius Strobl CommitDate: 2023-08-06 20:28:46 +0000 mergemaster(8): Remove support for sparc64 --- 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 edbf07d743ee..82a48b090d2e 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -782,7 +782,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 @@ -808,7 +808,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