From 15ba84b0abfe209d9b6590ac19e42db10da24f1e Mon Sep 17 00:00:00 2001
From: Sebastian Bernauer <sebastian.bernauer@stackable.de>
Date: Fri, 5 Apr 2024 10:39:25 +0200
Subject: [PATCH 1/4] Split Airflow build step for tighter feedback loop

---
 airflow/Dockerfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/airflow/Dockerfile b/airflow/Dockerfile
index c0a5489e3..a93293747 100644
--- a/airflow/Dockerfile
+++ b/airflow/Dockerfile
@@ -37,8 +37,9 @@ RUN microdnf update && \
         python${PYTHON}-pip \
         python${PYTHON}-wheel \
         unixODBC-devel && \
-    microdnf clean all && \
-    python3 -m venv --system-site-packages /stackable/app && \
+    microdnf clean all
+
+RUN python3 -m venv --system-site-packages /stackable/app && \
     source /stackable/app/bin/activate && \
     pip install --no-cache-dir --upgrade pip && \
     pip install --no-cache-dir apache-airflow[${AIRFLOW_EXTRAS}]==${PRODUCT} --constraint /tmp/constraints.txt && \

From 3f437ab6659151dbd1ec9a7a6fbfb6f2f02eb2b2 Mon Sep 17 00:00:00 2001
From: Sebastian Bernauer <sebastian.bernauer@stackable.de>
Date: Fri, 5 Apr 2024 10:58:15 +0200
Subject: [PATCH 2/4] fix(arm): Let Airflow 2.8.x and 2.9.x build on ARM

---
 CHANGELOG.md       |  6 ++++++
 airflow/Dockerfile | 15 +++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d20923912..804ecdc79 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+### Fixed
+
+- Let Airflow 2.8.x and 2.9.x build on ARM by adding `make` and `diffutils` ([#XXX]).
+
+## [24.3.0] - 2024-03-20
+
 ### Added
 
 - omid: init at 1.1.0 ([#493]).
diff --git a/airflow/Dockerfile b/airflow/Dockerfile
index a93293747..9b663c889 100644
--- a/airflow/Dockerfile
+++ b/airflow/Dockerfile
@@ -28,6 +28,10 @@ RUN microdnf update && \
         # Used to extract statsd_exporter
         tar \
         cyrus-sasl-devel \
+        # Needed by ./configure to build gevent, see snippet [1] at the end of file
+        diffutils \
+        # Needed to build gevent, see snippet [1] at the end of file
+        make \
         gcc \
         gcc-c++ \
         libpq-devel \
@@ -117,3 +121,14 @@ WORKDIR /stackable
 
 ENTRYPOINT ["/usr/bin/tini", "--", "/run-airflow.sh"]
 CMD []
+
+# SNIPPET 1
+# 137.0       Running '(cd  "/tmp/pip-install-cyuymnu6/gevent_0f8b4d282c464210b62acdf399e4a04c/deps/libev"  && sh ./configure -C > configure-output.txt )' in /tmp/pip-install-cyuymnu6/gevent_0f8b4d282c464210b62acdf399e4a04c
+# 137.0       ./configure: line 6350: cmp: command not found
+# 137.0       ./configure: line 6350: cmp: command not found
+# 137.0       ./configure: line 8279: diff: command not found
+# 137.0       config.status: error: in `/tmp/pip-install-cyuymnu6/gevent_0f8b4d282c464210b62acdf399e4a04c/deps/libev':
+# 137.0       config.status: error: Something went wrong bootstrapping makefile fragments
+# 137.0           for automatic dependency tracking.  Try re-running configure with the
+# 137.0           '--disable-dependency-tracking' option to at least be able to build
+# 137.0           the package (albeit without support for automatic dependency tracking).

From 061ed5207a2ddfe92c679909accebab107db9ad8 Mon Sep 17 00:00:00 2001
From: Sebastian Bernauer <sebastian.bernauer@stackable.de>
Date: Fri, 5 Apr 2024 11:27:47 +0200
Subject: [PATCH 3/4] changelog

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 804ecdc79..0318c9a6a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,9 @@ All notable changes to this project will be documented in this file.
 
 ### Fixed
 
-- Let Airflow 2.8.x and 2.9.x build on ARM by adding `make` and `diffutils` ([#XXX]).
+- Let Airflow 2.8.x and 2.9.x build on ARM by adding `make` and `diffutils` ([#612]).
+
+[#612]: https://github.com/stackabletech/docker-images/pull/612
 
 ## [24.3.0] - 2024-03-20
 

From fd928476419fb9f30b8d97d8511737fafd929df9 Mon Sep 17 00:00:00 2001
From: Sebastian Bernauer <sebastian.bernauer@stackable.de>
Date: Fri, 5 Apr 2024 11:32:15 +0200
Subject: [PATCH 4/4] changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0318c9a6a..3d0ca9d8d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,8 +6,10 @@ All notable changes to this project will be documented in this file.
 
 ### Fixed
 
+- Let Superset 3.1.0 build on ARM by adding `make` and `diffutils` ([#611]).
 - Let Airflow 2.8.x and 2.9.x build on ARM by adding `make` and `diffutils` ([#612]).
 
+[#611]: https://github.com/stackabletech/docker-images/pull/611
 [#612]: https://github.com/stackabletech/docker-images/pull/612
 
 ## [24.3.0] - 2024-03-20