From 177adf6dd45234eac70f8b5063340de69c1a289a Mon Sep 17 00:00:00 2001 From: Ethan Dye Date: Fri, 21 Jun 2024 18:46:43 -0600 Subject: [PATCH] Fix minor issues Signed-off-by: Ethan Dye --- .github/workflows/test-action.yml | 2 +- tests/image.bash | 2 +- tests/install-packages.bash | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml index 8abb63d..04b67fa 100644 --- a/.github/workflows/test-action.yml +++ b/.github/workflows/test-action.yml @@ -28,7 +28,7 @@ jobs: sudo -E bash -c set sudo add-apt-repository ppa:canonical-server/server-backports sudo apt-get update - sudo apt-get install --yes gnupg xz-utils expect systemd-container qemu-user-static qemu-utils qemu-system-arm + sudo apt-get install --yes gnupg xz-utils expect systemd-container qemu-user-static qemu-utils qemu-system-arm libfdt-dev echo "imagexz=$(basename "$(curl "https://downloads.raspberrypi.org/raspios_lite_armhf_latest" -s -L -I -o /dev/null -w '%{url_effective}')")" >> $GITHUB_OUTPUT echo "image=$(echo "$(basename "$(curl "https://downloads.raspberrypi.org/raspios_lite_armhf_latest" -s -L -I -o /dev/null -w '%{url_effective}')")" | sed -e 's/.xz//')" >> $GITHUB_OUTPUT - name: Cache Raspberry Pi OS 32bit image diff --git a/tests/image.bash b/tests/image.bash index 3b71029..e97533f 100755 --- a/tests/image.bash +++ b/tests/image.bash @@ -39,7 +39,7 @@ if [[ $1 == "setup" ]]; then cmake utils/dtmerge make sudo make install - cp ../tests/dtb/bcm2710-rpi-3-b.dtb custom.dtb + cp tests/dtb/bcm2710-rpi-3-b.dtb custom.dtb # (dtparam=uart0=on) dtmerge custom.dtb merged.dtb - uart0=on mv merged.dtb custom.dtb diff --git a/tests/install-packages.bash b/tests/install-packages.bash index 8355b84..76f9834 100755 --- a/tests/install-packages.bash +++ b/tests/install-packages.bash @@ -2,9 +2,9 @@ export DEBIAN_FRONTEND="noninteractive" -apt-get --quiet update -apt-get --quiet upgrade --yes -apt-get --quiet install --fix-broken --yes +# apt-get --quiet update +# apt-get --quiet upgrade --yes +# apt-get --quiet install --fix-broken --yes apt-get --quiet install --yes gcc make libc6-dev apt-get --quiet autoremove --yes systemctl mask rpi-eeprom-update.service hciuart.service systemd-logind.service