diff --git a/scripts/release/build_all.sh b/scripts/release/build_all.sh index 9ce1309..747fbdc 100755 --- a/scripts/release/build_all.sh +++ b/scripts/release/build_all.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Example usage: release_scripts/build_all.sh v4.8.1 +# Example usage: release_scripts/build_all.sh v4.9 cd "$(dirname "$0")" diff --git a/scripts/release/freebsd_aarch64/build.sh b/scripts/release/freebsd_aarch64/build.sh index 0a4cb07..15f5507 100755 --- a/scripts/release/freebsd_aarch64/build.sh +++ b/scripts/release/freebsd_aarch64/build.sh @@ -1,10 +1,16 @@ #!/bin/sh -# Example usage: ./build.sh v4.8.1 +# Example usage: ./build.sh v4.9 cd "$(dirname "$0")" -docker build --cpuset-cpus $2 --build-arg P2POOL_VERSION=$1 -t p2pool_freebsd_aarch64_build_$1 . +if [ "$2" ]; then + cpu_set="--cpuset-cpus $2" +else + cpu_set="" +fi + +docker build $cpu_set --build-arg P2POOL_VERSION=$1 -t p2pool_freebsd_aarch64_build_$1 . docker create --name p2pool_freebsd_aarch64_build_$1_container p2pool_freebsd_aarch64_build_$1:latest docker cp p2pool_freebsd_aarch64_build_$1_container:/p2pool/build/p2pool-$1-freebsd-aarch64.tar.gz ../p2pool-$1-freebsd-aarch64.tar.gz diff --git a/scripts/release/freebsd_x64/build.sh b/scripts/release/freebsd_x64/build.sh index 49480df..814c933 100755 --- a/scripts/release/freebsd_x64/build.sh +++ b/scripts/release/freebsd_x64/build.sh @@ -1,10 +1,16 @@ #!/bin/sh -# Example usage: ./build.sh v4.8.1 +# Example usage: ./build.sh v4.9 cd "$(dirname "$0")" -docker build --cpuset-cpus $2 --build-arg P2POOL_VERSION=$1 -t p2pool_freebsd_x64_build_$1 . +if [ "$2" ]; then + cpu_set="--cpuset-cpus $2" +else + cpu_set="" +fi + +docker build $cpu_set --build-arg P2POOL_VERSION=$1 -t p2pool_freebsd_x64_build_$1 . docker create --name p2pool_freebsd_x64_build_$1_container p2pool_freebsd_x64_build_$1:latest docker cp p2pool_freebsd_x64_build_$1_container:/p2pool/build/p2pool-$1-freebsd-x64.tar.gz ../p2pool-$1-freebsd-x64.tar.gz diff --git a/scripts/release/images/ubuntu/prepare.sh b/scripts/release/images/ubuntu/prepare.sh index 8431f9e..a2ba96f 100755 --- a/scripts/release/images/ubuntu/prepare.sh +++ b/scripts/release/images/ubuntu/prepare.sh @@ -15,6 +15,7 @@ MACOSX_SDK_VERSION=15.5 MAKE_VERSION=4.4.1 MINGW_VERSION=13.0.0 XZ_VERSION=5.8.1 +TAR_VERSION=1.35 _7ZIP_SHA256="914c7e20ad5ef8e4d3cf08620ff8894b28fe11b7eb99809d6930870fbe48a281" CMAKE_SHA256="585ae9e013107bc8e7c7c9ce872cbdcbdff569e675b07ef57aacfb88c886faac" @@ -24,6 +25,7 @@ GLIBC_SHA256="a5a26b22f545d6b7d7b3dd828e11e428f24f4fac43c934fb071b6a7d0828e901" HEADERS_SHA256="0eafd627b602f58d73917d00e4fc3196ba18cba67df6995a42aa74744d8efa16" MACOSX_SDK_SHA256="c15cf0f3f17d714d1aa5a642da8e118db53d79429eb015771ba816aa7c6c1cbd" MAKE_SHA256="dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3" +TAR_SHA256="4d62ff37342ec7aed748535323930c7cf94acf71c3591882b26a7ea50f3edc16" echo "Install prerequisites" @@ -427,6 +429,27 @@ make -j$(nproc) cp -f lzma* /usr/bin cp -f xz* /usr/bin +echo "Install tar" + +cd /root + +TAR_FILE=tar-$TAR_VERSION.tar.xz + +curl -L -O https://ftpmirror.gnu.org/tar/$TAR_FILE + +TAR_FILE_SHA256="$(sha256sum $TAR_FILE | awk '{ print $1 }')" + +if [ $TAR_FILE_SHA256 != $TAR_SHA256 ]; then + echo "Error: SHA256 sum does not match for $TAR_FILE - expected $TAR_SHA256, got $TAR_FILE_SHA256" + exit 1 +fi + +tar xvf $TAR_FILE +cd tar-$TAR_VERSION +FORCE_UNSAFE_CONFIGURE=1 ./configure +make -j$(nproc) +make install + echo "Deleting system glibc files to force our glibc" rm /usr/lib/x86_64-linux-gnu/crt1.o diff --git a/scripts/release/linux_aarch64/build.sh b/scripts/release/linux_aarch64/build.sh index f54619b..e79a4de 100755 --- a/scripts/release/linux_aarch64/build.sh +++ b/scripts/release/linux_aarch64/build.sh @@ -1,10 +1,16 @@ #!/bin/sh -# Example usage: ./build.sh v4.8.1 +# Example usage: ./build.sh v4.9 cd "$(dirname "$0")" -docker build --cpuset-cpus $2 --build-arg P2POOL_VERSION=$1 -t p2pool_ubuntu_aarch64_build_$1 . +if [ "$2" ]; then + cpu_set="--cpuset-cpus $2" +else + cpu_set="" +fi + +docker build $cpu_set --build-arg P2POOL_VERSION=$1 -t p2pool_ubuntu_aarch64_build_$1 . docker create --name p2pool_ubuntu_aarch64_build_$1_container p2pool_ubuntu_aarch64_build_$1:latest docker cp p2pool_ubuntu_aarch64_build_$1_container:/p2pool/build/p2pool-$1-linux-aarch64.tar.gz ../p2pool-$1-linux-aarch64.tar.gz diff --git a/scripts/release/linux_riscv64/build.sh b/scripts/release/linux_riscv64/build.sh index 5470bc2..fcdcde0 100755 --- a/scripts/release/linux_riscv64/build.sh +++ b/scripts/release/linux_riscv64/build.sh @@ -1,10 +1,16 @@ #!/bin/sh -# Example usage: ./build.sh v4.8.1 +# Example usage: ./build.sh v4.9 cd "$(dirname "$0")" -docker build --cpuset-cpus $2 --build-arg P2POOL_VERSION=$1 -t p2pool_ubuntu_riscv64_build_$1 . +if [ "$2" ]; then + cpu_set="--cpuset-cpus $2" +else + cpu_set="" +fi + +docker build $cpu_set --build-arg P2POOL_VERSION=$1 -t p2pool_ubuntu_riscv64_build_$1 . docker create --name p2pool_ubuntu_riscv64_build_$1_container p2pool_ubuntu_riscv64_build_$1:latest docker cp p2pool_ubuntu_riscv64_build_$1_container:/p2pool/build/p2pool-$1-linux-riscv64.tar.gz ../p2pool-$1-linux-riscv64.tar.gz diff --git a/scripts/release/linux_x64/build.sh b/scripts/release/linux_x64/build.sh index 670d5a0..a24116c 100755 --- a/scripts/release/linux_x64/build.sh +++ b/scripts/release/linux_x64/build.sh @@ -1,10 +1,16 @@ #!/bin/sh -# Example usage: ./build.sh v4.8.1 +# Example usage: ./build.sh v4.9 cd "$(dirname "$0")" -docker build --cpuset-cpus $2 --build-arg P2POOL_VERSION=$1 -t p2pool_linux_x64_build_$1 . +if [ "$2" ]; then + cpu_set="--cpuset-cpus $2" +else + cpu_set="" +fi + +docker build $cpu_set --build-arg P2POOL_VERSION=$1 -t p2pool_linux_x64_build_$1 . docker create --name p2pool_linux_x64_build_$1_container p2pool_linux_x64_build_$1:latest docker cp p2pool_linux_x64_build_$1_container:/p2pool/build/p2pool-$1-linux-x64.tar.gz ../p2pool-$1-linux-x64.tar.gz diff --git a/scripts/release/macos_aarch64/build.sh b/scripts/release/macos_aarch64/build.sh index 0244d1e..e191128 100755 --- a/scripts/release/macos_aarch64/build.sh +++ b/scripts/release/macos_aarch64/build.sh @@ -1,10 +1,16 @@ #!/bin/sh -# Example usage: ./build.sh v4.8.1 +# Example usage: ./build.sh v4.9 cd "$(dirname "$0")" -docker build --cpuset-cpus $2 --build-arg P2POOL_VERSION=$1 -t p2pool_macos_aarch64_build_$1 . +if [ "$2" ]; then + cpu_set="--cpuset-cpus $2" +else + cpu_set="" +fi + +docker build $cpu_set --build-arg P2POOL_VERSION=$1 -t p2pool_macos_aarch64_build_$1 . docker create --name p2pool_macos_aarch64_build_$1_container p2pool_macos_aarch64_build_$1:latest docker cp p2pool_macos_aarch64_build_$1_container:/p2pool/build/p2pool-$1-macos-aarch64.tar.gz ../p2pool-$1-macos-aarch64.tar.gz diff --git a/scripts/release/macos_x64/build.sh b/scripts/release/macos_x64/build.sh index 9bfbbff..297dff3 100755 --- a/scripts/release/macos_x64/build.sh +++ b/scripts/release/macos_x64/build.sh @@ -1,10 +1,16 @@ #!/bin/sh -# Example usage: ./build.sh v4.8.1 +# Example usage: ./build.sh v4.9 cd "$(dirname "$0")" -docker build --cpuset-cpus $2 --build-arg P2POOL_VERSION=$1 -t p2pool_macos_x64_build_$1 . +if [ "$2" ]; then + cpu_set="--cpuset-cpus $2" +else + cpu_set="" +fi + +docker build $cpu_set --build-arg P2POOL_VERSION=$1 -t p2pool_macos_x64_build_$1 . docker create --name p2pool_macos_x64_build_$1_container p2pool_macos_x64_build_$1:latest docker cp p2pool_macos_x64_build_$1_container:/p2pool/build/p2pool-$1-macos-x64.tar.gz ../p2pool-$1-macos-x64.tar.gz diff --git a/scripts/release/source/build.sh b/scripts/release/source/build.sh index 9ad2593..b7c6317 100755 --- a/scripts/release/source/build.sh +++ b/scripts/release/source/build.sh @@ -1,10 +1,16 @@ #!/bin/sh -# Example usage: ./build.sh v4.8.1 +# Example usage: ./build.sh v4.9 cd "$(dirname "$0")" -docker build --cpuset-cpus $2 --build-arg P2POOL_VERSION=$1 -t p2pool_source_build_$1 . +if [ "$2" ]; then + cpu_set="--cpuset-cpus $2" +else + cpu_set="" +fi + +docker build $cpu_set --build-arg P2POOL_VERSION=$1 -t p2pool_source_build_$1 . docker create --name p2pool_source_build_$1_container p2pool_source_build_$1:latest docker cp p2pool_source_build_$1_container:/p2pool_source-$1.tar.xz ../p2pool_source-$1.tar.xz diff --git a/scripts/release/windows_x64/build.sh b/scripts/release/windows_x64/build.sh index be0da4b..7d82164 100755 --- a/scripts/release/windows_x64/build.sh +++ b/scripts/release/windows_x64/build.sh @@ -1,10 +1,16 @@ #!/bin/sh -# Example usage: ./build.sh v4.8.1 +# Example usage: ./build.sh v4.9 cd "$(dirname "$0")" -docker build --cpuset-cpus $2 --build-arg P2POOL_VERSION=$1 -t p2pool_windows_x64_build_$1 . +if [ "$2" ]; then + cpu_set="--cpuset-cpus $2" +else + cpu_set="" +fi + +docker build $cpu_set --build-arg P2POOL_VERSION=$1 -t p2pool_windows_x64_build_$1 . docker create --name p2pool_windows_x64_build_$1_container p2pool_windows_x64_build_$1:latest docker cp p2pool_windows_x64_build_$1_container:/p2pool/build/p2pool-$1-windows-x64.zip ../p2pool-$1-windows-x64.zip