Update .github/release-nest-v3

.github/build-canary-v3

@@ -0,0 +1 @@
+1

.github/build-nest-v3

@@ -0,0 +1 @@
+1

.github/release-canary-v3

@@ -0,0 +1 @@
+2

.github/release-nest-v3

@@ -0,0 +1 @@
+3

.github/workflows/build-canaryv3.yml

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

.github/workflows/build-nestv3.yml

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

.github/workflows/release-canaryv3.yml

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

.github/workflows/release-nestv3.yml

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

.github/workflows/release.yml

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

LICENSE.md

@@ -0,0 +1,24 @@
+MIT License (With DPKG packaging compatibility)
+
+Copyright (c) 2024 PikaOS
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+Notes:
+The files covered by this license are any files and directories in the root of this repository (including but not limited to: `main.sh`, `release.sh`, and `.github`), with the exception of the `debian` directory and its contents if `debian/copyright` exists, and declares any files or directories as a different LICENSE/COPYRIGHT.

main.sh

@@ -1,3 +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-baseos
 
@@ -5,8 +15,8 @@ cd ./pika-baseos
 apt-get build-dep ./ -y
 
 # Build package
-dh_make --createorig
+LOGNAME=root dh_make --createorig -y -l -p pika-baseos_"$VERSION" || echo "dh-make: Ignoring Last Error"
-dpkg-buildpackage
+dpkg-buildpackage --no-sign
 
 # Move the debs to output
 cd ../

pika-baseos/debian/changelog

@@ -1,3 +1,63 @@
+pika-baseos (4.0.0-101pika3) pika; urgency=medium
+
+  * Fix PPD
+
+ -- Ward Nakchbandi <hotrod.master@hotmail.com>  Thu, 12 Jan 2023 16:48:00 +030
+
+pika-baseos (4.0.0-101pika1) pika; urgency=medium
+
+  * Split into multiple packages
+
+ -- Ward Nakchbandi <hotrod.master@hotmail.com>  Thu, 12 Jan 2023 16:48:00 +030
+
+pika-baseos (3.0.7-101pika2) pika; urgency=medium
+
+  * Add basic network config
+
+ -- Ward Nakchbandi <hotrod.master@hotmail.com>  Thu, 12 Jan 2023 16:48:00 +030
+
+pika-baseos (3.0.7-101pika1) pika; urgency=medium
+
+  * Add basic network config
+
+ -- Ward Nakchbandi <hotrod.master@hotmail.com>  Thu, 12 Jan 2023 16:48:00 +030
+
+pika-baseos (3.0.6-101pika1) pika; urgency=medium
+
+  * Add basic network config
+
+ -- Ward Nakchbandi <hotrod.master@hotmail.com>  Thu, 12 Jan 2023 16:48:00 +030
+
+pika-baseos (3.0.5-101pika1) pika; urgency=medium
+
+  * zram-tools
+
+ -- Ward Nakchbandi <hotrod.master@hotmail.com>  Thu, 12 Jan 2023 16:48:00 +030
+
+pika-baseos (3.0.4-101pika1) pika; urgency=medium
+
+  * remove cups
+
+ -- Ward Nakchbandi <hotrod.master@hotmail.com>  Thu, 12 Jan 2023 16:48:00 +030
+
+pika-baseos (3.0.3-101pika1) pika; urgency=medium
+
+  * fix some depends
+
+ -- Ward Nakchbandi <hotrod.master@hotmail.com>  Thu, 12 Jan 2023 16:48:00 +030
+
+pika-baseos (3.0.1-101pika1) pika; urgency=medium
+
+  * fix autocomplete and PATH
+
+ -- Ward Nakchbandi <hotrod.master@hotmail.com>  Thu, 12 Jan 2023 16:48:00 +030
+
+pika-baseos (3.0.0-101pika1) pika; urgency=medium
+
+  * PikaOS 4
+
+ -- Ward Nakchbandi <hotrod.master@hotmail.com>  Thu, 12 Jan 2023 16:48:00 +030
+
 pika-baseos (2.5.4-100pika8) pikauwu; urgency=medium
 
   * Remove ACPI-CALL-DKMS as it is built into the kernel

pika-baseos/debian/control

@@ -6,48 +6,80 @@ 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:
+## Basic minimal setup
+    adduser,
+    apt,
+    apt-utils,
+    base-files,    
+    console-setup,
+    debconf,
+    debconf-i18n,
+    dhcpcd-base,
+    e2fsprogs,
+    eject,
+    init,
+    iproute2,
+    iputils-ping,
+    kbd,
+    kmod,
+    less,
+    locales,
+    lsb-release,
+    mawk,
+    mount,
+    netbase,
+    netcat-openbsd,
+    netplan.io,
+    passwd,
+    procps,
+    python3,
+    sensible-utils,
+    sudo,
+    tzdata,
+    udev,
+    vim,
+    whiptail,
+    rsyslog,
+    zram-tools,
 Depends: ${misc:Depends}, 
-# Base
+## Basic minimal setup
-## General
+    adduser,
-    ubuntu-minimal,
+    apt,
-    libglib2.0-bin,
+    apt-utils,
-    pika-package-manager,
+    base-files,
-    apt-transport-https,
+    console-setup,
-    software-properties-common,
+    debconf,
-    refind,
+    debconf-i18n,
-    avahi-autoipd,
+    dhcpcd-base,
-    avahi-daemon,
+    e2fsprogs,
-    dbus-user-session,
+    eject,
-    pika-sources,
+    init,
-    openssh-server,
+    iproute2,
-    ppa-purge,
+    iputils-ping,
-    nano,
+    kbd,
-    bash-completion,
+    kmod,
-    wget,
+    less,
-    curl,
+    locales,
-    git,
+    lsb-release,
-    dbus-broker,
+    mawk,
-    flatpak,
+    mount,
-    ca-certificates,
+    netbase,
-    libapr1,
+    netcat-openbsd,
-    libaprutil1, 
+    netplan.io,
-    libxcb-cursor0,
+    passwd,
-    ananicy-rules,
+    procps,
-    booster,
+    python3,
-    python3-cairo,
+    sensible-utils,
-    python3-gi-cairo,
+    sudo,
-## gvfs backends
+    tzdata,
-    gvfs-backends,
+    udev,
-    gvfs-fuse,
+    vim,
-## XDG
+    whiptail,
-    policykit-desktop-privileges,
+    rsyslog,
-    xdg-desktop-portal,
-    xdg-user-dirs,
-    xdg-utils,
-    xdg-terminal,
 ## Filesystems
     lvm2,
     ecryptfs-utils,
@@ -59,12 +91,83 @@ Depends: ${misc:Depends},
     exfatprogs,
     hfsprogs,
     xfsprogs,
+## General
+    pika-package-manager,
+    apt-transport-https,
+    software-properties-common,
+    refind,
+    avahi-autoipd,
+    avahi-daemon,
+    dbus-user-session,
+    pika-sources,
+    openssh-server,
+    nano,
+    bash-completion,
+    auto-complete-el,
+    wget,
+    curl,
+    git,
+    dbus-broker,
+    ca-certificates,
+    libapr1,
+    libaprutil1, 
+    ananicy-rules,
+    booster,
+    xdg-user-dirs,
+    xdg-utils,
 # Hardware
     fwupd,
     fwupdate,
     pcmciautils,
-    ubuntu-drivers-common,
+    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
+    gvfs-backends,
+    gvfs-fuse,
+## XDG
+    policykit-1,
+    xdg-desktop-portal,
+    xdg-user-dirs,
+    xdg-utils,
+## 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,
@@ -74,48 +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,
+Description: Power saving and laptops
-## Printing
+
-    cups-bsd,
+Package: pika-baseos-audio
-    cups,
+Architecture: all
-    openprinting-ppds,
+Essential: no
-    printer-driver-brlaser,
+Depends: ${misc:Depends},
-    printer-driver-c2esp,
-    printer-driver-foo2zjs,
-    printer-driver-gutenprint,
-    printer-driver-m2300w,
-    printer-driver-min12xxw,
-    printer-driver-ptouch,
-    printer-driver-pxljr,
-    printer-driver-sag-gdi,
-    printer-driver-splix,
-    cups-client,
-    cups-filters,
-    cups-pk-helper,
-## Networking and Bluetooth
-    bluez,
-    bluez-cups,
-    ifupdown,
-    network-manager,
-    resolvconf,
-    libnss-mdns,
-    net-tools,
-    libproxy1-plugin-gsettings,
-    libproxy1-plugin-networkmanager,
-    wireless-tools,
-    rfkill,
-    gstreamer1.0-plugins-base-apps,
-    alsa-base,
-    glib-networking,
-    nfs-common,
-    samba-common-bin,
-    wpasupplicant,
 ## Audio and codecs
     pika-audio-pipewire | pika-audio-legacy
-Recommends: power-profiles-daemon
+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,
+    power-profiles-daemon | tuned-ppd | tlp
 Conflicts: nvidia-prime
 Description: The backbone of PikaOS

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

pika-baseos/debian/pika-baseos.postinst

@@ -2,3 +2,4 @@
 systemctl disable --now gpu-manager || true
 systemctl mask gpu-manager || true
 systemctl enable --now nvidia-pika-prime || true
+rm /usr/sbin/policy-rc.d || true

pika-baseos/debian/rules

@@ -1,3 +1,6 @@
 #! /usr/bin/make -f
+
+export PIKA_BUILD_ARCH = $(shell cat ../pika-build-arch)
+
 %:
 	dh $@

pika-baseos/debian/source/format

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

pika-baseos/etc/hosts

@@ -0,0 +1,6 @@
+127.0.0.1       localhost
+::1             localhost ip6-localhost ip6-loopback
+fe00::0         ip6-localnet
+ff00::0         ip6-mcastprefix
+ff02::1         ip6-allnodes
+ff02::2         ip6-allrouters

pika-baseos/etc/profile.d/0-pika-path.sh

@@ -0,0 +1,2 @@
+#! /bin/sh
+export PATH="/usr/local/sbin:/usr/local/bin:/usr/local/libexec:/usr/sbin:/usr/bin:/sbin:/bin:/usr/libexec:/usr/local/games:/usr/games:$PATH"

pika-baseos/etc/profile.d/00-append-pika-ld.sh

@@ -1,3 +0,0 @@
-#! /bin/bash
-
-#LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"$(echo $(for i in /usr/share/pika/ld.so.d/*; do cat $i && echo -e "\n" ; done) | grep -v '^#' | tr '\n' ':' | tr ' ' ':')"

pika-build-config/amd64-v3.sh

@@ -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=auto"
+export DEB_CFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto=auto"
+export DEB_CPPFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto=auto"
+export DEB_CXXFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto=auto"
+export DEB_LDFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto=auto"
+export DEB_BUILD_OPTIONS="nocheck notest terse"
+export DPKG_GENSYMBOLS_CHECK_LEVEL=0

pika-build-config/i386.sh

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

release.sh

@@ -1,8 +1,2 @@
 # 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:'