22 changed files with 83 additions and 349 deletions
--- a/.github/build-canary-v3
+++ b/.github/build-canary-v3
@ -1 +0,0 @@
-1
--- a/.github/build-nest-v3
+++ b/.github/build-nest-v3
@ -1 +0,0 @@
-1
--- a/.github/release-canary-v3
+++ b/.github/release-canary-v3
@ -1 +0,0 @@
-2
--- a/.github/release-nest-v3
+++ b/.github/release-nest-v3
@ -1 +0,0 @@
-2
--- a/.github/workflows/build-canaryv3.yml
+++ b/.github/workflows/build-canaryv3.yml
@ -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
--- a/.github/workflows/build-nestv3.yml
+++ b/.github/workflows/build-nestv3.yml
@ -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
--- a/.github/workflows/release-canaryv3.yml
+++ b/.github/workflows/release-canaryv3.yml
@ -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
--- a/.github/workflows/release-nestv3.yml
+++ b/.github/workflows/release-nestv3.yml
@ -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
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -0,0 +1,46 @@
+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 }}
--- a/LICENSE.md
+++ b/LICENSE.md
@ -1,24 +0,0 @@
-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.
--- a/main.sh
+++ b/main.sh
@ -1,13 +1,3 @@
-#! /bin/bash
-
-set -e
-
-VERSION="3.0.7"
-
-source ./pika-build-config.sh
-
-echo "$PIKA_BUILD_ARCH" > pika-build-arch
-
 # Clone Upstream
 cd ./pika-baseos

@ -15,8 +5,8 @@ cd ./pika-baseos
 apt-get build-dep ./ -y

 # Build package
-LOGNAME=root dh_make --createorig -y -l -p pika-baseos_"$VERSION" || echo "dh-make: Ignoring Last Error"
-dpkg-buildpackage --no-sign
+dh_make --createorig
+dpkg-buildpackage

 # Move the debs to output
 cd ../
--- a/pika-baseos/debian/changelog
+++ b/pika-baseos/debian/changelog
@ -1,51 +1,3 @@
-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
--- a/pika-baseos/debian/control
+++ b/pika-baseos/debian/control
@ -9,80 +9,10 @@ Rules-Requires-Root: no
 Package: pika-baseos
 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-tiny,
-    whiptail,
-    rsyslog,
-    zram-tools,
 Depends: ${misc:Depends}, 
 # Base
-## 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-tiny,
-    whiptail,
-    rsyslog,
 ## General
-    desktop-base,
+    ubuntu-minimal,
    libglib2.0-bin,
    pika-package-manager,
    apt-transport-https,
@ -93,9 +23,9 @@ Depends: ${misc:Depends},
    dbus-user-session,
    pika-sources,
    openssh-server,
+    ppa-purge,
    nano,
    bash-completion,
-    auto-complete-el,
    wget,
    curl,
    git,
@ -113,10 +43,11 @@ Depends: ${misc:Depends},
    gvfs-backends,
    gvfs-fuse,
 ## XDG
-    policykit-1,
+    policykit-desktop-privileges,
    xdg-desktop-portal,
    xdg-user-dirs,
    xdg-utils,
+    xdg-terminal,
 ## Filesystems
    lvm2,
    ecryptfs-utils,
@ -132,6 +63,7 @@ Depends: ${misc:Depends},
    fwupd,
    fwupdate,
    pcmciautils,
+    ubuntu-drivers-common,
    mousetweaks,
 ## Display and Graphics
    pika-amdgpu-core,
@ -147,11 +79,26 @@ Depends: ${misc:Depends},
    supergfxctl,
    switcheroo-control,
    acpi,
-## Firmware
-    linux-firmware,
-    firmware-sof-signed,
+## Printing
+    cups-bsd,
+    cups,
+    openprinting-ppds,
+    printer-driver-brlaser,
+    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,
@ -162,6 +109,7 @@ Depends: ${misc:Depends},
    wireless-tools,
    rfkill,
    gstreamer1.0-plugins-base-apps,
+    alsa-base,
    glib-networking,
    nfs-common,
    samba-common-bin,
--- a/pika-baseos/debian/pika-baseos.postinst
+++ b/pika-baseos/debian/pika-baseos.postinst
@ -2,6 +2,3 @@
 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
--- a/pika-baseos/debian/rules
+++ b/pika-baseos/debian/rules
@ -1,6 +1,3 @@
 #! /usr/bin/make -f
-
-export PIKA_BUILD_ARCH = $(shell cat ../pika-build-arch)
-
 %:
 	dh $@
--- a/pika-baseos/debian/source/format
+++ b/pika-baseos/debian/source/format
@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)
--- a/pika-baseos/etc/hosts
+++ b/pika-baseos/etc/hosts
@ -1,6 +0,0 @@
-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
--- a/pika-baseos/etc/profile.d/0-pika-path.sh
+++ b/pika-baseos/etc/profile.d/0-pika-path.sh
@ -1,2 +0,0 @@
-#! /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"
--- a/pika-baseos/etc/profile.d/00-append-pika-ld.sh
+++ b/pika-baseos/etc/profile.d/00-append-pika-ld.sh
@ -0,0 +1,3 @@
+#! /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 ' ' ':')"
--- a/pika-build-config/amd64-v3.sh
+++ b/pika-build-config/amd64-v3.sh
@ -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=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
--- a/pika-build-config/i386.sh
+++ b/pika-build-config/i386.sh
@ -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
--- a/release.sh
+++ b/release.sh
@ -1,2 +1,8 @@
 # send debs to server
-rsync -azP --include './' --include '*.deb' --exclude '*' ./output/ ferreo@direct.pika-os.com:/srv/www/cockatiel-incoming/
+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:'