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

.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,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 -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,3 +1,21 @@
+hwdata (0.384-101pika1) pika; urgency=medium
+
+  * New upstream release && update to PikaOS 4.
+  
+ -- Ward Nakchbandi <hotrod.master@hotmail.com>  Sat, 15 Oct 2022 18:58:00 +0300
+
+hwdata (0.379-100pika1) pikauwu; urgency=medium
+
+  * New upstream release && update to pikauwuw.
+  
+ -- Ward Nakchbandi <hotrod.master@hotmail.com>  Sat, 15 Oct 2022 18:58:00 +0300
+
+hwdata (0.370-99pika3.lunar) lunar; urgency=medium
+
+  * New upstream release && update to lunar.
+  
+ -- Ward Nakchbandi <hotrod.master@hotmail.com>  Sat, 15 Oct 2022 18:58:00 +0300
+
 hwdata (0.367-99pika1) kinetic; urgency=medium
 
   * New upstream release.

debian/control

@@ -12,9 +12,17 @@ Vcs-Git: https://salsa.debian.org/pino/hwdata.git
 Package: hwdata
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}, pci.ids
+Depends: ${misc:Depends}, pci.ids, usb.ids
-Provides: hwdata-dev, usb.ids
 Description: hardware identification / configuration data
  This package contains various hardware identification and configuration data,
  such as the pci.ids database, or the XFree86/xorg Cards database.
  It is needed for the kudzu hardware detection.
+
+Package: hwdata-dev
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}, hwdata (= ${binary:Version})
+Description: hardware identification / configuration data
+ This package contains various hardware identification and configuration data,
+ such as the pci.ids database, or the XFree86/xorg Cards database.
+ It is needed for the kudzu hardware detection (development headers).

debian/hwdata-dev.install

@@ -0,0 +1 @@
+usr/share/pkgconfig/*

debian/hwdata.install

@@ -0,0 +1,2 @@
+usr/share/hwdata/*
+usr/lib/*/*

debian/rules

@@ -2,6 +2,7 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+export PIKA_BUILD_ARCH = $(shell cat ../pika-build-arch)
 
 override_dh clean:
 	echo "disabled"

debian/source/format

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

main.sh

@@ -1,11 +1,16 @@
-# Add dependent repositories
+#! /bin/bash
-wget -q -O - https://ppa.pika-os.com/key.gpg | sudo apt-key add -
+
-add-apt-repository https://ppa.pika-os.com
+set -e
-add-apt-repository ppa:pikaos/pika
+
-add-apt-repository ppa:kubuntu-ppa/backports
+VERSION="0.384"
+
+source ./pika-build-config.sh
+
+echo "$PIKA_BUILD_ARCH" > pika-build-arch
+
 # Clone Upstream
-git  clone https://github.com/vcrhonek/hwdata
+git clone https://github.com/vcrhonek/hwdata -b v"$VERSION"
-sed -i 's#/usr/bin/env\ python#/usr/bin/env\ python3#' ./*
+find . -type f ! -path '*' -exec sed -i 's#/usr/bin/env\ python#/usr/bin/env\ python3#' {} \;
 cp -rvf ./debian ./hwdata/
 cd ./hwdata
 
@@ -13,8 +18,8 @@ cd ./hwdata
 apt-get build-dep ./ -y
 
 # Build package
-dh_make --createorig
+LOGNAME=root dh_make --createorig -y -l -p hwdata_"$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

release.sh

@@ -1,14 +1,2 @@
-# Sign the packages
+# send debs to server
-dpkg-sig --sign builder ./output/hwdata*.deb
+rsync -azP --include './' --include '*.deb' --exclude '*' ./output/ ferreo@direct.pika-os.com:/srv/www/cockatiel-incoming/
-
-# Pull down existing ppa repo db files etc
-rsync -azP --exclude '*.deb' ferreo@direct.pika-os.com:/srv/www/pikappa/ ./output/repo
-
-# Remove our existing package from the repo
-reprepro -V --basedir ./output/repo/ removefilter kinetic 'Package (% hwdata*)'
-
-# Add the new package to the repo
-reprepro -V --basedir ./output/repo/ includedeb kinetic ./output/hwdata*.deb
-
-# Push the updated ppa repo to the server
-rsync -azP ./output/repo/ ferreo@direct.pika-os.com:/srv/www/pikappa/