rpms/ignition
6
0
Fork 0
Code Issues Pull Requests Releases Activity

additional fixups for building against rhel7

Browse Source 
add gopath macro to build against rhel7
This commit is contained in:
Michael Nguyen 2018-12-14 17:58:28 +00:00
parent f1d23b1b46
commit 45ea7ada15
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ignition.spec
View File

@ -73,17 +73,17 @@
Name: ignition Name: ignition
Version: 0.29.1 Version: 0.29.1
Release: 2.git%{shortcommit}%{?dist} Release: 3.git%{shortcommit}%{?dist}
Summary: First boot installer and configuration tool Summary: First boot installer and configuration tool
License: ASL 2.0 License: ASL 2.0
URL: https://%{provider_prefix} URL: https://%{provider_prefix}
Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
# For RHEL7 we'll want to specify gopath and list of arches since there is no
# For RHEL7 we'll want to specify list of arches since there is no # gopath or go_arches macro. We'll also want to make sure we pull in golang
# go_arches macro. We'll also want to make sure we pull in golang 1.10 # 1.10 require golang >= 1.10
# require golang >= 1.10
%if 0%{?rhel} <= 7 && 0%{?centos} == 0 %if 0%{?rhel} <= 7 && 0%{?centos} == 0
%define gopath %{_datadir}/gocode
ExclusiveArch: x86_64 ppc64le aarch64 s390x ExclusiveArch: x86_64 ppc64le aarch64 s390x
BuildRequires: golang >= 1.10 BuildRequires: golang >= 1.10
%else %else
@ -482,6 +482,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
%endif %endif
%changelog %changelog
* Fri Dec 14 2018 Michael Nguyen <mnguyen@redhat.com> - 0.29.1-3.gitb1ab0b2
- define gopath for RHEL7
* Tue Dec 11 2018 Dusty Mabe <dusty@dustymabe.com> - 0.29.1-2.gitb1ab0b2 * Tue Dec 11 2018 Dusty Mabe <dusty@dustymabe.com> - 0.29.1-2.gitb1ab0b2
- require golang >= 1.10 and specify architecture list for RHEL7 - require golang >= 1.10 and specify architecture list for RHEL7