[golang/epel7: 2/2] Merge branch 'master' into epel7
by Vincent Batts
commit a9a1e214b27a142095fd1d76028d1fa916fdba47
Merge: 9a07007 25b1d04
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Fri Jan 24 14:02:47 2014 -0500
Merge branch 'master' into epel7
golang-1.2-skipCpuProfileTest.patch | 12 ++++++++++++
golang.spec | 12 +++++++++++-
2 files changed, 23 insertions(+), 1 deletions(-)
---
10 years, 3 months
[golang/el6: 2/2] Merge branch 'master' into el6
by Vincent Batts
commit 8197a39098b9c5f15fb486b1360dbe2fc7a0c559
Merge: 64f997f 25b1d04
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Fri Jan 24 14:03:48 2014 -0500
Merge branch 'master' into el6
golang-1.2-skipCpuProfileTest.patch | 12 ++++++++++++
golang.spec | 12 +++++++++++-
2 files changed, 23 insertions(+), 1 deletions(-)
---
10 years, 3 months
[golang/el6: 1/2] skip flaky test
by Vincent Batts
commit 25b1d04efe51bd8e40259eb2fbbcb8d787ca529c
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Fri Jan 24 14:02:19 2014 -0500
skip flaky test
golang-1.2-skipCpuProfileTest.patch | 12 ++++++++++++
golang.spec | 12 +++++++++++-
2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/golang-1.2-skipCpuProfileTest.patch b/golang-1.2-skipCpuProfileTest.patch
new file mode 100644
index 0000000..3dee29f
--- /dev/null
+++ b/golang-1.2-skipCpuProfileTest.patch
@@ -0,0 +1,12 @@
+diff -r 87dea3f5ebe7 src/pkg/runtime/pprof/pprof_test.go
+--- a/src/pkg/runtime/pprof/pprof_test.go Fri Nov 29 08:32:31 2013 +1100
++++ b/src/pkg/runtime/pprof/pprof_test.go Fri Jan 24 13:47:42 2014 -0500
+@@ -32,7 +32,7 @@
+ })
+ }
+
+-func TestCPUProfileMultithreaded(t *testing.T) {
++func testCPUProfileMultithreaded(t *testing.T) {
+ buf := make([]byte, 100000)
+ defer runtime.GOMAXPROCS(runtime.GOMAXPROCS(2))
+ testCPUProfile(t, []string{"crc32.ChecksumIEEE", "crc32.Update"}, func() {
diff --git a/golang.spec b/golang.spec
index b02a0a8..21428aa 100644
--- a/golang.spec
+++ b/golang.spec
@@ -25,7 +25,7 @@
Name: golang
Version: 1.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: The Go Programming Language
License: BSD
@@ -55,6 +55,10 @@ Patch0: golang-1.2-verbose-build.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1038683
Patch2: golang-1.2-remove-ECC-p224.patch
+# disable flaky test for now
+# http://code.google.com/p/go/issues/detail?id=6522
+Patch3: ./golang-1.2-skipCpuProfileTest.patch
+
# Having documentation separate was broken
Obsoletes: %{name}-docs < 1.1-4
@@ -135,6 +139,9 @@ end
# remove the P224 curve
%patch2 -p1
+# skip flaky test
+%patch3 -p1
+
# create a [dirty] gcc wrapper to allow us to build with our own flags
# (dirty because it is spoofing 'gcc' since CC value is stored in the go tool)
# TODO: remove this and just set CFLAGS/LDFLAGS once upstream supports it
@@ -286,6 +293,9 @@ cp -av %{SOURCE101} $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d/golang.conf
%changelog
+* Thu Jan 24 2014 Vincent Batts <vbatts(a)redhat.com> 1.2-4
+- skip a flaky test that is sporadically failing on the build server
+
* Thu Jan 16 2014 Vincent Batts <vbatts(a)redhat.com> 1.2-3
- remove golang-godoc dependency. cyclic dependency on compiling godoc
10 years, 3 months
Broken dependencies: docker-io
by Fedora Koji Build System
docker-io has broken dependencies in the epel-7 tree:
On x86_64:
docker-io-0.7.6-4.el7.x86_64 requires lxc
Please resolve this as soon as possible.
10 years, 3 months
Broken dependencies: docker-io
by Fedora Koji Build System
docker-io has broken dependencies in the epel-7 tree:
On x86_64:
docker-io-0.7.6-4.el7.x86_64 requires lxc
Please resolve this as soon as possible.
10 years, 3 months
[docker-io/el6] correct typo in manpage
by Lokesh Mandvekar
commit 90202bf13f90858436ea1a5cb920bcc77871a9d1
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Wed Jan 22 17:02:37 2014 -0500
correct typo in manpage
Signed-off-by: Lokesh Mandvekar <lsm5(a)redhat.com>
docker-io.spec | 5 ++++-
docker.1 | 37 +++++++------------------------------
2 files changed, 11 insertions(+), 31 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 31d61b2..b7e73af 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -14,7 +14,7 @@
Name: docker-io
Version: 0.7.6
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
@@ -167,6 +167,9 @@ fi
%{_sysconfdir}/udev/rules.d/80-docker.rules
%changelog
+* Wed Jan 22 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.7.6-4
+- correct typos in manpage
+
* Wed Jan 22 2014 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.7.6-3
- install fedora customized manpage instead of upstream provided version
- get rid of python-sphinx* dependencies
diff --git a/docker.1 b/docker.1
index c9bfaba..780231c 100644
--- a/docker.1
+++ b/docker.1
@@ -622,41 +622,18 @@ Show the history of an image
.UNINDENT
.UNINDENT
.sp
-To see how the \fBdocker:latest\fP image was built:
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-$ docker history docker
-ID CREATED CREATED BY
-docker:latest 19 hours ago /bin/sh \-c #(nop) ADD . in /go/src/github.com/dotcloud/docker
-cf5f2467662d 2 weeks ago /bin/sh \-c #(nop) ENTRYPOINT ["hack/dind"]
-3538fbe372bf 2 weeks ago /bin/sh \-c #(nop) WORKDIR /go/src/github.com/dotcloud/docker
-7450f65072e5 2 weeks ago /bin/sh \-c #(nop) VOLUME /var/lib/docker
-b79d62b97328 2 weeks ago /bin/sh \-c apt\-get install \-y \-q lxc
-36714852a550 2 weeks ago /bin/sh \-c apt\-get install \-y \-q iptables
-8c4c706df1d6 2 weeks ago /bin/sh \-c /bin/echo \-e \(aq[default]\enaccess_key=$AWS_ACCESS_KEY\ensecret_key=$AWS_SECRET_KEYn\(aq > /.s3cfg
-b89989433c48 2 weeks ago /bin/sh \-c pip install python\-magic
-a23e640d85b5 2 weeks ago /bin/sh \-c pip install s3cmd
-41f54fec7e79 2 weeks ago /bin/sh \-c apt\-get install \-y \-q python\-pip
-d9bc04add907 2 weeks ago /bin/sh \-c apt\-get install \-y \-q reprepro dpkg\-sig
-e74f4760fa70 2 weeks ago /bin/sh \-c gem install \-\-no\-rdoc \-\-no\-ri fpm
-1e43224726eb 2 weeks ago /bin/sh \-c apt\-get install \-y \-q ruby1.9.3 rubygems libffi\-dev
-460953ae9d7f 2 weeks ago /bin/sh \-c #(nop) ENV GOPATH=/go:/go/src/github.com/dotcloud/docker/vendor
-8b63eb1d666b 2 weeks ago /bin/sh \-c #(nop) ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/goroot/bin
-3087f3bcedf2 2 weeks ago /bin/sh \-c #(nop) ENV GOROOT=/goroot
-635840d198e5 2 weeks ago /bin/sh \-c cd /goroot/src && ./make.bash
-439f4a0592ba 2 weeks ago /bin/sh \-c curl \-s https://go.googlecode.com/files/go1.1.2.src.tar.gz | tar \-v \-C / \-xz && mv /go /goroot
-13967ed36e93 2 weeks ago /bin/sh \-c #(nop) ENV CGO_ENABLED=0
-bf7424458437 2 weeks ago /bin/sh \-c apt\-get install \-y \-q build\-essential
-a89ec997c3bf 2 weeks ago /bin/sh \-c apt\-get install \-y \-q mercurial
-b9f165c6e749 2 weeks ago /bin/sh \-c apt\-get install \-y \-q git
-17a64374afa7 2 weeks ago /bin/sh \-c apt\-get install \-y \-q curl
-d5e85dc5b1d8 2 weeks ago /bin/sh \-c apt\-get update
-13e642467c11 2 weeks ago /bin/sh \-c echo \(aqdeb http://archive.fedora.com/ubuntu precise main universe\(aq > /etc/apt/sources.list
-ae6dde92a94e 2 weeks ago /bin/sh \-c #(nop) MAINTAINER Solomon Hykes <solomon(a)dotcloud.com>
-fedora:20 6 months ago
+To see how an image was built:
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+$ docker history lsm5/test
+IMAGE CREATED CREATED BY SIZE
+ca1a85fb2f1a 5 hours ago /bin/bash 5.893 MB
+924a401326b8 2 weeks ago /bin/sh -c #(nop) ADD fedora-20-medium.tar.xz 385.5 MB
+4a646dfe724f 2 weeks ago /bin/sh -c #(nop) MAINTAINER Lokesh Mandvekar 0 B
+511136ea3c5a 7 months ago
.ft P
.fi
.UNINDENT
10 years, 3 months