fix cargo build opts

.github/build-canary-v3

@@ -0,0 +1 @@
+2

.github/build-nest-v3

@@ -0,0 +1 @@
+1

.github/release-canary-v3

@@ -0,0 +1 @@
+1

.github/release-nest-v3

@@ -0,0 +1 @@
+1

.github/workflows/build-canaryv3.yml

@@ -0,0 +1,37 @@
+name: PikaOS Package Build Only (Canary) (amd64-v3)
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - '.github/build-canary-v3'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/pikaos-linux/pikaos-builder:canaryv3
+      volumes:
+        - /proc:/proc
+      options: --privileged -it
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Install SSH key
+      uses: shimataro/ssh-key-action@v2
+      with:
+        key: ${{ secrets.SSH_KEY }}
+        name: id_rsa
+        known_hosts: ${{ secrets.KNOWN_HOSTS }}
+        if_key_exists: replace
+    
+    - 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: ./main.sh

.github/workflows/build-nestv3.yml

@@ -0,0 +1,37 @@
+name: PikaOS Package Build Only (amd64-v3)
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - '.github/build-nest-v3'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/pikaos-linux/pikaos-builder:nestv3
+      volumes:
+        - /proc:/proc
+      options: --privileged -it
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Install SSH key
+      uses: shimataro/ssh-key-action@v2
+      with:
+        key: ${{ secrets.SSH_KEY }}
+        name: id_rsa
+        known_hosts: ${{ secrets.KNOWN_HOSTS }}
+        if_key_exists: replace
+    
+    - 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: ./main.sh

.github/workflows/release-canaryv3.yml

@@ -0,0 +1,40 @@
+name: PikaOS Package Build & Release (Canary) (amd64-v3)
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - '.github/release-canary-v3'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/pikaos-linux/pikaos-builder:canaryv3
+      volumes:
+        - /proc:/proc
+      options: --privileged -it
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Install SSH key
+      uses: shimataro/ssh-key-action@v2
+      with:
+        key: ${{ secrets.SSH_KEY }}
+        name: id_rsa
+        known_hosts: ${{ secrets.KNOWN_HOSTS }}
+        if_key_exists: replace
+    
+    - 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: ./main.sh
+
+    - name: Release Package
+      run: ./release.sh

.github/workflows/release-nestv3.yml

@@ -0,0 +1,40 @@
+name: PikaOS Package Build & Release (amd64-v3)
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - '.github/release-nest-v3'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/pikaos-linux/pikaos-builder:nestv3
+      volumes:
+        - /proc:/proc
+      options: --privileged -it
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Install SSH key
+      uses: shimataro/ssh-key-action@v2
+      with:
+        key: ${{ secrets.SSH_KEY }}
+        name: id_rsa
+        known_hosts: ${{ secrets.KNOWN_HOSTS }}
+        if_key_exists: replace
+    
+    - 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: ./main.sh
+
+    - name: Release Package
+      run: ./release.sh

.github/workflows/release.yml

@@ -1,40 +0,0 @@
-name: PikaOS Package Release
-
-on:
-  workflow_dispatch
-
-jobs:
-  build:
-    runs-on: self-hosted
-    container:
-      image: ubuntu:22.10
-      volumes:
-        - /proc:/proc
-      options: --privileged -it
-
-    steps:
-    - uses: actions/checkout@v3
-  
-    - name: Install needed packages
-      run: apt update && apt install software-properties-common sudo git bc gpg gpg-agent bison build-essential ccache cpio fakeroot flex git kmod libelf-dev libncurses5-dev libssl-dev lz4 qtbase5-dev rsync schedtool wget zstd tar reprepro dpkg-sig devscripts dh-make -y
-
-    - name: Import GPG key
-      id: import_gpg
-      uses: crazy-max/ghaction-import-gpg@v5
-      with:
-        gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
-        passphrase: ${{ secrets.PASSPHRASE }}
-
-    - name: Install SSH key
-      uses: shimataro/ssh-key-action@v2
-      with:
-        key: ${{ secrets.SSH_KEY }}
-        name: id_rsa
-        known_hosts: ${{ secrets.KNOWN_HOSTS }}
-        if_key_exists: replace
-    
-    - name: Build Package
-      run: ./main.sh
-
-    - name: Release Package
-      run: ./release.sh

LICENSE.md

@@ -0,0 +1,24 @@
+MIT License (With DPKG packaging compatibility)
+
+Copyright (c) 2024 PikaOS
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+Notes:
+The files covered by this license are any files and directories in the root of this repository (including but not limited to: `main.sh`, `release.sh`, and `.github`), with the exception of the `debian` directory and its contents if `debian/copyright` exists, and declares any files or directories as a different LICENSE/COPYRIGHT.

debian/changelog

@@ -1,3 +1,36 @@
+asusctl (6.0.11-101pika1) pika; urgency=low
+
+  * New Upstream Release + PikaOS 4
+
+ -- Ward Nakchbandi <hotrod.master@hotmail.com>  Sat, 01 Oct 2022 14:50:00 +0200
+
+asusctl (4.7.2-100pika1) pikauwu; urgency=low
+
+  * New Upstream Release
+
+ -- Ward Nakchbandi <hotrod.master@hotmail.com>  Sat, 01 Oct 2022 14:50:00 +0200
+
+asusctl (4.7.2-99pika1.lunar) lunar; urgency=low
+
+  * New Upstream Release
+
+ -- Ward Nakchbandi <hotrod.master@hotmail.com>  Sat, 01 Oct 2022 14:50:00 +0200
+
+asusctl (4.6.2-99pika1.lunar) lunar; urgency=low
+
+  * New Upstream Release
+
+ -- Ward Nakchbandi <hotrod.master@hotmail.com>  Sat, 01 Oct 2022 14:50:00 +0200
+
+
+asusctl (4.6.0-99pika1.lunar) lunar; urgency=low
+
+  * New Upstream Release
+
+ -- Ward Nakchbandi <hotrod.master@hotmail.com>  Sat, 01 Oct 2022 14:50:00 +0200
+
+
+
 asusctl (4.6.0-rc1-99pika1) kinetic; urgency=low
 
   * New Upstream Release

debian/control

@@ -2,18 +2,44 @@ Source: asusctl
 Section: misc
 Priority: optional
 Maintainer: Ward Nakchbandi <hotrod.master@hotmail.com>
-Build-Depends: debhelper-compat (= 13), rustc, libdbus-1-dev, cargo, quilt, libgtk-3-dev, libudev-dev, libgdk3.0-cil-dev, desktop-file-utils, libstd-rust-dev, llvm, clang, libclang-15-dev
+Build-Depends: 
+  debhelper-compat (= 13),
+  rustc,
+  libdbus-1-dev,
+  cargo,
+  quilt,
+  libgtk-3-dev,
+  libudev-dev,
+  libgdk3.0-cil-dev,
+  desktop-file-utils,
+  libstd-rust-dev,
+  llvm,
+  clang,
+  libclang-15-dev,
+  libseat-dev,
+  libgbm-dev,
+  libinput-dev,
 Homepage: https://gitlab.com/asus-linux/asusctl
 
 Package: asusctl
 Section: misc
 Architecture: amd64
-Depends: ${misc:Depends}, supergfxctl
+Depends: 
+  ${misc:Depends},
+  ${shlibs:Depends},
+  supergfxctl,
+Suggests:
+  rog-control-center,
 Description: Control fan speeds, LEDs, graphics modes, and charge levels for ASUS notebooks
 
 Package: rog-control-center
 Section: misc
 Architecture: amd64
-Depends: ${misc:Depends}, asusctl, libappindicator3-1
+Depends: 
+  ${misc:Depends},
+  ${shlibs:Depends},
+  asusctl (= ${binary:Version}),
+  libappindicator3-1,
 Description: A one-stop-shop GUI tool for asusd/asusctl. It aims to provide most controls, a notification service, and ability to run in the background
-Provides: rog-gui
+Provides:
+  rog-gui (= ${binary:Version}),

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 -C opt-level=3 -C lto=fat -C embed-bitcode -C codegen-units=1
+endif
+
 %:
 	dh ${@}

debian/source/format

@@ -1 +1 @@
-3.0 (native)
+3.0 (quilt)

debian/source/include-binaries

@@ -1 +0,0 @@
-vendor_asusctl_4.5.3.tar.xz

main.sh

@@ -1,23 +1,24 @@
-DEBIAN_FRONTEND=noninteractive
+#! /bin/bash
+
+set -e
+
+VERSION=6.0.11
+
+source ./pika-build-config.sh
+
+echo "$PIKA_BUILD_ARCH" > pika-build-arch
 
-# Add dependent repositories
-wget -q -O - https://ppa.pika-os.com/key.gpg | sudo apt-key add -
-add-apt-repository https://ppa.pika-os.com
-add-apt-repository ppa:pikaos/pika
-add-apt-repository ppa:kubuntu-ppa/backports
 # Clone Upstream
-git clone https://gitlab.com/asus-linux/asusctl -b 4.6.0-rc1
+git clone https://gitlab.com/asus-linux/asusctl -b "$VERSION"
 cp -rvf ./debian ./asusctl
 cd ./asusctl
 
 # Get build deps
-ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime
-DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata
 apt-get build-dep ./ -y
 
 # Build package
-LOGNAME=root dh_make --createorig -y -l -p asusctl_4.6.0-rc1
+LOGNAME=root dh_make --createorig -y -l -p asusctl_"$VERSION" || echo "dh-make: Ignoring Last Error"
-dpkg-buildpackage
+dpkg-buildpackage --no-sign
 
 # Move the debs to output
 cd ../

pika-build-config/amd64-v3.sh

@@ -0,0 +1,10 @@
+#! /bin/bash
+export PIKA_BUILD_ARCH="amd64-v3"
+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

pika-build-config/i386.sh

@@ -0,0 +1,5 @@
+#! /bin/bash
+export PIKA_BUILD_ARCH="i386"
+export DEBIAN_FRONTEND="noninteractive"
+export DEB_BUILD_OPTIONS="nocheck notest terse"
+export DPKG_GENSYMBOLS_CHECK_LEVEL=0

release.sh

@@ -1,11 +1,2 @@
-# Sign the packages
+# send debs to server
-dpkg-sig --sign builder ./output/*.deb
+rsync -azP --include './' --include '*.deb' --exclude '*' ./output/ ferreo@direct.pika-os.com:/srv/www/cockatiel-incoming/
-
-# Pull down existing ppa repo db files etc
-rsync -azP --exclude '*.deb' ferreo@direct.pika-os.com:/srv/www/pikappa/ ./output/repo
-
-# Add the new package to the repo
-reprepro -V --basedir ./output/repo/ includedeb kinetic ./output/*.deb
-
-# Push the updated ppa repo to the server
-rsync -azP ./output/repo/ ferreo@direct.pika-os.com:/srv/www/pikappa/