opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-09-11 09:05:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

re-add BR for golang compiler to contrib/spec/podman.spec.in

Browse Source 
Signed-off-by: baude <bbaude@redhat.com>
This commit is contained in:
baude
2018-10-01 10:15:43 -05:00
parent 3750b35ae2
commit c6a6c06435
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.copr/prepare.sh
View File

@ -1,5 +1,6 @@
#!/bin/sh -euf #!/bin/sh -euf
set -x set -x
OS_TEST=${OS_TEST:=0}
if [ ! -e /usr/bin/git ]; then if [ ! -e /usr/bin/git ]; then
dnf -y install git-core dnf -y install git-core
@ -11,6 +12,9 @@ COMMIT=$(git rev-parse HEAD)
COMMIT_SHORT=$(git rev-parse --short=8 HEAD) COMMIT_SHORT=$(git rev-parse --short=8 HEAD)
COMMIT_NUM=$(git rev-list HEAD --count) COMMIT_NUM=$(git rev-list HEAD --count)
COMMIT_DATE=$(date +%s) COMMIT_DATE=$(date +%s)
BR="#BuildRequires: golang-bin"
NEWBR="BuildRequires: golang-bin"
sed "s,#COMMIT#,${COMMIT},; sed "s,#COMMIT#,${COMMIT},;
s,#SHORTCOMMIT#,${COMMIT_SHORT},; s,#SHORTCOMMIT#,${COMMIT_SHORT},;
@ -18,6 +22,10 @@ sed "s,#COMMIT#,${COMMIT},;
s,#COMMITDATE#,${COMMIT_DATE}," \ s,#COMMITDATE#,${COMMIT_DATE}," \
contrib/spec/podman.spec.in > contrib/spec/podman.spec 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/ mkdir build/
git archive --prefix "libpod-${COMMIT_SHORT}/" --format "tar.gz" HEAD -o "build/libpod-${COMMIT_SHORT}.tar.gz" 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 git clone https://github.com/kubernetes-incubator/cri-o

4
contrib/spec/podman.spec.in
View File

@ -49,7 +49,9 @@ Source1: crio.tar.gz
# 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 aarch64 %%{arm}} #ExclusiveArch: %%{?go_arches:%%{go_arches}}%%{!?go_arches:%%{ix86} x86_64 aarch64 %%{arm}}
ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64 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: btrfs-progs-devel
BuildRequires: glib2-devel BuildRequires: glib2-devel
BuildRequires: glibc-devel BuildRequires: glibc-devel