From bd4359ffd91d1d6fe66ec91cfdb5a4c8112f1b2a Mon Sep 17 00:00:00 2001
From: Achilleas Koutsou <achilleas@koutsou.net>
Date: Wed, 2 Nov 2022 18:21:27 +0100
Subject: [PATCH] distro/rhel9: update ami to new definitions

Add the image function and remove the pipeline function.
Remove the build package set: build packages are added to the pipeline
on-demand.
---
 internal/distro/rhel9/ami.go | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/internal/distro/rhel9/ami.go b/internal/distro/rhel9/ami.go
index 6b52d3886..b7189bc55 100644
--- a/internal/distro/rhel9/ami.go
+++ b/internal/distro/rhel9/ami.go
@@ -15,8 +15,7 @@ var (
 		filename: "image.raw",
 		mimeType: "application/octet-stream",
 		packageSets: map[string]packageSetFunc{
-			buildPkgsKey: ec2BuildPackageSet,
-			osPkgsKey:    ec2CommonPackageSet,
+			osPkgsKey: ec2CommonPackageSet,
 		},
 		packageSetChains: map[string][]string{
 			osPkgsKey: {osPkgsKey, blueprintPkgsKey},
@@ -25,7 +24,7 @@ var (
 		bootable:            true,
 		bootType:            distro.LegacyBootType,
 		defaultSize:         10 * common.GibiByte,
-		pipelines:           ec2Pipelines,
+		image:               liveImage,
 		buildPipelines:      []string{"build"},
 		payloadPipelines:    []string{"os", "image"},
 		exports:             []string{"image"},