diff options
| author | Zach Marano <zmarano@google.com> | 2019-05-03 13:59:36 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-03 13:59:36 -0700 |
| commit | 49d2969bb81ecc1061f475ce304e6316b5980273 (patch) | |
| tree | 48a349c5a26aa9c10168f33ed691a08b2e4d6633 /packages/google-compute-engine | |
| parent | fd564de77d393ac6ed078075e888737f0aa57e65 (diff) | |
| download | google-compute-image-packages-49d2969bb81ecc1061f475ce304e6316b5980273.tar.gz | |
RHEL 8 packages for google-compute-engine. (#753)
* RHEL 8 packages for google-compute-engine.
Diffstat (limited to 'packages/google-compute-engine')
| -rw-r--r-- | packages/google-compute-engine/packaging/google-compute-engine.spec | 11 | ||||
| -rwxr-xr-x | packages/google-compute-engine/packaging/setup_rpm.sh | 4 |
2 files changed, 10 insertions, 5 deletions
diff --git a/packages/google-compute-engine/packaging/google-compute-engine.spec b/packages/google-compute-engine/packaging/google-compute-engine.spec index 39307cb..aba148d 100644 --- a/packages/google-compute-engine/packaging/google-compute-engine.spec +++ b/packages/google-compute-engine/packaging/google-compute-engine.spec @@ -12,16 +12,25 @@ # See the License for the specific language governing permissions and # limitations under the License. +# For EL7, if building on CentOS, override dist to be el7. +%if 0%{?rhel} == 7 + %define dist .el7 +%endif + Name: google-compute-engine Version: %{_version} -Release: 1.el7 +Release: 1%{?dist} Summary: Google Compute Engine guest environment. License: ASL 2.0 Url: https://github.com/GoogleCloudPlatform/compute-image-packages Source0: %{name}_%{version}.orig.tar.gz Requires: curl Requires: google-compute-engine-oslogin +%if 0%{?rhel} == 8 +Requires: python3-google-compute-engine = %{version} +%else Requires: python-google-compute-engine = %{version} +%endif Requires: rsyslog BuildArch: noarch diff --git a/packages/google-compute-engine/packaging/setup_rpm.sh b/packages/google-compute-engine/packaging/setup_rpm.sh index d98c2aa..4537982 100755 --- a/packages/google-compute-engine/packaging/setup_rpm.sh +++ b/packages/google-compute-engine/packaging/setup_rpm.sh @@ -23,10 +23,6 @@ if [[ $(basename "$working_dir") != $NAME ]]; then exit 1 fi -# Build dependencies. -sudo yum -y install make gcc-c++ libcurl-devel json-c json-c-devel pam-devel \ - policycoreutils-python boost-devel - # RPM creation tools. sudo yum -y install rpmdevtools |