From 93a514cc179a2d5785bcb908a514c386c11b11ee Mon Sep 17 00:00:00 2001
From: Esa Varemo <esa@kuivanto.fi>
Date: Sat, 16 Nov 2019 03:48:51 +0200
Subject: [PATCH 1/2] Add a SPEC file for EL8

---
 rpm.el8.spec | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 rpm.el8.spec

diff --git a/rpm.el8.spec b/rpm.el8.spec
new file mode 100644
index 0000000..1251dde
--- /dev/null
+++ b/rpm.el8.spec
@@ -0,0 +1,39 @@
+#
+# spec file for package cloud-init-vmware-guestinfo
+#
+
+#################################################################################
+# common
+#################################################################################
+Name:           cloud-init-vmware-guestinfo
+Version:        1.1.0
+Release:        1.el8
+Summary:        A cloud-init datasource that uses VMware GuestInfo
+License:        Apache2
+Requires:       cloud-init python3-netifaces
+Group:          Applications/System
+BuildArch:      noarch
+
+#################################################################################
+# specific
+#################################################################################
+%description
+A cloud-init datasource that uses VMware GuestInfo
+
+%prep
+
+%build
+
+%install
+mkdir -p %{buildroot}/etc/cloud/cloud.cfg.d
+mkdir -p %{buildroot}/usr/lib/python3.6/site-packages/cloudinit/sources
+cp 99-DataSourceVMwareGuestInfo.cfg %{buildroot}/etc/cloud/cloud.cfg.d/99-DataSourceVMwareGuestInfo.cfg
+cp DataSourceVMwareGuestInfo.py %{buildroot}/usr/lib/python3.6/site-packages/cloudinit/sources/DataSourceVMwareGuestInfo.py
+
+%clean
+
+%files
+%defattr(0644, root,root, 0755)
+/etc/cloud/cloud.cfg.d/99-DataSourceVMwareGuestInfo.cfg
+/usr/lib/python3.6/site-packages/cloudinit/sources/DataSourceVMwareGuestInfo.py
+/usr/lib/python3.6/site-packages/cloudinit/sources/__pycache__/DataSourceVMwareGuestInfo.*.pyc

From c767ab9983f509d24e876c7637b1b4c21bab5137 Mon Sep 17 00:00:00 2001
From: akutz <akutz@vmware.com>
Date: Thu, 16 Jul 2020 13:58:32 -0500
Subject: [PATCH 2/2] Build RPM for CentOS 8

This patch updates the Makefile and Dockerfile.rpmbuild to support
building the RPM for CentOS 8.

This patch also includes a few, small addendums required to make the
previous patches work for CentOS 8.
---
 Dockerfile.rpmbuild |  5 ++++-
 Makefile            | 16 ++++++++++++++++
 rpm.el8.spec        |  2 +-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/Dockerfile.rpmbuild b/Dockerfile.rpmbuild
index 6e97b68..b5dfc85 100644
--- a/Dockerfile.rpmbuild
+++ b/Dockerfile.rpmbuild
@@ -1,2 +1,5 @@
-FROM centos:7
+# The CentOS image is the base of this image.
+ARG CENTOS_IMAGE=centos:7
+
+FROM ${CENTOS_IMAGE}
 RUN yum install -y rpm-build
diff --git a/Makefile b/Makefile
index 1a6cf9d..9b798ad 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,22 @@ rpm-el7:
 		rpmbuild:el7 \
 		rpmbuild -ba /root/rpmbuild/SPECS/rpm.spec
 
+rpm-el8:
+	@rm -fr rpmbuild/el8
+	@mkdir -p rpmbuild/el8/RPMS rpmbuild/el8/SPECS \
+	  rpmbuild/el8/SRPMS \
+	  rpmbuild/el8/BUILD/etc/cloud/cloud.cfg.d \
+	  rpmbuild/el8/BUILD/usr/lib/python3.6/site-packages/cloudinit/sources
+	docker build --build-arg="CENTOS_IMAGE=centos:8" -f Dockerfile.rpmbuild -t rpmbuild:el8 .
+	docker run --rm -it \
+		-v $$(pwd)/rpmmacros:/root/.rpmmacros:ro \
+		-v $$(pwd)/rpmbuild/el8:/root/rpmbuild \
+		-v $$(pwd)/rpm.el8.spec:/root/rpmbuild/SPECS/rpm.spec:ro \
+		-v $$(pwd)/99-DataSourceVMwareGuestInfo.cfg:/root/rpmbuild/BUILD/99-DataSourceVMwareGuestInfo.cfg:ro \
+		-v $$(pwd)/DataSourceVMwareGuestInfo.py:/root/rpmbuild/BUILD/DataSourceVMwareGuestInfo.py:ro \
+		rpmbuild:el8 \
+		rpmbuild -ba /root/rpmbuild/SPECS/rpm.spec
+
 rpm: rpm-el7
 
 build: rpm
diff --git a/rpm.el8.spec b/rpm.el8.spec
index 1251dde..ea66d02 100644
--- a/rpm.el8.spec
+++ b/rpm.el8.spec
@@ -6,7 +6,7 @@
 # common
 #################################################################################
 Name:           cloud-init-vmware-guestinfo
-Version:        1.1.0
+Version:        1.2.0
 Release:        1.el8
 Summary:        A cloud-init datasource that uses VMware GuestInfo
 License:        Apache2