Changed RPM name to include OS ver info, ex. el7
This patch changes the RPM name to include OS version information, such
as "el7" for RHEL/CentOS 7.
diff --git a/Makefile b/Makefile
index 0ba81cb..50a6de6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,22 @@
all: build
-rpm-centos7:
- @mkdir -p rpmbuild/centos7/RPMS rpmbuild/centos7/SPECS \
- rpmbuild/centos7/SRPMS \
- rpmbuild/centos7/BUILD/etc/cloud/cloud.cfg.d \
- rpmbuild/centos7/BUILD/usr/lib/python2.7/site-packages/cloudinit/sources
- docker build -f Dockerfile.rpmbuild -t rpmbuild:centos7 .
+rpm-el7:
+ @rm -fr rpmbuild/el7
+ @mkdir -p rpmbuild/el7/RPMS rpmbuild/el7/SPECS \
+ rpmbuild/el7/SRPMS \
+ rpmbuild/el7/BUILD/etc/cloud/cloud.cfg.d \
+ rpmbuild/el7/BUILD/usr/lib/python2.7/site-packages/cloudinit/sources
+ docker build -f Dockerfile.rpmbuild -t rpmbuild:el7 .
docker run --rm -it \
-v $$(pwd)/rpmmacros:/root/.rpmmacros:ro \
- -v $$(pwd)/rpmbuild/centos7:/root/rpmbuild \
- -v $$(pwd)/rpm.centos7.spec:/root/rpmbuild/SPECS/rpm.spec:ro \
+ -v $$(pwd)/rpmbuild/el7:/root/rpmbuild \
+ -v $$(pwd)/rpm.el7.spec:/root/rpmbuild/SPECS/rpm.spec:ro \
-v $$(pwd)/99_vmx_guestinfo.cfg:/root/rpmbuild/BUILD/etc/cloud/cloud.cfg.d/99_vmx_guestinfo.cfg:ro \
-v $$(pwd)/DataSourceVmxGuestinfo.py:/root/rpmbuild/BUILD/usr/lib/python2.7/site-packages/cloudinit/sources/DataSourceVmxGuestinfo.py:ro \
- rpmbuild:centos7 \
+ rpmbuild:el7 \
rpmbuild -ba /root/rpmbuild/SPECS/rpm.spec
-rpm: rpm-centos7
+rpm: rpm-el7
build: rpm
diff --git a/README.md b/README.md
index 8f6e983..a380be2 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
There is an RPM available for installing on RedHat/CentOS:
```shell
-$ yum install https://s3-us-west-2.amazonaws.com/cnx.vmware/cicd/centos/cloud-init-vmx-guestinfo-1.0.0-0.noarch.rpm
+$ yum install https://github.com/akutz/cloudinit-ds-vmx-guestinfo/releases/download/v1.0.0/cloud-init-vmx-guestinfo-1.0.0-1.el7.noarch.rpm
```
### Installing on other Linux distributions
@@ -220,7 +220,7 @@
The resulting RPMs are located in `rpmbuild/$OS/RPMS/noarch/`. The list
of supported `$OS` platforms are:
-* centos7
+* el7 (RHEL/CentOS 7)
## Conclusion
To learn more about how to use cloud-init with CentOS, please see the cloud-init
diff --git a/rpm.centos7.spec b/rpm.el7.spec
similarity index 97%
rename from rpm.centos7.spec
rename to rpm.el7.spec
index 37b34fb..8eda749 100644
--- a/rpm.centos7.spec
+++ b/rpm.el7.spec
@@ -7,7 +7,7 @@
#################################################################################
Name: cloud-init-vmx-guestinfo
Version: 1.0.0
-Release: 0
+Release: 1.el7
Summary: A cloud-init datasource that uses VMX Guestinfo
License: Apache2
Requires: cloud-init