The package rpms/skopeo.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/skopeo.git/commit/?id=b38e929c552....
Change:
+%ifarch x86_64
Thanks.
Full change:
============
commit b38e929c552de4233a46914d85404c9db910242d
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Tue Dec 15 14:50:05 2020 -0500
skopeo-1:1.2.0-15
- handle fcf-protection for fedora and centos8
Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
(cherry picked from commit 6f545deb0b9a96ce7fab4b74da51c730d97b7772)
Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
diff --git a/skopeo.spec b/skopeo.spec
index 7f2b85a..1953fc3 100644
--- a/skopeo.spec
+++ b/skopeo.spec
@@ -50,7 +50,7 @@ ExcludeArch: ppc64
Name: %{repo}
Epoch: %{conditional_epoch}
Version: 1.2.0
-Release: 14%{?dist}
+Release: 15%{?dist}
Summary: Inspect container images and repositories on registries
License: ASL 2.0
URL: %{git0}
@@ -300,9 +300,11 @@ mkdir -p
src/github.com/containers
ln -s ../../../ src/%{import_path}
export CGO_CFLAGS='-O2 -g -grecord-gcc-switches -pipe -Wall -Werror=format-security
-Wp,-D_FORTIFY_SOURCE=2 -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -ffat-lto-objects
-fexceptions -fasynchronous-unwind-tables -fstack-protector-strong
-fstack-clash-protection -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-D_FILE_OFFSET_BITS=64'
-%ifarch x86_64 && 0%{?centos} >= 8
+%ifarch x86_64
+%if 0%{?fedora} || 0%{?centos} >= 8
export CGO_CFLAGS="$CGO_CFLAGS -m64 -mtune=generic -fcf-protection"
%endif
+%endif
# These extra flags present in %%{optflags} have been skipped for now as they break the
build
#export CGO_CFLAGS="$CGO_CFLAGS -flto=auto -Wp,D_GLIBCXX_ASSERTIONS
-specs=/usr/lib/rpm/redhat/redhat-annobin-cc1"
@@ -466,6 +468,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
%{_datadir}/%{name}/test
%changelog
+* Tue Dec 15 2020 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1:1.2.0-15
+- handle fcf-protection for fedora and centos8
+
* Tue Dec 15 2020 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1:1.2.0-14
- no fcf-protection for centos7