Using find_symvers for dolphin kernel build

src/epics/util/Makefile.in

@@ -35,6 +35,9 @@ endif
 ifndef RTS_LOGGER_SYM
 RTS_LOGGER_SYM := $(shell $(srcdir)/find_module_symvers -q rts-logger)
 endif
+ifndef DOLPHIN_SYM
+DOLPHIN_SYM := $(shell $(srcdir)/find_module_symvers -q ligo-dolphin-ix)
+endif
 
 %:
 	env RCG_SRC_DIR=$(top_srcdir) \
@@ -43,6 +46,7 @@ endif
 	GPSTIME_SYM=$(GPSTIME_SYM) \
 	RTS_CPU_ISOLATOR_SYM=$(RTS_CPU_ISOLATOR_SYM) \
 	RTS_LOGGER_SYM=$(RTS_LOGGER_SYM) \
+	DOLPHIN_SYM="$(DOLPHIN_SYM)" \ #Quote because we will have multiple symvers
 	$(srcdir)/feCodeGen.pl $@.mdl $@
 
 all: 

src/epics/util/feCodeGen.pl

@@ -87,6 +87,7 @@ $mbufsymfile = $ENV{"MBUF_SYM"};
 $gpssymfile = $ENV{"GPSTIME_SYM"};
 $cpuisolatorfile = $ENV{"RTS_CPU_ISOLATOR_SYM"};
 $rtsloggerfile = $ENV{"RTS_LOGGER_SYM"};
+$dolphinsymfile = $ENV{"DOLPHIN_SYM"};
 $dolphinGen = 2;
 
 if (! length $rcg_src_dir) { $rcg_src_dir = "$currWorkDir/../../.."; }

src/epics/util/find_module_symvers

@@ -16,7 +16,7 @@ def print_symvers_in_dir_and_exit(modsymDir):
 
         if len(symversFiles) > 0:
             for fileName in symversFiles:
-                print(fileName)
+                print(fileName + " ", end='')
             exit()
 
 

src/epics/util/lib/createKernelModuleBuildEnv.pm

@@ -172,9 +172,8 @@ if ($::iopModel > -1) {  #************ SETUP FOR IOP ***************
         if ($::dolphinGen == 2) {
           print OUTM "#Enable use of PCIe RFM Network Gen 2\n";
           print OUTM "DISDIR = /opt/srcdis\n";
-          print OUTM "KERNEL_RELEASE := \$(shell uname -r)\n";
 
-          print OUTM "KBUILD_EXTRA_SYMBOLS += /opt/DIS/lib/modules/\$(KERNEL_RELEASE)/dis_sisci.symvers\n";
+          print OUTM "KBUILD_EXTRA_SYMBOLS += $::dolphinsymfile\n";
           print OUTM "EXTRA_CFLAGS += -DDOLPHIN_TEST=1 -DDIS_BROADCAST=0x80000000\n";
           print OUTM "EXTRA_CFLAGS += -DOS_IS_LINUX=1 -D_DIS_KERNEL_=1 \n";
           print OUTM "EXTRA_CFLAGS += -I\$(DISDIR)/src/include/ \n";