Provides: container-network-stack = 1
We want containers-common to install netavark by default for new installations, while still allowing simultaneous installations of containernetworking-plugins and netavark. So, this package will have Provides: container-network-stack = 1 and netavark will have Provides: container-network-stack = 2. Also, remove unused packages. Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
This commit is contained in:
Lokesh Mandvekar
parent
56c410a451
commit
3cb932f8e1
@ -1,7 +1,4 @@
|
||||
%global with_devel 1
|
||||
%global with_bundled 1
|
||||
%global with_check 0
|
||||
%global with_unit_test 1
|
||||
|
||||
%if 0%{?fedora}
|
||||
%global with_debug 1
|
||||
@ -27,19 +24,17 @@
|
||||
%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
|
||||
%global built_tag v1.0.1
|
||||
%global built_tag_strip %(b=%{built_tag}; echo ${b:1})
|
||||
%global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"})
|
||||
|
||||
Name: %{project}-%{repo}
|
||||
Version: 1.0.1
|
||||
Version: %{gen_version}
|
||||
Release: %autorelease
|
||||
Summary: Libraries for writing CNI plugin
|
||||
License: ASL 2.0
|
||||
URL: %{git0}
|
||||
Source0: %{git0}/archive/%{built_tag}.tar.gz
|
||||
# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
|
||||
BuildRequires: golang >= 1.16.6
|
||||
BuildRequires: go-rpm-macros
|
||||
BuildRequires: git
|
||||
@ -48,21 +43,10 @@ BuildRequires: go-rpm-macros
|
||||
BuildRequires: systemd-devel
|
||||
Requires: systemd
|
||||
|
||||
%if ! 0%{?with_bundled}
|
||||
BuildRequires: go-bindata
|
||||
BuildRequires: golang(github.com/vishvananda/netlink)
|
||||
BuildRequires: golang(github.com/coreos/go-systemd/activation)
|
||||
BuildRequires: golang(github.com/d2g/dhcp4)
|
||||
BuildRequires: golang(github.com/d2g/dhcp4client)
|
||||
BuildRequires: golang(github.com/vishvananda/netlink)
|
||||
BuildRequires: golang(golang.org/x/sys/unix)
|
||||
BuildRequires: golang(github.com/coreos/go-iptables/iptables)
|
||||
%endif
|
||||
|
||||
Obsoletes: %{project}-cni < 0.7.1-2
|
||||
Provides: %{project}-cni = %{version}-%{release}
|
||||
Provides: kubernetes-cni
|
||||
Provides: container-network-stack
|
||||
Provides: container-network-stack = 1
|
||||
|
||||
%description
|
||||
The CNI (Container Network Interface) project consists of a specification
|
||||
@ -71,83 +55,6 @@ containers, along with a number of supported plugins. CNI concerns itself
|
||||
only with network connectivity of containers and removing allocated resources
|
||||
when the container is deleted.
|
||||
|
||||
%if 0%{?with_devel}
|
||||
%package devel
|
||||
Summary: %{summary}
|
||||
BuildArch: noarch
|
||||
|
||||
%if 0%{?with_check} && ! 0%{?with_bundled}
|
||||
BuildRequires: golang(github.com/coreos/go-iptables/iptables)
|
||||
BuildRequires: golang(github.com/vishvananda/netlink)
|
||||
BuildRequires: golang(golang.org/x/sys/unix)
|
||||
%endif
|
||||
|
||||
Requires: golang(github.com/coreos/go-iptables/iptables)
|
||||
Requires: golang(github.com/vishvananda/netlink)
|
||||
Requires: golang(golang.org/x/sys/unix)
|
||||
|
||||
Provides: golang(%{import_path}/libcni) = %{version}-%{release}
|
||||
Provides: golang(%{import_path}/pkg/invoke) = %{version}-%{release}
|
||||
Provides: golang(%{import_path}/pkg/invoke/fakes) = %{version}-%{release}
|
||||
Provides: golang(%{import_path}/pkg/ip) = %{version}-%{release}
|
||||
Provides: golang(%{import_path}/pkg/ipam) = %{version}-%{release}
|
||||
Provides: golang(%{import_path}/pkg/ns) = %{version}-%{release}
|
||||
Provides: golang(%{import_path}/pkg/skel) = %{version}-%{release}
|
||||
Provides: golang(%{import_path}/pkg/testutils) = %{version}-%{release}
|
||||
Provides: golang(%{import_path}/pkg/types) = %{version}-%{release}
|
||||
Provides: golang(%{import_path}/pkg/types/020) = %{version}-%{release}
|
||||
Provides: golang(%{import_path}/pkg/types/current) = %{version}-%{release}
|
||||
Provides: golang(%{import_path}/pkg/utils) = %{version}-%{release}
|
||||
Provides: golang(%{import_path}/pkg/utils/hwaddr) = %{version}-%{release}
|
||||
Provides: golang(%{import_path}/pkg/utils/sysctl) = %{version}-%{release}
|
||||
Provides: golang(%{import_path}/pkg/version) = %{version}-%{release}
|
||||
Provides: golang(%{import_path}/pkg/version/legacy_examples) = %{version}-%{release}
|
||||
Provides: golang(%{import_path}/pkg/version/testhelpers) = %{version}-%{release}
|
||||
Provides: golang(%{import_path}/plugins/ipam/host-local/backend) = %{version}-%{release}
|
||||
Provides: golang(%{import_path}/plugins/ipam/host-local/backend/allocator) = %{version}-%{release}
|
||||
Provides: golang(%{import_path}/plugins/ipam/host-local/backend/disk) = %{version}-%{release}
|
||||
Provides: golang(%{import_path}/plugins/ipam/host-local/backend/testing) = %{version}-%{release}
|
||||
Provides: golang(%{import_path}/plugins/test/noop/debug) = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
This package contains library source intended for
|
||||
building other packages which use import path with
|
||||
%{import_path} prefix.
|
||||
%endif
|
||||
|
||||
%if 0%{?with_unit_test} && 0%{?with_devel}
|
||||
%package unit-test-devel
|
||||
Summary: Unit tests for %{name} package
|
||||
%if 0%{?with_check}
|
||||
%endif
|
||||
|
||||
Requires: %{name}-devel = %{version}-%{release}
|
||||
|
||||
%if 0%{?with_check} && ! 0%{?with_bundled}
|
||||
BuildRequires: golang(github.com/d2g/dhcp4)
|
||||
BuildRequires: golang(github.com/onsi/ginkgo)
|
||||
BuildRequires: golang(github.com/onsi/ginkgo/config)
|
||||
BuildRequires: golang(github.com/onsi/ginkgo/extensions/table)
|
||||
BuildRequires: golang(github.com/onsi/gomega)
|
||||
BuildRequires: golang(github.com/onsi/gomega/gbytes)
|
||||
BuildRequires: golang(github.com/onsi/gomega/gexec)
|
||||
BuildRequires: golang(github.com/vishvananda/netlink/nl)
|
||||
%endif
|
||||
|
||||
Requires: golang(github.com/d2g/dhcp4)
|
||||
Requires: golang(github.com/onsi/ginkgo)
|
||||
Requires: golang(github.com/onsi/ginkgo/config)
|
||||
Requires: golang(github.com/onsi/ginkgo/extensions/table)
|
||||
Requires: golang(github.com/onsi/gomega)
|
||||
Requires: golang(github.com/onsi/gomega/gbytes)
|
||||
Requires: golang(github.com/onsi/gomega/gexec)
|
||||
Requires: golang(github.com/vishvananda/netlink/nl)
|
||||
|
||||
%description unit-test-devel
|
||||
This package contains unit tests for project
|
||||
providing packages with %{import_path} prefix.
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%autosetup -Sgit -n %{repo}-%{built_tag_strip}
|
||||
rm -rf plugins/main/windows
|
||||
@ -185,89 +92,6 @@ install -dp %{buildroot}%{_unitdir}
|
||||
install -p plugins/ipam/dhcp/systemd/cni-dhcp.service %{buildroot}%{_unitdir}
|
||||
install -p plugins/ipam/dhcp/systemd/cni-dhcp.socket %{buildroot}%{_unitdir}
|
||||
|
||||
# source codes for building projects
|
||||
%if 0%{?with_devel}
|
||||
install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
|
||||
echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
|
||||
# find all *.go but no *_test.go files and generate devel.file-list
|
||||
for file in $(find . \( -iname "*.go" -or -iname "*.s" \) \! -iname "*_test.go" | grep -v "vendor") ; do
|
||||
dirprefix=$(dirname $file)
|
||||
install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
|
||||
cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
|
||||
echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
|
||||
|
||||
while [ "$dirprefix" != "." ]; do
|
||||
echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
|
||||
dirprefix=$(dirname $dirprefix)
|
||||
done
|
||||
done
|
||||
%endif
|
||||
|
||||
# testing files for this project
|
||||
%if 0%{?with_unit_test} && 0%{?with_devel}
|
||||
install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
|
||||
# find all *_test.go files and generate unit-test-devel.file-list
|
||||
for file in $(find . -iname "*_test.go" | grep -v "vendor") ; do
|
||||
dirprefix=$(dirname $file)
|
||||
install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
|
||||
cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
|
||||
echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list
|
||||
|
||||
while [ "$dirprefix" != "." ]; do
|
||||
echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
|
||||
dirprefix=$(dirname $dirprefix)
|
||||
done
|
||||
done
|
||||
%endif
|
||||
|
||||
%if 0%{?with_devel}
|
||||
sort -u -o devel.file-list devel.file-list
|
||||
%endif
|
||||
|
||||
%check
|
||||
%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
|
||||
%if ! 0%{?with_bundled}
|
||||
export GOPATH=%{buildroot}/%{gopath}:%{gopath}
|
||||
%else
|
||||
# Since we aren't packaging up the vendor directory we need to link
|
||||
# back to it somehow. Hack it up so that we can add the vendor
|
||||
# directory from BUILD dir as a gopath to be searched when executing
|
||||
# tests from the BUILDROOT dir.
|
||||
ln -s ./ ./vendor/src # ./vendor/src -> ./vendor
|
||||
|
||||
export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
|
||||
%endif
|
||||
|
||||
%if ! 0%{?gotest:1}
|
||||
%global gotest go test
|
||||
%endif
|
||||
|
||||
%gotest %{import_path}/libcni
|
||||
%gotest %{import_path}/pkg/invoke
|
||||
%gotest %{import_path}/pkg/ip
|
||||
%gotest %{import_path}/pkg/ipam
|
||||
%gotest %{import_path}/pkg/ns
|
||||
%gotest %{import_path}/pkg/skel
|
||||
%gotest %{import_path}/pkg/types
|
||||
%gotest %{import_path}/pkg/types/020
|
||||
%gotest %{import_path}/pkg/types/current
|
||||
%gotest %{import_path}/pkg/utils
|
||||
%gotest %{import_path}/pkg/utils/hwaddr
|
||||
%gotest %{import_path}/pkg/version
|
||||
%gotest %{import_path}/pkg/version/legacy_examples
|
||||
%gotest %{import_path}/pkg/version/testhelpers
|
||||
%gotest %{import_path}/plugins/ipam/dhcp
|
||||
%gotest %{import_path}/plugins/ipam/host-local
|
||||
%gotest %{import_path}/plugins/ipam/host-local/backend/allocator
|
||||
%gotest %{import_path}/plugins/main/bridge
|
||||
%gotest %{import_path}/plugins/main/ipvlan
|
||||
%gotest %{import_path}/plugins/main/loopback
|
||||
%gotest %{import_path}/plugins/main/macvlan
|
||||
%gotest %{import_path}/plugins/main/ptp
|
||||
%gotest %{import_path}/plugins/meta/flannel
|
||||
%gotest %{import_path}/plugins/test/noop
|
||||
%endif
|
||||
|
||||
#define license tag if not already defined
|
||||
%{!?_licensedir:%global license %doc}
|
||||
|
||||
@ -279,18 +103,5 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
|
||||
%{_unitdir}/cni-dhcp.service
|
||||
%{_unitdir}/cni-dhcp.socket
|
||||
|
||||
%if 0%{?with_devel}
|
||||
%files devel -f devel.file-list
|
||||
%license LICENSE
|
||||
%doc *.md
|
||||
%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
|
||||
%endif
|
||||
|
||||
%if 0%{?with_unit_test} && 0%{?with_devel}
|
||||
%files unit-test-devel -f unit-test-devel.file-list
|
||||
%license LICENSE
|
||||
%doc *.md
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
|
||||
Loading…
Reference in New Issue
Block a user