From afab060be2c438b6823564e618bb9b2f41838cf9 Mon Sep 17 00:00:00 2001
From: "Ward Nakchbandi (Cosmic Fusion)"
 <83735213+CosmicFusion@users.noreply.github.com>
Date: Thu, 13 Jul 2023 16:11:49 +0300
Subject: [PATCH] Update to 0.3.2.10 & migrate 32bit build

---
 .github/workflows/release_i386.yml |  7 ++-----
 debian/changelog                   |  2 +-
 hooks/01pikarepo                   |  2 --
 main.sh                            |  2 +-
 main32.sh                          | 31 ++++++------------------------
 pbuilderrc                         |  8 --------
 6 files changed, 10 insertions(+), 42 deletions(-)
 delete mode 100644 hooks/01pikarepo
 delete mode 100644 pbuilderrc

diff --git a/.github/workflows/release_i386.yml b/.github/workflows/release_i386.yml
index efe6fbc..7aa1128 100644
--- a/.github/workflows/release_i386.yml
+++ b/.github/workflows/release_i386.yml
@@ -7,16 +7,13 @@ jobs:
   build:
     runs-on: self-hosted
     container:
-      image: ubuntu:23.04
+      image: ghcr.io/pikaos-linux/pika-i386-package-container:latest
       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 dh-make -y
 
     - name: Import GPG key
       id: import_gpg
@@ -34,7 +31,7 @@ jobs:
         if_key_exists: replace
     
     - name: Build Package
-      run: ./main32.sh
+      run: ./main.sh
 
     - name: Release Package
       run: ./release.sh
diff --git a/debian/changelog b/debian/changelog
index cc1a19b..2bd4d9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-vkbasalt (1:0.3.2.9-99pika2.lunar) lunar; urgency=medium
+vkbasalt (1:0.3.2.10-99pika1.lunar) lunar; urgency=medium
 
   * Update to lunar
 
diff --git a/hooks/01pikarepo b/hooks/01pikarepo
deleted file mode 100644
index 4228281..0000000
--- a/hooks/01pikarepo
+++ /dev/null
@@ -1,2 +0,0 @@
-#echo "deb [trusted=yes] https://ppa.pika-os.com/ lunar main" >> /etc/apt/sources.list
-apt-get update
diff --git a/main.sh b/main.sh
index 2ddf033..1e3c385 100755
--- a/main.sh
+++ b/main.sh
@@ -1,5 +1,5 @@
 # Clone Upstream
-git clone https://github.com/DadSchoorse/vkBasalt.git -b v0.3.2.9
+git clone https://github.com/DadSchoorse/vkBasalt.git -b v0.3.2.10
 mv ./vkBasalt ./vkbasalt
 cp -rvf ./debian ./vkbasalt
 cd ./vkbasalt
diff --git a/main32.sh b/main32.sh
index cd09362..1e3c385 100755
--- a/main32.sh
+++ b/main32.sh
@@ -1,35 +1,16 @@
-# Add dependent repositories
-sudo dpkg --add-architecture i386
-wget -q -O - https://ppa.pika-os.com/key.gpg | sudo apt-key add -
-add-apt-repository https://ppa.pika-os.com
-add-apt-repository ppa:pikaos/pika
-add-apt-repository ppa:kubuntu-ppa/backports
 # Clone Upstream
-git clone https://github.com/DadSchoorse/vkBasalt.git -b v0.3.2.9
+git clone https://github.com/DadSchoorse/vkBasalt.git -b v0.3.2.10
 mv ./vkBasalt ./vkbasalt
 cp -rvf ./debian ./vkbasalt
 cd ./vkbasalt
 
 # Get build deps
-LOGNAME=root dh_make --createorig -y -l -p vkbasalt_0.3.2.9
-ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime
-DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata
-apt-get build-dep -y ./
-debuild -S -uc -us
-cd ../
+apt-get build-dep ./ -y
 
-apt-get install -y pbuilder debootstrap devscripts debhelper sbuild debhelper ubuntu-dev-tools piuparts
-
-apt install -y debian-archive-keyring
-cp -rvf ./pbuilderrc /etc/pbuilderrc
-mkdir -p /var/cache/pbuilder/hook.d/
-cp -rvf ./hooks/* /var/cache/pbuilder/hook.d/
-rm -rf /var/cache/apt/
-mkdir -p /pbuilder-results
-DIST=lunar ARCH=i386 pbuilder create --distribution lunar --architecture i386 --debootstrapopts --include=ca-certificates
-echo 'starting build'
-DIST=lunar ARCH=i386 pbuilder build ./*.dsc --distribution lunar --architecture i386 --debootstrapopts --include=ca-certificates
+# Build package
+dpkg-buildpackage --no-sign
 
 # Move the debs to output
+cd ../
 mkdir -p ./output
-mv /var/cache/pbuilder/result/*.deb ./output/ || sudo mv ../*.deb ./output/
+mv ./*.deb ./output/
diff --git a/pbuilderrc b/pbuilderrc
deleted file mode 100644
index 5d7a733..0000000
--- a/pbuilderrc
+++ /dev/null
@@ -1,8 +0,0 @@
-USENETWORK=yes
-OTHERMIRROR="deb [trusted=yes] http://ppa.pika-os.com/ lunar main"
-HOOKDIR="/var/cache/pbuilder/hook.d/"
-APTCACHEHARDLINK=no
-export DEBIAN_FRONTEND="noninteractive"
-#OTHERMIRROR="deb [trusted=yes] https://ppa.pika-os.com/ lunar main"
-
-