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

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

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.

debian-firmware/debian/control

@@ -0,0 +1,20 @@
+Source: linux-firmware
+Section: misc
+Priority: optional
+Maintainer: Ubuntu Kernel Team <kernel-team@lists.ubuntu.com>
+Standards-Version: 4.5.0
+Build-Depends: debhelper-compat (= 13), dh-exec
+Vcs-Git: git://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux-firmware
+
+Package: linux-firmware
+Architecture: all
+Multi-Arch: foreign
+Priority: optional
+Depends: ${misc:Depends}
+Recommends: firmware-sof-signed
+Provides: atmel-firmware
+Conflicts: atmel-firmware
+Replaces: atmel-firmware, linux-restricted-common, linux-firmware-snapdragon (<= 1.2-0ubuntu1)
+Breaks: linux-firmware-snapdragon (<= 1.2-0ubuntu1), linux-firmware-raspi2 (<= 1.20190819-0ubuntu2), amd64-microcode (<= 3.20220411.1ubuntu1)
+Description: Firmware for Linux kernel drivers
+ This package provides firmware used by Linux kernel drivers.

debian-firmware/debian/patches/series

@@ -0,0 +1 @@
+#ubuntu.patch

debian-firmware/debian/rules

@@ -2,7 +2,7 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
-export PIKA_BUILD_ARCH = $(shell cat ../pika-build-arch)
+
 dest_dir = $(CURDIR)/debian/linux-firmware
 firmware_dir = $(dest_dir)/lib/firmware
 license_dir = $(dest_dir)/usr/share/doc/linux-firmware/licenses
@@ -20,6 +20,10 @@ override_dh_install:
 
 override_dh_clean:
 	dh_clean
+	# Run sanity checks if in a git repo
+	if [ -d .git ] ; then \
+		$(MAKE) check ; \
+	fi
 
 override_dh_auto_build:
 

debian/control

@@ -1,158 +0,0 @@
-Source: linux-firmware
-Section: misc
-Priority: optional
-Maintainer: Ubuntu Kernel Team <kernel-team@lists.ubuntu.com>
-Standards-Version: 4.5.0
-Build-Depends: debhelper-compat (= 13), dh-exec, rdfind
-Vcs-Git: git://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux-firmware
-
-Package: linux-firmware
-Architecture: all
-Multi-Arch: foreign
-Priority: optional
-Depends: ${misc:Depends}
-Recommends: 
-  firmware-sof-signed
-Provides: 
-  atmel-firmware (= ${binary:Version}),
-  linux-firmware-snapdragon (= ${binary:Version}),
-  linux-firmware-raspi2 (= ${binary:Version}),
-  firmware-linux-free (= ${binary:Version}),
-  firmware-amd-graphics (= ${binary:Version}),
-  firmware-atheros (= ${binary:Version}),
-  firmware-bnx2 (= ${binary:Version}),
-  firmware-bnx2x (= ${binary:Version}),
-  firmware-brcm80211 (= ${binary:Version}),
-  firmware-cavium (= ${binary:Version}),
-  firmware-cirrus (= ${binary:Version}),
-  firmware-intel-graphics (= ${binary:Version}),
-  firmware-intel-misc (= ${binary:Version}),
-  firmware-intel-sound (= ${binary:Version}),
-  firmware-ipw2x00 (= ${binary:Version}),
-  firmware-ivtv (= ${binary:Version}),
-  firmware-iwlwifi (= ${binary:Version}),
-  firmware-libertas (= ${binary:Version}),
-  firmware-linux (= ${binary:Version}),
-  firmware-linux-nonfree (= ${binary:Version}),
-  firmware-marvell-prestera (= ${binary:Version}),
-  firmware-mediatek (= ${binary:Version}),
-  firmware-misc-nonfree (= ${binary:Version}),
-  firmware-myricom (= ${binary:Version}),
-  firmware-netronome (= ${binary:Version}),
-  firmware-netxen (= ${binary:Version}),
-  firmware-nvidia-graphics (= ${binary:Version}),
-  firmware-qcom-media (= ${binary:Version}),
-  firmware-qcom-soc (= ${binary:Version}),
-  firmware-qlogic (= ${binary:Version}),
-  firmware-realtek (= ${binary:Version}),
-  firmware-samsung (= ${binary:Version}),
-  firmware-siano (= ${binary:Version}),
-  firmware-ti-connectivity  (= ${binary:Version}),
-Conflicts: 
-  atmel-firmware,
-  linux-firmware-snapdragon,
-  linux-firmware-raspi2,
-  firmware-linux-free,
-  firmware-amd-graphics,
-  firmware-atheros,
-  firmware-bnx2,
-  firmware-bnx2x,
-  firmware-brcm80211,
-  firmware-cavium,
-  firmware-cirrus,
-  firmware-intel-graphics,
-  firmware-intel-misc,
-  firmware-intel-sound,
-  firmware-ipw2x00,
-  firmware-ivtv,
-  firmware-iwlwifi,
-  firmware-libertas,
-  firmware-linux,
-  firmware-linux-nonfree,
-  firmware-marvell-prestera,
-  firmware-mediatek,
-  firmware-misc-nonfree,
-  firmware-myricom,
-  firmware-netronome,
-  firmware-netxen,
-  firmware-nvidia-graphics,
-  firmware-qcom-media,
-  firmware-qcom-soc,
-  firmware-qlogic,
-  firmware-realtek,
-  firmware-samsung,
-  firmware-siano,
-  firmware-ti-connectivity,
-Replaces: 
-  atmel-firmware,
-  linux-firmware-snapdragon,
-  linux-firmware-raspi2,
-  firmware-linux-free,
-  firmware-amd-graphics,
-  firmware-atheros,
-  firmware-bnx2,
-  firmware-bnx2x,
-  firmware-brcm80211,
-  firmware-cavium,
-  firmware-cirrus,
-  firmware-intel-graphics,
-  firmware-intel-misc,
-  firmware-intel-sound,
-  firmware-ipw2x00,
-  firmware-ivtv,
-  firmware-iwlwifi,
-  firmware-libertas,
-  firmware-linux,
-  firmware-linux-nonfree,
-  firmware-marvell-prestera,
-  firmware-mediatek,
-  firmware-misc-nonfree,
-  firmware-myricom,
-  firmware-netronome,
-  firmware-netxen,
-  firmware-nvidia-graphics,
-  firmware-qcom-media,
-  firmware-qcom-soc,
-  firmware-qlogic,
-  firmware-realtek,
-  firmware-samsung,
-  firmware-siano,
-  firmware-ti-connectivity,
-Breaks: 
-  amd64-microcode (<= 3.20220411.1ubuntu1),
-  atmel-firmware,
-  linux-firmware-snapdragon,
-  linux-firmware-raspi2,
-  firmware-linux-free,
-  firmware-amd-graphics,
-  firmware-atheros,
-  firmware-bnx2,
-  firmware-bnx2x,
-  firmware-brcm80211,
-  firmware-cavium,
-  firmware-cirrus,
-  firmware-intel-graphics,
-  firmware-intel-misc,
-  firmware-intel-sound,
-  firmware-ipw2x00,
-  firmware-ivtv,
-  firmware-iwlwifi,
-  firmware-libertas,
-  firmware-linux,
-  firmware-linux-nonfree,
-  firmware-marvell-prestera,
-  firmware-mediatek,
-  firmware-misc-nonfree,
-  firmware-myricom,
-  firmware-netronome,
-  firmware-netxen,
-  firmware-nvidia-graphics,
-  firmware-qcom-media,
-  firmware-qcom-soc,
-  firmware-qlogic,
-  firmware-realtek,
-  firmware-samsung,
-  firmware-siano,
-  firmware-ti-connectivity,
-Description: Firmware for Linux kernel drivers
- This package provides firmware used by Linux kernel drivers.

main.sh

@@ -1,28 +1,20 @@
 #! /bin/bash
 
-set -e
-
-#VERSION="$(date '+%Y%m%d').git"
-VERSION='20241017'
-
-source ./pika-build-config.sh
-
-echo "$PIKA_BUILD_ARCH" > pika-build-arch
-
 # Clone Upstream
-#git clone https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/ -b main --depth 1
-git clone https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/ -b $VERSION --depth 1
-cp -rvf ./debian ./linux-firmware/
-cp -rvf ./ath12k ./linux-firmware/
+#git clone https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/
+git clone https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/ -b main
+cp -rvn ./debian-firmware/* ./linux-firmware/
 cd ./linux-firmware
 touch debian/changelog
-echo -e "linux-firmware ("$VERSION"-101pika1) pika; urgency=medium\n\n  * New Upstream Release\n\n -- Ward Nakchbandi <hotrod.master@hotmail.com> Sat, 01 Oct 2022 14:50:00 +0200" > debian/changelog
+#echo -e "linux-firmware ("$(date '+%Y%m%d')".git-99pika"$(date '+%M')") lunar; urgency=medium\n\n  * New Upstream Release\n\n -- Ward Nakchbandi <hotrod.master@hotmail.com> Sat, 01 Oct 2022 14:50:00 +0200" > debian/changelog
+echo -e "linux-firmware (20230810.git-99pika"$(date '+%M')") lunar; urgency=medium\n\n  * New Upstream Release\n\n -- Ward Nakchbandi <hotrod.master@hotmail.com> Sat, 01 Oct 2022 14:50:00 +0200" > debian/changelog
 
 # Get build deps
 apt-get build-dep ./ -y
 
 # Build package
-LOGNAME=root dh_make --createorig -y -l -p linux-firmware_"$VERSION" || echo "dh-make: Ignoring Last Error"
+#LOGNAME=root dh_make --createorig -y -l -p linux-firmware_"$(date '+%Y%m%d')".git || echo "dh-make didn't go clean"
+LOGNAME=root dh_make --createorig -y -l -p linux-firmware_20230810.git || echo "dh-make didn't go clean"
 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 pika-main /srv/www/incoming/'
+
+# publish the repo
+ssh ferreo@direct.pika-os.com 'aptly publish update -batch -skip-contents -force-overwrite lunar filesystem:pikarepo:'