fix main

.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

.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

.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

.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

cargo-config-v3.toml

@@ -1,3 +0,0 @@
-[build]
-[target.x86_64-unknown-linux-gnu]
-rustflags = ["-Ctarget-cpu=x86-64-v3"]

debian/rules

@@ -1,4 +1,12 @@
 #!/usr/bin/make -f
 
+export PIKA_BUILD_ARCH = $(shell cat pika-build-arch)
+
+override_dh_prep:
+# amd64 build prep
+ifeq (amd64-v3,$(PIKA_BUILD_ARCH))
+	export RUSTFLAGS  = "-C target-cpu=x86-64-v3"
+endif
+
 %:
 	dh ${@}

main.sh

@@ -0,0 +1,26 @@
+#! /bin/bash
+
+set -e
+
+VERSION=6.0.11
+
+source ./pika-build-config.sh
+
+echo "$PIKA_BUILD_ARCH" > pika-build-arch
+
+# Clone Upstream
+git clone https://gitlab.com/asus-linux/asusctl -b "$VERSION"
+cp -rvf ./debian ./asusctl
+cd ./asusctl
+
+# Get build deps
+apt-get build-dep ./ -y
+
+# Build package
+LOGNAME=root dh_make --createorig -y -l -p asusctl_"$VERSION" || echo "dh-make: Ignoring Last Error"
+dpkg-buildpackage --no-sign
+
+# Move the debs to output
+cd ../
+mkdir -p ./output
+mv ./*.deb ./output/

mainv3.sh

@@ -1,33 +0,0 @@
-#! /bin/bash
-
-set -e
-
-VERSION=6.0.11
-
-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://gitlab.com/asus-linux/asusctl -b "$VERSION"
-cp -rvf ./debian ./asusctl
-mkdir ./asusctl/.cargo
-cp -vf ./cargo-config-v3.toml ./asusctl/.cargo/config.toml
-cd ./asusctl
-
-# Get build deps
-apt-get build-dep ./ -y
-
-# Build package
-LOGNAME=root dh_make --createorig -y -l -p asusctl_"$VERSION" || echo "dh-make: Ignoring Last Error"
-dpkg-buildpackage --no-sign
-
-# Move the debs to output
-cd ../
-mkdir -p ./output
-mv ./*.deb ./output/

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