- change order of conflicting patches and rediff
authorJan Rękorajski <baggins@pld-linux.org>
Thu, 25 Feb 2021 20:55:02 +0000 (21:55 +0100)
committerJan Rękorajski <baggins@pld-linux.org>
Thu, 25 Feb 2021 20:55:02 +0000 (21:55 +0100)
kernel-5.2.patch
linux-gpib.spec

index 589942611658c478399120ba6da21a236e8fedac..9977ee0ff2cc7b3fd50fd184535726f166498da6 100644 (file)
@@ -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/
index c8ceba5d2385a87afbfc1d7f61b203422d931766..a99188f0e004a790d7215043601f05cc8555815a 100644 (file)
@@ -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
This page took 0.070486 seconds and 4 git commands to generate.