Compare commits

..

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

21 changed files with 200 additions and 360 deletions

View File

@ -1 +0,0 @@
1

View File

@ -1 +0,0 @@
1

View File

@ -1 +0,0 @@
1

View File

@ -1 +0,0 @@
4

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

23
main.sh
View File

@ -1,24 +1,19 @@
#! /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-gnome-desktop
cd ./pika-desktop
# Get build deps
apt-get build-dep ./ -y
# Build package
LOGNAME=root dh_make --createorig -y -l -p pika-gnome-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

@ -0,0 +1,56 @@
pika-desktop (3.6.0) kinetic; urgency=medium
* Add pika-theme
-- Ward Nakchbandi <hotrod.master@hotmail.com> Thu, 12 Jan 2023 16:48:00 +0300
pika-desktop (3.4.0) kinetic; urgency=medium
* Add gir1.2-gmenu-3.0
-- Ward Nakchbandi <hotrod.master@hotmail.com> Sat, 01 Oct 2022 14:50:00 +0300
pika-desktop (3.3.0) kinetic; urgency=medium
* Make the package non essential
-- Ward Nakchbandi <hotrod.master@hotmail.com> Sat, 01 Oct 2022 14:50:00 +0300
pika-desktop (3.2.0) kinetic; urgency=medium
* Move firefox to recommends
-- Ward Nakchbandi <hotrod.master@hotmail.com> Sat, 01 Oct 2022 14:50:00 +0300
pika-desktop (3.1.0) kinetic; urgency=medium
* Fix broken deps
-- Ward Nakchbandi <hotrod.master@hotmail.com> Sat, 01 Oct 2022 14:50:00 +0300
pika-desktop (3.0.0) kinetic; urgency=medium
* Adapt to BaseOS
-- Ward Nakchbandi <hotrod.master@hotmail.com> Sat, 01 Oct 2022 14:50:00 +0300
pika-desktop (2.0.0) kinetic; urgency=medium
* Replace Adwaita with papirus
-- Ward Nakchbandi <hotrod.master@hotmail.com> Sat, 01 Oct 2022 14:50:00 +0300
pika-desktop (1.0.1) kinetic; urgency=medium
* Change office depends to pika-meta
-- Ward Nakchbandi <hotrod.master@hotmail.com> Sat, 01 Oct 2022 14:50:00 +0300
pika-desktop (1.0.0) kinetic; urgency=medium
* First release
-- Ward Nakchbandi <hotrod.master@hotmail.com> Sat, 01 Oct 2022 14:50:00 +0300

View File

@ -1,4 +1,4 @@
Source: pika-gnome-desktop
Source: pika-desktop
Section: metapackages
Priority: optional
Maintainer: Ward Nakchbandi <hotrod.master@hotmail.com>
@ -6,111 +6,108 @@ Standards-Version: 4.6.1
Build-Depends: debhelper-compat (= 13)
Rules-Requires-Root: no
Package: pika-gnome-desktop
Package: pika-gnome-desktop-minimal
Architecture: linux-any
Depends:
${misc:Depends},
# PikaOS Basic
Depends: ${misc:Depends},
# BaseOS
pika-baseos,
pika-gnome-settings | pika-settings,
# Basic Desktop
# Basic Session
pika-session,
pika-settings,
gdm3,
gnome-shell,
gnome-session,
gnome-session-xsession,
# Gnome VRR Session
gnome-shell-vrr,
mutter-vrr,
# Fonts
fonts-cantarell,
fonts-dejavu-core,
fonts-freefont-ttf,
fonts-inter-variable,
fonts-liberation,
fonts-noto-color-emoji,
# Theming
adwaita-icon-theme,
adw-gtk3-theme,
gnome-themes-standard,
gnome-themes-extra,
sound-theme-freedesktop,
adwaita-icon-theme-full,
adw-gtk3-theme,
papirus-icon-theme,
# Desktop Libs
appmenu-gtk2-module,
appmenu-gtk3-module,
at-spi2-core,
baobab,
brltty,
sound-theme-freedesktop,
pika-theme,
pika-gdm-theme,
# Plugins
chrome-gnome-shell,
dconf-cli,
dconf-gsettings-backend,
ghostscript-x,
gir1.2-gmenu-3.0,
gkbd-capplet,
glib-networking,
gsettings-desktop-schemas,
gstreamer1.0-packagekit,
gstreamer1.0-plugins-base,
gstreamer1.0-plugins-good,
gucharmap,
gvfs-backends,
gvfs-fuse,
ibus-table-emoji,
gnome-bluetooth,
gnome-online-miners,
gnome-menus,
gnome-video-effects,
inputattach,
libatk-adaptor,
libcanberra-pulse,
libglib2.0-bin,
libcanberra-gtk-module,
libpam-gnome-keyring,
libproxy1-plugin-gsettings,
libproxy1-plugin-webkit,
librsvg2-common,
system-config-printer-common,
system-config-printer-udev,
tracker,
xdg-desktop-portal-gnome,
# Apps
gnome-bluetooth,
gnome-calculator,
gnome-calendar,
gnome-characters,
gnome-clocks,
gnome-console | kgx | gnome-terminal,
gnome-contacts,
network-manager-pptp-gnome,
network-manager-openvpn-gnome,
appmenu-gtk2-module,
appmenu-gtk3-module,
brltty,
language-selector-gnome,
gnome-remote-desktop,
gnome-shell-extension-legacy-gtk3-theme-scheme-auto-switcher,
gnome-shell-extension-supergfxctl-gex,
nautilus-share,
gir1.2-gmenu-3.0,
# Applications
gnome-control-center,
gnome-disk-utility,
gnome-firmware,
gnome-font-viewer,
gnome-keyring,
gnome-logs,
gnome-menus,
gnome-online-accounts,
gnome-photos,
gnome-power-manager,
gnome-remote-desktop,
gnome-settings-daemon,
gnome-shell-extension-manager,
gnome-software,
gnome-sushi,
gnome-system-monitor,
gnome-text-editor,
gnome-tweaks,
gnome-user-docs,
gnome-user-share,
gnome-video-effects,
gnome-weather,
loupe,
gnome-terminal | kgx,
nautilus,
pavucontrol,
fonts-noto-color-emoji,
gnome-shell-extension-manager,
gnome-tweaks,
baobab,
eog,
firmware-manager,
geary,
gnome-text-editor,
gnome-calculator,
gnome-calendar,
gnome-contacts,
gnome-font-viewer,
gnome-power-manager,
gnome-weather,
gnome-photos,
gnome-sushi,
gucharmap,
ibus-table-emoji,
pika-welcome,
seahorse,
simple-scan,
totem,
zenity,
yelp,
# Extensions
gnome-shell-extension-supergfxctl-gex,
gnome-software-plugin-deb,
gnome-software-plugin-flatpak,
gnome-software-plugin-fwupd,
nautilus-share,
network-manager-openvpn-gnome,
network-manager-pptp-gnome,
gnome-bluetooth-sendto,
pavucontrol,
## Last to replace mime information
file-roller,
Description: PikaOS Minimal Gnome Desktop Metapackage
Recommends: firefox
Package: pika-gnome-desktop
Architecture: linux-any
Depends: ${misc:Depends},
# Pull minimal desktop
pika-gnome-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 Gnome Desktop Metapackage
Recommends: firefox, pika-gnome-settings

View File

View File

@ -0,0 +1 @@
3.0 (native)

View File

@ -1,87 +0,0 @@
pika-gnome-desktop (4.0.0-101pika1) pika; urgency=medium
* Update to OS 4
-- Ward Nakchbandi <hotrod.master@hotmail.com> Thu, 12 Jan 2023 16:48:00 +0300
pika-gnome-desktop (3.7.2-100pika1) pikauwu; urgency=medium
* Use new settings model
-- Ward Nakchbandi <hotrod.master@hotmail.com> Thu, 12 Jan 2023 16:48:00 +0300
pika-gnome-desktop (3.7.0-100pika1) pikauwu; urgency=medium
* Return to ibus
-- Ward Nakchbandi <hotrod.master@hotmail.com> Thu, 12 Jan 2023 16:48:00 +0300
pika-gnome-desktop (3.6.4-99pika3.lunar) lunar; urgency=medium
* Add pika-theme
-- Ward Nakchbandi <hotrod.master@hotmail.com> Thu, 12 Jan 2023 16:48:00 +0300
pika-gnome-desktop (3.6.2-99pika2.lunar) lunar; urgency=medium
* Add pika-theme
-- Ward Nakchbandi <hotrod.master@hotmail.com> Thu, 12 Jan 2023 16:48:00 +0300
pika-gnome-desktop (3.6.0) kinetic; urgency=medium
* Add pika-theme
-- Ward Nakchbandi <hotrod.master@hotmail.com> Thu, 12 Jan 2023 16:48:00 +0300
pika-gnome-desktop (3.4.0) kinetic; urgency=medium
* Add gir1.2-gmenu-3.0
-- Ward Nakchbandi <hotrod.master@hotmail.com> Sat, 01 Oct 2022 14:50:00 +0300
pika-gnome-desktop (3.3.0) kinetic; urgency=medium
* Make the package non essential
-- Ward Nakchbandi <hotrod.master@hotmail.com> Sat, 01 Oct 2022 14:50:00 +0300
pika-gnome-desktop (3.2.0) kinetic; urgency=medium
* Move firefox to recommends
-- Ward Nakchbandi <hotrod.master@hotmail.com> Sat, 01 Oct 2022 14:50:00 +0300
pika-gnome-desktop (3.1.0) kinetic; urgency=medium
* Fix broken deps
-- Ward Nakchbandi <hotrod.master@hotmail.com> Sat, 01 Oct 2022 14:50:00 +0300
pika-gnome-desktop (3.0.0) kinetic; urgency=medium
* Adapt to BaseOS
-- Ward Nakchbandi <hotrod.master@hotmail.com> Sat, 01 Oct 2022 14:50:00 +0300
pika-gnome-desktop (2.0.0) kinetic; urgency=medium
* Replace Adwaita with papirus
-- Ward Nakchbandi <hotrod.master@hotmail.com> Sat, 01 Oct 2022 14:50:00 +0300
pika-gnome-desktop (1.0.1) kinetic; urgency=medium
* Change office depends to pika-meta
-- Ward Nakchbandi <hotrod.master@hotmail.com> Sat, 01 Oct 2022 14:50:00 +0300
pika-gnome-desktop (1.0.0) kinetic; urgency=medium
* First release
-- Ward Nakchbandi <hotrod.master@hotmail.com> Sat, 01 Oct 2022 14:50:00 +0300

View File

@ -1 +0,0 @@
3.0 (quilt)

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-gnome-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-gnome-desktop*)'
# Add the new package to the repo
reprepro -V --basedir ./output/repo/ includedeb kinetic ./output/pika-gnome-desktop*.deb
# Push the updated ppa repo to the server
rsync -azP ./output/repo/ ferreo@direct.pika-os.com:/srv/www/pikappa/