From 3756b8d049abe053e7094cfb8a8e9187dfaac662 Mon Sep 17 00:00:00 2001
From: Martin Pulec <martin.pulec@cesnet.cz>
Date: Mon, 25 Sep 2023 09:26:45 +0200
Subject: [PATCH] CI ARM: modernize

removed deprecated features
---
 .github/scripts/Linux/arm/bootstrap.sh | 9 ++++++---
 .github/workflows/arm-build.yml        | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/scripts/Linux/arm/bootstrap.sh b/.github/scripts/Linux/arm/bootstrap.sh
index 5c98d54ea..bf306bc2f 100755
--- a/.github/scripts/Linux/arm/bootstrap.sh
+++ b/.github/scripts/Linux/arm/bootstrap.sh
@@ -15,9 +15,12 @@ deb http://security.debian.org/debian-security $debver-security main contrib non
 deb http://deb.debian.org/debian $debver-updates main contrib non-free
 EOF
 fi
-curl http://archive.raspberrypi.org/debian/raspberrypi.gpg.key | apt-key add -
-echo "deb http://archive.raspberrypi.org/debian $debver main" >> \
-        /etc/apt/sources.list
+curl http://archive.raspberrypi.org/debian/raspberrypi.gpg.key -o \
+        /usr/share/keyrings/raspberrypi.gpg.key
+cat >>/etc/apt/sources.list <<EOF
+deb [signed-by=/usr/share/keyrings/raspberrypi.gpg.key] \
+http://archive.raspberrypi.org/debian $debver main
+EOF
 apt -y update
 
 apt -y install autoconf automake build-essential cmake git pkg-config libtool sudo
diff --git a/.github/workflows/arm-build.yml b/.github/workflows/arm-build.yml
index 859aacf40..cda17b51c 100644
--- a/.github/workflows/arm-build.yml
+++ b/.github/workflows/arm-build.yml
@@ -60,7 +60,7 @@ jobs:
         sudo mkdir -p ~/chroot/var/tmp
         sudo mv /var/tmp/*NDI* ~/chroot/var/tmp
         wget http://archive.raspbian.org/raspbian.public.key -O - | sudo apt-key add -q
-        sudo qemu-debootstrap --keyring=${{ matrix.keyring }} --arch ${{ matrix.arch }} bullseye ~/chroot ${{ matrix.repo }}
+        sudo debootstrap --keyring=${{ matrix.keyring }} --arch ${{ matrix.arch }} bullseye ~/chroot ${{ matrix.repo }}
         sudo cp -r $GITHUB_WORKSPACE/.github ~/chroot
         sudo cp /usr/bin/qemu-${{ matrix.qemu_bin_arch }}-static ~/chroot/usr/bin
         sudo chroot ~/chroot /.github/scripts/Linux/arm/bootstrap.sh ${{ matrix.arch }}