Merge branch 'master' into arm64

2022-01-13 15:39:30 +00:00 · 2022-01-13 15:39:30 +00:00 · dec2743355
parent 43c42bf9e4 231487d9d6
commit dec2743355
2 changed files with 2 additions and 1 deletions
--- a/stage0/00-configure-apt/00-run.sh
+++ b/stage0/00-configure-apt/00-run.sh
@ -12,7 +12,7 @@ else
 	rm -f "${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache"
 fi

-on_chroot apt-key add - < files/raspberrypi.gpg.key
+cat files/raspberrypi.gpg.key | gpg --dearmor > "${ROOTFS_DIR}/etc/apt/trusted.gpg.d/raspberrypi-archive-stable.gpg"
 on_chroot << EOF
 dpkg --add-architecture armhf
 apt-get update
--- a/stage0/00-configure-apt/01-packages
+++ b/stage0/00-configure-apt/01-packages
@ -0,0 +1 @@
+raspberrypi-archive-keyring