bryan/openwrtbuilder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix src dirs

Browse Source
This commit is contained in:
Bryan Roessler
2023-01-29 20:41:26 -05:00
parent 0b05defeaf
commit c32971ebed
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
openwrtbuilder
View File

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