diff --git a/.github/build-canary-v3 b/.github/build-canary-v3 new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.github/build-canary-v3 @@ -0,0 +1 @@ +1 diff --git a/.github/build-nest-v3 b/.github/build-nest-v3 new file mode 100644 index 0000000..56a6051 --- /dev/null +++ b/.github/build-nest-v3 @@ -0,0 +1 @@ +1 \ No newline at end of file diff --git a/.github/release-canary-v3 b/.github/release-canary-v3 new file mode 100644 index 0000000..56a6051 --- /dev/null +++ b/.github/release-canary-v3 @@ -0,0 +1 @@ +1 \ No newline at end of file diff --git a/.github/release-nest-v3 b/.github/release-nest-v3 new file mode 100644 index 0000000..56a6051 --- /dev/null +++ b/.github/release-nest-v3 @@ -0,0 +1 @@ +1 \ No newline at end of file diff --git a/.github/workflows/build-canaryv3.yml b/.github/workflows/build-canaryv3.yml new file mode 100644 index 0000000..bff3d86 --- /dev/null +++ b/.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 diff --git a/.github/workflows/build-nestv3.yml b/.github/workflows/build-nestv3.yml new file mode 100644 index 0000000..3c9c34d --- /dev/null +++ b/.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 diff --git a/.github/workflows/release-canaryv3.yml b/.github/workflows/release-canaryv3.yml new file mode 100644 index 0000000..436c8ff --- /dev/null +++ b/.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 diff --git a/.github/workflows/release-nestv3.yml b/.github/workflows/release-nestv3.yml new file mode 100644 index 0000000..ed42bb7 --- /dev/null +++ b/.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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index 1641898..0000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,46 +0,0 @@ -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 }} diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..16ff30b --- /dev/null +++ b/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. diff --git a/debian/files b/debian/files deleted file mode 100644 index 1aa7862..0000000 --- a/debian/files +++ /dev/null @@ -1 +0,0 @@ -xpadneo-dkms_0.9.5-5_source.buildinfo games optional diff --git a/debian/postinst b/debian/postinst deleted file mode 100755 index 557c6dc..0000000 --- a/debian/postinst +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -set -e - -dkms install -m hid-xpadneo/0.9.5 - diff --git a/debian/prerm b/debian/prerm deleted file mode 100755 index efa435e..0000000 --- a/debian/prerm +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -set -e - -dkms remove -m hid-xpadneo/0.9.5 - diff --git a/debian/source/format b/debian/source/format deleted file mode 100644 index 89ae9db..0000000 --- a/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (native) diff --git a/main.sh b/main.sh index b332536..86497ff 100755 --- a/main.sh +++ b/main.sh @@ -1,15 +1,23 @@ #! /bin/bash +set -e + +VERSION="0.9.6.git" + +source ./pika-build-config.sh + +echo "$PIKA_BUILD_ARCH" > pika-build-arch + # Clone Upstream -git clone https://github.com/atar-axis/xpadneo -b v0.9.6 -cp -rvf ./debian ./xpadneo -cd ./xpadneo -for i in ../patches/* ; do patch -Np1 -i $i; done +cd ./xpadneo-debian +#git clone https://github.com/atar-axis/xpadneo -b v"$VERSION" +git clone https://github.com/atar-axis/xpadneo # Get build deps apt-get build-dep ./ -y # Build package +LOGNAME=root dh_make --createorig -y -l -p xpadneo_"$VERSION" || echo "dh-make: Ignoring Last Error" dpkg-buildpackage --no-sign # Move the debs to output diff --git a/patches/series b/patches/series deleted file mode 100644 index 15f853d..0000000 --- a/patches/series +++ /dev/null @@ -1 +0,0 @@ -xpadneo-package-adapt.patch diff --git a/patches/xpadneo-package-adapt.patch b/patches/xpadneo-package-adapt.patch deleted file mode 100644 index a1acee4..0000000 --- a/patches/xpadneo-package-adapt.patch +++ /dev/null @@ -1,21 +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,12 @@ -+VERSION=0.9.5 -+ -+all: -+ true -+ -+install: -+ sed 's/"@DO_NOT_CHANGE@"/"'"${VERSION}"'"/g' hid-xpadneo/dkms.conf -+ install -d $(DESTDIR)/usr/src/ -+ cp -r hid-xpadneo $(DESTDIR)/usr/src/ -+ install -d $(DESTDIR)/etc/modules-load.d -+ ln -s /usr/src/hid-xpadneo $(DESTDIR)/usr/src/hid-xpadneo-"${VERSION}" -+ cp -r modules-load-d-xpadneo.conf $(DESTDIR)/etc/modules-load.d/xpadneo.conf -diff -uraN a/modules-load-d-xpadneo.conf b/modules-load-d-xpadneo.conf ---- a/modules-load-d-xpadneo.conf 1970-01-01 02:00:00.000000000 +0200 -+++ b/modules-load-d-xpadneo.conf 2022-09-25 20:44:46.000000000 +0300 -@@ -0,0 +1 @@ -+hid_xpadneo diff --git a/pika-build-config/amd64-v3.sh b/pika-build-config/amd64-v3.sh new file mode 100755 index 0000000..10285b4 --- /dev/null +++ b/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 -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 diff --git a/pika-build-config/i386.sh b/pika-build-config/i386.sh new file mode 100755 index 0000000..7629d66 --- /dev/null +++ b/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 diff --git a/release.sh b/release.sh index 1575255..660f48f 100755 --- a/release.sh +++ b/release.sh @@ -1,8 +1,2 @@ # send debs to server -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:' \ No newline at end of file +rsync -azP --include './' --include '*.deb' --exclude '*' ./output/ ferreo@direct.pika-os.com:/srv/www/cockatiel-incoming/ diff --git a/xpadneo-debian/Makefile b/xpadneo-debian/Makefile new file mode 100644 index 0000000..1823d5e --- /dev/null +++ b/xpadneo-debian/Makefile @@ -0,0 +1,12 @@ +VERSION=0.9.6 + +all: + true + +install: + sed 's/"@DO_NOT_CHANGE@"/"'"${VERSION}"'"/g' hid-xpadneo/dkms.conf + install -d $(DESTDIR)/usr/src/ + cp -r hid-xpadneo $(DESTDIR)/usr/src/ + install -d $(DESTDIR)/etc/modules-load.d + ln -s /usr/src/hid-xpadneo $(DESTDIR)/usr/src/hid-xpadneo-"${VERSION}" + cp -r modules-load-d-xpadneo.conf $(DESTDIR)/etc/modules-load.d/xpadneo.conf diff --git a/debian/changelog b/xpadneo-debian/debian/changelog similarity index 82% rename from debian/changelog rename to xpadneo-debian/debian/changelog index a7f29fb..1506f57 100644 --- a/debian/changelog +++ b/xpadneo-debian/debian/changelog @@ -1,3 +1,9 @@ +xpadneo (0.9.6.git-101pika1) pika; urgency=medium + + * Update to PikaOS 4. + + -- Ward Nakchbandi Thu, 04 Oct 2022 17:50:00 +0300 + xpadneo (0.9.6-100pika1) pikauwu; urgency=medium * pikauwu. diff --git a/debian/control b/xpadneo-debian/debian/control similarity index 100% rename from debian/control rename to xpadneo-debian/debian/control diff --git a/debian/copyright b/xpadneo-debian/debian/copyright similarity index 100% rename from debian/copyright rename to xpadneo-debian/debian/copyright diff --git a/xpadneo-debian/debian/postinst b/xpadneo-debian/debian/postinst new file mode 100755 index 0000000..c4eed6d --- /dev/null +++ b/xpadneo-debian/debian/postinst @@ -0,0 +1,6 @@ +#!/bin/sh + +set -e + +dkms install -m hid-xpadneo/0.9.6 + diff --git a/xpadneo-debian/debian/prerm b/xpadneo-debian/debian/prerm new file mode 100755 index 0000000..50bf0e8 --- /dev/null +++ b/xpadneo-debian/debian/prerm @@ -0,0 +1,6 @@ +#!/bin/sh + +set -e + +dkms remove -m hid-xpadneo/0.9.6 + diff --git a/debian/rules b/xpadneo-debian/debian/rules similarity index 100% rename from debian/rules rename to xpadneo-debian/debian/rules diff --git a/xpadneo-debian/debian/source/format b/xpadneo-debian/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/xpadneo-debian/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/xpadneo-debian/modules-load-d-xpadneo.conf b/xpadneo-debian/modules-load-d-xpadneo.conf new file mode 100644 index 0000000..9a5fd2d --- /dev/null +++ b/xpadneo-debian/modules-load-d-xpadneo.conf @@ -0,0 +1 @@ +hid_xpadneo