Browse Source

Fix sha256 check

bryan 1 year ago
parent
commit
0b05defeaf
2 changed files with 4 additions and 2 deletions
  1. 2 1
      openwrtbuilder
  2. 2 1
      profiles

+ 2 - 1
openwrtbuilder

@@ -370,6 +370,7 @@ getImageBuilderChecksum() {
         fi
     fi
 
+    debug "$DL_TOOL -o $IB_SHA256_FILE $IB_SHA256_URL"
     "$DL_TOOL" -o "$IB_SHA256_FILE" "$IB_SHA256_URL"
 }
 
@@ -818,7 +819,7 @@ main() {
         declare -g IB_URL="$url_prefix/$url_filename"
         declare -g IB_ARCHIVE="$SRCDIR/$url_filename"
         declare -g IB_SHA256_URL="$url_prefix/sha256sums"
-        declare -g IB_SHA256_FILE="$BUILDDIR/sha256sums"
+        declare -g IB_SHA256_FILE="$IB_ARCHIVE.sha256sums"
         declare -g IB_OUT_SHA256_FILE="$THIS_BINDIR/sha256sums"
         declare -g FACTORYIMG="$BUILDDIR/$img_fname-factory.img"
         declare -g FACTORYIMGGZ="$BUILDDIR/$img_fname-factory.img.gz"

+ 2 - 1
profiles

@@ -15,6 +15,8 @@ default_packages="\
 	bash \
 	rsync \
 	openssh-sftp-server \
+	luci-app-wireguard \
+	luci-proto-wireguard \
 	luci-app-statistics \
 	collectd-mod-sensors \
 	collectd-mod-thermal \
@@ -116,7 +118,6 @@ r4s['files']="\
 	/mnt/backup \
 "
 
-
 declare -Ag ax6000_stock
 ax6000_stock['profile']="xiaomi_redmi-router-ax6000-stock"
 ax6000_stock['target']="mediatek/filogic"