The package rpms/cri-tools.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/cri-tools.git/commit/?id=ba573a46....
Change:
+ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit a9e30a37e7154f920bdaf1e756e36543335fd2ac
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Mon Mar 26 13:48:41 2018 -0400
cri-tools-1.0.0-4.git207e773
- built commit 207e773
Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
diff --git a/.gitignore b/.gitignore
index bd108c6..0132193 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/cri-tools-653cc8c.tar.gz
+/cri-tools-207e773.tar.gz
diff --git a/cri-tools.spec b/cri-tools.spec
index 6e9ce0e..dee06f5 100644
--- a/cri-tools.spec
+++ b/cri-tools.spec
@@ -18,12 +18,12 @@
%global repo %{name}
%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
%global import_path %{provider_prefix}
-%global commit0 653cc8c6509c540b8a7c6f6b43e437c0687a93a7
+%global commit0 207e773f72fde8d8aed1447692d8f800a6686d6c
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
Name: cri-tools
Version: 1.0.0
-Release: 3.git%{shortcommit0}%{?dist}
+Release: 4.git%{shortcommit0}%{?dist}
Summary: CLI and validation tools for Container Runtime Interface
License: ASL 2.0
URL: https://%{provider_prefix}
@@ -125,6 +125,9 @@ install -p -m 644 docs/crictl.1 %{buildroot}%{_mandir}/man1
%{_mandir}/man1/crictl*
%changelog
+* Mon Mar 26 2018 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.0.0-4.git207e773
+- built commit 207e773
+
* Mon Mar 26 2018 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.0.0-3.git653cc8c
- disable critest cause PITA to build
diff --git a/sources b/sources
index ea23d65..f4ca466 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cri-tools-653cc8c.tar.gz) =
e2a791fa2067b8af041d28a26ea90a3df6103cea68f00c0f3761d2567d06003d2025dcbbc993901b1fb405c45714adfd88ee5890b2a031225c3394606e9b3082
+SHA512 (cri-tools-207e773.tar.gz) =
05c3ed7a0ad09bd7a79919a346433a2c88a2b047bef450f3817440b555be752efbf3e77dabfda476dbd0c89830b69f8abaed8afcd2bbd82ec15802620c139d2b
commit e982836c87522d2523d4ef908b1f990c3778f9ef
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Mon Mar 26 13:47:38 2018 -0400
disable critest cause PITA to build
Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
diff --git a/cri-tools.spec b/cri-tools.spec
index 854f60a..6e9ce0e 100644
--- a/cri-tools.spec
+++ b/cri-tools.spec
@@ -10,7 +10,6 @@
# %if ! 0% {?gobuild:1}
%define gobuild(o:) go build -tags="$BUILDTAGS selinux seccomp" -ldflags
"${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')"
-a -v -x %{?**};
-%define gotest(o:) go test -tags="$BUILDTAGS selinux seccomp" -ldflags
"${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')"
-a -v -x %{?**};
#% endif
%global provider github
@@ -102,14 +101,12 @@ ln -s vendor src
export GOPATH=$(pwd)/_build:$(pwd):$(pwd):%{gopath}
GOPATH=$GOPATH %gobuild -o bin/crictl %{import_path}/cmd/crictl
-GOPATH=$GOPATH %gotest -o bin/critest %{import_path}/cmd/critest
go-md2man -in docs/crictl.md -out docs/crictl.1
%install
# install binaries
install -dp %{buildroot}%{_bindir}
install -p -m 755 ./bin/crictl %{buildroot}%{_bindir}
-install -p -m 755 ./bin/critest %{buildroot}%{_bindir}
# install manpage
install -dp %{buildroot}%{_mandir}/man1
@@ -125,10 +122,12 @@ install -p -m 644 docs/crictl.1 %{buildroot}%{_mandir}/man1
%doc CHANGELOG.md CONTRIBUTING.md OWNERS README.md RELEASE.md code-of-conduct.md
%doc docs/{benchmark.md,roadmap.md,validation.md}
%{_bindir}/crictl
-%{_bindir}/critest
%{_mandir}/man1/crictl*
%changelog
+* Mon Mar 26 2018 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.0.0-3.git653cc8c
+- disable critest cause PITA to build
+
* Wed Feb 07 2018 Lokesh Mandvekar <lsm5(a)fedoraproject.org> -
1.0.0-2.alpha.0.git653cc8c
- include critest binary
commit ba573a463a5f1aa3fbb5a2f1defce237e5d4f22a
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Mon Mar 26 10:47:00 2018 -0400
changes to spec to build from master
Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
diff --git a/cri-tools.spec b/cri-tools.spec
index 19a308d..854f60a 100644
--- a/cri-tools.spec
+++ b/cri-tools.spec
@@ -10,32 +10,33 @@
# %if ! 0% {?gobuild:1}
%define gobuild(o:) go build -tags="$BUILDTAGS selinux seccomp" -ldflags
"${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')"
-a -v -x %{?**};
+%define gotest(o:) go test -tags="$BUILDTAGS selinux seccomp" -ldflags
"${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')"
-a -v -x %{?**};
#% endif
-%global provider github
-%global provider_tld com
-%global project kubernetes-incubator
-%global repo cri-tools
+%global provider github
+%global provider_tld com
+%global project kubernetes-incubator
+%global repo %{name}
%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
-%global commit 653cc8c6509c540b8a7c6f6b43e437c0687a93a7
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-
-Name: cri-tools
-Version: 1.0.0
-Release: 2.alpha.0.git%{shortcommit}%{?dist}
-Summary: CLI and validation tools for Container Runtime Interface
-License: ASL 2.0
-URL: https://%{provider_prefix}
-Source0:
https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
+%global import_path %{provider_prefix}
+%global commit0 653cc8c6509c540b8a7c6f6b43e437c0687a93a7
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+
+Name: cri-tools
+Version: 1.0.0
+Release: 3.git%{shortcommit0}%{?dist}
+Summary: CLI and validation tools for Container Runtime Interface
+License: ASL 2.0
+URL: https://%{provider_prefix}
+Source0: https://%{provider_prefix}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz
# no ppc64
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
+ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
# 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: glibc-static
-BuildRequires: git
-BuildRequires: go-md2man
-Provides: crictl = %{version}-%{release}
+BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
+BuildRequires: glibc-static
+BuildRequires: git
+BuildRequires: go-md2man
+Provides: crictl = %{version}-%{release}
# vendored libraries
# awk '{print "Provides: bundled(golang("$1")) = "$2}'
vendor.conf | sort
@@ -89,7 +90,7 @@ Provides: bundled(golang(k8s.io/utils)) =
bf963466fd3fea33c428098b12a89d8ecd012f
%{summary}
%prep
-%autosetup -Sgit -n %{repo}-%{commit}
+%autosetup -Sgit -n %{name}-%{commit0}
%build
mkdir _build
@@ -101,7 +102,7 @@ ln -s vendor src
export GOPATH=$(pwd)/_build:$(pwd):$(pwd):%{gopath}
GOPATH=$GOPATH %gobuild -o bin/crictl %{import_path}/cmd/crictl
-GOPATH=$GOPATH %gobuild -o bin/critest %{import_path}/cmd/critest
+GOPATH=$GOPATH %gotest -o bin/critest %{import_path}/cmd/critest
go-md2man -in docs/crictl.md -out docs/crictl.1
%install