diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-02 12:04:08 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-07 20:05:31 +0000 |
commit | 2345af9b4829ed3eed5abf60f2483055649f8af7 (patch) | |
tree | 96a9a31e4b1957b93c4fe3eb669117d2752caf0d /meta/recipes-core/coreutils/coreutils-6.9/futimens.patch | |
parent | c4901328fe5cf912c0965e5b011b64a95a9bcb9d (diff) | |
download | poky-2345af9b4829ed3eed5abf60f2483055649f8af7.tar.gz |
recipes: Move out stale GPLv2 versions to a seperate layeruninative-1.5
These are recipes where the upstream has moved to GPLv3 and these old
versions are the last ones under the GPLv2 license.
There are several reasons for making this move. There is a different
quality of service with these recipes in that they don't get security
fixes and upstream no longer care about them, in fact they're actively
hostile against people using old versions. The recipes tend to need a
different kind of maintenance to work with changes in the wider ecosystem
and there needs to be isolation between changes made in the v3 versions
and those in the v2 versions.
There are probably better ways to handle a "non-GPLv3" system but right
now having these in OE-Core makes them look like a first class citizen
when I believe they have potential for a variety of undesireable issues.
Moving them into a separate layer makes their different needs clearer, it
also makes it clear how many of these there are. Some are probably not
needed (e.g. mc), I also wonder whether some are useful (e.g. gmp)
since most things that use them are GPLv3 only already. Someone could
now more clearly see how to streamline the list of recipes here.
I'm proposing we mmove to this separate layer for 2.3 with its future
maintinership and testing to be determined in 2.4 and beyond.
(From OE-Core rev: 19b7e950346fb1dde6505c45236eba6cd9b33b4b)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/coreutils/coreutils-6.9/futimens.patch')
-rw-r--r-- | meta/recipes-core/coreutils/coreutils-6.9/futimens.patch | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/meta/recipes-core/coreutils/coreutils-6.9/futimens.patch b/meta/recipes-core/coreutils/coreutils-6.9/futimens.patch deleted file mode 100644 index 508810623d..0000000000 --- a/meta/recipes-core/coreutils/coreutils-6.9/futimens.patch +++ /dev/null | |||
@@ -1,63 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [legacy version] | ||
2 | |||
3 | # coreutils uses gnulib which conflicts with newer libc header on futimens | ||
4 | # this patch simply renames coreutils futimes to avoid confliction | ||
5 | # | ||
6 | # Signed-off-by: Kevin Tian <kevin.tian@intel.com>, 2010-08-18 | ||
7 | # (this patch is licensed under GPLv2) | ||
8 | |||
9 | diff --git a/lib/utimens.c b/lib/utimens.c | ||
10 | index 71bc510..ae870b8 100644 | ||
11 | --- a/lib/utimens.c | ||
12 | +++ b/lib/utimens.c | ||
13 | @@ -75,7 +75,7 @@ struct utimbuf | ||
14 | Return 0 on success, -1 (setting errno) on failure. */ | ||
15 | |||
16 | int | ||
17 | -futimens (int fd ATTRIBUTE_UNUSED, | ||
18 | +futimens_coreutils (int fd ATTRIBUTE_UNUSED, | ||
19 | char const *file, struct timespec const timespec[2]) | ||
20 | { | ||
21 | /* Some Linux-based NFS clients are buggy, and mishandle time stamps | ||
22 | @@ -185,5 +185,5 @@ futimens (int fd ATTRIBUTE_UNUSED, | ||
23 | int | ||
24 | utimens (char const *file, struct timespec const timespec[2]) | ||
25 | { | ||
26 | - return futimens (-1, file, timespec); | ||
27 | + return futimens_coreutils (-1, file, timespec); | ||
28 | } | ||
29 | diff --git a/lib/utimens.h b/lib/utimens.h | ||
30 | index 0097aaa..13fc45a 100644 | ||
31 | --- a/lib/utimens.h | ||
32 | +++ b/lib/utimens.h | ||
33 | @@ -1,3 +1,3 @@ | ||
34 | #include <time.h> | ||
35 | -int futimens (int, char const *, struct timespec const [2]); | ||
36 | +int futimens_coreutils (int, char const *, struct timespec const [2]); | ||
37 | int utimens (char const *, struct timespec const [2]); | ||
38 | diff --git a/src/copy.c b/src/copy.c | ||
39 | index 4bdb75c..04634f1 100644 | ||
40 | --- a/src/copy.c | ||
41 | +++ b/src/copy.c | ||
42 | @@ -518,7 +518,7 @@ copy_reg (char const *src_name, char const *dst_name, | ||
43 | timespec[0] = get_stat_atime (src_sb); | ||
44 | timespec[1] = get_stat_mtime (src_sb); | ||
45 | |||
46 | - if (futimens (dest_desc, dst_name, timespec) != 0) | ||
47 | + if (futimens_coreutils (dest_desc, dst_name, timespec) != 0) | ||
48 | { | ||
49 | error (0, errno, _("preserving times for %s"), quote (dst_name)); | ||
50 | if (x->require_preserve) | ||
51 | diff --git a/src/touch.c b/src/touch.c | ||
52 | index a79c26d..6ef317d 100644 | ||
53 | --- a/src/touch.c | ||
54 | +++ b/src/touch.c | ||
55 | @@ -182,7 +182,7 @@ touch (const char *file) | ||
56 | t = timespec; | ||
57 | } | ||
58 | |||
59 | - ok = (futimens (fd, (fd == STDOUT_FILENO ? NULL : file), t) == 0); | ||
60 | + ok = (futimens_coreutils (fd, (fd == STDOUT_FILENO ? NULL : file), t) == 0); | ||
61 | |||
62 | if (fd == STDIN_FILENO) | ||
63 | { | ||