From 53878e7a79e750236829e240ac56f4dd77f1067a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Aug 2024 07:00:06 +0000
Subject: [PATCH 1/2] build(deps): bump
 redhat-plumbers-in-action/differential-shellcheck

Bumps [redhat-plumbers-in-action/differential-shellcheck](https://github.com/redhat-plumbers-in-action/differential-shellcheck) from 5.3.1 to 5.4.0.
- [Release notes](https://github.com/redhat-plumbers-in-action/differential-shellcheck/releases)
- [Changelog](https://github.com/redhat-plumbers-in-action/differential-shellcheck/blob/main/docs/CHANGELOG.md)
- [Commits](https://github.com/redhat-plumbers-in-action/differential-shellcheck/compare/b8c7b83d16cce15d13563f5d055b34b9e3360ed3...cc6721c45a8800cc666de45493545a07a638d121)

---
updated-dependencies:
- dependency-name: redhat-plumbers-in-action/differential-shellcheck
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/differential-shellcheck.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/differential-shellcheck.yml b/.github/workflows/differential-shellcheck.yml
index 936aaa4..d4bca25 100644
--- a/.github/workflows/differential-shellcheck.yml
+++ b/.github/workflows/differential-shellcheck.yml
@@ -32,6 +32,6 @@ jobs:
 
       - id: ShellCheck
         name: Differential ShellCheck
-        uses: redhat-plumbers-in-action/differential-shellcheck@b8c7b83d16cce15d13563f5d055b34b9e3360ed3 # pin@aa647ec4466543e8555c2c3b648124a9813cee44
+        uses: redhat-plumbers-in-action/differential-shellcheck@cc6721c45a8800cc666de45493545a07a638d121 # pin@aa647ec4466543e8555c2c3b648124a9813cee44
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file

From 68983eda4daa6627899749f80d63a678e6152728 Mon Sep 17 00:00:00 2001
From: nkraetzschmar <9020053+nkraetzschmar@users.noreply.github.com>
Date: Thu, 29 Aug 2024 13:53:00 +0200
Subject: [PATCH 2/2] fix: make cross-arch build work with rosetta on mac

new podman machine now uses rosetta to emulate x86 on arm macos, rosetta, however, always requires /proc/ to be mounted in any chroot
---
 builder/image.manifest | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/builder/image.manifest b/builder/image.manifest
index 769f14b..f5d949f 100755
--- a/builder/image.manifest
+++ b/builder/image.manifest
@@ -6,8 +6,12 @@ chroot_dir="$(mktemp -d)"
 mount -t tmpfs tmpfs "$chroot_dir"
 tar --extract --xattrs --xattrs-include '*' --directory "$chroot_dir" < "$1"
 
+mount --rbind --make-rslave /proc "$chroot_dir/proc"
+
 #shellcheck disable=SC2016
 chroot "$chroot_dir" dpkg-query --show --showformat='${binary:Package} ${Version}\n' > "$2"
 
+umount -l "$chroot_dir/proc"
+
 umount "$chroot_dir"
 rmdir "$chroot_dir"