From 976d10948cf690507f366c6c0d6da6ce45921c73 Mon Sep 17 00:00:00 2001
From: Dirk Zimoch <dirk.zimoch@psi.ch>
Date: Wed, 5 Oct 2016 16:41:29 +0200
Subject: [PATCH] startup script updates

---
 App/startup/startup.script_common | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/App/startup/startup.script_common b/App/startup/startup.script_common
index 8b0f139..94f0faa 100644
--- a/App/startup/startup.script_common
+++ b/App/startup/startup.script_common
@@ -9,7 +9,7 @@
 EPICS_MODULES = "/ioc/modules"
 
 # find a better way later to know current require version
-REQUIRE_VERSION="2.3.6"
+REQUIRE_VERSION="2.4.3"
 
 #set EPICS_HOST_ARCH according to vxWorks version and cpu type
 VX6=(*runtimeVersion>>24)&255-'5'
@@ -63,7 +63,7 @@ sprintf LIB, "%s/iocBoot/%s/%s", INSTBASE, EPICS, EPICS_HOST_ARCH
 DBD=malloc(80)
 sprintf DBD, "dbd:%s/iocBoot/%s/dbd", INSTBASE, EPICS
 
-sprintf STRINGBUFFER, "EPICS_DRIVER_PATH=.:bin:snl:%s:%s", EPICS_MODULES, LIB
+sprintf STRINGBUFFER, "EPICS_DRIVER_PATH=.:bin/%s_%s:bin:snl:%s:%s", EPICS, EPICS_HOST_ARCH, EPICS_MODULES, LIB
 putenv STRINGBUFFER
 
 TEMPLATES=malloc(80)
@@ -77,7 +77,7 @@ EXTENDED_MEMORY=0
 #EXTENDED_MEMORY=sysPhysMemTop()-sysMemTop()
 
 # load EPICS system core (different names for 3.13 and 3.14)
-sprintf STRINGBUFFER, "%s/iocCore%s", LIB, strncmp(EPICS,"R3.13",5) ? "Library.munch" : ""
+sprintf STRINGBUFFER, "%s/iocCore%s", LIB, strncmp(EPICS,"R3.13.",6) ? "Library.munch" : ""
 ld 0, 0, STRINGBUFFER
 
 # TIMEZONE must be set after loading iocCoreLibrary.munch and before iocInit
@@ -106,7 +106,7 @@ require "utilities", getenv("utilities_VERSION")
 require "misc", getenv("misc_VERSION")
 require "iocmon", getenv("iocmon_VERSION")
 require "genTime", getenv("genTime_VERSION") ? getenv("genTime_VERSION") : "ifexists"
-require "seq", "ifexists"
+require "seq", getenv("seq_VERSION") ? getenv("seq_VERSION") : "ifexists"
 
 # run EPICS only on 1st network port
 putenv "EPICS_CA_AUTO_ADDR_LIST=NO"