diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2010-05-21 23:24:12 +0200 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2010-05-25 12:45:21 +0200 |
| commit | e89c540b93ae08a8d9fca39ef65b3e3dec5a4c90 (patch) | |
| tree | 65aed83b05beb7233bdd17d697e8452c3c14b517 /patches | |
| parent | fbc2e2f38fb2c9d25a054ffd38575f55e22b3b7c (diff) | |
| download | ptxdist-e89c540b93ae08a8d9fca39ef65b3e3dec5a4c90.tar.gz ptxdist-e89c540b93ae08a8d9fca39ef65b3e3dec5a4c90.tar.xz | |
[coreutils] version bump 8.4 -> 8.5
While being there, fix a typo (when echo was selected, cp was
installed).
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/coreutils-8.4/0001-tail-include-sys-vfs.h-if-possible-when-sys-statfs.h.patch | 30 | ||||
| -rw-r--r-- | patches/coreutils-8.4/series | 2 | ||||
| -rw-r--r-- | patches/coreutils-8.5/0002-tail-HACK-touch-man-file-to-avoid-re-generation.patch (renamed from patches/coreutils-8.4/0002-tail-HACK-touch-man-file-to-avoid-re-generation.patch) | 0 | ||||
| -rw-r--r-- | patches/coreutils-8.5/series | 1 |
4 files changed, 1 insertions, 32 deletions
diff --git a/patches/coreutils-8.4/0001-tail-include-sys-vfs.h-if-possible-when-sys-statfs.h.patch b/patches/coreutils-8.4/0001-tail-include-sys-vfs.h-if-possible-when-sys-statfs.h.patch deleted file mode 100644 index c1f487c36..000000000 --- a/patches/coreutils-8.4/0001-tail-include-sys-vfs.h-if-possible-when-sys-statfs.h.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 98dacf492e2e6f2153455cb4179058578cee20ff Mon Sep 17 00:00:00 2001 -From: Marc Kleine-Budde <mkl@pengutronix.de> -Date: Sun, 4 Apr 2010 09:15:07 +0200 -Subject: [PATCH] tail: include sys/vfs.h (if possible) when sys/statfs.h is absent - -* src/tail.c [HAVE_INOTIFY && !HAVE_SYS_STATFS_H]: Include <sys/vfs.h>. - -(cherry-picked from upstream commit 98dacf492e2e6f2153455cb4179058578cee20ff) - -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> ---- - src/tail.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/src/tail.c b/src/tail.c -index 02c4a1a..9e95dee 100644 ---- a/src/tail.c -+++ b/src/tail.c -@@ -56,6 +56,8 @@ - # include "fs.h" - # if HAVE_SYS_STATFS_H - # include <sys/statfs.h> -+# elif HAVE_SYS_VFS_H -+# include <sys/vfs.h> - # endif - #endif - --- -1.7.0.3 - diff --git a/patches/coreutils-8.4/series b/patches/coreutils-8.4/series deleted file mode 100644 index f240386c0..000000000 --- a/patches/coreutils-8.4/series +++ /dev/null @@ -1,2 +0,0 @@ -0001-tail-include-sys-vfs.h-if-possible-when-sys-statfs.h.patch -0002-tail-HACK-touch-man-file-to-avoid-re-generation.patch diff --git a/patches/coreutils-8.4/0002-tail-HACK-touch-man-file-to-avoid-re-generation.patch b/patches/coreutils-8.5/0002-tail-HACK-touch-man-file-to-avoid-re-generation.patch index 033a54d72..033a54d72 100644 --- a/patches/coreutils-8.4/0002-tail-HACK-touch-man-file-to-avoid-re-generation.patch +++ b/patches/coreutils-8.5/0002-tail-HACK-touch-man-file-to-avoid-re-generation.patch diff --git a/patches/coreutils-8.5/series b/patches/coreutils-8.5/series new file mode 100644 index 000000000..65738008b --- /dev/null +++ b/patches/coreutils-8.5/series @@ -0,0 +1 @@ +0002-tail-HACK-touch-man-file-to-avoid-re-generation.patch |