The package rpms/oci-seccomp-bpf-hook.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/oci-seccomp-bpf-hook.git/commit/?....
Change:
+ExcludeArch: i686 armv7hl
Thanks.
Full change:
============
commit 7869bef877e96d0ecd285ca93c2a49d126ad67f1
Author: Jindrich Novy <jnovy(a)redhat.com>
Date: Fri Oct 2 09:36:08 2020 +0200
oci-seccomp-bpf-hook-1.2.0-2.fc31
- update to
https://github.com/containers/oci-seccomp-bpf-hook/releases/tag/v1.2.0
- exclude armv7hl arch as bcc isnot built there
Signed-off-by: Jindrich Novy <jnovy(a)redhat.com>
diff --git a/.gitignore b/.gitignore
index d984084..f6a3a77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1 @@
-/oci-seccomp-bpf-hook-3baa603a.tar.gz
-/oci-seccomp-bpf-hook-ba7bbb16.tar.gz
-/v1.1.0.tar.gz
-/v1.1.1.tar.gz
-/v1.1.2.tar.gz
-/v1.2.0.tar.gz
+/*.tar.gz
diff --git a/oci-seccomp-bpf-hook.spec b/oci-seccomp-bpf-hook.spec
index 226eba7..b5c7d59 100644
--- a/oci-seccomp-bpf-hook.spec
+++ b/oci-seccomp-bpf-hook.spec
@@ -11,33 +11,34 @@
%global debug_package %{nil}
%endif
+%if 0%{?rhel} > 7 && ! 0%{?fedora}
+%define gobuild(o:) \
+go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -compressdwarf=false -B 0x$(head -c20
/dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags
'%__global_ldflags'" -a -v -x %{?**};
+%else
+%if ! 0%{?gobuild:1}
%define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc
-tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B
0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro
-Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v -x %{?**};
-
+%endif
+%endif
%global provider github
%global provider_tld com
%global project containers
%global repo oci-seccomp-bpf-hook
#
https://github.com/containers/oci-seccomp-bpf-hook
-%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
-%global git0 https://%{import_path}
-
-# Used for comparing with latest upstream tag
-# to decide whether to autobuild (non-rawhide only)
-%define built_tag v1.2.0
-%define built_tag_strip %(b=%{built_tag}; echo ${b:1})
-%define download_url %{git0}/archive/%{built_tag}.tar.gz
+%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
+%global import_path %{provider_prefix}
+%global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo}
-# bcc is built only for these arches
-ExclusiveArch: x86_64 %{power64} aarch64 s390x
+# bcc is not built for i686 and armv7hl
+ExcludeArch: i686 armv7hl
-Name: %{repo}
+Name: oci-seccomp-bpf-hook
Version: 1.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: OCI Hook to generate seccomp json files based on EBF syscalls used by container
License: ASL 2.0
URL: %{git0}
-Source0: %{download_url}
+Source0: %{git0}/archive/v%{version}.tar.gz
BuildRequires: golang
BuildRequires: go-md2man
BuildRequires: glib2-devel
@@ -47,6 +48,8 @@ BuildRequires: git
BuildRequires: gpgme-devel
BuildRequires: libseccomp-devel
BuildRequires: make
+Enhances: podman
+Enhances: cri-o
%description
%{summary}
@@ -54,10 +57,16 @@ BuildRequires: make
the Container Pod concept popularized by Kubernetes.
%prep
-%autosetup -Sgit -n %{name}-%{built_tag_strip}
+%autosetup -Sgit
sed -i '/$(MAKE) -C docs install/d' Makefile
+sed -i 's/HOOK_BIN_DIR/\%{_usr}\/libexec\/oci\/hooks.d/' %{name}.json
+sed -i '/$(HOOK_DIR)\/%{name}.json/d' Makefile
%build
+export GO111MODULE=off
+export GOPATH=$(pwd):$(pwd)/_build
+export CGO_CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE
-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
+
mkdir _build
pushd _build
mkdir -p src/%{provider}.%{provider_tld}/%{project}
@@ -66,16 +75,16 @@ popd
ln -s vendor src
export GOPATH=$(pwd)/_build:$(pwd)
+export LDFLAGS="-X main.version=%{version}"
%gobuild -o bin/%{name} %{import_path}
-%{__make} GOMD2MAN=go-md2man -C docs
+pushd docs
+go-md2man -in %{name}.md -out %{name}.1
+popd
%install
-make DESTDIR=%{buildroot} PREFIX=%{_prefix} OCI-SECCOMP-BPF_VERSION=%{version} install
-
-# install manpage
-install -dp %{buildroot}%{_mandir}/man1
-install -m 0644 docs/%{name}.1 %{buildroot}/%{_mandir}/man1
+%{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} install-nobuild
+%{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} GOMD2MAN=go-md2man -C docs
install-nobuild
%check
%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
@@ -100,16 +109,17 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
%files
%license LICENSE
%doc README.md
-%dir %{_libexecdir}/oci
%dir %{_libexecdir}/oci/hooks.d
%{_libexecdir}/oci/hooks.d/%{name}
-%dir %{_datadir}/containers
-%dir %{_datadir}/containers/oci
-%dir %{_datadir}/containers/oci/hooks.d
%{_datadir}/containers/oci/hooks.d/%{name}.json
%{_mandir}/man1/%{name}.1*
%changelog
+* Fri Oct 02 2020 Jindrich Novy <jnovy(a)redhat.com> - 1.2.0-2
+- update to
+
https://github.com/containers/oci-seccomp-bpf-hook/releases/tag/v1.2.0
+- exclude armv7hl arch as bcc isnot built there
+
* Wed Aug 12 10:11:04 GMT 2020 RH Container Bot <rhcontainerbot(a)fedoraproject.org>
- 1.2.0-1
- autobuilt v1.2.0