Date: Sun, 6 Aug 2023 20:29:59 GMT From: Marius Strobl <marius@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 9ec7a595ed2c - main - mergemaster(8): Remove support for sparc64 Message-ID: <202308062029.376KTxGw025851@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=9ec7a595ed2c7631ef916d9f5818ccd5c5d327c8 commit 9ec7a595ed2c7631ef916d9f5818ccd5c5d327c8 Author: Marius Strobl <marius@FreeBSD.org> AuthorDate: 2023-08-06 20:07:29 +0000 Commit: Marius Strobl <marius@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308062029.376KTxGw025851>