From e36800779d1c66bae958e105cbbbf77513c476b3 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Wed, 24 Jul 2024 14:00:56 +0300 Subject: [PATCH] fix main --- .github/workflows/build-canaryv3.yml | 5 +++- .github/workflows/build-nestv3.yml | 5 +++- .github/workflows/release-canaryv3.yml | 5 +++- .github/workflows/release-nestv3.yml | 5 +++- cargo-config-v3.toml | 3 --- debian/rules | 7 ++++++ main.sh | 28 +++++++++++++++++++++ mainv3.sh | 35 -------------------------- pika-build-config/amd64-v3.sh | 9 +++++++ 9 files changed, 60 insertions(+), 42 deletions(-) delete mode 100644 cargo-config-v3.toml create mode 100755 main.sh delete mode 100755 mainv3.sh create mode 100755 pika-build-config/amd64-v3.sh diff --git a/.github/workflows/build-canaryv3.yml b/.github/workflows/build-canaryv3.yml index 72adde7..25f3de9 100644 --- a/.github/workflows/build-canaryv3.yml +++ b/.github/workflows/build-canaryv3.yml @@ -30,5 +30,8 @@ jobs: - name: Update APT Cache run: apt-get update -y + - name: Set Build Config + run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh + - name: Build Package - run: ./mainv3.sh + run: ./main.sh diff --git a/.github/workflows/build-nestv3.yml b/.github/workflows/build-nestv3.yml index 3098818..80a4e86 100644 --- a/.github/workflows/build-nestv3.yml +++ b/.github/workflows/build-nestv3.yml @@ -30,5 +30,8 @@ jobs: - name: Update APT Cache run: apt-get update -y + - name: Set Build Config + run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh + - name: Build Package - run: ./mainv3.sh + run: ./main.sh diff --git a/.github/workflows/release-canaryv3.yml b/.github/workflows/release-canaryv3.yml index 3e837ff..895def8 100644 --- a/.github/workflows/release-canaryv3.yml +++ b/.github/workflows/release-canaryv3.yml @@ -30,8 +30,11 @@ jobs: - name: Update APT Cache run: apt-get update -y + - name: Set Build Config + run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh + - name: Build Package - run: ./mainv3.sh + run: ./main.sh - name: Release Package run: ./release.sh diff --git a/.github/workflows/release-nestv3.yml b/.github/workflows/release-nestv3.yml index bb9261e..a1aa799 100644 --- a/.github/workflows/release-nestv3.yml +++ b/.github/workflows/release-nestv3.yml @@ -30,8 +30,11 @@ jobs: - name: Update APT Cache run: apt-get update -y + - name: Set Build Config + run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh + - name: Build Package - run: ./mainv3.sh + run: ./main.sh - name: Release Package run: ./release.sh diff --git a/cargo-config-v3.toml b/cargo-config-v3.toml deleted file mode 100644 index 3e2c55e..0000000 --- a/cargo-config-v3.toml +++ /dev/null @@ -1,3 +0,0 @@ -[build] -[target.x86_64-unknown-linux-gnu] -rustflags = ["-Ctarget-cpu=x86-64-v3"] diff --git a/debian/rules b/debian/rules index d4d9ddd..ba7a667 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,14 @@ #!/usr/bin/make -f +export PIKA_BUILD_ARCH = $(shell cat pika-build-arch) export PATH := $(PATH):/root/.cargo/bin +override_dh_prep: +# amd64 build prep +ifeq (amd64-v3,$(PIKA_BUILD_ARCH)) + export RUSTFLAGS = "-C target-cpu=x86-64-v3" +endif + %: dh ${@} diff --git a/main.sh b/main.sh new file mode 100755 index 0000000..d6e91c7 --- /dev/null +++ b/main.sh @@ -0,0 +1,28 @@ +#! /bin/bash + +set -e + +VERSION="1.0.0" + +source ./pika-build-config.sh + +echo "$PIKA_BUILD_ARCH" > pika-build-arch + +# Clone Upstream +mkdir -p pika-drivers +cp -rvf ./* ./pika-drivers/ || true +cd ./pika-drivers/ + +# Get build deps +apt-get build-dep ./ -y +apt-get install curl -y +curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | CARGO_HOME=/root/.cargo sh -s -- -y + +# Build package +LOGNAME=root dh_make --createorig -y -l -p pika-drivers_"$VERSION" || echo "dh-make: Ignoring Last Error" +dpkg-buildpackage --no-sign + +# Move the debs to output +cd ../ +mkdir -p ./output +mv ./*.deb ./output/ diff --git a/mainv3.sh b/mainv3.sh deleted file mode 100755 index cf8e6c8..0000000 --- a/mainv3.sh +++ /dev/null @@ -1,35 +0,0 @@ -#! /bin/bash - -set -e - -VERSION="1.0.0" - -export DEBIAN_FRONTEND="noninteractive" -export DEB_BUILD_MAINT_OPTIONS="optimize=+lto -march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" -export DEB_CFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" -export DEB_CPPFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" -export DEB_CXXFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" -export DEB_LDFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" -export DEB_BUILD_OPTIONS="nocheck notest terse" -export DPKG_GENSYMBOLS_CHECK_LEVEL=0 - -# Clone Upstream -mkdir -p pika-drivers -cp -rvf ./* ./pika-drivers/ || true -mkdir ./pika-drivers/.cargo -cp -vf ./cargo-config-v3.toml ./pika-drivers/.cargo/config.toml -cd ./pika-drivers/ - -# Get build deps -apt-get build-dep ./ -y -apt-get install curl -y -curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | CARGO_HOME=/root/.cargo sh -s -- -y - -# Build package -LOGNAME=root dh_make --createorig -y -l -p pika-drivers_"$VERSION" || echo "dh-make: Ignoring Last Error" -dpkg-buildpackage --no-sign - -# Move the debs to output -cd ../ -mkdir -p ./output -mv ./*.deb ./output/ diff --git a/pika-build-config/amd64-v3.sh b/pika-build-config/amd64-v3.sh new file mode 100755 index 0000000..4547e43 --- /dev/null +++ b/pika-build-config/amd64-v3.sh @@ -0,0 +1,9 @@ +PIKA_BUILD_ARCH="amd64-v3" +DEBIAN_FRONTEND="noninteractive" +DEB_BUILD_MAINT_OPTIONS="optimize=+lto -march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" +DEB_CFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" +DEB_CPPFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" +DEB_CXXFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" +DEB_LDFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" +DEB_BUILD_OPTIONS="nocheck notest terse" +DPKG_GENSYMBOLS_CHECK_LEVEL=0