Date: Sat, 6 Jan 2024 19:25:26 GMT From: Marius Strobl <marius@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: f35b3d1171f6 - stable/13 - mergemaster(8): Remove support for sparc64 Message-ID: <202401061925.406JPQfm064944@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=f35b3d1171f69ae76b6c1dad7da547cc33006eb6 commit f35b3d1171f69ae76b6c1dad7da547cc33006eb6 Author: Marius Strobl <marius@FreeBSD.org> AuthorDate: 2023-08-06 20:07:29 +0000 Commit: Marius Strobl <marius@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401061925.406JPQfm064944>