From 5110a9828e5e93149f3a13ef817a7f104d5b590c Mon Sep 17 00:00:00 2001 From: Alex Huszagh Date: Mon, 12 Sep 2022 14:26:58 -0500 Subject: [PATCH] Update deny list to all system packages for ARMv6 HF. --- .changes/1018.json | 4 +++ docker/Dockerfile.arm-unknown-linux-gnueabihf | 3 +++ docker/deny-debian-packages.sh | 25 +++++++++++++------ 3 files changed, 24 insertions(+), 8 deletions(-) create mode 100644 .changes/1018.json diff --git a/.changes/1018.json b/.changes/1018.json new file mode 100644 index 000000000..0b99a1fa3 --- /dev/null +++ b/.changes/1018.json @@ -0,0 +1,4 @@ +{ + "description": "deny installation of armhf debian packages for the arm-unknown-linux-gnueabihf target.", + "type": "fixed" +} diff --git a/docker/Dockerfile.arm-unknown-linux-gnueabihf b/docker/Dockerfile.arm-unknown-linux-gnueabihf index 83fd1e97a..e5217c305 100644 --- a/docker/Dockerfile.arm-unknown-linux-gnueabihf +++ b/docker/Dockerfile.arm-unknown-linux-gnueabihf @@ -17,6 +17,9 @@ RUN /crosstool-ng.sh arm-unknown-linux-gnueabihf.config 5 ENV PATH /x-tools/arm-unknown-linux-gnueabihf/bin/:$PATH +COPY deny-debian-packages.sh / +RUN TARGET_ARCH=armhf /deny-debian-packages.sh + COPY qemu.sh / RUN /qemu.sh arm diff --git a/docker/deny-debian-packages.sh b/docker/deny-debian-packages.sh index 3193333e9..6aa0f5343 100755 --- a/docker/deny-debian-packages.sh +++ b/docker/deny-debian-packages.sh @@ -3,15 +3,24 @@ set -x set -euo pipefail -main() { - local package - - for package in "${@}"; do - echo "Package: ${package}:${TARGET_ARCH} +deny_package() { + local package="${1}" + local filename="${2}" + echo "Package: ${package}:${TARGET_ARCH} Pin: release * -Pin-Priority: -1" > "/etc/apt/preferences.d/${package}" - echo "${package}" - done +Pin-Priority: -1" > "/etc/apt/preferences.d/${filename}" +} + +main() { + if [[ $# -eq 0 ]]; then + deny_package '*' "all-packages" + else + local package + for package in "${@}"; do + deny_package "${package}" "${package}" + echo "${package}" + done + fi rm "${0}" }