diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-10-07 00:07:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-07 00:07:26 -0700 |
| commit | 141a1327fbb2d6e476d959ba9a23d01e1200a9fc (patch) | |
| tree | 7db13b1ea34d59ec60fa2725b2f6363ea3c0d818 | |
| parent | d137b0908c3f9ee2ee05364128682e7053294260 (diff) | |
| parent | c6a6c06435516f6438a1dfe739845ba6490e0513 (diff) | |
| download | podman-141a1327fbb2d6e476d959ba9a23d01e1200a9fc.tar.gz podman-141a1327fbb2d6e476d959ba9a23d01e1200a9fc.tar.bz2 podman-141a1327fbb2d6e476d959ba9a23d01e1200a9fc.zip | |
Merge pull request #1573 from baude/readdgolang
re-add BR for golang compiler to contrib/spec/podman.spec.in
| -rw-r--r-- | .copr/prepare.sh | 8 | ||||
| -rw-r--r-- | contrib/spec/podman.spec.in | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/.copr/prepare.sh b/.copr/prepare.sh index 8ec38f2df..1ad29da36 100644 --- a/.copr/prepare.sh +++ b/.copr/prepare.sh @@ -1,5 +1,6 @@ #!/bin/sh -euf set -x +OS_TEST=${OS_TEST:=0} if [ ! -e /usr/bin/git ]; then dnf -y install git-core @@ -11,6 +12,9 @@ COMMIT=$(git rev-parse HEAD) COMMIT_SHORT=$(git rev-parse --short=8 HEAD) COMMIT_NUM=$(git rev-list HEAD --count) COMMIT_DATE=$(date +%s) +BR="#BuildRequires: golang-bin" +NEWBR="BuildRequires: golang-bin" + sed "s,#COMMIT#,${COMMIT},; s,#SHORTCOMMIT#,${COMMIT_SHORT},; @@ -18,6 +22,10 @@ sed "s,#COMMIT#,${COMMIT},; s,#COMMITDATE#,${COMMIT_DATE}," \ contrib/spec/podman.spec.in > contrib/spec/podman.spec +if [ ${OS_TEST} -eq 0 ]; then + sed -i "s/${BR}/${NEWBR}/g" contrib/spec/podman.spec +fi + mkdir build/ git archive --prefix "libpod-${COMMIT_SHORT}/" --format "tar.gz" HEAD -o "build/libpod-${COMMIT_SHORT}.tar.gz" git clone https://github.com/kubernetes-incubator/cri-o diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index a577581a3..a114d8384 100644 --- a/contrib/spec/podman.spec.in +++ b/contrib/spec/podman.spec.in @@ -49,7 +49,9 @@ Source1: crio.tar.gz # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required #ExclusiveArch: %%{?go_arches:%%{go_arches}}%%{!?go_arches:%%{ix86} x86_64 aarch64 %%{arm}} ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64 -# If go_compiler is not set to 1, there is no virtual provide. Use golang instead. +# The COPR process will uncomment this +#BuildRequires: golang-bin +# BuildRequires: btrfs-progs-devel BuildRequires: glib2-devel BuildRequires: glibc-devel |