From 79f0ccf760099dcf3b25c7eb4c8ce6df5f13c63d Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Wed, 24 Jul 2024 14:00:05 +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 +++- debian/rules | 1 + main.sh | 27 ++++++++++++++++++++++ mainv3.sh | 32 -------------------------- pika-build-config/amd64-v3.sh | 9 ++++++++ 8 files changed, 53 insertions(+), 36 deletions(-) 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/debian/rules b/debian/rules index a52f961..9bc3628 100755 --- a/debian/rules +++ b/debian/rules @@ -2,6 +2,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +export PIKA_BUILD_ARCH = $(shell cat pika-build-arch) override_dh clean: echo "disabled" diff --git a/main.sh b/main.sh new file mode 100755 index 0000000..7253296 --- /dev/null +++ b/main.sh @@ -0,0 +1,27 @@ +#! /bin/bash + +set -e + +VERSION="0.384" + +source ./pika-build-config.sh + +echo "$PIKA_BUILD_ARCH" > pika-build-arch + +# Clone Upstream +git clone https://github.com/vcrhonek/hwdata -b v"$VERSION" +find . -type f ! -path '*' -exec sed -i 's#/usr/bin/env\ python#/usr/bin/env\ python3#' {} \; +cp -rvf ./debian ./hwdata/ +cd ./hwdata + +# Get build deps +apt-get build-dep ./ -y + +# Build package +LOGNAME=root dh_make --createorig -y -l -p hwdata_"$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 4716961..0000000 --- a/mainv3.sh +++ /dev/null @@ -1,32 +0,0 @@ -#! /bin/bash - -set -e - -VERSION="0.384" - -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 -git clone https://github.com/vcrhonek/hwdata -b v"$VERSION" -find . -type f ! -path '*' -exec sed -i 's#/usr/bin/env\ python#/usr/bin/env\ python3#' {} \; -cp -rvf ./debian ./hwdata/ -cd ./hwdata - -# Get build deps -apt-get build-dep ./ -y - -# Build package -LOGNAME=root dh_make --createorig -y -l -p hwdata_"$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