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

Separate bindirs

Browse Source
This commit is contained in:
Bryan Roessler
2023-01-13 14:41:23 -05:00
parent 36d392c2f2
commit 0dfd58b9ef
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
openwrtbuilder
View File

@@ -443,9 +443,9 @@ makeImage() {
debug "${FUNCNAME[0]}" debug "${FUNCNAME[0]}"
# Reuse the existing output # Reuse the existing output
if [[ -d "$BINDIR" ]]; then if [[ -d "$THIS_BINDIR" ]]; then
if askOk "$BINDIR exists. Rebuild?"; then if askOk "$THIS_BINDIR exists. Rebuild?"; then
rm -rf "$BINDIR" rm -rf "$THIS_BINDIR"
else else
return 0 return 0
fi fi
@@ -454,7 +454,7 @@ makeImage() {
[[ -d "$BUILDDIR" ]] || mkdir -p "$BUILDDIR" [[ -d "$BUILDDIR" ]] || mkdir -p "$BUILDDIR"
if ! make image \ if ! make image \
BIN_DIR="$BINDIR" \ BIN_DIR="$THIS_BINDIR" \
PROFILE="${P_ARR[profile]}" \ PROFILE="${P_ARR[profile]}" \
PACKAGES="${P_ARR[packages]}" \ PACKAGES="${P_ARR[packages]}" \
FILES="${FILESDIR}" \ FILES="${FILESDIR}" \
@@ -588,9 +588,9 @@ resetAll() {
resetProfile() { resetProfile() {
debug "${FUNCNAME[0]}" debug "${FUNCNAME[0]}"
askOk "Remove $BUILDDIR?" || exit $? askOk "Remove $BUILDDIR and $THIS_BINDIR?" || exit $?
debug "rm -rf $BUILDDIR" debug "rm -rf $BUILDDIR $THIS_BINDIR"
rm -rf "$BUILDDIR" rm -rf "$BUILDDIR" "$THIS_BINDIR"
} }
@@ -652,6 +652,7 @@ main() {
declare -g BUILDDIR="$SRCDIR/${P_ARR[profile]}-$RELEASE" declare -g BUILDDIR="$SRCDIR/${P_ARR[profile]}-$RELEASE"
declare -g IB_ARCHIVE="$SRCDIR/${P_ARR[profile]}-$RELEASE.tar.xz" declare -g IB_ARCHIVE="$SRCDIR/${P_ARR[profile]}-$RELEASE.tar.xz"
declare -g FILESYSTEM="${P_ARR[filesystem]:="squashfs"}" declare -g FILESYSTEM="${P_ARR[filesystem]:="squashfs"}"
declare -g THIS_BINDIR="$BINDIR/${P_ARR[profile]}-$RELEASE"
if [[ "$RELEASE" == "snapshot" ]]; then if [[ "$RELEASE" == "snapshot" ]]; then
declare url_prefix="https://downloads.openwrt.org/snapshots/targets/${P_ARR[target]}" declare url_prefix="https://downloads.openwrt.org/snapshots/targets/${P_ARR[target]}"
@@ -679,7 +680,11 @@ main() {
echo "Build settings:" echo "Build settings:"
cat <<- EOF cat <<- EOF
ALIAS: $profile ALIAS: $profile
BUILDROOT: $BUILDROOT
BUILDDIR: $BUILDDIR BUILDDIR: $BUILDDIR
SRCDIR: $SRCDIR
BINDIR: $BINDIR
THIS_BINDIR: $THIS_BINDIR
TARGET: ${P_ARR[target]} TARGET: ${P_ARR[target]}
PROFILE: ${P_ARR[profile]} PROFILE: ${P_ARR[profile]}
RELEASE: $RELEASE RELEASE: $RELEASE