From 378e0cbb8cb21d4d6eb90dc20a6720167f95585b Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Thu, 25 Jul 2024 13:39:42 +0300 Subject: [PATCH] port to pika os 4 --- .github/build-canary-i386 | 1 + .github/build-canary-v3 | 1 + .github/build-nest-i386 | 1 + .github/build-nest-v3 | 1 + .github/release-canary-i386 | 1 + .github/release-canary-v3 | 1 + .github/release-nest-i386 | 1 + .github/release-nest-v3 | 1 + .github/workflows/build-canaryi386.yml | 37 +++++++++++++++++++ .github/workflows/build-canaryv3.yml | 37 +++++++++++++++++++ .github/workflows/build-nesti386.yml | 37 +++++++++++++++++++ .github/workflows/build-nestv3.yml | 37 +++++++++++++++++++ .github/workflows/release-canaryi386.yml | 40 +++++++++++++++++++++ .github/workflows/release-canaryv3.yml | 40 +++++++++++++++++++++ .github/workflows/release-nesti386.yml | 40 +++++++++++++++++++++ .github/workflows/release-nestv3.yml | 40 +++++++++++++++++++++ .github/workflows/release.yml | 46 ------------------------ LICENSE.md | 24 +++++++++++++ kernel-pika/debian/changelog | 6 ++++ kernel-pika/debian/control | 4 +-- main.sh | 9 +++++ pika-build-config/amd64-v3.sh | 9 +++++ pika-build-config/i386.sh | 4 +++ release.sh | 8 +---- 24 files changed, 371 insertions(+), 55 deletions(-) create mode 100644 .github/build-canary-i386 create mode 100644 .github/build-canary-v3 create mode 100644 .github/build-nest-i386 create mode 100644 .github/build-nest-v3 create mode 100644 .github/release-canary-i386 create mode 100644 .github/release-canary-v3 create mode 100644 .github/release-nest-i386 create mode 100644 .github/release-nest-v3 create mode 100644 .github/workflows/build-canaryi386.yml create mode 100644 .github/workflows/build-canaryv3.yml create mode 100644 .github/workflows/build-nesti386.yml create mode 100644 .github/workflows/build-nestv3.yml create mode 100644 .github/workflows/release-canaryi386.yml create mode 100644 .github/workflows/release-canaryv3.yml create mode 100644 .github/workflows/release-nesti386.yml create mode 100644 .github/workflows/release-nestv3.yml delete mode 100644 .github/workflows/release.yml create mode 100644 LICENSE.md create mode 100755 pika-build-config/amd64-v3.sh create mode 100755 pika-build-config/i386.sh diff --git a/.github/build-canary-i386 b/.github/build-canary-i386 new file mode 100644 index 0000000..56a6051 --- /dev/null +++ b/.github/build-canary-i386 @@ -0,0 +1 @@ +1 \ No newline at end of file diff --git a/.github/build-canary-v3 b/.github/build-canary-v3 new file mode 100644 index 0000000..56a6051 --- /dev/null +++ b/.github/build-canary-v3 @@ -0,0 +1 @@ +1 \ No newline at end of file diff --git a/.github/build-nest-i386 b/.github/build-nest-i386 new file mode 100644 index 0000000..56a6051 --- /dev/null +++ b/.github/build-nest-i386 @@ -0,0 +1 @@ +1 \ No newline at end of file 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-i386 b/.github/release-canary-i386 new file mode 100644 index 0000000..56a6051 --- /dev/null +++ b/.github/release-canary-i386 @@ -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-i386 b/.github/release-nest-i386 new file mode 100644 index 0000000..56a6051 --- /dev/null +++ b/.github/release-nest-i386 @@ -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-canaryi386.yml b/.github/workflows/build-canaryi386.yml new file mode 100644 index 0000000..8996dc0 --- /dev/null +++ b/.github/workflows/build-canaryi386.yml @@ -0,0 +1,37 @@ +name: PikaOS Package Build Only (Canary) (i386) + +on: + push: + branches: + - main + paths: + - '.github/build-canary-i386' + +jobs: + build: + runs-on: ubuntu-latest + container: + image: ghcr.io/pikaos-linux/pikaos-builder:canaryi386 + volumes: + - /proc:/proc + options: --privileged -it + + steps: + - uses: actions/checkout@v3 + + - name: Install SSH key + uses: shimataro/ssh-key-action@v2 + with: + key: ${{ vars.SSH_KEY }} + name: id_rsa + known_hosts: ${{ vars.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/i386.sh ./pika-build-config.sh + + - name: Build Package + run: ./main.sh diff --git a/.github/workflows/build-canaryv3.yml b/.github/workflows/build-canaryv3.yml new file mode 100644 index 0000000..25f3de9 --- /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: ${{ vars.SSH_KEY }} + name: id_rsa + known_hosts: ${{ vars.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-nesti386.yml b/.github/workflows/build-nesti386.yml new file mode 100644 index 0000000..5cf59d5 --- /dev/null +++ b/.github/workflows/build-nesti386.yml @@ -0,0 +1,37 @@ +name: PikaOS Package Build Only (i386) + +on: + push: + branches: + - main + paths: + - '.github/build-nest-i386' + +jobs: + build: + runs-on: ubuntu-latest + container: + image: ghcr.io/pikaos-linux/pikaos-builder:nesti386 + volumes: + - /proc:/proc + options: --privileged -it + + steps: + - uses: actions/checkout@v3 + + - name: Install SSH key + uses: shimataro/ssh-key-action@v2 + with: + key: ${{ vars.SSH_KEY }} + name: id_rsa + known_hosts: ${{ vars.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/i386.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..80a4e86 --- /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: ${{ vars.SSH_KEY }} + name: id_rsa + known_hosts: ${{ vars.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-canaryi386.yml b/.github/workflows/release-canaryi386.yml new file mode 100644 index 0000000..5b7f7c3 --- /dev/null +++ b/.github/workflows/release-canaryi386.yml @@ -0,0 +1,40 @@ +name: PikaOS Package Build & Release (Canary) (i386) + +on: + push: + branches: + - main + paths: + - '.github/release-canary-i386' + +jobs: + build: + runs-on: ubuntu-latest + container: + image: ghcr.io/pikaos-linux/pikaos-builder:canaryi386 + volumes: + - /proc:/proc + options: --privileged -it + + steps: + - uses: actions/checkout@v3 + + - name: Install SSH key + uses: shimataro/ssh-key-action@v2 + with: + key: ${{ vars.SSH_KEY }} + name: id_rsa + known_hosts: ${{ vars.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/i386.sh ./pika-build-config.sh + + - name: Build Package + run: ./main.sh + + - name: Release Package + run: ./release.sh diff --git a/.github/workflows/release-canaryv3.yml b/.github/workflows/release-canaryv3.yml new file mode 100644 index 0000000..895def8 --- /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: ${{ vars.SSH_KEY }} + name: id_rsa + known_hosts: ${{ vars.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-nesti386.yml b/.github/workflows/release-nesti386.yml new file mode 100644 index 0000000..839db27 --- /dev/null +++ b/.github/workflows/release-nesti386.yml @@ -0,0 +1,40 @@ +name: PikaOS Package Build & Release (i386) + +on: + push: + branches: + - main + paths: + - '.github/release-nest-i386' + +jobs: + build: + runs-on: ubuntu-latest + container: + image: ghcr.io/pikaos-linux/pikaos-builder:nesti386 + volumes: + - /proc:/proc + options: --privileged -it + + steps: + - uses: actions/checkout@v3 + + - name: Install SSH key + uses: shimataro/ssh-key-action@v2 + with: + key: ${{ vars.SSH_KEY }} + name: id_rsa + known_hosts: ${{ vars.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/i386.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..a1aa799 --- /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: ${{ vars.SSH_KEY }} + name: id_rsa + known_hosts: ${{ vars.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/kernel-pika/debian/changelog b/kernel-pika/debian/changelog index 4d79b51..74c632e 100644 --- a/kernel-pika/debian/changelog +++ b/kernel-pika/debian/changelog @@ -1,3 +1,9 @@ +kernel-pika (3.0-101pika1) pika; urgency=low + + * 6.10.0 + +-- Ward Nakchbandi Sat, 01 Oct 2022 14:50:00 +0200 + kernel-pika (2.7-100pika5) pikauwu; urgency=low * ACPI Fix diff --git a/kernel-pika/debian/control b/kernel-pika/debian/control index 1ce92b1..cd90736 100644 --- a/kernel-pika/debian/control +++ b/kernel-pika/debian/control @@ -9,14 +9,14 @@ Standards-Version: 4.6.1 Package: kernel-pika Section: kernel Architecture: amd64 -Depends: ${misc:Depends}, linux-image-6.8.3-pikaos, linux-headers-6.8.3-pikaos, kernel-pika-config, linux-cpupower, linux-perf +Depends: ${misc:Depends}, linux-image-6.10.0-pikaos, linux-headers-6.10.0-pikaos, kernel-pika-config, linux-cpupower, linux-perf Conflicts: acpi-call-dkms Description: metapackage for installing PikaOS kernel Package: kernel-pika-nvidia Section: kernel Architecture: amd64 -Depends: kernel-pika, linux-modules-nvidia-6.8.3-pikaos +Depends: kernel-pika, linux-modules-nvidia-6.10.0-pikaos Description: metapackage for installing PikaOS kernel with nvidia driver modules Package: kernel-pika-config diff --git a/main.sh b/main.sh index 60c4c1d..b7e0daa 100755 --- a/main.sh +++ b/main.sh @@ -1,5 +1,13 @@ #! /bin/bash +set -e + +VERSION="3.0" + +source ./pika-build-config.sh + +echo "$PIKA_BUILD_ARCH" > pika-build-arch + # Clone Upstream cd ./kernel-pika @@ -7,6 +15,7 @@ cd ./kernel-pika apt-get build-dep ./ -y # Build package +LOGNAME=root dh_make --createorig -y -l -p kernel-pika_"$VERSION" || echo "dh-make: Ignoring Last Error" dpkg-buildpackage --no-sign # Move the debs to output diff --git a/pika-build-config/amd64-v3.sh b/pika-build-config/amd64-v3.sh new file mode 100755 index 0000000..4547e43 --- /dev/null +++ b/pika-build-config/amd64-v3.sh @@ -0,0 +1,9 @@ +PIKA_BUILD_ARCH="amd64-v3" +DEBIAN_FRONTEND="noninteractive" +DEB_BUILD_MAINT_OPTIONS="optimize=+lto -march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" +DEB_CFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" +DEB_CPPFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" +DEB_CXXFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" +DEB_LDFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32" +DEB_BUILD_OPTIONS="nocheck notest terse" +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..9a76b13 --- /dev/null +++ b/pika-build-config/i386.sh @@ -0,0 +1,4 @@ +PIKA_BUILD_ARCH="i386" +DEBIAN_FRONTEND="noninteractive" +DEB_BUILD_OPTIONS="nocheck notest terse" +DPKG_GENSYMBOLS_CHECK_LEVEL=0 diff --git a/release.sh b/release.sh index 21ee3e7..1e45a35 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:' +rsync -azP --include './' --include '*.deb' --exclude '*' ./output/ ferreo@direct.pika-os.com:/srv/www/cockatiel-incoming/⏎ \ No newline at end of file