Update rules

.github/build-canary-v3

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

.github/build-nest-v3

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

.github/release-canary-v3

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

.github/release-nest-v3

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

.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

.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

.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

.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

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

Cargo.toml

@@ -16,12 +16,3 @@ users = "0.11.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 reqwest = { version = "0.11", features = ["blocking"] }
-
-[profile.release]
-lto = "fat"
-debug = false
-strip = true
-opt-level = 3
-panic = "abort"
-codegen-units = 1
-

data/check-pkg.sh

@@ -1,10 +0,0 @@
-#! /usr/bin/bash
-export LANG=C
-
-package=$1
-if dpkg-query -W -f='${Status}' $package 2>/dev/null | grep -q "install ok installed"
-then
-    exit 0
-else
-    exit 1
-fi

data/modify-driver.sh

@@ -37,7 +37,7 @@ then
 	pkg="$1"
 fi
 
-if /usr/lib/pika/drivers/check-pkg.sh "$1"
+if dpkg -s "$1"
 then
 	if echo $pkg | grep -i mesa
 	then
@@ -94,7 +94,7 @@ then
 	pkg="$1"
 fi
 
-if /usr/lib/pika/drivers/check-pkg.sh "$1"
+if dpkg -s "$1"
 then
 	if echo $pkg | grep -i mesa
 	then
@@ -105,7 +105,7 @@ then
 else
 	if echo $pkg | grep -i nvidia
  	then
-		pkexec env DISPLAY=$DISPLAY XAUTHORITY=$XAUTHORITY bash -c "DEBIAN_FRONTEND=noninteractive apt update -y -o Dpkg::Options::='--force-confnew' && DEBIAN_FRONTEND=noninteractive apt purge nvidia-driver-* nvidia-open-driver-* -y -o Dpkg::Options::='--force-confnew' && DEBIAN_FRONTEND=noninteractive apt install $pkg -y -o Dpkg::Options::='--force-confnew' && sudo DEBIAN_FRONTEND=noninteractive apt autoremove -y -o Dpkg::Options::='--force-confnew'"
+		pkexec env DISPLAY=$DISPLAY XAUTHORITY=$XAUTHORITY bash -c "DEBIAN_FRONTEND=noninteractive apt update -y -o Dpkg::Options::='--force-confnew' && DEBIAN_FRONTEND=noninteractive apt purge nvidia-driver-* -y -o Dpkg::Options::='--force-confnew' && DEBIAN_FRONTEND=noninteractive apt install $pkg -y -o Dpkg::Options::='--force-confnew' && sudo DEBIAN_FRONTEND=noninteractive apt autoremove -y -o Dpkg::Options::='--force-confnew'"
 	else
 		if echo $pkg | grep -i mesa-hybrid
 		then

debian/changelog

@@ -1,6 +1,6 @@
-pika-drivers (1.0.0-101pika2) pika; urgency=medium
+pika-drivers (1.0.0-100pika8+goodbye3) pikauwu; urgency=medium
 
-  * Update for PikaOS 4
+  * Nvidia 550 no longer experimental
 
  -- Pika <root@pika.com>  Wed, 11 Jan 2023 11:41:38 +0000
 

debian/control

@@ -2,8 +2,7 @@ Source: pika-drivers
 Section: admin
 Priority: optional
 Maintainer: Pika <root@pika.com>
-Build-Depends: debhelper (>= 9),
-            build-essential,
+Build-Depends: debhelper (>= 9), build-essential,
             debhelper,
             python3,
             meson,

debian/rules

@@ -1,16 +1,7 @@
 #!/usr/bin/make -f
 
-export PIKA_BUILD_ARCH = $(shell cat ../pika-build-arch)
 export PATH := $(PATH):/root/.cargo/bin
 
-override_dh_prep:
-# amd64 build prep
-ifeq (amd64-v3,$(PIKA_BUILD_ARCH))
-# Does not support LTO due to dylib-lto
-#export RUSTFLAGS = -C target-cpu=x86-64-v3 -C lto=fat -C embed-bitcode -C codegen-units=1 -C opt-level=3 -Zdylib-lto
-export RUSTFLAGS = -C target-cpu=x86-64-v3 -C opt-level=3
-endif
-
 %:
 	dh ${@}
 

debian/source/format

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

driver-db.json

@@ -98,7 +98,7 @@
     },
     {
       "id": 12,
-      "driver": "nvidia-driver-550",
+      "driver": "nvidia-driver-525",
       "icon": "nvidia",
       "experimental": false,
       "removable": true,
@@ -106,15 +106,7 @@
     },
     {
       "id": 13,
-      "driver": "nvidia-driver-555",
-      "icon": "nvidia",
-      "experimental": false,
-      "removable": true,
-      "detection": "lspci -D | grep -iE 'VGA|3D' | grep -i nvidia"
-    },
-    {
-      "id": 18,
-      "driver": "nvidia-open-driver-555",
+      "driver": "nvidia-driver-525-open",
       "icon": "nvidia",
       "experimental": true,
       "removable": true,
@@ -122,7 +114,7 @@
     },
     {
       "id": 14,
-      "driver": "nvidia-driver-560",
+      "driver": "nvidia-driver-535",
       "icon": "nvidia",
       "experimental": false,
       "removable": true,
@@ -130,14 +122,46 @@
     },
     {
       "id": 15,
-      "driver": "nvidia-open-driver-560",
+      "driver": "nvidia-driver-535-open",
+      "icon": "nvidia",
+      "experimental": true,
+      "removable": true,
+      "detection": "lspci -D | grep -iE 'VGA|3D' | grep -i nvidia"
+    },
+    {
+      "id": 16,
+      "driver": "nvidia-driver-545",
       "icon": "nvidia",
       "experimental": false,
       "removable": true,
       "detection": "lspci -D | grep -iE 'VGA|3D' | grep -i nvidia"
     },
     {
-      "id": 16,
+      "id": 17,
+      "driver": "nvidia-driver-545-open",
+      "icon": "nvidia",
+      "experimental": true,
+      "removable": true,
+      "detection": "lspci -D | grep -iE 'VGA|3D' | grep -i nvidia"
+    },
+    {
+      "id": 18,
+      "driver": "nvidia-driver-550",
+      "icon": "nvidia",
+      "experimental": false,
+      "removable": true,
+      "detection": "lspci -D | grep -iE 'VGA|3D' | grep -i nvidia"
+    },
+    {
+      "id": 19,
+      "driver": "nvidia-driver-550-open",
+      "icon": "nvidia",
+      "experimental": true,
+      "removable": true,
+      "detection": "lspci -D | grep -iE 'VGA|3D' | grep -i nvidia"
+    },
+    {
+      "id": 20,
       "driver": "xone-dkms",
       "icon": "input-gaming",
       "experimental": false,
@@ -145,12 +169,28 @@
       "detection": "lsusb | grep -i xbox"
     },
     {
-      "id": 17,
+      "id": 21,
       "driver": "intel-gpu-compute",
       "icon": "intel",
       "experimental": false,
       "removable": true,
       "detection": "lspci -D | grep -iE 'VGA|3D' | grep -i intel"
+    },
+    {
+      "id": 22,
+      "driver": "nvidia-driver-555",
+      "icon": "nvidia",
+      "experimental": false,
+      "removable": true,
+      "detection": "lspci -D | grep -iE 'VGA|3D' | grep -i nvidia"
+    },
+    {
+      "id": 23,
+      "driver": "nvidia-driver-555-open",
+      "icon": "nvidia",
+      "experimental": true,
+      "removable": true,
+      "detection": "lspci -D | grep -iE 'VGA|3D' | grep -i nvidia"
     }    
   ]
 }

locales/de_DE.json

@@ -17,5 +17,5 @@
     "driver_install_dialog_success_false": "Der Treiber konnte nicht installiert werden!",
     "window_no_drivers_box_text_title": "Keine Geräte erfordern spezielle Treiber",
     "window_no_drivers_box_text_description": "Für keine auf Ihrem System installierten Geräte existieren spezielle Treiber in unserer Datenbank.",
-    "driver_status_icon_tooltip_text": "Dieser Treiber ist installiert!"
+    "driver_status_icon_tooltip_text": ""
 }

locales/es_ES.json

@@ -1,21 +0,0 @@
-{
-    "app_name": "Bienvenida de PikaOS",
-    "app_dev": "Cosmo",
-    "loading_label_label": "Descargando la base de datos de los controladores...",
-    "loading_no_internet_box_text_title": "¡Error de red!",
-    "loading_no_internet_box_text_description": "Se requiere una conexión a Internet para descargar la base de datos del controlador.",
-    "device_label_label_prefix": "Dispositivo: ",
-    "driver_install_button_label": "Instalar",
-    "driver_install_button_tooltip_text": "Instale el paquete de controladores.",
-    "driver_remove_button_label": "Desinstalar",
-    "driver_remove_button_tooltip_text": "Desinstalar el paquete de los controladores.",
-    "driver_expander_row_title_suffix": "(ADVERTENCIA: ¡ESTE CONTROLADOR ES EXPERIMENTAL, ÚSELO BAJO SU PROPIA RESPONSABILIDAD!)",
-    "driver_install_dialog_heading": "Registro de instalación del controlador",
-    "driver_install_dialog_ok_label": "Reiniciar más tarde",
-    "driver_install_dialog_reboot_label": "Reiniciar ahora",
-    "driver_install_dialog_success_true": "¡El controlador se instaló correctamente!",
-    "driver_install_dialog_success_false": "¡No se pudo instalar el controlador!",
-    "window_no_drivers_box_text_title": "Ningún dispositivo requiere controladores especiales",
-    "window_no_drivers_box_text_description": "Ningún dispositivo instalado en su sistema requiere un controlador especial de nuestra base de datos.",
-    "driver_status_icon_tooltip_text": "¡Éste controlador está instalado!"
-}

locales/fr_FR.json

@@ -1,14 +1,14 @@
 {
-    "app_name": "PikaOS configuration initiale",
+    "app_name": "Gestionnaire de pilotes PikaOS",
     "app_dev": "Cosmo",
     "loading_label_label": "Téléchargement de la base de données des pilotes...",
     "loading_no_internet_box_text_title": "Erreur de réseau!",
     "loading_no_internet_box_text_description": "Une connexion Internet est nécessaire pour télécharger la base de données des pilotes.",
-    "device_label_label_prefix": "Périphérique: ",
+    "device_label_label_prefix": "Périphérique:",
     "driver_install_button_label": "Installer",
-    "driver_install_button_tooltip_text": "Installer le package du pilote.",
+    "driver_install_button_tooltip_text": "Installer le pilote.",
     "driver_remove_button_label": "Désinstaller",
-    "driver_remove_button_tooltip_text": "Désinstaller le package du pilote.",
+    "driver_remove_button_tooltip_text": "Désinstaller le pilote.",
     "driver_expander_row_title_suffix": "(AVERTISSEMENT : CE PILOTE EST EXPÉRIMENTAL, À UTILISER À VOS RISQUES ET PÉRILS)",
     "driver_install_dialog_heading": "Journal d'installation des pilotes",
     "driver_install_dialog_ok_label": "Redémarrer plus tard",
@@ -16,6 +16,6 @@
     "driver_install_dialog_success_true": "Le pilote a été Installé avec succès !",
     "driver_install_dialog_success_false": "Le pilote n'a pas été installé!",
     "window_no_drivers_box_text_title": "Aucun périphérique ne nécessite de pilote spécial",
-    "window_no_drivers_box_text_description": "Aucun périphérique installé sur votre système ne dispose d'un pilote spécial présent dans notre base de données.",
-    "driver_status_icon_tooltip_text": "Le pilote est installé !"
+    "window_no_drivers_box_text_description": "Aucun périphérique de votre système ne dispose d'un pilote spécial présent dans notre base de données.",
+    "driver_status_icon_tooltip_text": ""
 }

locales/sv_SE.json

@@ -1,5 +1,5 @@
 {
-    "app_name": "PikaOS Välkommen",
+    "app_name": "Första inställningarna",
     "app_dev": "Cosmo",
     "loading_label_label": "Laddar ner databas för drivrutiner...",
     "loading_no_internet_box_text_title": "Nätverksfel!",
@@ -17,5 +17,5 @@
     "driver_install_dialog_success_false": "Drivrutinen har inte installerats korrekt!",
     "window_no_drivers_box_text_title": "Inga Enheter kräver några speciella drivrutiner",
     "window_no_drivers_box_text_description": "Inga Enheter installerade på ditt system behöver en drivrutin från vår databas.",
-    "driver_status_icon_tooltip_text": "Den här Drivrutinen är installerad!"
+    "driver_status_icon_tooltip_text": ""
 }

locales/tr_TR.json

@@ -1,5 +1,5 @@
 {
-    "app_name": "PikaOS Sürücü Yöneticisi",
+    "app_name": "PikaOS İlk Kurulum",
     "app_dev": "Cosmo",
     "loading_label_label": "Sürücü veritabanı indiriliyor...",
     "loading_no_internet_box_text_title": "İnternet hatası!",

main.sh

@@ -1,25 +1,18 @@
-#! /bin/bash
-
-set -e
-
-VERSION="1.0.0"
-
-source ./pika-build-config.sh
-
-echo "$PIKA_BUILD_ARCH" > pika-build-arch
-
 # Clone Upstream
 mkdir -p pika-drivers
-cp -rvf ./* ./pika-drivers/ || true
+cp -rvf ./* ./pika-drivers/
 cd ./pika-drivers/
 
+# Dead PikaOS3 Release Quirk?
+apt update
+apt-get install libglib2.0-0=2.78.0-2 libglib2.0-bin=2.78.0-2 libglib2.0-dev-bin=2.78.0-2 -y --allow-downgrades
+
 # Get build deps
 apt-get build-dep ./ -y
 apt-get install curl -y
 curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | CARGO_HOME=/root/.cargo sh -s -- -y
 
 # Build package
-LOGNAME=root dh_make --createorig -y -l -p pika-drivers_"$VERSION" || echo "dh-make: Ignoring Last Error"
 dpkg-buildpackage --no-sign
 
 # Move the debs to output

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

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

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:'

src/build_ui/mod.rs

@@ -326,8 +326,8 @@ fn get_drivers(
                 let driver_package_removeble = driver.removeble.to_owned();
 
                 gio::spawn_blocking(move || loop {
-                    let command_installed_status = Command::new("/usr/lib/pika/drivers/check-pkg.sh")
-                        .arg(&driver_package_ind2)
+                    let command_installed_status = Command::new("dpkg")
+                        .args(["-s", &driver_package_ind2])
                         .output()
                         .unwrap();
                     if command_installed_status.status.success() {

src/config.rs

@@ -2,4 +2,5 @@ pub const APP_ID: &str = "com.github.pikaos-linux.pikadrivers";
 pub const VERSION: &str = env!("CARGO_PKG_VERSION");
 pub const APP_ICON: &str = "com.github.pikaos-linux.pikadrivers";
 pub const APP_GITHUB: &str = "https://github.com/PikaOS-Linux/pkg-pika-drivers";
-pub const DRIVER_DB_JSON_URL: &str = "https://git.pika-os.com/custom-gui-packages/pika-drivers/raw/branch/main/driver-db.json";
+pub const DRIVER_DB_JSON_URL: &str =
+    "https://raw.githubusercontent.com/PikaOS-Linux/pkg-pika-drivers/OS3/driver-db.json";