Update to PikaOS 4

2024-07-23 01:33:18 +03:00 · 2024-07-23 01:33:18 +03:00 · a1f741d14c
commit a1f741d14c
parent 40ac38ba0f
10 changed files with 205 additions and 32 deletions
--- a/.github/workflows/build-canaryv3.yml
+++ b/.github/workflows/build-canaryv3.yml
@ -0,0 +1,34 @@
+name: PikaOS Package Build Only (Canary) (amd64-v3)
+
+on:
+  workflow_dispatch
+
+jobs:
+  build:
+    runs-on: self-hosted
+    container:
+      image: ghcr.io/pikaos-linux/pikaos-builder:canaryv3
+      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: ./mainv3.sh
--- a/.github/workflows/build-nestv3.yml
+++ b/.github/workflows/build-nestv3.yml
@ -0,0 +1,34 @@
+name: PikaOS Package Build Only (amd64-v3)
+
+on:
+  workflow_dispatch
+
+jobs:
+  build:
+    runs-on: self-hosted
+    container:
+      image: ghcr.io/pikaos-linux/pikaos-builder:nestv3
+      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: ./mainv3.sh
--- a/.github/workflows/release-canaryv3.yml
+++ b/.github/workflows/release-canaryv3.yml
@ -1,4 +1,4 @@
-name: PikaOS Package Release
+name: PikaOS Package Build & Release (Canary) (amd64-v3)

 on:
  workflow_dispatch
@ -7,7 +7,7 @@ jobs:
  build:
    runs-on: self-hosted
    container:
-      image: ghcr.io/pikaos-linux/pika-package-container:latest
+      image: ghcr.io/pikaos-linux/pikaos-builder:canaryv3
      volumes:
        - /proc:/proc
      options: --privileged -it
@ -31,16 +31,7 @@ jobs:
        if_key_exists: replace
    
    - name: Build Package
-      run: ./main.sh
+      run: ./mainv3.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/.github/workflows/release-nestv3.yml
+++ b/.github/workflows/release-nestv3.yml
@ -0,0 +1,37 @@
+name: PikaOS Package Build & Release (amd64-v3)
+
+on:
+  workflow_dispatch
+
+jobs:
+  build:
+    runs-on: self-hosted
+    container:
+      image: ghcr.io/pikaos-linux/pikaos-builder:nestv3
+      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: ./mainv3.sh
+
+    - name: Release Package
+      run: ./release.sh
--- a/main.sh
+++ b/main.sh
@ -1,14 +0,0 @@
-# Clone Upstream
-cd ./pika-baseos
-
-# Get build deps
-apt-get build-dep ./ -y
-
-# Build package
-dh_make --createorig
-dpkg-buildpackage
-
-# Move the debs to output
-cd ../
-mkdir -p ./output
-mv ./*.deb ./output/
--- a/mainv3.sh
+++ b/mainv3.sh
@ -0,0 +1,23 @@
+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
+
+# Clone Upstream
+cd ./pika-baseos
+
+# Get build deps
+apt-get build-dep ./ -y
+
+# Build package
+dh_make --createorig
+dpkg-buildpackage
+
+# Move the debs to output
+cd ../
+mkdir -p ./output
+mv ./*.deb ./output/
--- a/pika-baseos/debian/changelog
+++ b/pika-baseos/debian/changelog
@ -1,3 +1,9 @@
+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,10 +9,76 @@ Rules-Requires-Root: no
 Package: pika-baseos
 Architecture: all
 Essential: yes
+Pre-Depends:
+## Basic minimal setup
+    adduser,
+    apt,
+    apt-utils,
+    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,
 Depends: ${misc:Depends}, 
 # Base
+## Basic minimal setup
+    adduser,
+    apt,
+    apt-utils,
+    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
-    ubuntu-minimal,
    libglib2.0-bin,
    pika-package-manager,
    apt-transport-https,
@ -23,7 +89,6 @@ Depends: ${misc:Depends},
    dbus-user-session,
    pika-sources,
    openssh-server,
-    ppa-purge,
    nano,
    bash-completion,
    wget,
@ -47,7 +112,6 @@ Depends: ${misc:Depends},
    xdg-desktop-portal,
    xdg-user-dirs,
    xdg-utils,
-    xdg-terminal,
 ## Filesystems
    lvm2,
    ecryptfs-utils,
--- a/pika-baseos/debian/pika-baseos.postinst
+++ b/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
+apt-mark hold snapd  || true
--- a/pika-baseos/etc/profile.d/00-append-pika-ld.sh
+++ b/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 ' ' ':')"