Browse code
Add flannel pkg, update golang to 1.4.2
Vinay Kulkarni authored on 2015/08/05 07:27:33Showing 3 changed files
| 1 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,47 @@ |
| 0 |
+%global commit ed470048eed1c50ca042d3fbc7ac4e5d86bd64d5 |
|
| 1 |
+ |
|
| 2 |
+Summary: Overlay network for containers based on etcd |
|
| 3 |
+Name: flannel |
|
| 4 |
+Version: 0.5.2 |
|
| 5 |
+Release: 1%{?dist}
|
|
| 6 |
+License: ASL 2.0 |
|
| 7 |
+URL: https://github.com/coreos/flannel |
|
| 8 |
+Source0: https://github.com/coreos/flannel/archive/%{commit}/flannel-ed47004.tar.gz
|
|
| 9 |
+%define sha1 flannel-ed47004=c71c695e51fc9adb81f0e94f13451a4fbf12fd16 |
|
| 10 |
+Group: Development/Tools |
|
| 11 |
+Vendor: VMware, Inc. |
|
| 12 |
+Distribution: Photon |
|
| 13 |
+BuildRequires: etcd >= 2.0.0 |
|
| 14 |
+BuildRequires: gcc |
|
| 15 |
+BuildRequires: go |
|
| 16 |
+Requires: etcd >= 2.0.0 |
|
| 17 |
+ |
|
| 18 |
+%description |
|
| 19 |
+flannel is a virtual network that provides a subnet to a container runtime |
|
| 20 |
+host OS for use with containers. flannel uses etcd to store the network |
|
| 21 |
+configuration, allocated subnets, and additional data. |
|
| 22 |
+ |
|
| 23 |
+%prep |
|
| 24 |
+%setup -n %{name}-%{commit}
|
|
| 25 |
+ |
|
| 26 |
+%build |
|
| 27 |
+./build |
|
| 28 |
+ |
|
| 29 |
+%install |
|
| 30 |
+install -vdm 755 %{buildroot}%{_bindir}
|
|
| 31 |
+install -vpm 0755 -t %{buildroot}%{_bindir}/ bin/flanneld
|
|
| 32 |
+ |
|
| 33 |
+%check |
|
| 34 |
+make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
|
|
| 35 |
+ |
|
| 36 |
+%post |
|
| 37 |
+ |
|
| 38 |
+%postun |
|
| 39 |
+ |
|
| 40 |
+%files |
|
| 41 |
+%defattr(-,root,root) |
|
| 42 |
+%{_bindir}/flanneld
|
|
| 43 |
+ |
|
| 44 |
+%changelog |
|
| 45 |
+* Mon Aug 03 2015 Vinay Kulkarni <kulkarniv@vmware.com> 0.5.2-1 |
|
| 46 |
+- Add flannel package to photon. |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
|
| 2 | 2 |
%global goroot /usr/lib/golang |
| 3 | 3 |
%global gopath %{_datadir}/gocode
|
| 4 |
-%global gohostarch amd64 |
|
| 4 |
+%global gohostarch amd64 |
|
| 5 | 5 |
|
| 6 | 6 |
# rpmbuild magic to keep from having meta dependency on libc.so.6 |
| 7 | 7 |
%define _use_internal_dependency_generator 0 |
| ... | ... |
@@ -9,7 +9,7 @@ |
| 9 | 9 |
|
| 10 | 10 |
Summary: Go |
| 11 | 11 |
Name: go |
| 12 |
-Version: 1.3.3 |
|
| 12 |
+Version: 1.4.2 |
|
| 13 | 13 |
Release: 1%{?dist}
|
| 14 | 14 |
License: BSD |
| 15 | 15 |
URL: https://golang/org |
| ... | ... |
@@ -17,16 +17,18 @@ Group: System Environment/Security |
| 17 | 17 |
Vendor: VMware, Inc. |
| 18 | 18 |
Distribution: Photon |
| 19 | 19 |
Source0: https://storage.googleapis.com/golang/%{name}%{version}.src.tar.gz
|
| 20 |
-%define sha1 go=b54b7deb7b7afe9f5d9a3f5dd830c7dede35393a |
|
| 20 |
+%define sha1 go=460caac03379f746c473814a65223397e9c9a2f6 |
|
| 21 | 21 |
BuildRequires: mercurial |
| 22 | 22 |
Requires: mercurial |
| 23 | 23 |
# We strip meta dependency, but go requires glibc. |
| 24 | 24 |
Requires: glibc |
| 25 |
+ |
|
| 25 | 26 |
%description |
| 26 | 27 |
Go is an open source programming language that makes it easy to build simple, reliable, and efficient software. |
| 27 | 28 |
|
| 28 | 29 |
%prep |
| 29 | 30 |
%setup -qn %{name}
|
| 31 |
+ |
|
| 30 | 32 |
%build |
| 31 | 33 |
export GOROOT_FINAL=%{goroot}
|
| 32 | 34 |
export GOHOSTOS=linux |
| ... | ... |
@@ -34,6 +36,7 @@ export GOHOSTARCH=%{gohostarch}
|
| 34 | 34 |
pushd src |
| 35 | 35 |
./make.bash --no-clean |
| 36 | 36 |
popd |
| 37 |
+ |
|
| 37 | 38 |
%install |
| 38 | 39 |
rm -rf %{buildroot}
|
| 39 | 40 |
|
| ... | ... |
@@ -77,15 +80,20 @@ chown -R root:root %{buildroot}/etc/profile.d/go-exports.sh
|
| 77 | 77 |
|
| 78 | 78 |
|
| 79 | 79 |
%{_fixperms} %{buildroot}/*
|
| 80 |
+ |
|
| 80 | 81 |
%check |
| 81 | 82 |
make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
|
| 83 |
+ |
|
| 82 | 84 |
%post -p /sbin/ldconfig |
| 85 |
+ |
|
| 83 | 86 |
%postun -p /sbin/ldconfig |
| 84 | 87 |
rm /etc/profile.d/go-exports.sh |
| 85 | 88 |
rm -rf /opt/%{name}
|
| 86 | 89 |
exit 0 |
| 90 |
+ |
|
| 87 | 91 |
%clean |
| 88 | 92 |
rm -rf %{buildroot}/*
|
| 93 |
+ |
|
| 89 | 94 |
%files |
| 90 | 95 |
%defattr(-,root,root) |
| 91 | 96 |
%exclude %{goroot}/src/*.rc
|
| ... | ... |
@@ -101,6 +109,9 @@ rm -rf %{buildroot}/*
|
| 101 | 101 |
%exclude %{goroot}/src/pkg/debug/dwarf/testdata
|
| 102 | 102 |
%exclude %{goroot}/src/pkg/debug/elf/testdata
|
| 103 | 103 |
%{_bindir}/*
|
| 104 |
+ |
|
| 104 | 105 |
%changelog |
| 106 |
+* Mon Aug 03 2015 Vinay Kulkarni <kulkarniv@vmware.com> 1.4.2-1 |
|
| 107 |
+- Update to golang release version 1.4.2 |
|
| 105 | 108 |
* Fri Oct 17 2014 Divya Thaluru <dthaluru@vmware.com> 1.3.3-1 |
| 106 | 109 |
- Initial build. First version |
| ... | ... |
@@ -24,7 +24,8 @@ |
| 24 | 24 |
"rpm-devel","pycurl","urlgrabber","yum-metadata-parser","yum", "rocket", "strace", "cracklib-python", |
| 25 | 25 |
"haveged", "haveged-devel", "vim-extra", |
| 26 | 26 |
"postgresql", "openjdk", "apr", "apr-util", "httpd", "openvswitch", "eventlog", "syslog-ng", "syslog-ng-devel", "zookeeper", "fuse", "fleet", |
| 27 |
- "nss-altfiles", "apache-maven", "subversion", "mesos", "python3", "python3-libs", "python3-devel", "python3-tools", "fakeroot-ng", "ctags", "libtirpc","libtirpc-devel","lsof","nfs-utils", "cve-check-tool"] |
|
| 27 |
+ "nss-altfiles", "apache-maven", "subversion", "mesos", "python3", "python3-libs", "python3-devel", "python3-tools", "fakeroot-ng", "ctags", |
|
| 28 |
+ "libtirpc", "libtirpc-devel", "lsof", "nfs-utils", "cve-check-tool", "flannel"] |
|
| 28 | 29 |
} |
| 29 | 30 |
|
| 30 | 31 |
|