Re: pkg/59686: sysupgrade picks wrong sets filetype for some architectures (sparc64, evbarm-aarch64)

["Steve Rikli via gnats" <gnats-admin%NetBSD.org@localhost>]

The following reply was made to PR pkg/59686; it has been noted by GNATS.

From: Steve Rikli <sr%genyosha.net@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc: 
Subject: Re: pkg/59686: sysupgrade picks wrong sets filetype for some
 architectures (sparc64, evbarm-aarch64)
Date: Fri, 24 Jul 2026 13:42:53 -0700

 I don't know if this is the entirely proper way to submit diffs for
 pkgsrc files, hopefully it is at least a bit helpful towards a fix.
 
 PR pkg/59686: use correct ARCHIVE_EXTENSION for sparc64, evbarm-aarch64
 
 changes:
 1. remove override to ARCHIVE_EXTENSION for sparc64; the default tgz file
    extension matches the current default builds
    
 2. add override to ARCHIVE_EXTENSION for evbarm-aarch64 to tar.xz which
    matches the current default builds
 ----
 
 Index: patch-sysupgrade.sh
 ===================================================================
 RCS file: /cvsroot/pkgsrc/sysutils/sysupgrade/patches/patch-sysupgrade.sh,v
 retrieving revision 1.8
 diff -u -r1.8 patch-sysupgrade.sh
 --- patch-sysupgrade.sh	15 Apr 2022 09:10:56 -0000	1.8
 +++ patch-sysupgrade.sh	24 Jul 2026 20:14:42 -0000
 @@ -4,6 +4,8 @@
  * Add ARCHIVE_EXTENSION variable (Fix PR pkg/53697)
  * Use direct paths to etcupdate and postinstall
    (protect against user misconfiguration).
 +* Don't overide default tgz extension for sparc64 (PR pkg/59686)
 +* Use tar.xz for evbarm-aarch64 to match default builds (PR pkg/59686)
  
  --- sysupgrade.sh.orig	2013-07-28 21:27:57.000000000 +0000
  +++ sysupgrade.sh
 @@ -21,7 +23,7 @@
       shtk_config_set ETCUPDATE "yes"
       shtk_config_set KERNEL "AUTO"
       shtk_config_set SETS "AUTO"
 -+    if [ "$(uname -p)" = 'x86_64' ] || [ "$(uname -p)" = 'sparc64' ]; then
 ++    if [ "$(uname -p)" = 'x86_64' ] || [ "$(uname -m)-$(uname -p)" = 'evbarm-aarch64' ]; then
  +        shtk_config_set ARCHIVE_EXTENSION "tar.xz"
  +    else
  +        shtk_config_set ARCHIVE_EXTENSION "tgz"