force order of library path to look for platform dir before lib dir

kram · kram · commit 450ed3bc3f36 · 2018-01-05T15:55:33.000-08:00
diff --git a/syncd/scripts/syncd_init_common.sh b/syncd/scripts/syncd_init_common.sh
@@ -104,7 +104,7 @@ config_syncd_marvell()
 config_syncd_barefoot()
 {
     export ONIE_PLATFORM=`grep platform /etc/machine.conf | awk 'BEGIN { FS = "=" } ; { print $2 }'`
-    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/bfn/install/lib:/opt/bfn/install/lib/tofinopd/switch:/opt/bfn/install/lib/platform/$ONIE_PLATFORM
+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/bfn/install/lib/platform/$ONIE_PLATFORM:/opt/bfn/install/lib:/opt/bfn/install/lib/tofinopd/switch
      . /opt/bfn/install/bin/dma_setup.sh
      export LD_PRELOAD=libswitchapi.so:libswitchsai.so:libpd.so:libpdcli.so:libdriver.so:libbfsys.so
 }

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ config_syncd_marvell()`
`104`	`104`	`config_syncd_barefoot()`
`105`	`105`	`{`
`106`	`106`	export ONIE_PLATFORM=`grep platform /etc/machine.conf \| awk 'BEGIN { FS = "=" } ; { print $2 }'`
`107`		`- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/bfn/install/lib:/opt/bfn/install/lib/tofinopd/switch:/opt/bfn/install/lib/platform/$ONIE_PLATFORM`
	`107`	`+ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/bfn/install/lib/platform/$ONIE_PLATFORM:/opt/bfn/install/lib:/opt/bfn/install/lib/tofinopd/switch`
`108`	`108`	`. /opt/bfn/install/bin/dma_setup.sh`
`109`	`109`	`export LD_PRELOAD=libswitchapi.so:libswitchsai.so:libpd.so:libpdcli.so:libdriver.so:libbfsys.so`
`110`	`110`	`}`