Update upstream and for PikaOS 4

This commit is contained in:
Ward from fusion-voyager-3 2024-07-23 17:56:00 +03:00
parent 2a55967e60
commit b99fce2091
10 changed files with 153 additions and 37 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,14 +7,14 @@ 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
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Import GPG key - name: Import GPG key
id: import_gpg id: import_gpg
uses: crazy-max/ghaction-import-gpg@v5 uses: crazy-max/ghaction-import-gpg@v5
@ -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 @@
supergfxctl (5.2.3.git-101pika1) pika; urgency=low
* New Upstream Update + Update to PikaOS 4
-- Ward Nakchbandi <hotrod.master@hotmail.com> Sat, 01 Oct 2022 14:50:00 +0200
supergfxctl (5.1.2-100pika1) pikauwu; urgency=low supergfxctl (5.1.2-100pika1) pikauwu; urgency=low
* Update to pikauwu * Update to pikauwu

2
debian/control vendored
View File

@ -9,7 +9,7 @@ Homepage: https://gitlab.com/asus-linux/supergfxctl
Package: supergfxctl Package: supergfxctl
Section: misc Section: misc
Architecture: amd64 Architecture: amd64
Depends: ${misc:Depends} Depends: ${misc:Depends}, ${shlibs:Depends}
Description: supergfxctl is a super graphics mode controller for systems with hybrid gpus. Description: supergfxctl is a super graphics mode controller for systems with hybrid gpus.

16
main.sh
View File

@ -1,16 +0,0 @@
# Clone Upstream
git clone https://gitlab.com/asus-linux/supergfxctl -b 5.1.2
cp -rvf ./debian ./supergfxctl
cd ./supergfxctl
# Get build deps
apt-get build-dep ./ -y
# Build package
LOGNAME=root dh_make --createorig -y -l -p supergfxctl_5.1.2
dpkg-buildpackage
# Move the debs to output
cd ../
mkdir -p ./output
mv ./*.deb ./output/

34
mainv3.sh Executable file
View File

@ -0,0 +1,34 @@
#! /bin/bash
set -e
VERSION=5.2.3.git
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/supergfxctl -b "$VERSION"
git clone https://gitlab.com/asus-linux/supergfxctl
cp -rvf ./debian ./supergfxctl
mkdir ./supergfxctl/.cargo
cp -vf ./cargo-config-v3.toml ./supergfxctl/.cargo/config.toml
cd ./supergfxctl
# Get build deps
apt-get build-dep ./ -y
# Build package
LOGNAME=root dh_make --createorig -y -l -p supergfxctl_"$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:'