From 4f045f1d0fa02f2582e6359d626d6f3454202c43 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Wed, 24 Jul 2024 14:00:13 +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 | 2 +- mainv3.sh => main.sh | 11 +++-------- pika-build-config/amd64-v3.sh | 9 +++++++++ 7 files changed, 29 insertions(+), 13 deletions(-) rename mainv3.sh => main.sh (56%) 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 9977b98..4d47b52 100755 --- a/debian/rules +++ b/debian/rules @@ -2,7 +2,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 - +export PIKA_BUILD_ARCH = $(shell cat pika-build-arch) dest_dir = $(CURDIR)/debian/linux-firmware firmware_dir = $(dest_dir)/lib/firmware license_dir = $(dest_dir)/usr/share/doc/linux-firmware/licenses diff --git a/mainv3.sh b/main.sh similarity index 56% rename from mainv3.sh rename to main.sh index b0767b3..2cc04c5 100755 --- a/mainv3.sh +++ b/main.sh @@ -4,14 +4,9 @@ set -e VERSION="$(date '+%Y%m%d').git" -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 +source ./pika-build-config.sh + +echo "$PIKA_BUILD_ARCH" > pika-build-arch # Clone Upstream #git clone https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/ 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