Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package cilium for openSUSE:Factory checked
in at 2021-05-19 17:48:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cilium (Old)
and /work/SRC/openSUSE:Factory/.cilium.new.2988 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cilium"
Wed May 19 17:48:45 2021 rev:31 rq:894256 version:1.8.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/cilium/cilium.changes 2020-11-02
09:41:37.845681164 +0100
+++ /work/SRC/openSUSE:Factory/.cilium.new.2988/cilium.changes 2021-05-19
17:48:48.949676619 +0200
@@ -1,0 +2,14 @@
+Mon May 17 12:13:09 UTC 2021 - Dominique Leuenberger <dims...@opensuse.org>
+
+- Add cilium-no-ineffassign-in-root.patch: Do not run ineffassign
+ in the source root, where no go files exist.
+
+-------------------------------------------------------------------
+Thu Apr 1 09:15:23 UTC 2021 - Richard Brown <rbr...@suse.com>
+
+- Set GO111MODULE=auto to build with go1.16+
+ * Default changed to GO111MODULE=on in go1.16
+ * Set temporarily until using upstream release with go.mod
+ * Add BuildRequires: golang(API) >= 1.13 recommended dependency expression
+
+-------------------------------------------------------------------
New:
----
cilium-no-ineffassign-in-root.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cilium.spec ++++++
--- /var/tmp/diff_new_pack.aELouw/_old 2021-05-19 17:48:49.897672643 +0200
+++ /var/tmp/diff_new_pack.aELouw/_new 2021-05-19 17:48:49.901672627 +0200
@@ -1,7 +1,7 @@
#
# spec file for package cilium
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -46,6 +46,8 @@
Source3: cilium-cni-uninstall
# PATCH-FIX-UPSTREAM 0001-operator-make-Add-install-target.patch
Patch0: 0001-operator-make-Add-install-target.patch
+# PATCH-FIX-OPENSUSE cilium-no-ineffassign-in-root.patch dims...@opensuse.org
-- Do not run ineffassing in source root ('inefassign .' without go files
present)
+Patch1: cilium-no-ineffassign-in-root.patch
# Cilium needs to be aware of the version string of cilium-proxy
BuildRequires: cilium-proxy
BuildRequires: clang
@@ -60,7 +62,7 @@
BuildRequires: protobuf-devel
BuildRequires: shadow
BuildRequires: unzip
-BuildRequires: golang(API) = 1.13
+BuildRequires: golang(API) >= 1.13
Requires: awk
Requires: binutils
Requires: bpftool
@@ -182,6 +184,9 @@
find bpf/ -type f | grep -v .gitignore | tr "\n" ' ' > BPF_SRCFILES
%build
+# go1.16+ default is GO111MODULE=on set to auto temporarily
+# until using upstream release with go.mod
+export GO111MODULE=auto
%goprep %{provider_prefix}
export GOPATH=%{_builddir}/go
cd $GOPATH/src/%{provider_prefix}
@@ -198,7 +203,6 @@
%if 0%{?suse_version} > 1510 && 0%{?is_opensuse}
make precheck
make govet
-make ineffassign
make logging-subsys-field
%endif
++++++ cilium-no-ineffassign-in-root.patch ++++++
Index: cilium-1.8.5/Makefile
===================================================================
--- cilium-1.8.5.orig/Makefile
+++ cilium-1.8.5/Makefile
@@ -444,7 +444,7 @@ microk8s: check-microk8s
ci-precheck: precheck
$(QUIET) $(MAKE) $(SUBMAKEOPTS) -C bpf build_all
-precheck: ineffassign logging-subsys-field
+precheck: logging-subsys-field
ifeq ($(SKIP_K8S_CODE_GEN_CHECK),"false")
@$(ECHO_CHECK) contrib/scripts/check-k8s-code-gen.sh
$(QUIET) contrib/scripts/check-k8s-code-gen.sh
