adapt to OS 4

.github/build-canary-v3

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

.github/build-nest-v3

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

.github/release-canary-v3

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

.github/release-nest-v3

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

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

Makefile

@@ -1,11 +0,0 @@
-all:
-
-install:
-	mkdir -p $(DESTDIR)/usr/share/sounds/pika
-	cp -r etc /
-	cp --no-preserve=mode,ownership -r \
-		sounds/* \
-		$(DESTDIR)/usr/share/sounds/pika/
-
-uninstall:
-	-rm -rf $(DESTDIR)/usr/share/sounds/pika

debian/changelog

@@ -1,18 +0,0 @@
-pika-theme-sound (1.2.1-100pika1) pikauwu; urgency=medium
-
-  * First release
-
- -- Jeremy Soller <jeremy@system76.com>  Thu, 21 Apr 2017 13:20:00 -0600
-
-pika-theme-sound (1.2.1-99pika1.lunar) lunar; urgency=medium
-
-  * First release
-
- -- Jeremy Soller <jeremy@system76.com>  Thu, 21 Apr 2017 13:20:00 -0600
-
-pika-theme-sound (1.2.1) kinetic; urgency=medium
-
-  * First release
-
- -- Jeremy Soller <jeremy@system76.com>  Thu, 21 Apr 2017 13:20:00 -0600
-

debian/pika-theme-sound.install

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

debian/source/format

@@ -1 +0,0 @@
-3.0 (native)

etc/pika_login.sh

@@ -1,3 +0,0 @@
-#! /bin/bash
-sleep 5
-canberra-gtk-play --id="desktop-login" --description="GNOME Login"

etc/xdg/autostart/pika-login-sound.desktop

@@ -1,5 +0,0 @@
-[Desktop Entry]
-Name=Play Login Sound on startup
-Exec=/etc/pika_login.sh
-Type=Application
-Terminal=false

main.sh

@@ -1,15 +1,22 @@
-DEBIAN_FRONTEND=noninteractive
+#! /bin/bash
+
+set -e
+
+VERSION="1.0.0"
+
+source ./pika-build-config.sh
+
+echo "$PIKA_BUILD_ARCH" > pika-build-arch
 
 # Clone Upstream
-mkdir -p ./pika-theme-sound
-cp -rvf ./* ./pika-theme-sound || echo
-cd ./pika-theme-sound
+cd ./sound-theme-pika
 
 # Get build deps
 apt-get build-dep ./ -y
 
 # Build package
-dpkg-buildpackage
+LOGNAME=root dh_make --createorig -y -l -p sound-theme-pika_"$VERSION" || echo "dh-make: Ignoring Last Error"
+dpkg-buildpackage --no-sign
 
 # Move the debs to output
 cd ../

orig.source.txt

@@ -0,0 +1 @@
+Source is this git's root

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

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,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/

sound-theme-pika/debian/changelog

@@ -0,0 +1,5 @@
+sound-theme-pika (1.0.0-101pika1) pika; urgency=medium
+
+  * First release
+
+ -- Jeremy Soller <jeremy@system76.com>  Thu, 21 Apr 2017 13:20:00 -0600

sound-theme-pika/debian/control

@@ -1,13 +1,13 @@
-Source: pika-theme-sound
+Source: sound-theme-pika
 Section: gnome
 Priority: optional
 Maintainer: Jeremy Soller <jeremy@system76.com>
 Uploaders: Ian Santopietro <ian@system76.com>
 Build-Depends: debhelper (>= 9)
 Standards-Version: 3.9.8
-Homepage: https://github.com/PikaOS-Linux/pkg-pika-theme-sound
+Homepage: https://git.pika-os.com/general-packages/sound-theme-pika
 
-Package: pika-theme-sound
+Package: sound-theme-pika
 Architecture: all
 Description: Pika Sounds
-Depends: gnome-session-canberra, libglib2.0-bin
+Depends: libglib2.0-bin

sound-theme-pika/debian/sound-theme-pika.install

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

sound-theme-pika/debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)