From 42489ebc162d2f6d6d2f2218fb1179fd2df7a91a Mon Sep 17 00:00:00 2001
From: Alexsander de Souza <61709370+alexsander-souza@users.noreply.github.com>
Date: Fri, 15 Dec 2023 10:39:42 -0300
Subject: [PATCH] Fix ol makefiles (#185)

fixes #183
---
 README.md     | 7 ++++---
 ol8/Makefile  | 3 +--
 ol8/README.md | 3 ++-
 ol9/Makefile  | 3 +--
 ol9/README.md | 3 ++-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 601d5622..7bde4e68 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Read more about how [custom images](https://maas.io/docs/how-to-customise-images
 
 ## Existing templates
 
-| **OS**          | **Maturity Level** | **MAAS Version** | 
+| **OS**          | **Maturity Level** | **MAAS Version** |
 |-----------------|:------------------:|:-----------------|
 | CentOS 6        | EOL                | >= 1.6           |
 | CentOS 7        | Stable             | >= 2.3           |
@@ -20,8 +20,8 @@ Read more about how [custom images](https://maas.io/docs/how-to-customise-images
 | Debian 10       | Beta               | >= 3.3           |
 | Debian 11       | Beta               | >= 3.3           |
 | Debian 12       | Beta               | >= 3.3           |
-| OL8             | Beta               | >= 3.5           |
-| OL9             | Beta               | >= 3.5           |
+| OL8             | Alpha              | >= 3.5           |
+| OL9             | Alpha              | >= 3.5           |
 | RHEL 7          | EOL                | >= 2.3           |
 | RHEL 8          | Stable             | >= 2.7           |
 | RHEL 9          | Beta               | >= 3.3           |
@@ -37,6 +37,7 @@ Read more about how [custom images](https://maas.io/docs/how-to-customise-images
 ### Maturity level
 
 * Templates marked as *EOL* are OSes that are no longer supported by the upstream maintainer, and **are not recommended for new deployments**. These systems don't receive security updates and mirrors can become permanently offline at any moment.
+* *Alpha* templates require packages that are not yet generally available, e.g. an unreleased MAAS or Curtin version. These should not be used in production environments.
 * *Beta* templates should work but we still don't have enough successful deployment reports to regard it as *Stable*.
 
 ### Output
diff --git a/ol8/Makefile b/ol8/Makefile
index 9961a2a5..29befead 100644
--- a/ol8/Makefile
+++ b/ol8/Makefile
@@ -11,8 +11,7 @@ export PACKER_LOG KS_PROXY
 
 all: ol8.tar.gz
 
-check-deps:
-	$(call check_packages_deps)
+$(eval $(call check_packages_deps))
 
 ol8.tar.gz: check-deps clean http/ol8.ks
 	${PACKER} init ol8.pkr.hcl && ${PACKER} build ol8.pkr.hcl
diff --git a/ol8/README.md b/ol8/README.md
index f665e68c..a02a66ea 100644
--- a/ol8/README.md
+++ b/ol8/README.md
@@ -46,7 +46,8 @@ be in packer-maas/ol8, where this file is located. Once in packer-maas/ol8
 you can generate an image with:
 
 ```shell
-packer init
+envsubst '$${KS_PROXY}' < http/ol8.ks.in | tee http/ol8.ks
+packer init .
 PACKER_LOG=1 packer build .
 ```
 
diff --git a/ol9/Makefile b/ol9/Makefile
index de0371b1..73e5a311 100644
--- a/ol9/Makefile
+++ b/ol9/Makefile
@@ -11,8 +11,7 @@ export PACKER_LOG KS_PROXY
 
 all: ol9.tar.gz
 
-check-deps:
-	$(call check_packages_deps)
+$(eval $(call check_packages_deps))
 
 ol9.tar.gz: check-deps clean http/ol9.ks
 	${PACKER} init ol9.pkr.hcl && ${PACKER} build ol9.pkr.hcl
diff --git a/ol9/README.md b/ol9/README.md
index 521da661..995c4bef 100644
--- a/ol9/README.md
+++ b/ol9/README.md
@@ -46,7 +46,8 @@ be in packer-maas/ol9, where this file is located. Once in packer-maas/ol9
 you can generate an image with:
 
 ```shell
-packer init
+envsubst '$${KS_PROXY}' < http/ol9.ks.in | tee http/ol9.ks
+packer init .
 PACKER_LOG=1 packer build .
 ```