From 18822cf31cc61d131c890ed1e89e667d9a77a51b Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Tue, 30 Dec 2008 10:26:03 -0800 Subject: [PATCH] brcompat: Build brcompat module only under Linux 2.6. brcompat fails to compile under Linux 2.4 due to the lack of brioctl_set() and other symbols, but there's no intention of supporting Linux 2.4 for it anyhow, so don't build it under Linux 2.4. --- datapath/Modules.mk | 7 +------ datapath/linux-2.6/Modules.mk | 7 +++++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/datapath/Modules.mk b/datapath/Modules.mk index 7818ab76..9193d509 100644 --- a/datapath/Modules.mk +++ b/datapath/Modules.mk @@ -1,5 +1,5 @@ all_modules = $(dist_modules) -dist_modules = openflow brcompat +dist_modules = openflow openflow_sources = \ chain.c \ @@ -30,11 +30,6 @@ openflow_headers = \ nx_msg.h \ table.h -brcompat_sources = \ - brcompat.c - -brcompat_headers = - dist_sources = $(foreach module,$(dist_modules),$($(module)_sources)) dist_headers = $(foreach module,$(dist_modules),$($(module)_headers)) all_sources = $(foreach module,$(all_modules),$($(module)_sources)) diff --git a/datapath/linux-2.6/Modules.mk b/datapath/linux-2.6/Modules.mk index b950355b..dae76061 100644 --- a/datapath/linux-2.6/Modules.mk +++ b/datapath/linux-2.6/Modules.mk @@ -1,3 +1,5 @@ +dist_modules += brcompat + openflow_sources += \ linux-2.6/compat-2.6/genetlink.c \ linux-2.6/compat-2.6/random32.c @@ -18,3 +20,8 @@ openflow_headers += \ linux-2.6/compat-2.6/include/linux/udp.h \ linux-2.6/compat-2.6/include/net/checksum.h \ linux-2.6/compat-2.6/include/net/genetlink.h + +brcompat_sources = \ + brcompat.c + +brcompat_headers = -- 2.30.2