Adapt to OS 4
This commit is contained in:
parent
9f4794ec7f
commit
90dd1e2c68
1
.github/build-canary-v3
vendored
Normal file
1
.github/build-canary-v3
vendored
Normal file
@ -0,0 +1 @@
|
||||
1
|
1
.github/build-nest-v3
vendored
Normal file
1
.github/build-nest-v3
vendored
Normal file
@ -0,0 +1 @@
|
||||
1
|
1
.github/release-canary-v3
vendored
Normal file
1
.github/release-canary-v3
vendored
Normal file
@ -0,0 +1 @@
|
||||
2
|
1
.github/release-nest-v3
vendored
Normal file
1
.github/release-nest-v3
vendored
Normal file
@ -0,0 +1 @@
|
||||
1
|
37
.github/workflows/build-canaryv3.yml
vendored
Normal file
37
.github/workflows/build-canaryv3.yml
vendored
Normal 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
37
.github/workflows/build-nestv3.yml
vendored
Normal 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
40
.github/workflows/release-canaryv3.yml
vendored
Normal 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
40
.github/workflows/release-nestv3.yml
vendored
Normal 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
|
46
.github/workflows/release.yml
vendored
46
.github/workflows/release.yml
vendored
@ -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 }}
|
9
main.sh
9
main.sh
@ -1,5 +1,13 @@
|
||||
#! /bin/bash
|
||||
|
||||
set -e
|
||||
|
||||
VERSION="4.0.0"
|
||||
|
||||
source ./pika-build-config.sh
|
||||
|
||||
echo "$PIKA_BUILD_ARCH" > pika-build-arch
|
||||
|
||||
# Clone Upstream
|
||||
cd ./pika-kde-desktop
|
||||
|
||||
@ -7,6 +15,7 @@ cd ./pika-kde-desktop
|
||||
apt-get build-dep ./ -y
|
||||
|
||||
# Build package
|
||||
LOGNAME=root dh_make --createorig -y -l -p pika-kde-desktop_"$VERSION" || echo "dh-make: Ignoring Last Error"
|
||||
dpkg-buildpackage --no-sign
|
||||
|
||||
# Move the debs to output
|
||||
|
10
pika-build-config/amd64-v3.sh
Executable file
10
pika-build-config/amd64-v3.sh
Executable 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
5
pika-build-config/i386.sh
Executable 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
|
@ -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
|
||||
|
||||
* New settings model
|
||||
|
@ -6,22 +6,21 @@ Standards-Version: 4.6.1
|
||||
Build-Depends: debhelper-compat (= 13)
|
||||
Rules-Requires-Root: no
|
||||
|
||||
Package: pika-kde-desktop-minimal
|
||||
Package: pika-kde-desktop
|
||||
Architecture: amd64
|
||||
Homepage: https://www.kde.org
|
||||
Description: PikaOS Minimal KDE Desktop Metapackage
|
||||
Description: PikaOS KDE Desktop Metapackage
|
||||
Depends: ${misc:Depends},
|
||||
# BaseOS
|
||||
pika-baseos,
|
||||
# Basic Session
|
||||
kde-plasma-desktop,
|
||||
kamera,
|
||||
kgamma5,
|
||||
kgamma,
|
||||
svgpart,
|
||||
plasma-pa,
|
||||
plasma-nm,
|
||||
pika-kde-settings | pika-settings,
|
||||
plasma-workspace-wayland,
|
||||
kwin-x11,
|
||||
sddm,
|
||||
# Fonts
|
||||
@ -31,7 +30,6 @@ Depends: ${misc:Depends},
|
||||
fonts-liberation,
|
||||
fonts-indic,
|
||||
fonts-kacst-one,
|
||||
fonts-khmeros-core,
|
||||
fonts-lao,
|
||||
fonts-liberation,
|
||||
fonts-lklug-sinhala,
|
||||
@ -42,20 +40,10 @@ Depends: ${misc:Depends},
|
||||
fonts-thai-tlwg,
|
||||
fonts-tibetan-machine,
|
||||
fonts-ubuntu,
|
||||
# Theming
|
||||
breeze,
|
||||
breeze-icon-theme,
|
||||
breeze-gtk-theme,
|
||||
sddm-theme-breeze,
|
||||
papirus-icon-theme,
|
||||
sound-theme-freedesktop,
|
||||
pika-theme,
|
||||
pika-settings,
|
||||
# Plugins
|
||||
ghostscript-x,
|
||||
inputattach,
|
||||
libatk-adaptor,
|
||||
libcanberra-gtk-module,
|
||||
appmenu-gtk2-module,
|
||||
appmenu-gtk3-module,
|
||||
kde-config-cddb,
|
||||
@ -69,15 +57,14 @@ Depends: ${misc:Depends},
|
||||
kde-config-systemd,
|
||||
kde-config-tablet,
|
||||
kde-config-telepathy-accounts,
|
||||
kde-config-whoopsie,
|
||||
kdenetwork-filesharing,
|
||||
kde-zeroconf,
|
||||
dolphin-plugins,
|
||||
kdegraphics-mobipocket,
|
||||
kdegraphics-thumbnailers,
|
||||
kdeconnect,
|
||||
kde-cli-tools,
|
||||
baloo-kf5,
|
||||
baloo6,
|
||||
frameworkintegration,
|
||||
inputattach,
|
||||
khelpcenter,
|
||||
@ -87,7 +74,6 @@ Depends: ${misc:Depends},
|
||||
kio-extras,
|
||||
kmenuedit,
|
||||
kwrited,
|
||||
language-selector-common,
|
||||
bluedevil,
|
||||
powerdevil,
|
||||
desktop-file-utils,
|
||||
@ -121,7 +107,6 @@ Depends: ${misc:Depends},
|
||||
kwalletmanager,
|
||||
print-manager,
|
||||
fonts-noto-color-emoji,
|
||||
firmware-manager,
|
||||
gucharmap,
|
||||
pika-welcome,
|
||||
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
|
||||
Conflicts: plasma-discover-backend-snap, partitionmanager
|
||||
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
|
||||
|
@ -1 +0,0 @@
|
||||
pika-kde-desktop_3.3.0_source.buildinfo metapackages optional
|
@ -4,7 +4,7 @@ set -e
|
||||
|
||||
if [[ ! -f /usr/bin/kreadconfig ]]
|
||||
then
|
||||
ln -s /usr/bin/kreadconfig5 /usr/bin/kreadconfig
|
||||
ln -s /usr/bin/kreadconfig5 /usr/bin/kreadconfig || true
|
||||
fi
|
||||
|
||||
if [[ ! -f /usr/share/applications/org.kde.discover.desktop ]]
|
||||
|
@ -1 +1 @@
|
||||
3.0 (native)
|
||||
3.0 (quilt)
|
||||
|
@ -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:'
|
||||
rsync -azP --include './' --include '*.deb' --exclude '*' ./output/ ferreo@direct.pika-os.com:/srv/www/cockatiel-incoming/
|
Loading…
Reference in New Issue
Block a user