From 3a8dbb909b1a6b75037cc0bf4b99174fee80ffe5 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Tue, 23 Jul 2024 18:16:56 +0300 Subject: [PATCH] Update upstream + PikaOS 4 --- .github/workflows/build-canaryv3.yml | 34 +++++++++++++++++ .github/workflows/build-nestv3.yml | 34 +++++++++++++++++ .../{release.yml => release-canaryv3.yml} | 15 ++------ .github/workflows/release-nestv3.yml | 37 +++++++++++++++++++ cargo-config-v3.toml | 2 + debian/changelog | 6 +++ debian/control | 4 +- debian/source/format | 2 +- debian/source/include-binaries | 1 - main.sh | 18 --------- mainv3.sh | 33 +++++++++++++++++ release.sh | 8 +--- 12 files changed, 153 insertions(+), 41 deletions(-) create mode 100644 .github/workflows/build-canaryv3.yml create mode 100644 .github/workflows/build-nestv3.yml rename .github/workflows/{release.yml => release-canaryv3.yml} (62%) create mode 100644 .github/workflows/release-nestv3.yml create mode 100644 cargo-config-v3.toml delete mode 100644 debian/source/include-binaries delete mode 100755 main.sh create mode 100755 mainv3.sh diff --git a/.github/workflows/build-canaryv3.yml b/.github/workflows/build-canaryv3.yml new file mode 100644 index 0000000..61fbee7 --- /dev/null +++ b/.github/workflows/build-canaryv3.yml @@ -0,0 +1,34 @@ +name: PikaOS Package Build Only (Canary) (amd64-v3) + +on: + workflow_dispatch + +jobs: + build: + runs-on: self-hosted + container: + image: ghcr.io/pikaos-linux/pikaos-builder:canaryv3 + volumes: + - /proc:/proc + options: --privileged -it + + steps: + - uses: actions/checkout@v3 + + - 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: ./mainv3.sh diff --git a/.github/workflows/build-nestv3.yml b/.github/workflows/build-nestv3.yml new file mode 100644 index 0000000..0d013ba --- /dev/null +++ b/.github/workflows/build-nestv3.yml @@ -0,0 +1,34 @@ +name: PikaOS Package Build Only (amd64-v3) + +on: + workflow_dispatch + +jobs: + build: + runs-on: self-hosted + container: + image: ghcr.io/pikaos-linux/pikaos-builder:nestv3 + volumes: + - /proc:/proc + options: --privileged -it + + steps: + - uses: actions/checkout@v3 + + - 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: ./mainv3.sh diff --git a/.github/workflows/release.yml b/.github/workflows/release-canaryv3.yml similarity index 62% rename from .github/workflows/release.yml rename to .github/workflows/release-canaryv3.yml index 1641898..5b36604 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release-canaryv3.yml @@ -1,4 +1,4 @@ -name: PikaOS Package 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/pika-package-container:latest + image: ghcr.io/pikaos-linux/pikaos-builder:canaryv3 volumes: - /proc:/proc options: --privileged -it @@ -31,16 +31,7 @@ jobs: if_key_exists: replace - name: Build Package - run: ./main.sh + run: ./mainv3.sh - name: Release Package run: ./release.sh - - - name: Purge cache - uses: strrife/cloudflare-chunked-purge-action@master - env: - # Zone is required by both authentication methods - CLOUDFLARE_ZONE: ${{ secrets.CLOUDFLARE_ZONE }} - - CLOUDFLARE_TOKEN: ${{ secrets.CLOUDFLARE_TOKEN }} - PURGE_URLS: ${{ vars.PURGE_URLS }} diff --git a/.github/workflows/release-nestv3.yml b/.github/workflows/release-nestv3.yml new file mode 100644 index 0000000..36a34fb --- /dev/null +++ b/.github/workflows/release-nestv3.yml @@ -0,0 +1,37 @@ +name: PikaOS Package Build & Release (amd64-v3) + +on: + workflow_dispatch + +jobs: + build: + runs-on: self-hosted + container: + image: ghcr.io/pikaos-linux/pikaos-builder:nestv3 + volumes: + - /proc:/proc + options: --privileged -it + + steps: + - uses: actions/checkout@v3 + + - 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: ./mainv3.sh + + - name: Release Package + run: ./release.sh diff --git a/cargo-config-v3.toml b/cargo-config-v3.toml new file mode 100644 index 0000000..014e7d6 --- /dev/null +++ b/cargo-config-v3.toml @@ -0,0 +1,2 @@ +[build] +target = "x86-64-v3" \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 084ac02..18a653e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +asusctl (6.0.11-101pika1) pika; urgency=low + + * New Upstream Release + PikaOS 4 + + -- Ward Nakchbandi Sat, 01 Oct 2022 14:50:00 +0200 + asusctl (4.7.2-100pika1) pikauwu; urgency=low * New Upstream Release diff --git a/debian/control b/debian/control index b726e6b..5bbf745 100644 --- a/debian/control +++ b/debian/control @@ -8,12 +8,12 @@ Homepage: https://gitlab.com/asus-linux/asusctl Package: asusctl Section: misc Architecture: amd64 -Depends: ${misc:Depends}, supergfxctl +Depends: ${misc:Depends}, ${shlibs:Depends}, supergfxctl 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, 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 diff --git a/debian/source/format b/debian/source/format index 89ae9db..163aaf8 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (native) +3.0 (quilt) diff --git a/debian/source/include-binaries b/debian/source/include-binaries deleted file mode 100644 index 977818f..0000000 --- a/debian/source/include-binaries +++ /dev/null @@ -1 +0,0 @@ -vendor_asusctl_4.5.3.tar.xz diff --git a/main.sh b/main.sh deleted file mode 100755 index 792e315..0000000 --- a/main.sh +++ /dev/null @@ -1,18 +0,0 @@ -DEBIAN_FRONTEND=noninteractive - -# Clone Upstream -git clone https://gitlab.com/asus-linux/asusctl -b 4.7.2 -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_4.7.2 -dpkg-buildpackage - -# Move the debs to output -cd ../ -mkdir -p ./output -mv ./*.deb ./output/ diff --git a/mainv3.sh b/mainv3.sh new file mode 100755 index 0000000..1f3f53e --- /dev/null +++ b/mainv3.sh @@ -0,0 +1,33 @@ +#! /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 didn't go clean" +dpkg-buildpackage --no-sign + +# Move the debs to output +cd ../ +mkdir -p ./output +mv ./*.deb ./output/ diff --git a/release.sh b/release.sh index 1575255..660f48f 100755 --- a/release.sh +++ b/release.sh @@ -1,8 +1,2 @@ # send debs to server -rsync -azP --include './' --include '*.deb' --exclude '*' ./output/ ferreo@direct.pika-os.com:/srv/www/incoming/ - -# add debs to repo -ssh ferreo@direct.pika-os.com 'aptly repo add -force-replace -remove-files pikauwu-main /srv/www/incoming/' - -# publish the repo -ssh ferreo@direct.pika-os.com 'aptly publish update -batch -skip-contents -force-overwrite pikauwu filesystem:pikarepo:' \ No newline at end of file +rsync -azP --include './' --include '*.deb' --exclude '*' ./output/ ferreo@direct.pika-os.com:/srv/www/cockatiel-incoming/