Update upstream + PikaOS 4

This commit is contained in:
Ward from fusion-voyager-3 2024-07-23 18:16:56 +03:00
parent 942cf4d125
commit 3a8dbb909b
12 changed files with 153 additions and 41 deletions

34
.github/workflows/build-canaryv3.yml vendored Normal file
View File

@ -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

34
.github/workflows/build-nestv3.yml vendored Normal file
View File

@ -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

View File

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

37
.github/workflows/release-nestv3.yml vendored Normal file
View File

@ -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

2
cargo-config-v3.toml Normal file
View File

@ -0,0 +1,2 @@
[build]
target = "x86-64-v3"

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
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 asusctl (4.7.2-100pika1) pikauwu; urgency=low
* New Upstream Release * New Upstream Release

4
debian/control vendored
View File

@ -8,12 +8,12 @@ Homepage: https://gitlab.com/asus-linux/asusctl
Package: asusctl Package: asusctl
Section: misc Section: misc
Architecture: amd64 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 Description: Control fan speeds, LEDs, graphics modes, and charge levels for ASUS notebooks
Package: rog-control-center Package: rog-control-center
Section: misc Section: misc
Architecture: amd64 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 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

View File

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

View File

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

18
main.sh
View File

@ -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/

33
mainv3.sh Executable file
View File

@ -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/

View File

@ -1,8 +1,2 @@
# send debs to server # send debs to server
rsync -azP --include './' --include '*.deb' --exclude '*' ./output/ ferreo@direct.pika-os.com:/srv/www/incoming/ rsync -azP --include './' --include '*.deb' --exclude '*' ./output/ ferreo@direct.pika-os.com:/srv/www/cockatiel-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:'