File tree Expand file tree Collapse file tree 4 files changed +13
-3
lines changed
Expand file tree Collapse file tree 4 files changed +13
-3
lines changed Original file line number Diff line number Diff line change @@ -24,6 +24,11 @@ RUN <<EOF
2424 apt update -y
2525 apt install -y tar wget xz-utils vim-nox apt-utils
2626
27+ # Workaround for QEMU segfaults on Debian 11 ARM64 during ldconfig
28+ mv /sbin/ldconfig /sbin/ldconfig.real
29+ echo -e '#!/bin/sh\n exit 0' > /sbin/ldconfig
30+ chmod +x /sbin/ldconfig
31+
2732 wget https://packages.broadcom.com/artifactory/saltproject-generic/onedir/$SALT_VERSION/salt-$SALT_VERSION-onedir-linux-$ARCH.tar.xz
2833 tar xf salt-$SALT_VERSION-onedir-linux-$ARCH.tar.xz
2934
@@ -35,6 +40,10 @@ RUN <<EOF
3540
3641 ./salt/salt-call --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply provision
3742
43+ # Restore real ldconfig
44+ mv /sbin/ldconfig.real /sbin/ldconfig
45+ /sbin/ldconfig
46+
3847 rm -rf salt
3948 rm -rf salt-3007.6-onedir-linux-$ARCH.tar.xz
4049 rm -rf golden-pillar-tree
Original file line number Diff line number Diff line change @@ -48,9 +48,7 @@ include:
4848 - pkgs.cargo {# -
4949 - pkgs.awscli
5050 - pkgs.amazon-cloudwatch-agent # }
51- {%- if grains[' osrelease' ] != ' 11' or grains[' osarch' ] != ' arm64' %}
5251 - pkgs.samba
53- {%- endif %}
5452
5553 {# - OS Specific packages install #}
5654 - .apt-utils
Original file line number Diff line number Diff line change 77 {%- set pkg_name = ' nox' %}
88 {%- elif os == ' Debian' and os_major_release >= 13 %}
99 {%- set pkg_name = ' nox' %}
10+ {%- elif os == ' Debian' and os_major_release == 11 and grains[' osarch' ] == ' arm64' %}
11+ {# - Skip apt install on Debian 11 ARM64 because python3-gpg crashes QEMU #}
12+ {%- set pkg_name = None %}
1013 {%- else %}
1114 {%- set pkg_name = ' python3-nox' %}
1215 {%- endif %}
Original file line number Diff line number Diff line change 6767 {%- endif %}
6868 - require:
6969 - python3-pip
70- {%- if (os_family == ' Debian' ) or (os == ' Fedora' ) or (os == ' Arch' ) %}
70+ {%- if (os_family == ' Debian' and not (os == ' Debian ' and os_major_release == 11 and grains[ ' osarch ' ] == ' arm64 ' ) ) or (os == ' Fedora' ) or (os == ' Arch' ) %}
7171 - pkg: python3-nox
7272 {%- endif %}
7373
You can’t perform that action at this time.
0 commit comments