-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update patches for compatibility with
gbp pq
.
- Loading branch information
Showing
4 changed files
with
75 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,19 @@ | ||
Support install into $DESTDIR. | ||
From: Gavin Lambert <[email protected]> | ||
Date: Wed, 12 Apr 2017 15:52:45 +1200 | ||
Subject: Support install into $DESTDIR. | ||
|
||
--- | ||
utility/conf/Makefile | 4 ++-- | ||
utility/diag/Makefile | 4 ++-- | ||
utility/mon/Makefile | 4 ++-- | ||
utility/term/Makefile | 4 ++-- | ||
4 files changed, 8 insertions(+), 8 deletions(-) | ||
|
||
diff --git a/utility/conf/Makefile b/utility/conf/Makefile | ||
index 06d9027..7f1468a 100644 | ||
--- a/utility/conf/Makefile | ||
+++ b/utility/conf/Makefile | ||
@@ -5,7 +5,7 @@ | ||
@@ -5,7 +5,7 @@ FILES = conftool.o | ||
all: muestty | ||
|
||
install: muestty | ||
|
@@ -10,15 +22,17 @@ Support install into $DESTDIR. | |
|
||
muestty: $(FILES) | ||
@cc $(FILES) -o muestty | ||
@@ -18,4 +18,4 @@ | ||
@@ -18,4 +18,4 @@ clean: | ||
@rm -f muestty | ||
|
||
uninstall: | ||
- @rm -f /usr/bin/muestty | ||
+ @rm -f $(DESTDIR)/usr/bin/muestty | ||
diff --git a/utility/diag/Makefile b/utility/diag/Makefile | ||
index f2f30c8..f6dd426 100644 | ||
--- a/utility/diag/Makefile | ||
+++ b/utility/diag/Makefile | ||
@@ -4,7 +4,7 @@ | ||
@@ -4,7 +4,7 @@ FILES = diag.o ../global.o | ||
all: msdiag | ||
|
||
install: msdiag | ||
|
@@ -27,15 +41,17 @@ Support install into $DESTDIR. | |
|
||
msdiag: $(FILES) | ||
@cc $(FILES) -o msdiag | ||
@@ -20,4 +20,4 @@ | ||
@@ -20,4 +20,4 @@ clean: | ||
@rm -f msdiag | ||
|
||
uninstall: | ||
- @rm -f /usr/bin/msdiag | ||
+ @rm -f $(DESTDIR)/usr/bin/msdiag | ||
diff --git a/utility/mon/Makefile b/utility/mon/Makefile | ||
index 1b5909f..7df9ef4 100644 | ||
--- a/utility/mon/Makefile | ||
+++ b/utility/mon/Makefile | ||
@@ -12,7 +12,7 @@ | ||
@@ -12,7 +12,7 @@ endif | ||
all: msmon | ||
|
||
install: msmon | ||
|
@@ -44,15 +60,17 @@ Support install into $DESTDIR. | |
|
||
msmon: $(FILES) | ||
@cc $(FILES) -o msmon | ||
@@ -33,4 +33,4 @@ | ||
@@ -33,4 +33,4 @@ clean: | ||
@rm -f msmon | ||
|
||
uninstall: | ||
- @rm -f /usr/bin/msmon | ||
+ @rm -f $(DESTDIR)/usr/bin/msmon | ||
diff --git a/utility/term/Makefile b/utility/term/Makefile | ||
index 3bd877c..a8f2b6b 100644 | ||
--- a/utility/term/Makefile | ||
+++ b/utility/term/Makefile | ||
@@ -12,7 +12,7 @@ | ||
@@ -12,7 +12,7 @@ endif | ||
all: msterm | ||
|
||
install: msterm | ||
|
@@ -61,7 +79,7 @@ Support install into $DESTDIR. | |
|
||
msterm: $(FILES) | ||
@cc $(FILES) -o msterm | ||
@@ -44,4 +44,4 @@ | ||
@@ -44,4 +44,4 @@ clean: | ||
@rm -f msterm | ||
|
||
uninstall: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,19 @@ | ||
Ensure tools are linked statically. | ||
From: Gavin Lambert <[email protected]> | ||
Date: Wed, 12 Apr 2017 15:53:23 +1200 | ||
Subject: Ensure tools are linked statically. | ||
|
||
--- | ||
utility/conf/Makefile | 2 +- | ||
utility/diag/Makefile | 2 +- | ||
utility/mon/Makefile | 2 +- | ||
utility/term/Makefile | 2 +- | ||
4 files changed, 4 insertions(+), 4 deletions(-) | ||
|
||
diff --git a/utility/conf/Makefile b/utility/conf/Makefile | ||
index 7f1468a..2a4f993 100644 | ||
--- a/utility/conf/Makefile | ||
+++ b/utility/conf/Makefile | ||
@@ -8,7 +8,7 @@ | ||
@@ -8,7 +8,7 @@ install: muestty | ||
@install muestty $(DESTDIR)/usr/bin/ | ||
|
||
muestty: $(FILES) | ||
|
@@ -10,9 +22,11 @@ Ensure tools are linked statically. | |
|
||
conftool.o: conftool.c | ||
@$(CC) conftool.c $(HDR_DIR) | ||
diff --git a/utility/diag/Makefile b/utility/diag/Makefile | ||
index f6dd426..af9ac20 100644 | ||
--- a/utility/diag/Makefile | ||
+++ b/utility/diag/Makefile | ||
@@ -7,7 +7,7 @@ | ||
@@ -7,7 +7,7 @@ install: msdiag | ||
@install msdiag $(DESTDIR)/usr/bin/ | ||
|
||
msdiag: $(FILES) | ||
|
@@ -21,9 +35,11 @@ Ensure tools are linked statically. | |
|
||
diag.o: diag.c ../global.h | ||
@$(CC) diag.c | ||
diff --git a/utility/mon/Makefile b/utility/mon/Makefile | ||
index 7df9ef4..cb715d0 100644 | ||
--- a/utility/mon/Makefile | ||
+++ b/utility/mon/Makefile | ||
@@ -15,7 +15,7 @@ | ||
@@ -15,7 +15,7 @@ install: msmon | ||
@install msmon $(DESTDIR)/usr/bin/ | ||
|
||
msmon: $(FILES) | ||
|
@@ -32,9 +48,11 @@ Ensure tools are linked statically. | |
|
||
|
||
mon_p.o: mon_p.c ../global.h | ||
diff --git a/utility/term/Makefile b/utility/term/Makefile | ||
index a8f2b6b..4288022 100644 | ||
--- a/utility/term/Makefile | ||
+++ b/utility/term/Makefile | ||
@@ -15,7 +15,7 @@ | ||
@@ -15,7 +15,7 @@ install: msterm | ||
@install msterm $(DESTDIR)/usr/bin/ | ||
|
||
msterm: $(FILES) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,15 @@ | ||
Add Makefile for dkms package. | ||
From: Gavin Lambert <[email protected]> | ||
Date: Wed, 12 Apr 2017 15:53:27 +1200 | ||
Subject: Add Makefile for dkms package. | ||
|
||
--- | ||
dkms/Makefile | 11 +++++++++++ | ||
1 file changed, 11 insertions(+) | ||
create mode 100644 dkms/Makefile | ||
|
||
diff --git a/dkms/Makefile b/dkms/Makefile | ||
new file mode 100644 | ||
index 0000000..3884a06 | ||
--- /dev/null | ||
+++ b/dkms/Makefile | ||
@@ -0,0 +1,11 @@ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,14 @@ | ||
IRQF_DISABLED has been removed as of kernel 4.1 | ||
Index: b/driver/mxpcie.h | ||
=================================================================== | ||
From: Gavin Lambert <[email protected]> | ||
Date: Wed, 12 Apr 2017 15:53:31 +1200 | ||
Subject: IRQF_DISABLED has been removed as of kernel 4.1 | ||
|
||
--- | ||
driver/mxpcie.h | 4 +++- | ||
driver/mxser.c | 4 +++- | ||
2 files changed, 6 insertions(+), 2 deletions(-) | ||
|
||
diff --git a/driver/mxpcie.h b/driver/mxpcie.h | ||
index cfa6cd5..869feec 100644 | ||
--- a/driver/mxpcie.h | ||
+++ b/driver/mxpcie.h | ||
@@ -79,8 +79,10 @@ | ||
|
@@ -15,8 +23,8 @@ Index: b/driver/mxpcie.h | |
#endif | ||
|
||
#ifndef MIN | ||
Index: b/driver/mxser.c | ||
=================================================================== | ||
diff --git a/driver/mxser.c b/driver/mxser.c | ||
index 6322ac7..ad17fdb 100644 | ||
--- a/driver/mxser.c | ||
+++ b/driver/mxser.c | ||
@@ -156,8 +156,10 @@ | ||
|