From 29774c6a10959aa95429645fa67ddeab37d8cede Mon Sep 17 00:00:00 2001 From: ferreo Date: Sat, 21 Dec 2024 01:38:30 +0000 Subject: [PATCH] Upgrade to version 4.0.0, split pika-baseos into multiple packages, and update installation scripts. Adjusted changelog and release notes accordingly. --- .github/release-nest-v3 | 2 +- main.sh | 2 +- pika-baseos/debian/changelog | 6 + pika-baseos/debian/control | 129 ++++++++++++------ ...os.install => pika-baseos-minimal.install} | 0 .../debian/pika-baseos-minimal.postinst | 4 + pika-baseos/debian/pika-baseos.postinst | 5 +- 7 files changed, 101 insertions(+), 47 deletions(-) rename pika-baseos/debian/{pika-baseos.install => pika-baseos-minimal.install} (100%) create mode 100644 pika-baseos/debian/pika-baseos-minimal.postinst diff --git a/.github/release-nest-v3 b/.github/release-nest-v3 index d8263ee..56a6051 100644 --- a/.github/release-nest-v3 +++ b/.github/release-nest-v3 @@ -1 +1 @@ -2 \ No newline at end of file +1 \ No newline at end of file diff --git a/main.sh b/main.sh index a4f544c..37a5c27 100755 --- a/main.sh +++ b/main.sh @@ -2,7 +2,7 @@ set -e -VERSION="3.0.7" +VERSION="4.0.0" source ./pika-build-config.sh diff --git a/pika-baseos/debian/changelog b/pika-baseos/debian/changelog index 0fbca3b..2d15e50 100644 --- a/pika-baseos/debian/changelog +++ b/pika-baseos/debian/changelog @@ -1,3 +1,9 @@ +pika-baseos (4.0.0-101pika1) pika; urgency=medium + + * Split into multiple packages + + -- Ward Nakchbandi Thu, 12 Jan 2023 16:48:00 +030 + pika-baseos (3.0.7-101pika2) pika; urgency=medium * Add basic network config diff --git a/pika-baseos/debian/control b/pika-baseos/debian/control index 446450a..57df056 100644 --- a/pika-baseos/debian/control +++ b/pika-baseos/debian/control @@ -6,7 +6,7 @@ Standards-Version: 4.6.1 Build-Depends: debhelper-compat (= 13) Rules-Requires-Root: no -Package: pika-baseos +Package: pika-baseos-minimal Architecture: all Essential: yes Pre-Depends: @@ -46,7 +46,6 @@ Pre-Depends: rsyslog, zram-tools, Depends: ${misc:Depends}, -# Base ## Basic minimal setup adduser, apt, @@ -81,9 +80,18 @@ Depends: ${misc:Depends}, vim, whiptail, rsyslog, +## Filesystems + lvm2, + ecryptfs-utils, + ntfs-3g, + nfs-common, + apfsprogs, + btrfs-progs, + e2fsprogs, + exfatprogs, + hfsprogs, + xfsprogs, ## General - desktop-base, - libglib2.0-bin, pika-package-manager, apt-transport-https, software-properties-common, @@ -100,13 +108,42 @@ Depends: ${misc:Depends}, curl, git, dbus-broker, - flatpak, ca-certificates, libapr1, libaprutil1, - libxcb-cursor0, ananicy-rules, booster, + xdg-user-dirs, + xdg-utils, +# Hardware + fwupd, + fwupdate, + pcmciautils, + acpi, +## Firmware + linux-firmware, + firmware-sof-signed, +## Networking + network-manager, + resolvconf, + libnss-mdns, + net-tools, + libproxy1-plugin-networkmanager, + wireless-tools, + nfs-common, + samba-common-bin, + wpasupplicant, +Description: The minimal backbone of PikaOS + +Package: pika-baseos-desktop +Architecture: all +Essential: no +Depends: ${misc:Depends}, +## Desktop + desktop-base, + libglib2.0-bin, + flatpak, + libxcb-cursor0, python3-cairo, python3-gi-cairo, ## gvfs backends @@ -117,22 +154,20 @@ Depends: ${misc:Depends}, xdg-desktop-portal, xdg-user-dirs, xdg-utils, -## Filesystems - lvm2, - ecryptfs-utils, - ntfs-3g, - nfs-common, - apfsprogs, - btrfs-progs, - e2fsprogs, - exfatprogs, - hfsprogs, - xfsprogs, -# Hardware - fwupd, - fwupdate, - pcmciautils, +## Hardware mousetweaks, +## Networking + ifupdown, + network-manager, + libproxy1-plugin-gsettings, + gstreamer1.0-plugins-base-apps, + glib-networking, +Description: Desktop environment + +Package: pika-baseos-graphics +Architecture: all +Essential: no +Depends: ${misc:Depends}, ## Display and Graphics pika-amdgpu-core, pika-amdgpu-config, @@ -142,32 +177,44 @@ Depends: ${misc:Depends}, mesa-hybrid | mesa-stable | mesa-git | mesa-custom | mesa-hybrid-no-march | mesa-stable-no-march | mesa-git-no-march | mesa-custom-no-march, wayland-protocols, xwayland, +Description: Display and Graphics + +Package: pika-baseos-laptop +Architecture: all +Essential: no +Depends: ${misc:Depends}, ## Power saving and laptops laptop-detect, supergfxctl, switcheroo-control, - acpi, -## Firmware - linux-firmware, - firmware-sof-signed, -## Networking and Bluetooth - bluez, - ifupdown, - network-manager, - resolvconf, - libnss-mdns, - net-tools, - libproxy1-plugin-gsettings, - libproxy1-plugin-networkmanager, - wireless-tools, - rfkill, - gstreamer1.0-plugins-base-apps, - glib-networking, - nfs-common, - samba-common-bin, - wpasupplicant, +Description: Power saving and laptops + +Package: pika-baseos-audio +Architecture: all +Essential: no +Depends: ${misc:Depends}, ## Audio and codecs pika-audio-pipewire | pika-audio-legacy +Description: Audio stack + +Package: pika-baseos-bluetooth +Architecture: all +Essential: no +Depends: ${misc:Depends}, +## Bluetooth + bluez +Description: Bluetooth stack + +Package: pika-baseos +Architecture: all +Essential: yes +Depends: ${misc:Depends}, + pika-baseos-minimal, + pika-baseos-desktop, + pika-baseos-graphics, + pika-baseos-laptop, + pika-baseos-audio, + pika-baseos-bluetooth, Recommends: power-profiles-daemon Conflicts: nvidia-prime Description: The backbone of PikaOS diff --git a/pika-baseos/debian/pika-baseos.install b/pika-baseos/debian/pika-baseos-minimal.install similarity index 100% rename from pika-baseos/debian/pika-baseos.install rename to pika-baseos/debian/pika-baseos-minimal.install diff --git a/pika-baseos/debian/pika-baseos-minimal.postinst b/pika-baseos/debian/pika-baseos-minimal.postinst new file mode 100644 index 0000000..a24ba1f --- /dev/null +++ b/pika-baseos/debian/pika-baseos-minimal.postinst @@ -0,0 +1,4 @@ +#! /bin/bash +apt-mark hold snapd || true +echo "" >> /etc/hosts +echo "127.0.1.1 ${HOSTNAME}" >> /etc/hosts \ No newline at end of file diff --git a/pika-baseos/debian/pika-baseos.postinst b/pika-baseos/debian/pika-baseos.postinst index c4d0ebf..de2b76b 100644 --- a/pika-baseos/debian/pika-baseos.postinst +++ b/pika-baseos/debian/pika-baseos.postinst @@ -1,7 +1,4 @@ #! /bin/bash systemctl disable --now gpu-manager || true systemctl mask gpu-manager || true -systemctl enable --now nvidia-pika-prime || true -apt-mark hold snapd || true -echo "" >> /etc/hosts -echo "127.0.1.1 ${HOSTNAME}" >> /etc/hosts \ No newline at end of file +systemctl enable --now nvidia-pika-prime || true \ No newline at end of file