Adapt to OS 4

This commit is contained in:
Ward from fusion-voyager-3 2024-08-26 18:22:27 +03:00
parent 9f4794ec7f
commit 90dd1e2c68
18 changed files with 197 additions and 100 deletions

1
.github/build-canary-v3 vendored Normal file
View File

@ -0,0 +1 @@
1

1
.github/build-nest-v3 vendored Normal file
View File

@ -0,0 +1 @@
1

1
.github/release-canary-v3 vendored Normal file
View File

@ -0,0 +1 @@
2

1
.github/release-nest-v3 vendored Normal file
View File

@ -0,0 +1 @@
1

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

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

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

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

40
.github/workflows/release-canaryv3.yml vendored Normal file
View File

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

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

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

View File

@ -1,46 +0,0 @@
name: PikaOS Package Release
on:
workflow_dispatch
jobs:
build:
runs-on: self-hosted
container:
image: ghcr.io/pikaos-linux/pika-package-container:latest
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: ./main.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 }}

View File

@ -1,5 +1,13 @@
#! /bin/bash #! /bin/bash
set -e
VERSION="4.0.0"
source ./pika-build-config.sh
echo "$PIKA_BUILD_ARCH" > pika-build-arch
# Clone Upstream # Clone Upstream
cd ./pika-kde-desktop cd ./pika-kde-desktop
@ -7,6 +15,7 @@ cd ./pika-kde-desktop
apt-get build-dep ./ -y apt-get build-dep ./ -y
# Build package # Build package
LOGNAME=root dh_make --createorig -y -l -p pika-kde-desktop_"$VERSION" || echo "dh-make: Ignoring Last Error"
dpkg-buildpackage --no-sign dpkg-buildpackage --no-sign
# Move the debs to output # Move the debs to output

10
pika-build-config/amd64-v3.sh Executable file
View File

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

5
pika-build-config/i386.sh Executable file
View File

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

View File

@ -1,3 +1,9 @@
pika-kde-desktop (4.0.0-100pika1) pika; urgency=medium
* Port to PikaOS 4
-- Ward Nakchbandi <hotrod.master@hotmail.com> Thu, 12 Jan 2023 16:48:00 +0300
pika-kde-desktop (3.9.3-100pika3) pikauwu; urgency=medium pika-kde-desktop (3.9.3-100pika3) pikauwu; urgency=medium
* New settings model * New settings model

View File

@ -6,22 +6,21 @@ Standards-Version: 4.6.1
Build-Depends: debhelper-compat (= 13) Build-Depends: debhelper-compat (= 13)
Rules-Requires-Root: no Rules-Requires-Root: no
Package: pika-kde-desktop-minimal Package: pika-kde-desktop
Architecture: amd64 Architecture: amd64
Homepage: https://www.kde.org Homepage: https://www.kde.org
Description: PikaOS Minimal KDE Desktop Metapackage Description: PikaOS KDE Desktop Metapackage
Depends: ${misc:Depends}, Depends: ${misc:Depends},
# BaseOS # BaseOS
pika-baseos, pika-baseos,
# Basic Session # Basic Session
kde-plasma-desktop, kde-plasma-desktop,
kamera, kamera,
kgamma5, kgamma,
svgpart, svgpart,
plasma-pa, plasma-pa,
plasma-nm, plasma-nm,
pika-kde-settings | pika-settings, pika-kde-settings | pika-settings,
plasma-workspace-wayland,
kwin-x11, kwin-x11,
sddm, sddm,
# Fonts # Fonts
@ -31,7 +30,6 @@ Depends: ${misc:Depends},
fonts-liberation, fonts-liberation,
fonts-indic, fonts-indic,
fonts-kacst-one, fonts-kacst-one,
fonts-khmeros-core,
fonts-lao, fonts-lao,
fonts-liberation, fonts-liberation,
fonts-lklug-sinhala, fonts-lklug-sinhala,
@ -42,20 +40,10 @@ Depends: ${misc:Depends},
fonts-thai-tlwg, fonts-thai-tlwg,
fonts-tibetan-machine, fonts-tibetan-machine,
fonts-ubuntu, fonts-ubuntu,
# Theming
breeze,
breeze-icon-theme,
breeze-gtk-theme,
sddm-theme-breeze,
papirus-icon-theme,
sound-theme-freedesktop,
pika-theme,
pika-settings,
# Plugins # Plugins
ghostscript-x, ghostscript-x,
inputattach, inputattach,
libatk-adaptor, libatk-adaptor,
libcanberra-gtk-module,
appmenu-gtk2-module, appmenu-gtk2-module,
appmenu-gtk3-module, appmenu-gtk3-module,
kde-config-cddb, kde-config-cddb,
@ -69,15 +57,14 @@ Depends: ${misc:Depends},
kde-config-systemd, kde-config-systemd,
kde-config-tablet, kde-config-tablet,
kde-config-telepathy-accounts, kde-config-telepathy-accounts,
kde-config-whoopsie,
kdenetwork-filesharing, kdenetwork-filesharing,
kde-zeroconf, kde-zeroconf,
dolphin-plugins, dolphin-plugins,
kdegraphics-mobipocket,
kdegraphics-thumbnailers, kdegraphics-thumbnailers,
kdeconnect, kdeconnect,
kde-cli-tools, kde-cli-tools,
baloo-kf5, baloo-kf5,
baloo6,
frameworkintegration, frameworkintegration,
inputattach, inputattach,
khelpcenter, khelpcenter,
@ -87,7 +74,6 @@ Depends: ${misc:Depends},
kio-extras, kio-extras,
kmenuedit, kmenuedit,
kwrited, kwrited,
language-selector-common,
bluedevil, bluedevil,
powerdevil, powerdevil,
desktop-file-utils, desktop-file-utils,
@ -121,7 +107,6 @@ Depends: ${misc:Depends},
kwalletmanager, kwalletmanager,
print-manager, print-manager,
fonts-noto-color-emoji, fonts-noto-color-emoji,
firmware-manager,
gucharmap, gucharmap,
pika-welcome, pika-welcome,
pavucontrol-qt, pavucontrol-qt,
@ -151,26 +136,3 @@ Depends: ${misc:Depends},
Recommends: firefox, gir1.2-dbusmenu-glib-0.4, gir1.2-dbusmenu-gtk3-0.4, gir1.2-dbusmenu-gtk-0.4, libappindicator3-1, pika-kde-settings Recommends: firefox, gir1.2-dbusmenu-glib-0.4, gir1.2-dbusmenu-gtk3-0.4, gir1.2-dbusmenu-gtk-0.4, libappindicator3-1, pika-kde-settings
Conflicts: plasma-discover-backend-snap, partitionmanager Conflicts: plasma-discover-backend-snap, partitionmanager
Suggests: skanlite Suggests: skanlite
Package: pika-kde-desktop
Architecture: linux-any
Depends: ${misc:Depends},
# Pull minimal desktop
pika-kde-desktop-minimal,
# Essential Apps
build-essential,
wget,
git,
curl,
# Gaming Utils
pika-gameutils-meta,
# AMDGPU Utils
pika-amdgpu-switcher,
pika-rocm-meta,
Recommends:
va-driver-all,
vdpau-driver-all,
vlc,
pika-codecs-meta,
pika-office-meta,
Description: PikaOS KDE Desktop Metapackage

View File

@ -1 +0,0 @@
pika-kde-desktop_3.3.0_source.buildinfo metapackages optional

View File

@ -4,7 +4,7 @@ set -e
if [[ ! -f /usr/bin/kreadconfig ]] if [[ ! -f /usr/bin/kreadconfig ]]
then then
ln -s /usr/bin/kreadconfig5 /usr/bin/kreadconfig ln -s /usr/bin/kreadconfig5 /usr/bin/kreadconfig || true
fi fi
if [[ ! -f /usr/share/applications/org.kde.discover.desktop ]] if [[ ! -f /usr/share/applications/org.kde.discover.desktop ]]

View File

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

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:'