[packages/linux-gpib] - change order of conflicting patches and rediff

[baggins]

commit 41ab8c5b164dd6c2f1b43219cf3c295813f73209
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Feb 25 21:55:02 2021 +0100

    - change order of conflicting patches and rediff

 kernel-5.2.patch | 10 +++++-----
 linux-gpib.spec  |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/linux-gpib.spec b/linux-gpib.spec
index c8ceba5..a99188f 100644
--- a/linux-gpib.spec
+++ b/linux-gpib.spec
@@ -288,10 +288,10 @@ cd ..
 %if %{with kernel}
 tar xzf linux-gpib-kernel-%{version}.tar.gz
 cd linux-gpib-kernel-%{version}
+%patch9 -p1
 %ifarch %{ix86}
 %patch8 -p1
 %endif
-%patch9 -p1
 %endif
 
 %build
diff --git a/kernel-5.2.patch b/kernel-5.2.patch
index 5899426..9977ee0 100644
--- a/kernel-5.2.patch
+++ b/kernel-5.2.patch
@@ -1,10 +1,10 @@
---- linux-gpib-kernel-4.3.3.org/drivers/gpib/Makefile	2020-05-09 10:08:29.000000000 +0200
-+++ linux-gpib-kernel-4.3.3/drivers/gpib/Makefile	2021-02-25 21:36:41.392550371 +0100
-@@ -15,7 +15,6 @@ obj-y += cec/
+--- linux-gpib-kernel-4.3.3.org/drivers/gpib/Makefile	2021-02-25 21:53:53.399328345 +0100
++++ linux-gpib-kernel-4.3.3/drivers/gpib/Makefile	2021-02-25 21:53:53.472661757 +0100
+@@ -18,7 +18,6 @@ obj-y += cec/
  obj-$(CONFIG_OF) += eastwood/
  obj-$(CONFIG_OF) += fmh_gpib/
  obj-y += hp_82335/
 -obj-y += hp_82341/
  obj-y += ines/
- obj-$(CONFIG_USB) += lpvo_usb_gpib/
- obj-y += nec7210/
+ ifeq (${KERNEL_GE_5_10},0)
+ 	obj-$(CONFIG_USB) += lpvo_usb_gpib/
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/linux-gpib.git/commitdiff/41ab8c5b164dd6c2f1b43219cf3c295813f73209