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 @@
+5

.github/release-nest-v3

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

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

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.

main.sh

@@ -1,3 +1,13 @@
+#! /bin/bash
+
+set -e
+
+VERSION="7.2"
+
+source ./pika-build-config.sh
+
+echo "$PIKA_BUILD_ARCH" > pika-build-arch
+
 # Clone Upstream
 cd ./pika-sources
 
@@ -5,8 +15,8 @@ cd ./pika-sources
 apt-get build-dep ./ -y
 
 # Build package
-dh_make --createorig
+LOGNAME=root dh_make --createorig -y -l -p pika-sources_"$VERSION" || echo "dh-make: Ignoring Last Error"
-dpkg-buildpackage
+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

pika-sources/debian/changelog

@@ -1,3 +1,33 @@
+pika-sources (7.2-101pika9) pika; urgency=low
+
+  *  Make use of the apt cache so we can leverage it
+
+ -- Ward Nakchbandi <hotrod.master@hotmail.com>  Sat, 01 Oct 2022 14:50:00 +020
+
+pika-sources (7.2-101pika8) pika; urgency=low
+
+  *  Fix pigeon and raven
+
+ -- Ward Nakchbandi <hotrod.master@hotmail.com>  Sat, 01 Oct 2022 14:50:00 +020
+
+pika-sources (7.2-101pika1) pika; urgency=low
+
+  *  Fix pre depends
+
+ -- Ward Nakchbandi <hotrod.master@hotmail.com>  Sat, 01 Oct 2022 14:50:00 +0200
+
+pika-sources (7.1-101pika1) pika; urgency=low
+
+  *  Canary options
+
+ -- Ward Nakchbandi <hotrod.master@hotmail.com>  Sat, 01 Oct 2022 14:50:00 +0200
+
+pika-sources (7.0-101pika1) pika; urgency=low
+
+  *  PikaOS 4
+
+ -- Ward Nakchbandi <hotrod.master@hotmail.com>  Sat, 01 Oct 2022 14:50:00 +0200
+
 pika-sources (6.8-100pika7) pikauwu; urgency=low
 
   *  Fix rocm mesa issues

pika-sources/debian/control

@@ -9,9 +9,9 @@ Homepage: https://github.com/PikaOS-Linux/
 Package: pika-sources
 Section: misc
 Architecture: all
-Pre-Depends: python-apt-common, distro-info-data
+Pre-Depends: python-apt-common, distro-info-data, systemd, udev, bash
-Depends: ${misc:Depends}, ubuntu-keyring
+Depends: ${misc:Depends}, python-apt-common, distro-info-data, systemd, udev, bash
-Description: APT Source files and keyrings for the repositories we use/provide.
+Description: APT Source files and keyrings for the PikaOS Repositories
 
 
 

pika-sources/debian/debhelper-build-stamp

@@ -1 +0,0 @@
-pika-sources

pika-sources/debian/files

@@ -1,2 +0,0 @@
-pika-sources_3.0-99pika14_all.deb misc optional
-pika-sources_3.0-99pika14_amd64.buildinfo misc optional

pika-sources/debian/pika-sources.substvars

@@ -1,2 +0,0 @@
-misc:Depends=
-misc:Pre-Depends=

pika-sources/debian/postinst

@@ -2,24 +2,7 @@
 
 set -e
 
-rm -rf /etc/apt/sources.list.d/pika-* || true
+cp -rf /usr/share/apt-pika/etc / || true
-rm -rf /etc/apt/preferences.d/*pika* || true
-
-rm -f /etc/apt/sources.list.d/amdgpu.sources || true
-rm -f /etc/apt/sources.list.d/amdvlk.sources || true
-rm -f /etc/apt/sources.list.d/xtradeb-apps.sources || true
-rm -f /etc/apt/sources.list.d/kubuntu-backports.sources || true
-rm -f /etc/apt/sources.list.d/mozillateam-ppa.sources || true
-rm -f /etc/apt/sources.list.d/rocm.sources || true
-rm -f /etc/apt/sources.list.d/steam.sources || true
-rm -f /etc/apt/sources.list.d/winehq.sources || true
-rm -f /etc/apt/sources.list.d/xtradeb-play.sources || true
-rm -f /etc/apt/preferences.d/0-pika-default-settings || true
-rm -f /etc/apt/preferences.d/51-ppa-default-settings || true
-rm -f /etc/apt/preferences.d/0-radeon-repo-settings || true
-rm -f /etc/apt/sources.list.d/kisak-mesa.sources || true
-
-cp -rf /usr/share/apt-pika/apt /etc/ || true
 
 systemctl enable --now steam-repos-fix.service || echo "steam-repos-fix service could not be enabled"
 
@@ -27,5 +10,3 @@ mkdir -p /usr/share || echo "Path already exists!"
 mkdir -p /usr/share/distro-info/  || echo "Path already exists!"
 ln -sf /usr/share/distro-info/ubuntu.csv  /usr/share/distro-info/pika.csv  || echo "Link already exists!"
 mkdir -p /usr/share/python-apt/templates/ || echo "Path already exists!"
-ln -sf /usr/share/python-apt/templates/Ubuntu.info  /usr/share/python-apt/templates/Pika.info  || echo "Link already exists!"
-ln -sf /usr/share/python-apt/templates/Ubuntu.mirrors  /usr/share/python-apt/templates/Pika.mirrors  || echo "Link already exists!"

pika-sources/debian/rules

@@ -1,3 +1,6 @@
 #!/usr/bin/make -f
+
+export PIKA_BUILD_ARCH = $(shell cat ../pika-build-arch)
+
 %:
 	dh $@

pika-sources/debian/source/format

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

pika-sources/usr/share/apt-pika/apt/preferences.d/1-pika-ubuntu-settings

@@ -1,10 +0,0 @@
-# Lower Ubuntu's priority under pika's
-Package: *
-Pin: release c=ubuntu
-Pin-Priority: 400
-
-# Lower External's priority same as Ubuntu's for nvidia
-Package: *nvidia*
-Pin: release c=external
-Pin-Priority: 400
-

pika-sources/usr/share/apt-pika/apt/preferences.d/2-pika-radeon-settings

@@ -1,27 +0,0 @@
-Package: libhsa-runtime64*
-Pin: release c=Ubuntu
-Pin-Priority: 100
-
-Package: hipcc*
-Pin: release c=ubuntu
-Pin-Priority: 100
-
-Package: rocm*
-Pin: release c=ubuntu
-Pin-Priority: 100
-
-Package: *
-Pin: release c=rocm
-Pin-Priority: 450
- 
-Package: libglvnd0 libegl1 libegl-dev libglx0 libglx-dev libgl1 libgl-dev libglvnd-core-dev libgles1 libgles2 libgles-dev libglvnd-dev libopengl0 libopengl-dev libxatracker2 libgbm1 libgbm-dev
-Pin: release c=rocm
-Pin-Priority: -5
-
-Package: *mesa*
-Pin: release c=rocm
-Pin-Priority: -5
-
-Package: amdgpu-core amdgpu-pro-core amdgpu-dkms amdgpu-pro-lib32
-Pin: release a=*
-Pin-Priority: -10

pika-sources/usr/share/apt-pika/etc/apt/apt.conf.d/99cache

@@ -0,0 +1,4 @@
+Binary::apt::APT::Cache "/var/cache/apt";
+Binary::apt::APT::Cache::Archives "archives";
+Binary::apt::APT::Keep-Downloaded-Packages "true";
+APT::Keep-Downloaded-Packages "true";

pika-sources/usr/share/apt-pika/etc/apt/preferences.d/0-pika-apt-settings

@@ -0,0 +1,45 @@
+# Lower nest's priority under cockatiel's
+Package: *
+Pin: release a=pika,c=nest
+Pin-Priority: 450
+
+# Put nest ROCm under raven's ROCm
+Package: libhsa-runtime64* hipcc* rocm* hipify*
+Pin: release a=pika,c=nest
+Pin-Priority: 100
+
+# Lower canary's priority under cockatiel's
+Package: *
+Pin: release a=pika,c=canary
+Pin-Priority: 451
+
+# Put canary ROCm under raven's ROCm
+Package: libhsa-runtime64* hipcc* rocm* hipify*
+Pin: release a=pika,c=canary
+Pin-Priority: 100
+
+# Lower raven's priority under cockatiel's
+Package: *
+Pin: release a=pika,c=raven
+Pin-Priority: 452
+
+# Lower pigeon's priority under cockatiel's
+Package: *
+Pin: release a=pika,c=pigeon
+Pin-Priority: 450
+
+# Blacklist intel mesa from pigeon
+Package: libglvnd0 libegl1 libegl-dev libglx0 libglx-dev libgl1 libgl-dev libglvnd-core-dev libgles1 libgles2 libgles-dev libglvnd-dev libopengl0 libopengl-dev libxatracker2 libgbm1 libgbm-dev *mesa* *intel-media-va-driver* *libigdgmm*
+Pin: release a=pika,c=pigeon
+Pin-Priority: 100
+
+# Blacklist dangerous amdgpu-pro packages
+Package: amdgpu-core amdgpu-pro-core amdgpu-dkms amdgpu-pro-lib32
+Pin: release a=*
+Pin-Priority: -10
+
+# Lower parrot's priority under cockatiel's
+Package: *
+Pin: release a=pika,c=parrot
+Pin-Priority: 452
+

pika-sources/usr/share/apt-pika/etc/apt/sources.list.d/system.sources

@@ -2,8 +2,8 @@ X-Repolib-Name: PikaOS System Sources
 Enabled: yes
 Types: deb
 URIs: https://ppa.pika-os.com/
-Suites: pikauwu
+Suites: pika
-Components: main amdgpu rocm external ubuntu
+Components: nest raven parrot cockatiel pigeon
 X-Repolib-ID: system
 X-Repolib-Default-Mirror: https://ppa.pika-os.com/
 Signed-By: /etc/apt/keyrings/pika-keyring.gpg.key

pika-sources/usr/share/apt-pika/etc/dpkg/dpkg.cfg.d/force-overwrite

@@ -0,0 +1 @@
+force-overwrite

pika-sources/usr/share/python-apt/templates/Pika.info

@@ -0,0 +1,62 @@
+Suite: pika
+RepositoryType: deb
+BaseURI: https://ppa.pika-os.com/
+MatchURI: ((http|https|ftp)[0-9]*\.([a-z]*\.){0,1}|ppa\.|httpredir\.)pika-os\.com
+MirrorsFile: Pika.mirrors
+Description: PikaOS
+Component: nest
+CompDescription: Primary Repo
+Component: pending
+CompDescription: Primary Repo (Nest Pending)
+Component: canary
+CompDescription: Primary Repo (Canary)
+Component: cockatiel
+CompDescription: Pika Specific Repo
+Component: pigeon
+CompDescription: Properietary Drivers Repo
+Component: raven
+CompDescription: Compute Drivers Repo
+Component: parrot
+CompDescription: 3rd-Party Packages Repo
+
+Suite: nest
+RepositoryType: deb
+BaseURI: https://ppa.pika-os.com/
+MatchURI: ((http|https|ftp)[0-9]*\.([a-z]*\.){0,1}|ppa\.|httpredir\.)pika-os\.com
+MirrorsFile: Pika.mirrors
+Description: PikaOS
+Component: nest
+CompDescription: Primary Repo
+Component: pending
+CompDescription: Primary Repo (Nest Pending)
+Component: canary
+CompDescription: Primary Repo (Canary)
+Component: cockatiel
+CompDescription: Pika Specific Repo
+Component: pigeon
+CompDescription: Properietary Drivers Repo
+Component: raven
+CompDescription: Compute Drivers Repo
+Component: parrot
+CompDescription: 3rd-Party Packages Repo
+
+Suite: canary
+RepositoryType: deb
+BaseURI: https://ppa.pika-os.com/
+MatchURI: ((http|https|ftp)[0-9]*\.([a-z]*\.){0,1}|ppa\.|httpredir\.)pika-os\.com
+MirrorsFile: Pika.mirrors
+Description: PikaOS
+Component: nest
+CompDescription: Primary Repo
+Component: pending
+CompDescription: Primary Repo (Nest Pending)
+Component: canary
+CompDescription: Primary Repo (Canary)
+Component: cockatiel
+CompDescription: Pika Specific Repo
+Component: pigeon
+CompDescription: Properietary Drivers Repo
+Component: raven
+CompDescription: Compute Drivers Repo
+Component: parrot
+CompDescription: 3rd-Party Packages Repo

pika-sources/usr/share/python-apt/templates/Pika.mirrors

@@ -0,0 +1,2 @@
+#LOC:US
+https://ppa.pika-os.com/

release.sh

@@ -1,11 +1,2 @@
 # send debs to server
-rsync -azP --include './' --include '*.deb' --exclude '*' ./output/ ferreo@direct.pika-os.com:/srv/www/incoming/
+rsync -azP --include './' --include '*.deb' --exclude '*' ./output/ ferreo@direct.pika-os.com:/srv/www/cockatiel-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:'
-
-cp -vf ./output/pika-sources*.deb  ./output/pika-sources.deb 
-rsync ./output/pika-sources.deb ferreo@direct.pika-os.com:/srv/www/pikarepo/dists/pikauwu/