Re: Fw: PowerPC, f22 and docker-io

[Dave Jones]

That's good news, Dan; thanks.

Have a good weekend, too.

DJ

On 03/20/2015 11:27 AM, Dan Horák wrote:
>  And I have tested the patch for F-22/s390x and it builds there too.
> We
>  are one step closer :-)
>  
>  
>  		Dan
>  
>  Begin forwarded message:
>  
>  Date: Fri, 20 Mar 2015 11:08:37 -0400 (EDT)
>  From: Jakub Cajka <jcajka(a)redhat.com&gt;
>  To: ppc(a)lists.fedoraproject.org
>  Subject: PowerPC, f22 and docker-io
>  
>  
>  Hello,
>    as we have gcc5 with gcc-go in f22, I have tried to build docker-io
>  on both 64bit BE and LE. It does build, even test are failing in same
>  way as on x86 :). Only man pages are missing as
>  golang-github-cpuguy83-go-md2man is missing due to dependency on golang.
>  
>    I haven't tried to do any actual testing, as there are no fedora-ppc
>  images for docker yet.
>  
>    Bit rough fedora git patch fellows.(clean solution also depends how
>  gcc-go will be handled in fedora)(should apply cleanly against
>
> http://pkgs.fedoraproject.org/cgit/docker-io.git/commit/?id=b12666ec5e307...)
>  
>    Jakub
>  
>  -----------
>  
>  diff --git a/docker-gccgo.patch b/docker-gccgo.patch
>  new file mode 100644
>  index 0000000..8ff9b7e
>  --- /dev/null
>  +++ b/docker-gccgo.patch
>  @@ -0,0 +1,12 @@
>  +diff -up
>  docker-5ebfacda4747fb0b2473841dff9b9b771b3bcb53/hack/make.sh.gccgo
>  docker-5ebfacda4747fb0b2473841dff9b9b771b3bcb53/hack/make.sh +---
>  docker-5ebfacda4747fb0b2473841dff9b9b771b3bcb53/hack/make.sh.gccgo
>  2015-03-20 13:11:07.567000000 +0100 ++++
>  docker-5ebfacda4747fb0b2473841dff9b9b771b3bcb53/hack/make.sh
>  2015-03-20 13:11:24.111000000 +0100 +@@ -114,7 +114,7 @@
>  EXTLDFLAGS_STATIC='-static'
>  + # with options like -race.
>  + ORIG_BUILDFLAGS=( -a -tags "netgo static_build $DOCKER_BUILDTAGS"
>  -installsuffix netgo )
>  + # see https://github.com/golang/go/issues/9369#issuecomment-69864440
>  for why -installsuffix is necessary here +-BUILDFLAGS=( $BUILDFLAGS
>  "${ORIG_BUILDFLAGS[@]}" ) ++BUILDFLAGS=( $BUILDFLAGS "${ORIG_BUILDFLAGS
>  [@]}" -compiler gccgo -gccgoflags "$RPM_OPT_FLAGS" )
>  + # Test timeout.
>  + : ${TIMEOUT:=30m}
>  + TESTFLAGS+=" -test.timeout=${TIMEOUT}"
>  diff --git a/docker-io.spec b/docker-io.spec
>  index 334e6a5..b0727bf 100644
>  --- a/docker-io.spec
>  +++ b/docker-io.spec
>  @@ -15,6 +15,7 @@
>   %global shortcommit %(c=%{commit}; echo ${c:0:7})
>   
>   %global tar_import_path code.google.com/p/go/src/pkg/archive/tar
>  +%global gopath /usr/share/gocode
>   
>   Name:       %{repo}-io
>   Version:	1.5.0
>  @@ -22,7 +23,6 @@ Release:	20.git%{shortcommit}%{?dist}
>   Summary:    Automates deployment of containerized applications
>   License:    ASL 2.0
>   URL:        http://www.docker.com
>  -ExclusiveArch:  x86_64 %{arm}
>   #Source0:
>  https://%{import_path}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
>  Source0:
>  https://github.com/lsm5/docker/archive/%{commit}/%{repo}-%{shortcommit}.t...
>  Source1:    %{repo}.service @@ -31,13 +31,15 @@ Source3:    %
>  {repo}-storage.sysconfig Source4:    %{repo}-logrotate.sh Source5:
>  README.%{repo}-logrotate Source6:    %{repo}-network.sysconfig
>  +Patch0:     docker-gccgo.patch
>   BuildRequires:  glibc-static
>  -BuildRequires:  golang >= 1.3.3
>  -BuildRequires:  go-md2man
>  +#BuildRequires:  golang >= 1.3.3
>  +#BuildRequires:  go-md2man
>   BuildRequires:  device-mapper-devel
>   BuildRequires:  btrfs-progs-devel
>   BuildRequires:  sqlite-devel
>   BuildRequires:  pkgconfig(systemd)
>  +BuildRequires:  gcc-go libgo-static
>   %if 0%{?fedora} >= 21
>   # Resolves: rhbz#1165615
>   Requires:   device-mapper-libs >= 1.02.90-1
>  @@ -70,13 +72,15 @@ and tests on a laptop will run at scale, in
>  production*, on VMs, bare-metal servers, OpenStack clusters, public
>  instances, or combinations of the above. 
>   %package devel
>  -BuildRequires:  golang >= 1.2.1-3
>  -Requires: golang >= 1.2.1-3
>  +#BuildRequires:  golang >= 1.2.1-3
>  +#Requires: golang >= 1.2.1-3
>  +BuildRequires: gcc-go
>  +Requires: gcc-go
>   Provides: %{repo}-devel = %{version}-%{release}
>   Provides: %{name}-pkg-devel = %{version}-%{release}
>   Provides: %{repo}-pkg-devel = %{version}-%{release}
>   Provides: golang(%{import_path}/vendor/src/%{tar_import_path}) = %
>  {version}-%{release} -Summary:  A golang registry for global request
>  variables (source libraries) +Summary: A golang registry for global
>  request variables (source libraries) Provides: golang(%{import_path}) =
>  %{version}-%{release} Provides: golang(%{import_path}/builder) = %
>  {version}-%{release} Provides: golang(%{import_path}/builder/parser) = %
>  {version}-%{release} @@ -210,6 +214,7 @@ This package installs %
>  {summary}. 
>   %prep
>   %setup -q -n %{repo}-%{commit}
>  +%patch0 -p1 -b .gccgo
>   cp %{SOURCE5} .
>   
>   %build
>  @@ -222,7 +227,7 @@ export DOCKER_BUILDTAGS="selinux btrfs_noversion"
>   export GOPATH=$(pwd)/_build:$(pwd)/vendor:%{gopath}
>   
>   DEBUG=1 hack/make.sh dynbinary
>  -docs/man/md2man-all.sh
>  +#docs/man/md2man-all.sh
>   cp contrib/syntax/vim/LICENSE LICENSE-vim-syntax
>   cp contrib/syntax/vim/README.md README-vim-syntax.md
>   
>  @@ -239,10 +244,10 @@ for x in bundles/*-dev; do \
>   done
>   
>   # install manpages
>  -install -d %{buildroot}%{_mandir}/man1
>  -install -p -m 644 docs/man/man1/docker*.1 %{buildroot}%{_mandir}/man1
>  -install -d %{buildroot}%{_mandir}/man5
>  -install -p -m 644 docs/man/man5/Dockerfile.5 %{buildroot}%
>  {_mandir}/man5 +#install -d %{buildroot}%{_mandir}/man1
>  +#install -p -m 644 docs/man/man1/docker*.1 %{buildroot}%{_mandir}/man1
>  +#install -d %{buildroot}%{_mandir}/man5
>  +#install -p -m 644 docs/man/man5/Dockerfile.5 %{buildroot}%
>  {_mandir}/man5 
>   # install bash completion
>   install -dp %{buildroot}%{_datadir}/bash-completion/completions
>  @@ -287,14 +292,14 @@ install -p -m 644 %{SOURCE3} %{buildroot}%
>  {_sysconfdir}/sysconfig/docker-storage 
>   # sources
>   install -d -p %{buildroot}%{gopath}/src/%{import_path}
>  -rm -rf pkg/symlink/testdata
>  +#rm -rf pkg/symlink/testdata
>   
>   # install tar_import_path to devel package
>   install -d -p %{buildroot}%{gopath}/src/%{import_path}/vendor/src/%
>  {tar_import_path} cp -rpav vendor/src/%{tar_import_path}/* %{buildroot}%
>  {gopath}/src/%{import_path}/vendor/src/%{tar_import_path} 
>   # remove dirs that won't be installed in devel
>  -rm -rf vendor docs _build bundles contrib/init hack project
>  +#rm -rf vendor docs _build bundles contrib/init hack project
>   
>   # install sources to devel
>   for dir in */ ; do
>  @@ -305,15 +310,12 @@ done
>   install -dp %{buildroot}%{_sysconfdir}/%{repo}
>   
>   %check
>  -[ ! -e /run/docker.sock ] || {
>  -    mkdir test_dir
>  -    pushd test_dir
>  -    git clone https://%{import_path}
>  -    pushd docker
>  -    make test
>  -    popd
>  -    popd
>  -}
>  +
>  +export DOCKER_GITCOMMIT="%{shortcommit}/%{version}"
>  +export DOCKER_BUILDTAGS="selinux btrfs_noversion"
>  +export GOPATH=$(pwd)/_build:$(pwd)/vendor:%{gopath}
>  +
>  +DEBUG=1 hack/make.sh test-unit test-integration test-integration-cli
>  test-docker-py || : 
>   %pre
>   getent passwd dockerroot > /dev/null || %{_sbindir}/useradd -r -d %
>  {_sharedstatedir}/docker -s /sbin/nologin -c "Docker User" dockerroot
>  @@ -334,8 +336,8 @@ exit 0 %config(noreplace) %
>  {_sysconfdir}/sysconfig/docker %config(noreplace) %
>  {_sysconfdir}/sysconfig/docker-network %config(noreplace) %
>  {_sysconfdir}/sysconfig/docker-storage -%{_mandir}/man1/docker*.1.gz
>  -%{_mandir}/man5/Dockerfile.5.gz
>  +#%{_mandir}/man1/docker*.1.gz
>  +#%{_mandir}/man5/Dockerfile.5.gz
>   %{_bindir}/docker
>   %{_libexecdir}/docker
>   %{_unitdir}/docker.service
>  _______________________________________________
>  ppc mailing list
>  ppc(a)lists.fedoraproject.org
>  https://admin.fedoraproject.org/mailman/listinfo/ppc
>  _______________________________________________
>  s390x mailing list
>  s390x(a)lists.fedoraproject.org
>  https://admin.fedoraproject.org/mailman/listinfo/s390x
>   
-- 
Dave Jones
V/Soft Software
www.vsoft-software.com
Houston, TX
281.578.7544