Compare commits

..

No commits in common. "main" and "kinetic" have entirely different histories.

19 changed files with 114 additions and 269 deletions

View File

@ -1 +0,0 @@
1

View File

@ -1 +0,0 @@
1

View File

@ -1 +0,0 @@
2

View File

@ -1 +0,0 @@
2

View File

@ -1,37 +0,0 @@
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

View File

@ -1,37 +0,0 @@
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

View File

@ -1,40 +0,0 @@
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

View File

@ -1,40 +0,0 @@
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

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

@ -0,0 +1,40 @@
name: PikaOS Package Release
on:
workflow_dispatch
jobs:
build:
runs-on: self-hosted
container:
image: ubuntu:22.10
volumes:
- /proc:/proc
options: --privileged -it
steps:
- uses: actions/checkout@v3
- name: Install needed packages
run: apt update && apt install software-properties-common sudo git bc gpg gpg-agent bison build-essential ccache cpio fakeroot flex git kmod libelf-dev libncurses5-dev libssl-dev lz4 qtbase5-dev rsync schedtool wget zstd tar reprepro dpkg-sig devscripts -y
- 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

21
main.sh
View File

@ -1,13 +1,8 @@
#! /bin/bash
set -e
VERSION="4.0.0"
source ./pika-build-config.sh
echo "$PIKA_BUILD_ARCH" > pika-build-arch
# Add dependent repositories
wget -q -O - https://ppa.pika-os.com/key.gpg | sudo apt-key add -
add-apt-repository https://ppa.pika-os.com
add-apt-repository ppa:pikaos/pika
add-apt-repository ppa:kubuntu-ppa/backports
# Clone Upstream
cd ./pika-kde-desktop
@ -15,10 +10,10 @@ 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
dh_make --createorig
dpkg-buildpackage
# Move the debs to output
cd ../
mkdir -p ./output
mv ./*.deb ./output/
mv ./*.deb ./output/

View File

@ -1,10 +0,0 @@
#! /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

View File

@ -1,5 +0,0 @@
#! /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,27 +1,3 @@
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
-- Ward Nakchbandi <hotrod.master@hotmail.com> Thu, 12 Jan 2023 16:48:00 +0300
pika-kde-desktop (3.9.0-100pika1) pikauwu; urgency=medium
* Revert to ibus
-- Ward Nakchbandi <hotrod.master@hotmail.com> Thu, 12 Jan 2023 16:48:00 +0300
pika-kde-desktop (3.8.5-99pika2.lunar) lunar; urgency=medium
* Update to lunar
-- Ward Nakchbandi <hotrod.master@hotmail.com> Thu, 12 Jan 2023 16:48:00 +0300
pika-kde-desktop (3.7.0) kinetic; urgency=medium
* Add fcitix5

View File

@ -6,21 +6,22 @@ Standards-Version: 4.6.1
Build-Depends: debhelper-compat (= 13)
Rules-Requires-Root: no
Package: pika-kde-desktop
Package: pika-kde-desktop-minimal
Architecture: amd64
Homepage: https://www.kde.org
Description: PikaOS KDE Desktop Metapackage
Description: PikaOS Minimal KDE Desktop Metapackage
Depends: ${misc:Depends},
# BaseOS
pika-baseos,
# Basic Session
kde-plasma-desktop,
kamera,
kgamma,
kgamma5,
svgpart,
plasma-pa,
plasma-nm,
pika-kde-settings | pika-settings,
pika-kde-settings,
plasma-workspace-wayland,
kwin-x11,
sddm,
# Fonts
@ -30,6 +31,7 @@ Depends: ${misc:Depends},
fonts-liberation,
fonts-indic,
fonts-kacst-one,
fonts-khmeros-core,
fonts-lao,
fonts-liberation,
fonts-lklug-sinhala,
@ -40,31 +42,29 @@ 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,
# Plugins
ghostscript-x,
inputattach,
libatk-adaptor,
libcanberra-gtk-module,
appmenu-gtk2-module,
appmenu-gtk3-module,
kde-config-cddb,
kde-config-cron,
kde-config-flatpak,
kde-config-gtk-style,
kde-config-gtk-style-preview,
kde-config-plymouth,
kde-config-screenlocker,
kde-config-sddm,
kde-config-systemd,
kde-config-tablet,
kde-config-telepathy-accounts,
kdenetwork-filesharing,
kde-zeroconf,
dolphin-plugins,
kdegraphics-mobipocket,
kdegraphics-thumbnailers,
kdeconnect,
kde-cli-tools,
baloo-kf5,
baloo6,
frameworkintegration,
inputattach,
khelpcenter,
@ -74,6 +74,7 @@ Depends: ${misc:Depends},
kio-extras,
kmenuedit,
kwrited,
language-selector-common,
bluedevil,
powerdevil,
desktop-file-utils,
@ -107,7 +108,9 @@ Depends: ${misc:Depends},
kwalletmanager,
print-manager,
fonts-noto-color-emoji,
firmware-manager,
gucharmap,
ibus-table-emoji,
pika-welcome,
pavucontrol-qt,
filelight,
@ -127,12 +130,35 @@ Depends: ${misc:Depends},
ksystemlog,
gnome-disk-utility,
gwenview,
knewstuff-dialog,
plasma-discover,
plasma-discover-backend-flatpak,
plasma-discover-backend-fwupd,
fcitx5,
fcitx5-module-wayland,
fcitx5-module-xorg,
kde-config-fcitx5,
## Last to replace mime information
ark,
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
Recommends: firefox, gir1.2-dbusmenu-glib-0.4, gir1.2-dbusmenu-gtk3-0.4, gir1.2-dbusmenu-gtk-0.4, libappindicator3-1
Conflicts: plasma-discover, pika-gnome-layouts, 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

View File

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

View File

@ -1,20 +1,6 @@
#!/bin/bash
#!/bin/sh
set -e
if [[ ! -f /usr/bin/kreadconfig ]]
then
ln -s /usr/bin/kreadconfig5 /usr/bin/kreadconfig || true
fi
ln -s /usr/bin/kreadconfig5 /usr/bin/kreadconfig
if [[ ! -f /usr/share/applications/org.kde.discover.desktop ]]
then
ln -s /usr/share/applications/mintinstall.desktop /usr/share/applications/org.kde.discover.desktop
fi
if [[ ! -f /usr/share/applications/org.kde.discover.apt.urlhandler.desktop ]]
then
ln -s /usr/share/applications/mintinstall.desktop /usr/share/applications/org.kde.discover.apt.urlhandler.desktop
fi
sed -e '/NotShowIn/ s/^#*/#/' -i file /usr/share/applications/gdebi.desktop || true

View File

@ -1,18 +0,0 @@
#!/bin/bash
set -e
if readlink /usr/bin/kreadconfig
then
rm -rf /usr/bin/kreadconfig
fi
if readlink /usr/share/applications/org.kde.discover.desktop
then
rm -rf /usr/share/applications/org.kde.discover.desktop
fi
if readlink /usr/share/applications/org.kde.discover.apt.urlhandler.desktop
then
rm -rf /usr/share/applications/org.kde.discover.apt.urlhandler.desktop
fi

View File

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

View File

@ -1,2 +1,14 @@
# send debs to server
rsync -azP --include './' --include '*.deb' --exclude '*' ./output/ ferreo@direct.pika-os.com:/srv/www/cockatiel-incoming/
# Sign the packages
dpkg-sig --sign builder ./output/pika-kde-desktop*.deb
# Pull down existing ppa repo db files etc
rsync -azP --exclude '*.deb' ferreo@direct.pika-os.com:/srv/www/pikappa/ ./output/repo
# Remove our existing package from the repo
reprepro -V --basedir ./output/repo/ removefilter kinetic 'Package (% pika-kde-desktop*)'
# Add the new package to the repo
reprepro -V --basedir ./output/repo/ includedeb kinetic ./output/pika-kde-desktop*.deb
# Push the updated ppa repo to the server
rsync -azP ./output/repo/ ferreo@direct.pika-os.com:/srv/www/pikappa/