- hopefully resolved udev/hotplug/firmwaredir packaging issues; added firmwaredir...

[packages/linux-gpib.git] / linux-gpib-firmwaredir.patch

diff --git a/linux-gpib-firmwaredir.patch b/linux-gpib-firmwaredir.patch
new file mode 100644 (file)
index 0000000..ef3a4b1
--- /dev/null
+++ b/linux-gpib-firmwaredir.patch
@@ -0,0 +1,51 @@
+--- linux-gpib-4.0.3/usb/agilent_82357a/agilent_82357a.orig    2016-04-09 15:33:10.000000000 +0200
++++ linux-gpib-4.0.3/usb/agilent_82357a/agilent_82357a 2016-07-05 22:01:15.232112298 +0200
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ 
+ GPIB_CONFIG_OPTIONS="--minor 0"
+-DATADIR=/usr/share
++FIRMWAREDIR=/lib/firmware
+ FXLOAD=fxload
+ FXLOAD_OPTIONS=
+ 
+@@ -47,7 +47,7 @@
+ 
+ # 82357a without firmware
+ 957/7/*)
+-      FIRMWARE=$DATADIR/usb/agilent_82357a/82357a_fw.hex
++      FIRMWARE=$FIRMWAREDIR/agilent_82357a/82357a_fw.hex
+       ;;
+ 
+ # 82357b with firmware already loaded
+@@ -57,7 +57,7 @@
+ 
+ # 82357b without firmware
+ 957/518/*)
+-      FIRMWARE=$DATADIR/usb/agilent_82357a/measat_releaseX1.8.hex
++      FIRMWARE=$FIRMWAREDIR/agilent_82357a/measat_releaseX1.8.hex
+       FXLOAD_OPTIONS="-t fx2"
+       ;;
+ 
+--- linux-gpib-4.0.3/usb/ni_usb_gpib/ni_usb_gpib.orig  2016-04-09 15:33:10.000000000 +0200
++++ linux-gpib-4.0.3/usb/ni_usb_gpib/ni_usb_gpib       2016-07-05 22:01:43.015295116 +0200
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ 
+ GPIB_CONFIG_OPTIONS="--minor 0"
+-DATADIR=/usr/share
++FIRMWAREDIR=/lib/firmware
+ FXLOAD=fxload
+ FXLOAD_OPTIONS="-t fx"
+ 
+@@ -48,8 +48,8 @@
+ 
+ # ni-usb-b or kusb-488 without firmware
+ 3923/702b/* | 3923/713b/*)
+-      FIRMWARE=$DATADIR/usb/ni_usb_gpib/niusbb_firmware.hex
+-      SS_LOADER=$DATADIR/usb/ni_usb_gpib/niusbb_loader.hex
++      FIRMWARE=$FIRMWAREDIR/ni_usb_gpib/niusbb_firmware.hex
++      SS_LOADER=$FIRMWAREDIR/ni_usb_gpib/niusbb_loader.hex
+       ;;
+ 
+ # ni-usb-hs