Fix bin dirs

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"
 }
 
@@ -378,7 +379,6 @@ extractImageBuilder() {
     debug "${FUNCNAME[0]}"
 
     echo "Extracting Image Builder archive"
-    [[ ! -d "$BUILDDIR" ]] && mkdir -p "$BUILDDIR"
     debug "tar -xf $IB_ARCHIVE -C $BUILDDIR --strip-components 1"
     if ! tar -xf "$IB_ARCHIVE" -C "$BUILDDIR" --strip-components 1; then
         echo "Extraction failed"
@@ -448,8 +448,6 @@ makeImages() {
         fi
     fi
 
-    [[ -d "$BUILDDIR" ]] || mkdir -p "$BUILDDIR"
-
     make image \
         BIN_DIR="$THIS_BINDIR" \
         PROFILE="${P_ARR[profile]}" \
@@ -801,9 +799,9 @@ main() {
 
         # release precedence: user input>profile>env>hardcode
         declare -g RELEASE="${USER_RELEASE:=${P_ARR[release]:=$RELEASE}}"
-        declare -g BUILDDIR="$SRCDIR/$profile/${P_ARR[profile]}-$RELEASE"
+        declare -g BUILDDIR="$SRCDIR/$profile/$RELEASE"
         declare -g FILESYSTEM="${P_ARR[filesystem]:="squashfs"}"
-        declare -g THIS_BINDIR="$BINDIR/$profile/${P_ARR[profile]}-$RELEASE"
+        declare -g THIS_BINDIR="$BINDIR/$profile/$RELEASE"
 
         if [[ "$RELEASE" == "snapshot" ]]; then
             declare url_prefix="https://downloads.openwrt.org/snapshots/targets/${P_ARR[target]}"
@@ -816,9 +814,9 @@ main() {
         fi
 
         declare -g IB_URL="$url_prefix/$url_filename"
-        declare -g IB_ARCHIVE="$SRCDIR/$url_filename"
+        declare -g IB_ARCHIVE="$BUILDDIR/$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"
@@ -867,6 +865,8 @@ main() {
 
         (( RESET )) && resetProfile
 
+        [[ -d $BUILDDIR ]] || mkdir -p "$BUILDDIR"
+
         (( FROM_SOURCE )) && fromSource
 
         # Acquire and verify Image Builder

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 \
@@ -110,12 +112,12 @@ r4s['packages']="\
 	tailscale"
 r4s['kopts']="\
 	CONFIG_KERNEL_BTRFS_FS_POSIX_ACL=y \
+	CONFIG_BTRFS_PROGS_ZSTD=y
 "
 r4s['files']="\
 	/mnt/backup \
 "
 
-
 declare -Ag ax6000_stock
 ax6000_stock['profile']="xiaomi_redmi-router-ax6000-stock"
 ax6000_stock['target']="mediatek/filogic"