summarylogtreecommitdiffstats
path: root/0003-Rework-firmware-loading.patch
diff options
context:
space:
mode:
authorIvan Shapovalov2018-06-03 02:08:03 +0300
committerIvan Shapovalov2018-06-03 02:08:17 +0300
commit21896c6bd0cf96fddf94b4f0e1b349a6ab8eeadc (patch)
tree673610e48bf5c1537a55cab38b63362fd1d1bb38 /0003-Rework-firmware-loading.patch
parent613c2f841f4ec778bba0c3363a3278ec62ff26e8 (diff)
downloadaur-21896c6bd0cf96fddf94b4f0e1b349a6ab8eeadc.tar.gz
Bump; fix nightly source checksum; rebase patches; fix a race in Makefile
Diffstat (limited to '0003-Rework-firmware-loading.patch')
-rw-r--r--0003-Rework-firmware-loading.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/0003-Rework-firmware-loading.patch b/0003-Rework-firmware-loading.patch
index 8be92be65e18..583206f3b63d 100644
--- a/0003-Rework-firmware-loading.patch
+++ b/0003-Rework-firmware-loading.patch
@@ -1,13 +1,13 @@
-From 30bf1a17b94d95e550fa5528260c63f745d74c20 Mon Sep 17 00:00:00 2001
+From 101a7bea0ebcd50fbf7467128e628fcb24ad0b01 Mon Sep 17 00:00:00 2001
From: Ivan Shapovalov <intelfx@intelfx.name>
Date: Sun, 23 Oct 2016 10:18:08 +0300
-Subject: [PATCH 3/6] Rework firmware loading
+Subject: [PATCH 3/7] Rework firmware loading
---
- Makefile | 101 ++++++++++-----------------------
- foo2zjs-loadfw.in | 138 +++++++++++++++++++++++++++++++++++++++++++++
+ Makefile | 101 ++++++++-------------------
+ foo2zjs-loadfw.in | 138 +++++++++++++++++++++++++++++++++++++
foo2zjs-loadfw@.service.in | 6 ++
- hplj10xx.rules | 60 +++++++-------------
+ hplj10xx.rules | 60 ++++++----------
usblp.conf | 1 +
5 files changed, 196 insertions(+), 110 deletions(-)
create mode 100644 foo2zjs-loadfw.in
@@ -15,7 +15,7 @@ Subject: [PATCH 3/6] Rework firmware loading
create mode 100644 usblp.conf
diff --git a/Makefile b/Makefile
-index 09388c1..429b842 100644
+index c19f0c4..bac37c4 100644
--- a/Makefile
+++ b/Makefile
@@ -173,6 +173,7 @@ FILES = \
@@ -392,5 +392,5 @@ index 0000000..5a604bf
@@ -0,0 +1 @@
+blacklist usblp
--
-2.15.1
+2.17.1