From: Vicente Olivert Riera Date: Thu, 4 Sep 2014 11:18:45 +0000 (+0100) Subject: setserial: Rename patches to add sequence numbers X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=94734515d19a9141f556ceb62838455a66f0e72e;p=buildroot.git setserial: Rename patches to add sequence numbers Signed-off-by: Vicente Olivert Riera Reviewed-by: Markos Chandras Signed-off-by: Peter Korsgaard --- diff --git a/package/setserial/setserial-0001-build-system-fix.patch b/package/setserial/setserial-0001-build-system-fix.patch new file mode 100644 index 0000000000..eec7993d19 --- /dev/null +++ b/package/setserial/setserial-0001-build-system-fix.patch @@ -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 +--- + 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 index 0000000000..176a0c9e15 --- /dev/null +++ b/package/setserial/setserial-0002-tiocghayesesp-build-fix.patch @@ -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 +--- + 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/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 index eec7993d19..0000000000 --- a/package/setserial/setserial-2.17-build-system-fix.patch +++ /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 ---- - 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 index 176a0c9e15..0000000000 --- a/package/setserial/setserial-2.17-tiocghayesesp-build-fix.patch +++ /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 ---- - 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/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 ", "