openvswitch: pass KERNEL_MAKE_FLAGS for reproducible build

Reported-by: Paul Spooren <redacted>
Signed-off-by: Yousong Zhou <redacted>

diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile
index 73dbb3012c088b201210abf91d9ea5078c7ab211..f8fc3acaf9d4fb42373f29d0823f1b2f287f4356 100644 (file)
--- a/net/openvswitch/Makefile
+++ b/net/openvswitch/Makefile
@@ -17,7 +17,7 @@ include ./openvswitch.mk
 #
 PKG_NAME:=openvswitch
 PKG_VERSION:=$(ovs_version)
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.openvswitch.org/releases/
 PKG_HASH:=dd5f727427e36cab22bdeae61529d8c8fccacc53d968cfa7658f7f935ddda531
@@ -274,6 +274,8 @@ endif
 TARGET_CFLAGS += -flto -std=gnu99
 MAKE_VARS += PYTHONPATH="$(HOST_PYTHON3PATH)"
 
+export OVS_KERNEL_MAKE_FLAGS=$(KERNEL_MAKE_FLAGS)
+
 override CONFIG_AUTOREMOVE=
 
 $(foreach p,$(ovs_kmod_packages),\

diff --git a/net/openvswitch/patches/0001-netdev-linux-Let-interface-flag-survive-internal-por.patch b/net/openvswitch/patches/0001-netdev-linux-Let-interface-flag-survive-internal-por.patch
index 565f14a91e0cd1ed1305ca8289a025b84fdbbb63..2a049528e16fa0929dff69a15738ff91f96faf86 100644 (file)
--- a/net/openvswitch/patches/0001-netdev-linux-Let-interface-flag-survive-internal-por.patch
+++ b/net/openvswitch/patches/0001-netdev-linux-Let-interface-flag-survive-internal-por.patch
@@ -1,4 +1,4 @@
-From 6fda3936a85319d6b09108dda67466baa1c93b6c Mon Sep 17 00:00:00 2001
+From 66f96259c596f8f303bd98e5323a447cd60adbb2 Mon Sep 17 00:00:00 2001
 From: Helmut Schaa <helmut.schaa@googlemail.com>
 Date: Wed, 8 Jan 2014 13:48:49 +0100
 Subject: [PATCH] netdev-linux: Let interface flag survive internal port setup

diff --git a/net/openvswitch/patches/0002-python-separate-host-target-python-for-cross-compile.patch b/net/openvswitch/patches/0002-python-separate-host-target-python-for-cross-compile.patch
index a760cd5a249854abd92b3df8a9d95b845783e479..bcd1ce1084bef75d68686e5cf26dc665191200fb 100644 (file)
--- a/net/openvswitch/patches/0002-python-separate-host-target-python-for-cross-compile.patch
+++ b/net/openvswitch/patches/0002-python-separate-host-target-python-for-cross-compile.patch
@@ -1,4 +1,4 @@
-From c17f9e73b543043b438dee6759ae20047ee33d4a Mon Sep 17 00:00:00 2001
+From 29c5b1f1b53010a49d2ce1cc59060c334b1a40fc Mon Sep 17 00:00:00 2001
 From: Yousong Zhou <yszhou4tech@gmail.com>
 Date: Fri, 20 Mar 2020 15:11:31 +0800
 Subject: [PATCH] python: separate host/target python for cross-compile
@@ -6,8 +6,8 @@ Subject: [PATCH] python: separate host/target python for cross-compile
 Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
 ---
  Makefile.am       | 2 +-
- m4/openvswitch.m4 | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
+ m4/openvswitch.m4 | 2 ++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/Makefile.am b/Makefile.am
 index b279303d1..6140b2c7f 100644
@@ -23,7 +23,7 @@ index b279303d1..6140b2c7f 100644
  ALL_LOCAL =
  BUILT_SOURCES =
 diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4
-index add3aabcc..839eb7bda 100644
+index add3aabcc..ada31c491 100644
 --- a/m4/openvswitch.m4
 +++ b/m4/openvswitch.m4
 @@ -383,6 +383,8 @@ else:

diff --git a/net/openvswitch/patches/0003-ovs-lib-fix-install_dir.patch b/net/openvswitch/patches/0003-ovs-lib-fix-install_dir.patch
index dfa5c424d038d59ee6d7e6c18eceee98a9325fc9..4ff93c6664c9f41df0bc74569a526e7ea86e497e 100644 (file)
--- a/net/openvswitch/patches/0003-ovs-lib-fix-install_dir.patch
+++ b/net/openvswitch/patches/0003-ovs-lib-fix-install_dir.patch
@@ -1,4 +1,4 @@
-From e8203d10706e6289f773bfe84a3fd87f19fcee07 Mon Sep 17 00:00:00 2001
+From 1c0697cb4b57e85deafc0d518b68e0b13ba2995b Mon Sep 17 00:00:00 2001
 From: Yousong Zhou <yszhou4tech@gmail.com>
 Date: Wed, 14 Mar 2018 16:44:13 +0800
 Subject: [PATCH] ovs-lib: fix install_dir()

diff --git a/net/openvswitch/patches/0005-datapath-unexport-LDFLAGS.patch b/net/openvswitch/patches/0005-datapath-unexport-LDFLAGS.patch
index 0841279609b5a831ad86758987341b7ccfda6568..6b4d64254b96cfb733000889d9d5967c6a8c7067 100644 (file)
--- a/net/openvswitch/patches/0005-datapath-unexport-LDFLAGS.patch
+++ b/net/openvswitch/patches/0005-datapath-unexport-LDFLAGS.patch
@@ -1,4 +1,4 @@
-From cb16c9b1be1a0d11a26a3027af8168bd314c4114 Mon Sep 17 00:00:00 2001
+From b2c26315339fc17d0ad9d0009321671850cc7295 Mon Sep 17 00:00:00 2001
 From: Yousong Zhou <yszhou4tech@gmail.com>
 Date: Mon, 16 Mar 2020 15:18:16 +0800
 Subject: [PATCH] datapath: unexport LDFLAGS

diff --git a/net/openvswitch/patches/0006-datapath-allow-passing-additional-OVS_KERNEL_MAKE_FL.patch b/net/openvswitch/patches/0006-datapath-allow-passing-additional-OVS_KERNEL_MAKE_FL.patch
new file mode 100644 (file)
index 0000000..411d53c
--- /dev/null
+++ b/net/openvswitch/patches/0006-datapath-allow-passing-additional-OVS_KERNEL_MAKE_FL.patch
@@ -0,0 +1,25 @@
+From f29d4866cf566c916000426e0c206db008be4fb3 Mon Sep 17 00:00:00 2001
+From: Yousong Zhou <yszhou4tech@gmail.com>
+Date: Tue, 26 May 2020 22:45:53 +0800
+Subject: [PATCH] datapath: allow passing additional $(OVS_KERNEL_MAKE_FLAGS)
+
+This can be useful for passing args like -iremap for reproducible builds
+
+Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
+---
+ datapath/linux/Makefile.main.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/datapath/linux/Makefile.main.in b/datapath/linux/Makefile.main.in
+index 6db4aa3ab..6f295387a 100644
+--- a/datapath/linux/Makefile.main.in
++++ b/datapath/linux/Makefile.main.in
+@@ -68,7 +68,7 @@ ifeq (,$(wildcard $(CONFIG_FILE)))
+ endif
+ 
+ default:
+-      $(MAKE) -C $(KSRC) $(if @KARCH@,ARCH=@KARCH@) M=$(builddir) modules
++      $(MAKE) -C $(KSRC) $(OVS_KERNEL_MAKE_FLAGS) $(if @KARCH@,ARCH=@KARCH@) M=$(builddir) modules
+ 
+ modules_install:
+       $(MAKE) -C $(KSRC) $(if @KARCH@,ARCH=@KARCH@) M=$(builddir) modules_install