summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2017-09-04 18:09:30 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2017-09-05 08:08:13 +0200
commit520ce84db6212721402fb8c7b308a3a0553e0006 (patch)
treec3d5bdc4235ceebf10eb40cebd78671896f7bc9f
parenta246ed15a7d1946ffc6873a0375510ad42dfc6f0 (diff)
downloadptxdist-520ce84db6212721402fb8c7b308a3a0553e0006.tar.gz
ptxdist-520ce84db6212721402fb8c7b308a3a0553e0006.tar.xz
watchdog: remove old patches
They where forgotten and are no longer needed. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/watchdog-5.7/0001-Fix-compile-with-USE_SYSLOG-disabled.patch30
-rw-r--r--patches/watchdog-5.7/0002-Replace-index-with-strchr.patch52
-rw-r--r--patches/watchdog-5.7/series2
3 files changed, 0 insertions, 84 deletions
diff --git a/patches/watchdog-5.7/0001-Fix-compile-with-USE_SYSLOG-disabled.patch b/patches/watchdog-5.7/0001-Fix-compile-with-USE_SYSLOG-disabled.patch
deleted file mode 100644
index 479afa139..000000000
--- a/patches/watchdog-5.7/0001-Fix-compile-with-USE_SYSLOG-disabled.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 10bc35db707c552a2dcf002eccd6dbc644a33bcd Mon Sep 17 00:00:00 2001
-From: Jon Ringle <jon@ringle.org>
-Date: Tue, 2 Mar 2010 20:49:26 -0500
-Subject: [PATCH 1/2] Fix compile with USE_SYSLOG disabled
-
-Signed-off-by: Jon Ringle <jon@ringle.org>
----
- src/shutdown.c | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/src/shutdown.c b/src/shutdown.c
-index c743d8e..7490906 100644
---- a/src/shutdown.c
-+++ b/src/shutdown.c
-@@ -354,10 +354,11 @@ void do_shutdown(int errorcode)
- * We cannot let the shell check, because a non-existant or
- * non-executable sendmail binary means that the pipe is closed faster
- * than we can write to it. */
-- if ((stat(PATH_SENDMAIL, &buf) != 0) || ((buf.st_mode&S_IXUSR) == 0))
-+ if ((stat(PATH_SENDMAIL, &buf) != 0) || ((buf.st_mode&S_IXUSR) == 0)) {
- #if USE_SYSLOG
- syslog(LOG_ERR, "%s does not exist or is not executable (errno = %d)", PATH_SENDMAIL, errno);
- #endif /* USE_SYSLOG */
-+ }
- else
- {
- sprintf(exe, "%s -i %s", PATH_SENDMAIL, admin);
---
-1.7.0.rc2
-
diff --git a/patches/watchdog-5.7/0002-Replace-index-with-strchr.patch b/patches/watchdog-5.7/0002-Replace-index-with-strchr.patch
deleted file mode 100644
index c1e31866e..000000000
--- a/patches/watchdog-5.7/0002-Replace-index-with-strchr.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From cbb4eb9d35a809c328dc0a5d6651ec504ce4435c Mon Sep 17 00:00:00 2001
-From: Jon Ringle <jon@ringle.org>
-Date: Wed, 3 Mar 2010 19:21:24 -0500
-Subject: [PATCH 2/2] Replace index() with strchr()
-
-uclibc does not have index(), but strchr() is equivalent
-to index() according to the index man page
-
-Signed-off-by: Jon Ringle <jon@ringle.org>
----
- src/mntent.c | 4 ++--
- src/umount.c | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/mntent.c b/src/mntent.c
-index 4d103c3..a4aeed0 100644
---- a/src/mntent.c
-+++ b/src/mntent.c
-@@ -8,7 +8,7 @@
- #endif
-
- #include <stdio.h>
--#include <string.h> /* for index */
-+#include <string.h> /* for strchr */
- #include <ctype.h> /* for isdigit */
- #include "wd_mntent.h"
- #include "sundries.h" /* for xmalloc */
-@@ -157,7 +157,7 @@ my_getmntent (mntFILE *mfp) {
- if (fgets (buf, sizeof(buf), mfp->mntent_fp) == NULL)
- return NULL;
-
-- s = index (buf, '\n');
-+ s = strchr (buf, '\n');
- if (s == NULL) {
- /* extremely long line - assume file was corrupted */
- mfp->mntent_errs = 1;
-diff --git a/src/umount.c b/src/umount.c
-index 8c9f08c..d5fbd0b 100644
---- a/src/umount.c
-+++ b/src/umount.c
-@@ -212,7 +212,7 @@ umount_one (const char *spec, const char *node, const char *type,
- if (res < 0)
- umnt_err2 = errno;
- /* Do not complain about remote NFS mount points */
-- if (errno == ENOENT && index(spec, ':'))
-+ if (errno == ENOENT && strchr(spec, ':'))
- umnt_err2 = 0;
- }
- }
---
-1.7.0.rc2
-
diff --git a/patches/watchdog-5.7/series b/patches/watchdog-5.7/series
deleted file mode 100644
index 6aab8b78f..000000000
--- a/patches/watchdog-5.7/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-Fix-compile-with-USE_SYSLOG-disabled.patch
-0002-Replace-index-with-strchr.patch