Update pika-build-config/amd64-v3.sh

.github/build-canary-v3

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

.github/build-nest-v3

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

.github/release-canary-v3

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

.github/release-nest-v3

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

.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,40 +0,0 @@
-name: PikaOS Package Release
-
-on:
-  workflow_dispatch
-
-jobs:
-  build:
-    runs-on: self-hosted
-    container:
-      image: ubuntu:22.10
-      volumes:
-        - /proc:/proc
-      options: --privileged -it
-
-    steps:
-    - uses: actions/checkout@v3
-  
-    - name: Install needed packages
-      run: apt update && apt install software-properties-common sudo git bc gpg gpg-agent bison build-essential ccache cpio fakeroot flex git kmod libelf-dev libncurses5-dev libssl-dev lz4 qtbase5-dev rsync schedtool wget zstd tar reprepro dpkg-sig devscripts dh-make -y
-
-    - 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

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.

debian/changelog

@@ -1,18 +0,0 @@
-xone (0.3-6) kinetic; urgency=medium
-
-  * Fix bad deps.
- 
- -- Ward Nakchbandi <hotrod.master@hotmail.com>  Thu, 04 Oct 2022 17:50:00 +0300
-
-xone (0.3-4) kinetic; urgency=medium
-
-  * Revert Stupid Patch and use firmware install properly, and fix section.
- 
- -- Ward Nakchbandi <hotrod.master@hotmail.com>  Thu, 04 Oct 2022 17:50:00 +0300
-
-
-xone  (0.3) kinetic; urgency=medium
-
-  * Initial release.
- 
- -- Ward Nakchbandi <hotrod.master@hotmail.com>  Thu, 04 Oct 2022 17:50:00 +0300

debian/files

@@ -1 +0,0 @@
-xone-dkms_0.3-6_source.buildinfo games optional

debian/patches/series

@@ -1 +0,0 @@
-xone-package-adapt.patch

debian/patches/xone-package-adapt.patch

@@ -1,35 +0,0 @@
-diff -uraN a/Makefile b/Makefile
---- a/Makefile	1970-01-01 02:00:00.000000000 +0200
-+++ b/Makefile	2022-10-04 19:12:45.651268524 +0300
-@@ -0,0 +1,20 @@
-+VERSION=0.3
-+
-+.PHONY: install
-+all:
-+	true
-+
-+install:
-+		cp dkms.conf dkms.conf.in
-+		sed 's/"#VERSION#"/"'"${VERSION}"'"/g' <dkms.conf.in >dkms.conf
-+		echo 'ccflags-y += -DDEBUG' >> "Kbuild"
-+		echo "* Copying module into /usr/src..."
-+		install -dm755 $(DESTDIR)/usr/src/xone
-+		rsync -av --progress ./* $(DESTDIR)/usr/src/xone/ --exclude debian
-+		install -dm755 $(DESTDIR)/usr/bin
-+		cp install/firmware.sh $(DESTDIR)/usr/bin/xone-firmware
-+		ln -sf /usr/src/xone $(DESTDIR)/usr/src/xone-"${VERSION}"
-+		install -d $(DESTDIR)/etc/modules-load.d
-+		cp -r modules-load-d-xone.conf  $(DESTDIR)/etc/modules-load.d/xone.conf
-+		echo "* Blacklisting xpad module..."
-+		install -D -m 644 install/modprobe.conf $(DESTDIR)/etc/modprobe.d/xone-blacklist.conf
-diff -uraN a/modules-load-d-xpadneo.conf b/modules-load-d-xpadneo.conf
---- a/modules-load-d-xone.conf	1970-01-01 02:00:00.000000000 +0200
-+++ b/modules-load-d-xone.conf	2022-09-25 20:44:46.000000000 +0300
-@@ -0,0 +1,6 @@
-+xone-wired
-+xone-dongle
-+xone-gip
-+xone-gip-gamepad
-+xone-gip-headset
-+xone-gip-chatpad
-+xone-gip-guitar

main.sh

@@ -1,19 +1,24 @@
-# Add dependent repositories
-wget -q -O - https://ppa.pika-os.com/key.gpg | sudo apt-key add -
-add-apt-repository https://ppa.pika-os.com
-add-apt-repository ppa:pikaos/pika
-add-apt-repository ppa:kubuntu-ppa/backports
+#! /bin/bash
+
+set -e
+
+VERSION="0.3.git1"
+
+source ./pika-build-config.sh
+
+echo "$PIKA_BUILD_ARCH" > pika-build-arch
+
 # Clone Upstream
-git clone https://github.com/medusalix/xone -b v0.3
-cp -rvf ./debian ./xone
-cd ./xone
+cd ./xone-debian
+#git clone https://github.com/medusalix/xone -b v"$VERSION"
+git clone https://github.com/tskaar/xone -b fix-6.12
 
 # Get build deps
 apt-get build-dep ./ -y
 
 # Build package
-LOGNAME=root dh_make --createorig -y -l -p xone_0.3
-dpkg-buildpackage
+LOGNAME=root dh_make --createorig -y -l -p xone_"$VERSION" || echo "dh-make: Ignoring Last Error"
+dpkg-buildpackage --no-sign
 
 # Move the debs to output
 cd ../

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,11 +1,2 @@
-# Sign the packages
-dpkg-sig --sign builder ./output/*.deb
-
-# Pull down existing ppa repo db files etc
-rsync -azP --exclude '*.deb' ferreo@direct.pika-os.com:/srv/www/pikappa/ ./output/repo
-
-# Add the new package to the repo
-reprepro -V --basedir ./output/repo/ includedeb kinetic ./output/*.deb
-
-# Push the updated ppa repo to the server
-rsync -azP ./output/repo/ ferreo@direct.pika-os.com:/srv/www/pikappa/
+# send debs to server
+rsync -azP --include './' --include '*.deb' --exclude '*' ./output/ ferreo@direct.pika-os.com:/srv/www/cockatiel-incoming/

xone-debian/Makefile

@@ -0,0 +1,20 @@
+VERSION=0.3
+
+.PHONY: install
+all:
+	true
+
+install:
+		cp xone/dkms.conf xone/dkms.conf.in
+		sed 's/"#VERSION#"/"'"${VERSION}"'"/g' <xone/dkms.conf.in >xone/dkms.conf
+		echo 'ccflags-y += -DDEBUG' >> "xone/Kbuild"
+		echo "* Copying module into /usr/src..."
+		install -dm755 $(DESTDIR)/usr/src/xone
+		rsync -av --progress ./xone/* $(DESTDIR)/usr/src/xone/ --exclude debian
+		install -dm755 $(DESTDIR)/usr/bin
+		cp xone/install/firmware.sh $(DESTDIR)/usr/bin/xone-firmware
+		ln -sf /usr/src/xone $(DESTDIR)/usr/src/xone-"${VERSION}"
+		install -d $(DESTDIR)/etc/modules-load.d
+		cp -r modules-load-d-xone.conf  $(DESTDIR)/etc/modules-load.d/xone.conf
+		echo "* Blacklisting xpad module..."
+		install -D -m 644 xone/install/modprobe.conf $(DESTDIR)/etc/modprobe.d/xone-blacklist.conf

xone-debian/debian/changelog

@@ -0,0 +1,50 @@
+xone (0.3.git1-101pika2) pika; urgency=medium
+
+  * Upstream fixes
+ 
+ -- Ward Nakchbandi <hotrod.master@hotmail.com>  Thu, 04 Oct 2022 17:50:00 +0300
+
+xone (0.3.git-101pika2) pika; urgency=medium
+
+  * Update to PikaOS 4
+ 
+ -- Ward Nakchbandi <hotrod.master@hotmail.com>  Thu, 04 Oct 2022 17:50:00 +0300
+
+xone (0.3.git-101pika1) pikauwu; urgency=medium
+
+  * Update to latest (why are u 101????)
+ 
+ -- Ward Nakchbandi <hotrod.master@hotmail.com>  Thu, 04 Oct 2022 17:50:00 +0300
+
+xone (0.3.git-100pika1) pikauwu; urgency=medium
+
+  * Update to pikauwu.
+ 
+ -- Ward Nakchbandi <hotrod.master@hotmail.com>  Thu, 04 Oct 2022 17:50:00 +0300
+
+
+xone (0.3.git-99pika1.lunar) lunar; urgency=medium
+
+  * Update to lunar.
+ 
+ -- Ward Nakchbandi <hotrod.master@hotmail.com>  Thu, 04 Oct 2022 17:50:00 +0300
+
+
+xone (0.3-6) kinetic; urgency=medium
+
+  * Fix bad deps.
+ 
+ -- Ward Nakchbandi <hotrod.master@hotmail.com>  Thu, 04 Oct 2022 17:50:00 +0300
+
+xone (0.3-4) kinetic; urgency=medium
+
+  * Revert Stupid Patch and use firmware install properly, and fix section.
+ 
+ -- Ward Nakchbandi <hotrod.master@hotmail.com>  Thu, 04 Oct 2022 17:50:00 +0300
+
+
+xone  (0.3) kinetic; urgency=medium
+
+  * Initial release.
+ 
+ -- Ward Nakchbandi <hotrod.master@hotmail.com>  Thu, 04 Oct 2022 17:50:00 +0300

xone-debian/debian/rules

@@ -1,4 +1,4 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --with quilt
+	dh $@

xone-debian/modules-load-d-xone.conf

@@ -0,0 +1,6 @@
+xone-wired
+xone-dongle
+xone-gip
+xone-gip-gamepad
+xone-gip-headset
+xone-gip-chatpad