Merge branch 'master' of git.ligo.org:cds/advligorts into proper_exit

src/epics/util/Makefile.kernel

@@ -17,6 +17,12 @@ $(shell cp -rp $(RCG_SRC)/src/fe/ $(mkfile_dir)/src/)
 $(shell cp -rp $(RCG_SRC)/src/drv/ $(mkfile_dir)/src/)
 $(shell cp -rp $(RCG_SRC)/src/shmem/ $(mkfile_dir)/src/)
 
+# We always want to take these values from the below 
+# KernelVars.mk script and not the ENV
+undefine IOP_MODEL
+undefine BUILD_WITH_DOLPHIN
+
+
 # Include the generated make variables, written by
 # the feCodeGen.pl script.
 include $(mkfile_dir)/KernelVars.mk

src/epics/util/lib/Parser3.pm

@@ -643,7 +643,7 @@ sub node_processing {
 		return 1; # Do not call this function on leaves, we already did that
 	} elsif ($block_type eq "Reference") {
                 if ($source_block =~ /cdsIPCx/) {
-                   if ($block_name !~ /[CGHKLMSX]\d\:/) {
+                   if ($block_name !~ /[A-Z]\d\:/) {
                       die "***ERROR: Signal name of IPCx module must include IFO: $block_name\n";
                    }
                 }