From 2ca7886f881fb56a8e5d8db27bdb96d1c475da34 Mon Sep 17 00:00:00 2001 From: Bananymous Date: Wed, 7 Aug 2024 16:07:59 +0300 Subject: [PATCH] Ports: remove architecture from .compile_hash files This is was over complicating things and there can be only one banan-os build at a given time. --- ports/install.sh | 8 ++++---- ports/update.sh | 2 +- script/build.sh | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ports/install.sh b/ports/install.sh index abb49707..2193395d 100755 --- a/ports/install.sh +++ b/ports/install.sh @@ -61,7 +61,7 @@ done build_dir="$NAME-$VERSION-$BANAN_ARCH" if [ ! -d "$build_dir" ]; then - rm -f ".compile_hash-$BANAN_ARCH" + rm -f ".compile_hash" fi if [ "$VERSION" = "git" ]; then @@ -135,8 +135,8 @@ else fi needs_compile=1 -if [ -f ".compile_hash-$BANAN_ARCH" ]; then - sha256sum --check ".compile_hash-$BANAN_ARCH" &>/dev/null +if [ -f ".compile_hash" ]; then + sha256sum --check ".compile_hash" &>/dev/null needs_compile=$? fi @@ -144,7 +144,7 @@ cd "$build_dir" if (( $needs_compile )); then build - sha256sum "$BANAN_SYSROOT/usr/lib/libc.a" > "../.compile_hash-$BANAN_ARCH" + sha256sum "$BANAN_SYSROOT/usr/lib/libc.a" > "../.compile_hash" fi install diff --git a/ports/update.sh b/ports/update.sh index 49396872..79560fe3 100755 --- a/ports/update.sh +++ b/ports/update.sh @@ -6,4 +6,4 @@ while IFS= read -r port; do pushd $(dirname "$port") >/dev/null ./build.sh popd >/dev/null -done < <(find . -name '.compile_hash*') +done < <(find . -name '.compile_hash') diff --git a/script/build.sh b/script/build.sh index ca4c02f7..0cc7e324 100755 --- a/script/build.sh +++ b/script/build.sh @@ -121,7 +121,7 @@ case $1 in ;; distclean) rm -rf $BANAN_BUILD_DIR - rm $BANAN_ROOT_DIR/ports/*/.compile_hash* + find $BANAN_ROOT_DIR/ports -name '.compile_hash' -exec rm {} + ;; *) build_target $1