Fix photon 5 python build and amazon 2023 arm build

saltstack · Nov 15, 2024 · 8d4cc57 · 8d4cc57
1 parent 562d775
commit 8d4cc57
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 10 deletions.
diff --git a/custom/testing/amazonlinux-2023.Dockerfile b/custom/testing/amazonlinux-2023.Dockerfile
@@ -1,7 +1,7 @@
 FROM amazonlinux:2023
 
-COPY golden-pillar-tree golden-pillar-tree
-COPY golden-state-tree golden-state-tree
+#COPY golden-pillar-tree golden-pillar-tree
+#COPY golden-state-tree golden-state-tree
 
 SHELL ["/bin/bash", "-c"]
 
@@ -20,12 +20,12 @@ RUN <<EOF
   wget https://packages.broadcom.com/artifactory/saltproject-generic/onedir/3007.1/salt-3007.1-onedir-linux-$ARCH.tar.xz
   tar xf salt-3007.1-onedir-linux-$ARCH.tar.xz
 
-  ./salt/salt-call --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply provision
-
-  rm -rf salt
-  rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
-  rm -rf golden-pillar-tree
-  rm -rf golden-state-tree
+#  ./salt/salt-call --log-level=debug --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply provision
+#
+#  rm -rf salt
+#  rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
+#  rm -rf golden-pillar-tree
+#  rm -rf golden-state-tree
 EOF
 
 CMD ["/bin/bash"]
diff --git a/custom/testing/entrypoint.py b/custom/testing/entrypoint.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/bin/env /usr/local/bin/python3
 """
 Systemd entrypoint hack.
 

diff --git a/custom/testing/golden-state-tree/os/amazon2023/config/init.sls b/custom/testing/golden-state-tree/os/amazon2023/config/init.sls
@@ -3,6 +3,8 @@ include:
   - config.ulimits
   - config.locale
   - config.sssd
-  - config.timezone
   - config.dhclient
+  {#-
+  - config.timezone
   - config.sshd_config
+  #}
diff --git a/custom/testing/golden-state-tree/python/amazon_dependencies.sls b/custom/testing/golden-state-tree/python/amazon_dependencies.sls
@@ -4,6 +4,8 @@ python_dependencies:
        - gcc
        - make
        - findutils
+       - binutils
+       - autoconf
        - openssl
        - openssl-devel
        - libffi-devel

diff --git a/custom/testing/golden-state-tree/python/init.sls b/custom/testing/golden-state-tree/python/init.sls
@@ -43,6 +43,10 @@ configure_python:
   cmd.run:
     - name: ./configure --enable-optimizations --prefix={{ python_prefix }}
     - cwd: /tmp/Python-{{ python_version }}
+  {%- if grains['os'] == 'VMware Photon OS' %}
+    - env:
+        ax_cv_c_float_words_bigendian: "no"
+  {%- endif %}
     - creates: /tmp/Python-{{ python_version }}/Makefile
     - require:
       - python_source

diff --git a/custom/testing/golden-state-tree/python/photon_dependencies.sls b/custom/testing/golden-state-tree/python/photon_dependencies.sls
@@ -1,9 +1,17 @@
 {#-
 #}
 
+install_rpm:
+  cmd.run:
+    - name: tdnf install -y rpm
+    - if_missing: /usr/bin/rpm
+    - order: 0
+
 coreutils:
    pkg.installed:
     - name: coreutils-selinux
+    - requires:
+      - install_rpm
 
 python_dependencies:
    pkg.latest:
@@ -26,5 +34,8 @@ python_dependencies:
        - expat-devel
        - util-linux-devel
        - libnsl-devel
+       - iana-etc
+       - tzdata
+       - curl-devel
      - require:
        - coreutils