setserial: Rename patches to add sequence numbers
authorVicente Olivert Riera <Vincent.Riera@imgtec.com>
Thu, 4 Sep 2014 11:18:45 +0000 (12:18 +0100)
committerPeter Korsgaard <peter@korsgaard.com>
Thu, 4 Sep 2014 15:14:04 +0000 (17:14 +0200)
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Reviewed-by: Markos Chandras <Markos.Chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/setserial/setserial-0001-build-system-fix.patch [new file with mode: 0644]
package/setserial/setserial-0002-tiocghayesesp-build-fix.patch [new file with mode: 0644]
package/setserial/setserial-2.17-build-system-fix.patch [deleted file]
package/setserial/setserial-2.17-tiocghayesesp-build-fix.patch [deleted file]

diff --git a/package/setserial/setserial-0001-build-system-fix.patch b/package/setserial/setserial-0001-build-system-fix.patch
new file mode 100644 (file)
index 0000000..eec7993
--- /dev/null
@@ -0,0 +1,28 @@
+Install the setserial program in /usr/bin instead of /bin, and make
+sure that the directories (especially the manpages directory) are
+created before installing files to them. This is similar to what
+automake does.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ Makefile.in |    7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+Index: setserial-2.17/Makefile.in
+===================================================================
+--- setserial-2.17.orig/Makefile.in
++++ setserial-2.17/Makefile.in
+@@ -26,9 +26,10 @@ setserial.cat: setserial.8
+       nroff -man setserial.8 > setserial.cat
+ install: setserial setserial.8
+-      $(INSTALL_PROGRAM) setserial $(DESTDIR)/bin
+-      $(STRIP) $(DESTDIR)/bin/setserial
+-      $(INSTALL_DATA) setserial.8 $(DESTDIR)/usr/man/man8
++      mkdir -p $(DESTDIR)/usr/bin
++      $(INSTALL_PROGRAM) setserial $(DESTDIR)/usr/bin
++      mkdir -p $(DESTDIR)/usr/share/man/man8
++      $(INSTALL_DATA) setserial.8 $(DESTDIR)/usr/share/man/man8
+ clean:
+       $(RM) setserial setserial.o setserial.cat *~
diff --git a/package/setserial/setserial-0002-tiocghayesesp-build-fix.patch b/package/setserial/setserial-0002-tiocghayesesp-build-fix.patch
new file mode 100644 (file)
index 0000000..176a0c9
--- /dev/null
@@ -0,0 +1,28 @@
+[PATCH] setserial: fix build with 2.6.33+ kernel headers
+
+linux/hayesesp.h got removed in 2.6.33, but some archs (like x86) still
+define the TIOCGHAYESESP ioctl, breaking the build.
+
+It's very unlikely to be of interest anymore, so just undef it.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ setserial.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+Index: setserial-2.17/setserial.c
+===================================================================
+--- setserial-2.17.orig/setserial.c
++++ setserial-2.17/setserial.c
+@@ -24,6 +24,11 @@
+ #endif
+ #include <linux/serial.h>
++/* linux/hayesesp.h got removed in 2.6.33 but some archs (like x86)
++   still define TIOCGHAYESESP. It's very unlikely to be of interest
++   anymore, so just undef it */
++#undef TIOCGHAYESESP
++
+ #include "version.h"
+ static char version_str[] = "setserial version " SETSERIAL_VERSION ", "
diff --git a/package/setserial/setserial-2.17-build-system-fix.patch b/package/setserial/setserial-2.17-build-system-fix.patch
deleted file mode 100644 (file)
index eec7993..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-Install the setserial program in /usr/bin instead of /bin, and make
-sure that the directories (especially the manpages directory) are
-created before installing files to them. This is similar to what
-automake does.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- Makefile.in |    7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-Index: setserial-2.17/Makefile.in
-===================================================================
---- setserial-2.17.orig/Makefile.in
-+++ setserial-2.17/Makefile.in
-@@ -26,9 +26,10 @@ setserial.cat: setserial.8
-       nroff -man setserial.8 > setserial.cat
- install: setserial setserial.8
--      $(INSTALL_PROGRAM) setserial $(DESTDIR)/bin
--      $(STRIP) $(DESTDIR)/bin/setserial
--      $(INSTALL_DATA) setserial.8 $(DESTDIR)/usr/man/man8
-+      mkdir -p $(DESTDIR)/usr/bin
-+      $(INSTALL_PROGRAM) setserial $(DESTDIR)/usr/bin
-+      mkdir -p $(DESTDIR)/usr/share/man/man8
-+      $(INSTALL_DATA) setserial.8 $(DESTDIR)/usr/share/man/man8
- clean:
-       $(RM) setserial setserial.o setserial.cat *~
diff --git a/package/setserial/setserial-2.17-tiocghayesesp-build-fix.patch b/package/setserial/setserial-2.17-tiocghayesesp-build-fix.patch
deleted file mode 100644 (file)
index 176a0c9..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-[PATCH] setserial: fix build with 2.6.33+ kernel headers
-
-linux/hayesesp.h got removed in 2.6.33, but some archs (like x86) still
-define the TIOCGHAYESESP ioctl, breaking the build.
-
-It's very unlikely to be of interest anymore, so just undef it.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- setserial.c |    5 +++++
- 1 file changed, 5 insertions(+)
-
-Index: setserial-2.17/setserial.c
-===================================================================
---- setserial-2.17.orig/setserial.c
-+++ setserial-2.17/setserial.c
-@@ -24,6 +24,11 @@
- #endif
- #include <linux/serial.h>
-+/* linux/hayesesp.h got removed in 2.6.33 but some archs (like x86)
-+   still define TIOCGHAYESESP. It's very unlikely to be of interest
-+   anymore, so just undef it */
-+#undef TIOCGHAYESESP
-+
- #include "version.h"
- static char version_str[] = "setserial version " SETSERIAL_VERSION ", "