diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-01-14 14:59:53 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-01-16 22:33:09 +0000 |
commit | 3e9b54ed27b9852d195d8f8192af76948c390836 (patch) | |
tree | 9e47e843d9d652b6ff3bcb3078cd2d043740430f /meta/recipes-support/attr/attr | |
parent | 0e70fac8fe9dab4381e921f110bac301c10a470c (diff) | |
download | poky-3e9b54ed27b9852d195d8f8192af76948c390836.tar.gz |
acl/attr: update to latest upstream releases
The latest release use standard autotools, so drop all
the build system related hacks and patches.
Ptests have been rewritten, with 100% pass rate for both.
(From OE-Core rev: 0417eef364bad6d061b6a02bff27d766f4c1ce96)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/attr/attr')
4 files changed, 3 insertions, 188 deletions
diff --git a/meta/recipes-support/attr/attr/0001-Use-stdint-types-consistently.patch b/meta/recipes-support/attr/attr/0001-Use-stdint-types-consistently.patch deleted file mode 100644 index dcd6507bcc..0000000000 --- a/meta/recipes-support/attr/attr/0001-Use-stdint-types-consistently.patch +++ /dev/null | |||
@@ -1,69 +0,0 @@ | |||
1 | From 37a27b6fd09ecb37097b85e5db74e4f77b80fe0a Mon Sep 17 00:00:00 2001 | ||
2 | From: Felix Janda <felix.janda@posteo.de> | ||
3 | Date: Tue, 12 Jan 2016 22:20:33 +0100 | ||
4 | Subject: [PATCH] Use stdint types consistently | ||
5 | |||
6 | --- | ||
7 | Upstream-Status: Backport | ||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | |||
10 | include/attributes.h | 6 ++++-- | ||
11 | man/man3/attr_list.3 | 8 ++++---- | ||
12 | 2 files changed, 8 insertions(+), 6 deletions(-) | ||
13 | |||
14 | Index: attr-2.4.47/include/attributes.h | ||
15 | =================================================================== | ||
16 | --- attr-2.4.47.orig/include/attributes.h | ||
17 | +++ attr-2.4.47/include/attributes.h | ||
18 | @@ -22,6 +22,7 @@ | ||
19 | extern "C" { | ||
20 | #endif | ||
21 | |||
22 | +#include <stdint.h> | ||
23 | /* | ||
24 | * An almost-IRIX-compatible extended attributes API | ||
25 | * (the IRIX attribute "list" operation is missing, added ATTR_SECURE). | ||
26 | @@ -69,7 +70,7 @@ typedef struct attrlist { | ||
27 | * al_offset[i] entry points to. | ||
28 | */ | ||
29 | typedef struct attrlist_ent { /* data from attr_list() */ | ||
30 | - u_int32_t a_valuelen; /* number bytes in value of attr */ | ||
31 | + uint32_t a_valuelen; /* number bytes in value of attr */ | ||
32 | char a_name[1]; /* attr name (NULL terminated) */ | ||
33 | } attrlist_ent_t; | ||
34 | |||
35 | @@ -90,7 +91,7 @@ typedef struct attrlist_ent { /* data fr | ||
36 | * operation on a cursor is to bzero() it. | ||
37 | */ | ||
38 | typedef struct attrlist_cursor { | ||
39 | - u_int32_t opaque[4]; /* an opaque cookie */ | ||
40 | + uint32_t opaque[4]; /* an opaque cookie */ | ||
41 | } attrlist_cursor_t; | ||
42 | |||
43 | /* | ||
44 | Index: attr-2.4.47/man/man3/attr_list.3 | ||
45 | =================================================================== | ||
46 | --- attr-2.4.47.orig/man/man3/attr_list.3 | ||
47 | +++ attr-2.4.47/man/man3/attr_list.3 | ||
48 | @@ -72,9 +72,9 @@ The contents of an \f4attrlist_t\fP stru | ||
49 | .nf | ||
50 | .ft 4 | ||
51 | .ta 9n 22n | ||
52 | -__int32_t al_count; /\(** number of entries in attrlist \(**/ | ||
53 | -__int32_t al_more; /\(** T/F: more attrs (do syscall again) \(**/ | ||
54 | -__int32_t al_offset[1]; /\(** byte offsets of attrs [var-sized] \(**/ | ||
55 | +int32_t al_count; /\(** number of entries in attrlist \(**/ | ||
56 | +int32_t al_more; /\(** T/F: more attrs (do syscall again) \(**/ | ||
57 | +int32_t al_offset[1]; /\(** byte offsets of attrs [var-sized] \(**/ | ||
58 | .ft 1 | ||
59 | .fi | ||
60 | .RE | ||
61 | @@ -113,7 +113,7 @@ include the following members: | ||
62 | .nf | ||
63 | .ft 4 | ||
64 | .ta 9n 22n | ||
65 | -u_int32_t a_valuelen; /\(** number bytes in value of attr \(**/ | ||
66 | +uint32_t a_valuelen; /\(** number bytes in value of attr \(**/ | ||
67 | char a_name[]; /\(** attr name (NULL terminated) \(**/ | ||
68 | .ft 1 | ||
69 | .fi | ||
diff --git a/meta/recipes-support/attr/attr/attr-Missing-configure.ac.patch b/meta/recipes-support/attr/attr/attr-Missing-configure.ac.patch deleted file mode 100644 index 20fcc3cee7..0000000000 --- a/meta/recipes-support/attr/attr/attr-Missing-configure.ac.patch +++ /dev/null | |||
@@ -1,63 +0,0 @@ | |||
1 | Subject: [PATCH] attr: Missing configure.ac | ||
2 | |||
3 | Upstream-Status: Backport [Upstream released tarball missing this file] | ||
4 | Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com> | ||
5 | --- | ||
6 | configure.ac | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ | ||
7 | 1 file changed, 48 insertions(+) | ||
8 | create mode 100644 configure.ac | ||
9 | |||
10 | diff --git a/configure.ac b/configure.ac | ||
11 | new file mode 100644 | ||
12 | index 0000000..b966d0e | ||
13 | --- /dev/null | ||
14 | +++ b/configure.ac | ||
15 | @@ -0,0 +1,48 @@ | ||
16 | +# Copyright (C) 2009 Andreas Gruenbacher <agruen@suse.de> | ||
17 | +# | ||
18 | +# This program is free software: you can redistribute it and/or modify it | ||
19 | +# under the terms of the GNU General Public License as published by | ||
20 | +# the Free Software Foundation, either version 2 of the License, or | ||
21 | +# (at your option) any later version. | ||
22 | +# | ||
23 | +# This program is distributed in the hope that it will be useful, | ||
24 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
25 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
26 | +# GNU General Public License for more details. | ||
27 | +# | ||
28 | +# You should have received a copy of the GNU General Public License | ||
29 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
30 | +# | ||
31 | +AC_INIT(include/attributes.h) | ||
32 | +AC_CONFIG_AUX_DIR([.]) | ||
33 | +AC_CONFIG_MACRO_DIR([m4]) | ||
34 | +AC_CONFIG_HEADER(include/config.h) | ||
35 | +AC_PREFIX_DEFAULT(/usr) | ||
36 | + | ||
37 | +AC_PROG_LIBTOOL | ||
38 | + | ||
39 | +AC_ARG_ENABLE(shared, | ||
40 | +[ --enable-shared=[yes/no] Enable use of shared libraries [default=yes]],, | ||
41 | + enable_shared=yes) | ||
42 | +AC_SUBST(enable_shared) | ||
43 | + | ||
44 | +AC_ARG_ENABLE(gettext, | ||
45 | +[ --enable-gettext=[yes/no] Enable alternate language support [default=yes]],, | ||
46 | + enable_gettext=yes) | ||
47 | +AC_SUBST(enable_gettext) | ||
48 | + | ||
49 | +AC_ARG_ENABLE(lib64, | ||
50 | +[ --enable-lib64=[yes/no] Enable lib64 support [default=no]],, | ||
51 | + enable_lib64=no) | ||
52 | +AC_SUBST(enable_lib64) | ||
53 | + | ||
54 | +AC_PACKAGE_GLOBALS(attr) | ||
55 | +AC_PACKAGE_UTILITIES(attr) | ||
56 | +AC_MANUAL_FORMAT | ||
57 | +AC_MULTILIB($enable_lib64) | ||
58 | + | ||
59 | +AC_C_CONST | ||
60 | +AC_TYPE_MODE_T | ||
61 | +AC_FUNC_ALLOCA | ||
62 | + | ||
63 | +AC_OUTPUT(include/builddefs) | ||
diff --git a/meta/recipes-support/attr/attr/dont-use-decl-macros.patch b/meta/recipes-support/attr/attr/dont-use-decl-macros.patch deleted file mode 100644 index 9d4b8929e8..0000000000 --- a/meta/recipes-support/attr/attr/dont-use-decl-macros.patch +++ /dev/null | |||
@@ -1,56 +0,0 @@ | |||
1 | Use extern "C" instead of __BEGIN_DECL/__END_DECL macros | ||
2 | these macros are defined in sys/cdefs.h for glibc and this header is not available on all libc | ||
3 | |||
4 | anyway they defined like below | ||
5 | |||
6 | #ifdef __cplusplus | ||
7 | # define __BEGIN_DECLS extern "C" { | ||
8 | # define __END_DECLS } | ||
9 | #else | ||
10 | # define __BEGIN_DECLS /* empty */ | ||
11 | # define __END_DECLS /* empty */ | ||
12 | #endif | ||
13 | |||
14 | __THROW macro is also not available on musl, defined thusly | ||
15 | |||
16 | Upstream-Status: Pending | ||
17 | |||
18 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
19 | |||
20 | Index: attr-2.4.47/include/xattr.h | ||
21 | =================================================================== | ||
22 | --- attr-2.4.47.orig/include/xattr.h 2014-04-02 00:01:30.252091280 -0700 | ||
23 | +++ attr-2.4.47/include/xattr.h 2014-04-02 00:12:57.985428099 -0700 | ||
24 | @@ -30,8 +30,20 @@ | ||
25 | #define XATTR_CREATE 0x1 /* set value, fail if attr already exists */ | ||
26 | #define XATTR_REPLACE 0x2 /* set value, fail if attr does not exist */ | ||
27 | |||
28 | - | ||
29 | -__BEGIN_DECLS | ||
30 | +#ifndef __THROW | ||
31 | +# ifndef __GNUC_PREREQ | ||
32 | +# define __GNUC_PREREQ(maj, min) (0) | ||
33 | +# endif | ||
34 | +# if defined __cplusplus && __GNUC_PREREQ (2,8) | ||
35 | +# define __THROW throw () | ||
36 | +# else | ||
37 | +# define __THROW | ||
38 | +# endif | ||
39 | +#endif | ||
40 | + | ||
41 | +#ifdef __cplusplus | ||
42 | +extern "C" { | ||
43 | +#endif | ||
44 | |||
45 | extern int setxattr (const char *__path, const char *__name, | ||
46 | const void *__value, size_t __size, int __flags) __THROW; | ||
47 | @@ -58,6 +70,8 @@ | ||
48 | extern int lremovexattr (const char *__path, const char *__name) __THROW; | ||
49 | extern int fremovexattr (int __filedes, const char *__name) __THROW; | ||
50 | |||
51 | -__END_DECLS | ||
52 | +#ifdef __cplusplus | ||
53 | +} | ||
54 | +#endif | ||
55 | |||
56 | #endif /* __XATTR_H__ */ | ||
diff --git a/meta/recipes-support/attr/attr/run-ptest b/meta/recipes-support/attr/attr/run-ptest new file mode 100644 index 0000000000..f64244f239 --- /dev/null +++ b/meta/recipes-support/attr/attr/run-ptest | |||
@@ -0,0 +1,3 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | make test-suite.log | ||