third-party-mirrors/bliss-analyser
1
0
Fork 1
mirror of https://github.com/CDrummond/bliss-analyser.git synced 2025-04-12 15:07:14 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Place ARM binaries in bin sub-folder

Browse Source
This commit is contained in:
CDrummond 2022-06-18 09:05:00 +01:00
parent 45b20902d6
commit 3b6872b2a0
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docker/docker-build.sh
View File

@ -5,10 +5,8 @@ set -eux
uname -a uname -a
DESTDIR=/src/releases DESTDIR=/src/releases
for d in armhf-linux aarch64-linux; do mkdir -p $DESTDIR/bin
mkdir -p $DESTDIR/$d rm -rf $DESTDIR/bin/*
rm -rf $DESTDIR/$d/*
done
function build { function build {
echo Building for $1 to $3... echo Building for $1 to $3...
@ -22,6 +20,6 @@ function build {
$2 /build/$1/release/bliss-analyser && cp /build/$1/release/bliss-analyser $DESTDIR/$3 $2 /build/$1/release/bliss-analyser && cp /build/$1/release/bliss-analyser $DESTDIR/$3
} }
build arm-unknown-linux-gnueabihf arm-linux-gnueabihf-strip armhf/bliss-analyser build arm-unknown-linux-gnueabihf arm-linux-gnueabihf-strip bin/bliss-analyser-armhf
build aarch64-unknown-linux-gnu aarch64-linux-gnu-strip aarch64/bliss-analyser build aarch64-unknown-linux-gnu aarch64-linux-gnu-strip bin/bliss-analyser-aarch64

2
download.py
View File

@ -78,7 +78,7 @@ def make_executable(version):
os.chdir(td) os.chdir(td)
subprocess.call(["chmod", "a+x", "%s/bliss-analyser" % td], shell=False) subprocess.call(["chmod", "a+x", "%s/bliss-analyser" % td], shell=False)
if a == "bliss-analyser-linux-arm": if a == "bliss-analyser-linux-arm":
subprocess.call(["chmod", "a+x", "%s/bliss-analyser/armhf/bliss-analyser" % td, "%s/bliss-analyser/aarch64/bliss-analyser" % td], shell=False) subprocess.call(["chmod", "a+x", "%s/bliss-analyser/bin/bliss-analyser-armhf" % td, "%s/bliss-analyser/bin/bliss-analyser-aarch64" % td], shell=False)
shutil.make_archive("%s/%s-%s" % (cwd, a, version), "zip") shutil.make_archive("%s/%s-%s" % (cwd, a, version), "zip")
os.chdir(cwd) os.chdir(cwd)

4
scripts/bliss-analyser-arm
View File

@ -4,7 +4,7 @@ ARCH=`arch`
SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]:-$0}"; )" &> /dev/null && pwd 2> /dev/null; )"; SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]:-$0}"; )" &> /dev/null && pwd 2> /dev/null; )";
if [ "$ARCH" = "aarch64" ] ; then if [ "$ARCH" = "aarch64" ] ; then
$SCRIPT_DIR/aarch64/bliss-analyser $* $SCRIPT_DIR/bin/bliss-analyser-aarch64 $*
else else
$SCRIPT_DIR/armhf/bliss-analyser $* $SCRIPT_DIR/bin/bliss-analyser-armhf $*
fi fi