march model

.github/workflows/build-canaryv3.yml

@@ -1,4 +1,4 @@
-name: PikaOS Package Build Only
+name: PikaOS Package Build Only (Canary) (amd64-v3)
 
 on:
   workflow_dispatch
@@ -7,7 +7,7 @@ jobs:
   build:
     runs-on: self-hosted
     container:
-      image: ghcr.io/pikaos-linux/pikaos-builder:nest
+      image: ghcr.io/pikaos-linux/pikaos-builder:canaryv3
       volumes:
         - /proc:/proc
       options: --privileged -it
@@ -31,4 +31,4 @@ jobs:
         if_key_exists: replace
     
     - name: Build Package
-      run: ./main.sh
+      run: ./mainv3.sh

.github/workflows/build-nestv3.yml

@@ -1,4 +1,4 @@
-name: PikaOS Package Build Only (Canary)
+name: PikaOS Package Build Only (amd64-v3)
 
 on:
   workflow_dispatch
@@ -7,7 +7,7 @@ jobs:
   build:
     runs-on: self-hosted
     container:
-      image: ghcr.io/pikaos-linux/pikaos-builder:canary
+      image: ghcr.io/pikaos-linux/pikaos-builder:nestv3
       volumes:
         - /proc:/proc
       options: --privileged -it
@@ -31,4 +31,4 @@ jobs:
         if_key_exists: replace
     
     - name: Build Package
-      run: ./main.sh
+      run: ./mainv3.sh

.github/workflows/release-canaryv3.yml

@@ -1,4 +1,4 @@
-name: PikaOS Package Build & Release
+name: PikaOS Package Build & Release (Canary) (amd64-v3)
 
 on:
   workflow_dispatch
@@ -7,7 +7,7 @@ jobs:
   build:
     runs-on: self-hosted
     container:
-      image: ghcr.io/pikaos-linux/pikaos-builder:nest
+      image: ghcr.io/pikaos-linux/pikaos-builder:canaryv3
       volumes:
         - /proc:/proc
       options: --privileged -it
@@ -31,7 +31,7 @@ jobs:
         if_key_exists: replace
     
     - name: Build Package
-      run: ./main.sh
+      run: ./mainv3.sh
 
     - name: Release Package
       run: ./release.sh

.github/workflows/release-nestv3.yml

@@ -1,4 +1,4 @@
-name: PikaOS Package Build & Release (Canary)
+name: PikaOS Package Build & Release (amd64-v3)
 
 on:
   workflow_dispatch
@@ -7,7 +7,7 @@ jobs:
   build:
     runs-on: self-hosted
     container:
-      image: ghcr.io/pikaos-linux/pikaos-builder:canary
+      image: ghcr.io/pikaos-linux/pikaos-builder:nestv3
       volumes:
         - /proc:/proc
       options: --privileged -it
@@ -31,7 +31,7 @@ jobs:
         if_key_exists: replace
     
     - name: Build Package
-      run: ./main.sh
+      run: ./mainv3.sh
 
     - name: Release Package
       run: ./release.sh

main.sh

@@ -1,14 +0,0 @@
-# Clone Upstream
-cd ./pika-sources
-
-# Get build deps
-apt-get build-dep ./ -y
-
-# Build package
-LOGNAME=root dh_make --createorig -y -l -p pika-sources_7.0 || echo "dh-make didn't go clean"
-dpkg-buildpackage --no-sign
-
-# Move the debs to output
-cd ../
-mkdir -p ./output
-mv ./*.deb ./output/

mainv3.sh

@@ -0,0 +1,23 @@
+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
+cd ./pika-sources
+
+# Get build deps
+apt-get build-dep ./ -y
+
+# Build package
+LOGNAME=root dh_make --createorig -y -l -p pika-sources_7.1 || echo "dh-make didn't go clean"
+dpkg-buildpackage --no-sign
+
+# Move the debs to output
+cd ../
+mkdir -p ./output
+mv ./*.deb ./output/

pika-sources/debian/changelog

@@ -1,3 +1,9 @@
+pika-sources (7.1-101pika1) canary; urgency=low
+
+  *  Canary options
+
+ -- Ward Nakchbandi <hotrod.master@hotmail.com>  Sat, 01 Oct 2022 14:50:00 +0200
+
 pika-sources (7.0-101pika1) canary; urgency=low
 
   *  PikaOS 4

pika-sources/usr/share/apt-pika/apt/preferences.d/1-pika-nest-settings

@@ -3,3 +3,24 @@ Package: *
 Pin: release a=pika,c=nest
 Pin-Priority: 450
 
+# Lower raven's priority under cockatiel's
+Package: *
+Pin: release a=pika,c=raven
+Pin-Priority: 450
+
+# Lower pigeon's priority under cockatiel's
+Package: *
+Pin: release a=pika,c=pigeon
+Pin-Priority: 450
+
+
+# Lower parrot's priority under cockatiel's
+Package: *
+Pin: release a=pika,c=parrot
+Pin-Priority: 450
+
+# Put canary's priority over nest and under cockatiel's
+Package: *
+Pin: release a=pika,c=canary
+Pin-Priority: 451
+

pika-sources/usr/share/apt-pika/apt/preferences.d/2-pika-compute-settings

@@ -3,19 +3,9 @@ Package: libhsa-runtime64* hipcc* rocm*
 Pin: release a=pika,c=nest
 Pin-Priority: 100
  
-# Lower raven's priority under cockatiel's
-Package: *
-Pin: release a=pika,c=raven
-Pin-Priority: 450
-
-# Lower pigeon's priority under cockatiel's
-Package: *
-Pin: release a=pika,c=pigeon
-Pin-Priority: 450
- 
 # Blacklist intel mesa from raven
 Package: libglvnd0 libegl1 libegl-dev libglx0 libglx-dev libgl1 libgl-dev libglvnd-core-dev libgles1 libgles2 libgles-dev libglvnd-dev libopengl0 libopengl-dev libxatracker2 libgbm1 libgbm-dev *mesa*
-Pin: a=pika,c=raven
+Pin: release a=pika,c=raven
 Pin-Priority: -10
 
 # Blacklist dangerous amdgpu-pro packages