Browse Source

runc package update enable cgo and disable pie on ppc64

Signed-off-by: virtbuilder_pel7ppc64bebuilder0 <virtbuilder@powerel.org>
master
virtbuilder_pel7ppc64bebuilder0 5 years ago
parent
commit
7fcbdf5f6c
  1. 10
      SPECS/runc.spec

10
SPECS/runc.spec

@ -34,7 +34,7 @@ Patch0: 1807.patch


# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
#ExclusiveArch: %%{?go_arches:%%{go_arches}}%%{!?go_arches:%%{ix86} x86_64 %%{arm}} #ExclusiveArch: %%{?go_arches:%%{go_arches}}%%{!?go_arches:%%{ix86} x86_64 %%{arm}}
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le %{mips} s390x ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64 ppc64le %{mips} s390x
# If go_compiler is not set to 1, there is no virtual provide. Use golang instead. # If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
BuildRequires: pkgconfig(libseccomp) BuildRequires: pkgconfig(libseccomp)
@ -61,10 +61,10 @@ BuildRequires: golang(github.com/syndtr/gocapability/capability)
BuildRequires: golang(github.com/vishvananda/netlink) BuildRequires: golang(github.com/vishvananda/netlink)
BuildRequires: golang(github.com/vishvananda/netlink/nl) BuildRequires: golang(github.com/vishvananda/netlink/nl)
%endif %endif
Recommends: container-selinux >= 2:2.85-1 Requires: container-selinux >= 2:2.74-1


%ifnarch s390x %ifnarch s390x
Recommends: criu #Requires: criu
%endif %endif


%description %description
@ -173,6 +173,10 @@ popd
pushd GOPATH/src/%{import_path} pushd GOPATH/src/%{import_path}
export GOPATH=%{gopath}:$(pwd)/GOPATH export GOPATH=%{gopath}:$(pwd)/GOPATH


%ifarch ppc64
sed 's/-buildmode=pie//g' -i Makefile
export CGO_ENABLED=1
%endif
make BUILDTAGS="seccomp selinux" all make BUILDTAGS="seccomp selinux" all


sed -i '/\#\!\/bin\/bash/d' contrib/completions/bash/%{name} sed -i '/\#\!\/bin\/bash/d' contrib/completions/bash/%{name}

Loading…
Cancel
Save