[pkgsrc/trunk]: pkgsrc/sysutils/sysupgrade sysupgrade: Infer default archive ...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c4ca1dbd8773
branches:  trunk
changeset: 376997:c4ca1dbd8773
user:      nia <nia%pkgsrc.org@localhost>
date:      Fri Apr 15 09:10:56 2022 +0000

description:
sysupgrade: Infer default archive extension based on the CPU architecture.

diffstat:

 sysutils/sysupgrade/Makefile                           |   4 +-
 sysutils/sysupgrade/distinfo                           |   6 +-
 sysutils/sysupgrade/patches/patch-sysupgrade.conf.5.in |   4 +-
 sysutils/sysupgrade/patches/patch-sysupgrade.sh        |  30 ++++++++++-------
 4 files changed, 24 insertions(+), 20 deletions(-)

diffs (159 lines):

diff -r 063279582c2a -r c4ca1dbd8773 sysutils/sysupgrade/Makefile
--- a/sysutils/sysupgrade/Makefile      Fri Apr 15 08:07:25 2022 +0000
+++ b/sysutils/sysupgrade/Makefile      Fri Apr 15 09:10:56 2022 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2022/04/15 08:07:25 nia Exp $
+# $NetBSD: Makefile,v 1.20 2022/04/15 09:10:56 nia Exp $
 
 DISTNAME=      sysupgrade-1.5
-PKGREVISION=   9
+PKGREVISION=   10
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=jmmv/}
 MAINTAINER=    jmmv%NetBSD.org@localhost
diff -r 063279582c2a -r c4ca1dbd8773 sysutils/sysupgrade/distinfo
--- a/sysutils/sysupgrade/distinfo      Fri Apr 15 08:07:25 2022 +0000
+++ b/sysutils/sysupgrade/distinfo      Fri Apr 15 09:10:56 2022 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12 2022/04/15 08:07:25 nia Exp $
+$NetBSD: distinfo,v 1.13 2022/04/15 09:10:56 nia Exp $
 
 BLAKE2s (sysupgrade-1.5.tar.gz) = 5fb73e83c7b9b1a891ce0cfb26422f07822061e2df42db6a4e3692468d028186
 SHA512 (sysupgrade-1.5.tar.gz) = 47f37ce6802b8ba74d6edd19a2c80d46394c992b58d3077e6d1316e4f5505afbe53a68d28b28779a10a78d7be05f2f5b9d2a55b5b2f845bcc59a78950a8306f8
 Size (sysupgrade-1.5.tar.gz) = 75833 bytes
 SHA1 (patch-default.conf) = 2457714998c86994192ef57c5dd22646f76828c4
-SHA1 (patch-sysupgrade.conf.5.in) = dfe5d90d0360212ea052f2e25a26820ad277480b
-SHA1 (patch-sysupgrade.sh) = 47ec28af4527bb779f67ad92926be71c752ab091
+SHA1 (patch-sysupgrade.conf.5.in) = 2e1c0602fd58edb13abac98bf5db0b1e17360d20
+SHA1 (patch-sysupgrade.sh) = a20926d0012a0797aa6f8363661d1a94d14de126
diff -r 063279582c2a -r c4ca1dbd8773 sysutils/sysupgrade/patches/patch-sysupgrade.conf.5.in
--- a/sysutils/sysupgrade/patches/patch-sysupgrade.conf.5.in    Fri Apr 15 08:07:25 2022 +0000
+++ b/sysutils/sysupgrade/patches/patch-sysupgrade.conf.5.in    Fri Apr 15 09:10:56 2022 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-sysupgrade.conf.5.in,v 1.1 2019/06/03 20:35:55 triaxx Exp $
+$NetBSD: patch-sysupgrade.conf.5.in,v 1.2 2022/04/15 09:10:56 nia Exp $
 
 * Add variable for archive file extension
 
@@ -15,7 +15,7 @@
 +or
 +.Sq tar.xz .
 +.Pp
-+Default: tgz.
++Default: depends on CPU architecture.
  .El
  .Sh SEE ALSO
  .Xr sysupgrade 8
diff -r 063279582c2a -r c4ca1dbd8773 sysutils/sysupgrade/patches/patch-sysupgrade.sh
--- a/sysutils/sysupgrade/patches/patch-sysupgrade.sh   Fri Apr 15 08:07:25 2022 +0000
+++ b/sysutils/sysupgrade/patches/patch-sysupgrade.sh   Fri Apr 15 09:10:56 2022 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-sysupgrade.sh,v 1.7 2022/04/15 08:07:25 nia Exp $
+$NetBSD: patch-sysupgrade.sh,v 1.8 2022/04/15 09:10:56 nia Exp $
 
 * Don't reject https in sysupgrade_fetch()
 * Add ARCHIVE_EXTENSION variable (Fix PR pkg/53697)
@@ -17,15 +17,19 @@
  
  
  # Directory in which to keep downloaded release files.
-@@ -66,6 +67,7 @@ sysupgrade_set_defaults() {
+@@ -66,6 +67,11 @@ sysupgrade_set_defaults() {
      shtk_config_set ETCUPDATE "yes"
      shtk_config_set KERNEL "AUTO"
      shtk_config_set SETS "AUTO"
-+    shtk_config_set ARCHIVE_EXTENSION "tar.xz"
++    if [ "$(uname -p)" = 'x86_64' ] || [ "$(uname -p)" = 'sparc64' ]; then
++        shtk_config_set ARCHIVE_EXTENSION "tar.xz"
++    else
++        shtk_config_set ARCHIVE_EXTENSION "tgz"
++    fi
  }
  
  
-@@ -163,18 +165,29 @@ require_cached_file() {
+@@ -163,18 +169,29 @@ require_cached_file() {
  # The set to be extracted must have been previously fetched into the cache
  # directory by sysupgrade_fetch command.
  #
@@ -59,7 +63,7 @@
  }
  
  
-@@ -189,9 +202,10 @@ sysupgrade_fetch() {
+@@ -189,9 +206,10 @@ sysupgrade_fetch() {
  
      local releasedir="$(shtk_config_get RELEASEDIR)"
      local cachedir="$(shtk_config_get CACHEDIR)"
@@ -71,7 +75,7 @@
      done
      if shtk_config_has KERNEL; then
          local kernel_name="$(shtk_config_get KERNEL)"
-@@ -199,7 +213,7 @@ sysupgrade_fetch() {
+@@ -199,7 +217,7 @@ sysupgrade_fetch() {
      fi
  
      case "${releasedir}" in
@@ -80,7 +84,7 @@
              mkdir -p "${cachedir}"
  
              for relative_file in ${fetch_files}; do
-@@ -320,6 +334,7 @@ sysupgrade_modules() {
+@@ -320,6 +338,7 @@ sysupgrade_modules() {
  #
  # \param ... Names of the sets to extract, to override SETS.
  sysupgrade_sets() {
@@ -88,7 +92,7 @@
      local sets=
      for set_name in "${@:-$(shtk_config_get SETS)}"; do
          case "${set_name}" in
-@@ -334,7 +349,7 @@ sysupgrade_sets() {
+@@ -334,7 +353,7 @@ sysupgrade_sets() {
      done
  
      for set_name in ${sets}; do
@@ -97,7 +101,7 @@
      done
  
      shtk_cli_info "Upgrading base system"
-@@ -346,6 +361,7 @@ sysupgrade_sets() {
+@@ -346,6 +365,7 @@ sysupgrade_sets() {
  
  # Runs etcupdate to install new configuration files.
  sysupgrade_etcupdate() {
@@ -105,7 +109,7 @@
      [ ${#} -eq 0 ] || shtk_cli_usage_error "etcupdate does not take any" \
          "arguments"
  
-@@ -366,12 +382,12 @@ sysupgrade_etcupdate() {
+@@ -366,12 +386,12 @@ sysupgrade_etcupdate() {
  
      local sflags=
      for set_name in ${sets}; do
@@ -121,7 +125,7 @@
  }
  
  
-@@ -381,6 +397,7 @@ sysupgrade_etcupdate() {
+@@ -381,6 +401,7 @@ sysupgrade_etcupdate() {
  sysupgrade_postinstall() {
      local sets=
      local sets="$(shtk_list_filter '*etc' $(shtk_config_get SETS))"
@@ -129,7 +133,7 @@
      if [ -z "${sets}" ]; then
          shtk_cli_info "Skipping postinstall (no etc sets in SETS)"
          return 0
-@@ -392,8 +409,8 @@ sysupgrade_postinstall() {
+@@ -392,8 +413,8 @@ sysupgrade_postinstall() {
  
      local sflags=
      for set_name in ${sets}; do
@@ -140,7 +144,7 @@
      done
  
      shtk_cli_info "Performing postinstall checks"
-@@ -402,17 +419,20 @@ sysupgrade_postinstall() {
+@@ -402,17 +423,20 @@ sysupgrade_postinstall() {
          postinstall "-d${destdir}/" ${sflags} fix \
              $(shtk_config_get POSTINSTALL_AUTOFIX)
      fi