From 134fb668e82b09f6582ecf9eebcf0e2a635d1717 Mon Sep 17 00:00:00 2001
From: "Jesse L. Zamora" <xtremekforever@gmail.com>
Date: Fri, 27 Dec 2024 19:20:48 -0500
Subject: [PATCH] Try to reduce size of raspios sysroot a bit more

 - Not sure what else can be removed easily
---
 .github/workflows/build-swift-release.yml |  4 ++--
 build-sysroot.sh                          | 15 +++++++++++----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-swift-release.yml b/.github/workflows/build-swift-release.yml
index 337b274..4521ab0 100644
--- a/.github/workflows/build-swift-release.yml
+++ b/.github/workflows/build-swift-release.yml
@@ -55,7 +55,7 @@ jobs:
       uses: ncipollo/release-action@v1
       with:
         allowUpdates: true
-        name: Swift ${{ env.SWIFT_VERSION }} for armv7
+        name: Swift ${{ env.SWIFT_VERSION }} for armhf
         tag: ${{ env.SWIFT_VERSION }}
         commit: ${{ github.sha }}
         artifactErrorsFailBuild: true
@@ -92,7 +92,7 @@ jobs:
       uses: ncipollo/release-action@v1
       with:
         allowUpdates: true
-        name: Swift ${{ env.SWIFT_VERSION }} for armv6/armv7
+        name: Swift ${{ env.SWIFT_VERSION }} for armhf
         tag: ${{ env.SWIFT_VERSION }}
         commit: ${{ github.sha }}
         artifactErrorsFailBuild: false
diff --git a/build-sysroot.sh b/build-sysroot.sh
index ed95d0a..5827f28 100755
--- a/build-sysroot.sh
+++ b/build-sysroot.sh
@@ -118,6 +118,7 @@ if [[ $DISTRIBUTION_NAME = "raspios" ]]; then
     7z e -y $IMAGE_FILE
 
     echo "Mounting 1.img and needed passthroughs..."
+    sudo umount -R sysroot && true
     rm -rf sysroot && mkdir sysroot
     sudo mount -o loop 1.img sysroot
     sudo mount --bind /dev sysroot/dev
@@ -133,19 +134,25 @@ if [[ $DISTRIBUTION_NAME = "raspios" ]]; then
         network-manager \
         linux-image* \
         *firmware* \
+        openssh* \
+        p7zip* \
+        perl \
+        perl-modules* \
         raspi* \
         rpi* \
-        && apt-get autoremove -y \
     "
-    sudo chroot sysroot qemu-arm-static /bin/bash -c "$REMOVE_DEPS_CMD && $INSTALL_DEPS_CMD"
+    sudo chroot sysroot qemu-arm-static /bin/bash -c "$REMOVE_DEPS_CMD && $INSTALL_DEPS_CMD && apt-get autoremove -y"
 
     echo "Copying files from sysroot to $SYSROOT..."
     rm -rf $SYSROOT
-    mkdir -p $SYSROOT/usr
+    mkdir -p $SYSROOT/usr/lib
     sudo chroot sysroot qemu-arm-static /bin/bash -c "symlinks -cr /usr/lib"
     cp -r sysroot/lib $SYSROOT/lib
     cp -r sysroot/usr/include $SYSROOT/usr/include
-    cp -r sysroot/usr/lib $SYSROOT/usr/lib
+    cp -r sysroot/usr/lib/*.so* $SYSROOT/usr/lib/
+    cp -r sysroot/usr/lib/arm-linux-gnueabihf $SYSROOT/usr/lib/
+    cp -r sysroot/usr/lib/linux $SYSROOT/usr/lib/
+    cp -r sysroot/usr/lib/gcc $SYSROOT/usr/lib/
 
     echo "Umounting and cleaning up..."
     sudo umount -R sysroot