From d0280d83d961b1958fb3d8b37c696ec6243ce0e3 Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Wed, 15 Nov 2023 17:36:40 -0800
Subject: [PATCH] Add 8.2.0-rc0, remove 7.2

---
 {7.2 => 8.2-rc}/Dockerfile         | 8 ++++++--
 {7.2 => 8.2-rc}/Dockerfile.native  | 8 ++++++--
 {7.2 => 8.2-rc}/qemu-signals.patch | 0
 {7.2 => 8.2-rc}/start-qemu         | 0
 Dockerfile.template                | 2 +-
 generate-stackbrew-library.sh      | 1 -
 versions.json                      | 8 ++++----
 7 files changed, 17 insertions(+), 10 deletions(-)
 rename {7.2 => 8.2-rc}/Dockerfile (95%)
 rename {7.2 => 8.2-rc}/Dockerfile.native (96%)
 rename {7.2 => 8.2-rc}/qemu-signals.patch (100%)
 rename {7.2 => 8.2-rc}/start-qemu (100%)

diff --git a/7.2/Dockerfile b/8.2-rc/Dockerfile
similarity index 95%
rename from 7.2/Dockerfile
rename to 8.2-rc/Dockerfile
index cc6178c..c1a67d1 100644
--- a/7.2/Dockerfile
+++ b/8.2-rc/Dockerfile
@@ -42,8 +42,8 @@ ENV QEMU_KEYS \
 
 # https://www.qemu.org/download/#source
 # https://download.qemu.org/?C=M;O=D
-ENV QEMU_VERSION 7.2.6
-ENV QEMU_URL https://download.qemu.org/qemu-7.2.6.tar.xz
+ENV QEMU_VERSION 8.2.0-rc0
+ENV QEMU_URL https://download.qemu.org/qemu-8.2.0-rc0.tar.xz
 
 RUN set -eux; \
 	\
@@ -91,6 +91,10 @@ RUN set -eux; \
 		libfuse3-dev \
 # https://wiki.qemu.org/ChangeLog/7.2#Removal_of_the_.22slirp.22_submodule_.28affects_.22-netdev_user.22.29
 		libslirp-dev \
+# https://wiki.qemu.org/ChangeLog/8.1#Build_Dependencies
+		python3-venv \
+# "../meson.build:3070:18: ERROR: Git program not found, cannot download dtc.wrap via git."
+		git \
 	; \
 	rm -rf /var/lib/apt/lists/*; \
 	\
diff --git a/7.2/Dockerfile.native b/8.2-rc/Dockerfile.native
similarity index 96%
rename from 7.2/Dockerfile.native
rename to 8.2-rc/Dockerfile.native
index ccfea25..24f97ea 100644
--- a/7.2/Dockerfile.native
+++ b/8.2-rc/Dockerfile.native
@@ -44,8 +44,8 @@ ENV QEMU_KEYS \
 
 # https://www.qemu.org/download/#source
 # https://download.qemu.org/?C=M;O=D
-ENV QEMU_VERSION 7.2.6
-ENV QEMU_URL https://download.qemu.org/qemu-7.2.6.tar.xz
+ENV QEMU_VERSION 8.2.0-rc0
+ENV QEMU_URL https://download.qemu.org/qemu-8.2.0-rc0.tar.xz
 
 RUN set -eux; \
 	\
@@ -93,6 +93,10 @@ RUN set -eux; \
 		libfuse3-dev \
 # https://wiki.qemu.org/ChangeLog/7.2#Removal_of_the_.22slirp.22_submodule_.28affects_.22-netdev_user.22.29
 		libslirp-dev \
+# https://wiki.qemu.org/ChangeLog/8.1#Build_Dependencies
+		python3-venv \
+# "../meson.build:3070:18: ERROR: Git program not found, cannot download dtc.wrap via git."
+		git \
 	; \
 	rm -rf /var/lib/apt/lists/*; \
 	\
diff --git a/7.2/qemu-signals.patch b/8.2-rc/qemu-signals.patch
similarity index 100%
rename from 7.2/qemu-signals.patch
rename to 8.2-rc/qemu-signals.patch
diff --git a/7.2/start-qemu b/8.2-rc/start-qemu
similarity index 100%
rename from 7.2/start-qemu
rename to 8.2-rc/start-qemu
diff --git a/Dockerfile.template b/Dockerfile.template
index b932c2e..4876f60 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -117,7 +117,7 @@ RUN set -eux; \
 		libfuse3-dev \
 # https://wiki.qemu.org/ChangeLog/7.2#Removal_of_the_.22slirp.22_submodule_.28affects_.22-netdev_user.22.29
 		libslirp-dev \
-{{ if [ "7.2", "8.0" ] | index(env.version) then "" else ( -}}
+{{ if [ "8.0" ] | index(env.version) then "" else ( -}}
 # https://wiki.qemu.org/ChangeLog/8.1#Build_Dependencies
 		python3-venv \
 # "../meson.build:3070:18: ERROR: Git program not found, cannot download dtc.wrap via git."
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
index b56f5d1..42ee8ff 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -3,7 +3,6 @@ set -Eeuo pipefail
 
 declare -A aliases=(
 	[8.1]='8 latest'
-	[7.2]='7'
 )
 
 self="$(basename "$BASH_SOURCE")"
diff --git a/versions.json b/versions.json
index b0abd4e..dafd535 100644
--- a/versions.json
+++ b/versions.json
@@ -1,8 +1,4 @@
 {
-  "7.2": {
-    "url": "https://download.qemu.org/qemu-7.2.6.tar.xz",
-    "version": "7.2.6"
-  },
   "8.0": {
     "url": "https://download.qemu.org/qemu-8.0.5.tar.xz",
     "version": "8.0.5"
@@ -10,5 +6,9 @@
   "8.1": {
     "url": "https://download.qemu.org/qemu-8.1.2.tar.xz",
     "version": "8.1.2"
+  },
+  "8.2-rc": {
+    "url": "https://download.qemu.org/qemu-8.2.0-rc0.tar.xz",
+    "version": "8.2.0-rc0"
   }
 }