diff options
Diffstat (limited to 'meta/recipes-support/attr')
-rw-r--r-- | meta/recipes-support/attr/acl/0001-test-patch-out-failing-bits.patch | 5 | ||||
-rw-r--r-- | meta/recipes-support/attr/acl/0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch | 6 | ||||
-rw-r--r-- | meta/recipes-support/attr/acl/run-ptest | 6 | ||||
-rw-r--r-- | meta/recipes-support/attr/acl_2.3.2.bb (renamed from meta/recipes-support/attr/acl_2.2.53.bb) | 25 | ||||
-rw-r--r-- | meta/recipes-support/attr/attr.inc | 25 | ||||
-rw-r--r-- | meta/recipes-support/attr/attr/0001-attr.c-Include-libgen.h-for-posix-version-of-basenam.patch | 35 | ||||
-rw-r--r-- | meta/recipes-support/attr/attr/run-ptest | 7 | ||||
-rw-r--r-- | meta/recipes-support/attr/attr_2.4.48.bb | 6 | ||||
-rw-r--r-- | meta/recipes-support/attr/attr_2.5.2.bb | 5 |
9 files changed, 89 insertions, 31 deletions
diff --git a/meta/recipes-support/attr/acl/0001-test-patch-out-failing-bits.patch b/meta/recipes-support/attr/acl/0001-test-patch-out-failing-bits.patch index ba2ffee5d2..219feaccd0 100644 --- a/meta/recipes-support/attr/acl/0001-test-patch-out-failing-bits.patch +++ b/meta/recipes-support/attr/acl/0001-test-patch-out-failing-bits.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 9e08219e0e99ee2589cf35fa8d52cef3515accce Mon Sep 17 00:00:00 2001 | 1 | From 7dec6fa3b3494a55120402ff1ea3eb96b67138e8 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Thu, 12 Dec 2019 15:47:49 +0100 | 3 | Date: Thu, 12 Dec 2019 15:47:49 +0100 |
4 | Subject: [PATCH] test: patch out failing bits | 4 | Subject: [PATCH] test: patch out failing bits |
@@ -58,6 +58,3 @@ index 8f8f825..21e8a95 100644 | |||
58 | $ : > f | 58 | $ : > f |
59 | $ : <> f | 59 | $ : <> f |
60 | >~ .*f: Permission denied$ | 60 | >~ .*f: Permission denied$ |
61 | -- | ||
62 | 2.17.1 | ||
63 | |||
diff --git a/meta/recipes-support/attr/acl/0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch b/meta/recipes-support/attr/acl/0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch index 57ef0bb728..748f37f3e7 100644 --- a/meta/recipes-support/attr/acl/0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch +++ b/meta/recipes-support/attr/acl/0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 39d332a8801de5d9ef09dacb3dba85c208b7b2ad Mon Sep 17 00:00:00 2001 | 1 | From 42ae3f8a5e32ba0681ccd1552a203ddad8748a6e Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Thu, 12 Dec 2019 13:45:52 +0100 | 3 | Date: Thu, 12 Dec 2019 13:45:52 +0100 |
4 | Subject: [PATCH] tests: do not hardcode the build path into a helper library | 4 | Subject: [PATCH] tests: do not hardcode the build path into a helper library |
@@ -10,7 +10,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | 10 | 1 file changed, 1 insertion(+), 1 deletion(-) |
11 | 11 | ||
12 | diff --git a/test/Makemodule.am b/test/Makemodule.am | 12 | diff --git a/test/Makemodule.am b/test/Makemodule.am |
13 | index 17d4927..015de7f 100644 | 13 | index e1d715d..cffe732 100644 |
14 | --- a/test/Makemodule.am | 14 | --- a/test/Makemodule.am |
15 | +++ b/test/Makemodule.am | 15 | +++ b/test/Makemodule.am |
16 | @@ -30,7 +30,7 @@ EXTRA_DIST += \ | 16 | @@ -30,7 +30,7 @@ EXTRA_DIST += \ |
@@ -21,4 +21,4 @@ index 17d4927..015de7f 100644 | |||
21 | +libtestlookup_la_CFLAGS = -DBASEDIR=\"/tmp/acl-ptest\" | 21 | +libtestlookup_la_CFLAGS = -DBASEDIR=\"/tmp/acl-ptest\" |
22 | libtestlookup_la_LDFLAGS = -rpath $(abs_builddir) | 22 | libtestlookup_la_LDFLAGS = -rpath $(abs_builddir) |
23 | 23 | ||
24 | AM_TESTS_ENVIRONMENT = PATH="$(abs_top_builddir):$$PATH"; | 24 | # Make sure translations don't break tests when matching output. |
diff --git a/meta/recipes-support/attr/acl/run-ptest b/meta/recipes-support/attr/acl/run-ptest index 4312823365..3af75c84fe 100644 --- a/meta/recipes-support/attr/acl/run-ptest +++ b/meta/recipes-support/attr/acl/run-ptest | |||
@@ -7,4 +7,10 @@ | |||
7 | mkdir -p /tmp/acl-ptest/test | 7 | mkdir -p /tmp/acl-ptest/test |
8 | cp test/test.* /tmp/acl-ptest/test | 8 | cp test/test.* /tmp/acl-ptest/test |
9 | 9 | ||
10 | set +e | ||
10 | make test-suite.log | 11 | make test-suite.log |
12 | exitcode=$? | ||
13 | if [ $exitcode -ne 0 -a -e test-suite.log ]; then | ||
14 | cat test-suite.log | ||
15 | fi | ||
16 | exit $exitcode | ||
diff --git a/meta/recipes-support/attr/acl_2.2.53.bb b/meta/recipes-support/attr/acl_2.3.2.bb index b120c1f16f..6178473873 100644 --- a/meta/recipes-support/attr/acl_2.2.53.bb +++ b/meta/recipes-support/attr/acl_2.3.2.bb | |||
@@ -1,12 +1,15 @@ | |||
1 | SUMMARY = "Utilities for managing POSIX Access Control Lists" | 1 | SUMMARY = "Utilities for managing POSIX Access Control Lists" |
2 | HOMEPAGE = "http://savannah.nongnu.org/projects/acl/" | ||
3 | DESCRIPTION = "ACL allows you to provide different levels of access to files \ | 2 | DESCRIPTION = "ACL allows you to provide different levels of access to files \ |
4 | and folders for different users." | 3 | and folders for different users." |
4 | |||
5 | HOMEPAGE = "http://savannah.nongnu.org/projects/acl/" | ||
6 | BUGTRACKER = "http://savannah.nongnu.org/bugs/?group=acl" | ||
7 | |||
5 | SECTION = "libs" | 8 | SECTION = "libs" |
6 | 9 | ||
7 | LICENSE = "LGPLv2.1+ & GPLv2+" | 10 | LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later" |
8 | LICENSE_${PN} = "GPLv2+" | 11 | LICENSE:${PN} = "GPL-2.0-or-later" |
9 | LICENSE_lib${BPN} = "LGPLv2.1+" | 12 | LICENSE:lib${BPN} = "LGPL-2.1-or-later" |
10 | LIC_FILES_CHKSUM = "file://doc/COPYING;md5=c781d70ed2b4d48995b790403217a249 \ | 13 | LIC_FILES_CHKSUM = "file://doc/COPYING;md5=c781d70ed2b4d48995b790403217a249 \ |
11 | file://doc/COPYING.LGPL;md5=9e9a206917f8af112da634ce3ab41764" | 14 | file://doc/COPYING.LGPL;md5=9e9a206917f8af112da634ce3ab41764" |
12 | 15 | ||
@@ -18,14 +21,15 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/acl/${BP}.tar.gz \ | |||
18 | file://0001-test-patch-out-failing-bits.patch \ | 21 | file://0001-test-patch-out-failing-bits.patch \ |
19 | " | 22 | " |
20 | 23 | ||
21 | SRC_URI[md5sum] = "007aabf1dbb550bcddde52a244cd1070" | 24 | SRC_URI[sha256sum] = "5f2bdbad629707aa7d85c623f994aa8a1d2dec55a73de5205bac0bf6058a2f7c" |
22 | SRC_URI[sha256sum] = "06be9865c6f418d851ff4494e12406568353b891ffe1f596b34693c387af26c7" | ||
23 | 25 | ||
24 | inherit autotools gettext ptest | 26 | inherit autotools gettext ptest |
25 | 27 | ||
28 | EXTRA_OECONF += "--enable-largefile" | ||
29 | |||
26 | PACKAGES =+ "lib${BPN}" | 30 | PACKAGES =+ "lib${BPN}" |
27 | 31 | ||
28 | FILES_lib${BPN} = "${libdir}/lib*${SOLIBS}" | 32 | FILES:lib${BPN} = "${libdir}/lib*${SOLIBS}" |
29 | 33 | ||
30 | PTEST_BUILD_HOST_FILES = "builddefs" | 34 | PTEST_BUILD_HOST_FILES = "builddefs" |
31 | PTEST_BUILD_HOST_PATTERN = "^RPM" | 35 | PTEST_BUILD_HOST_PATTERN = "^RPM" |
@@ -56,10 +60,15 @@ do_install_ptest() { | |||
56 | rm ${D}${PTEST_PATH}/.libs/libtestlookup.lai | 60 | rm ${D}${PTEST_PATH}/.libs/libtestlookup.lai |
57 | } | 61 | } |
58 | 62 | ||
59 | RDEPENDS_${PN}-ptest = "acl \ | 63 | do_install_ptest:append:libc-musl() { |
64 | sed -i -e '/test\/misc.test/d' ${D}${PTEST_PATH}/Makefile | ||
65 | } | ||
66 | |||
67 | RDEPENDS:${PN}-ptest = "acl \ | ||
60 | bash \ | 68 | bash \ |
61 | coreutils \ | 69 | coreutils \ |
62 | perl \ | 70 | perl \ |
71 | perl-module-constant \ | ||
63 | perl-module-filehandle \ | 72 | perl-module-filehandle \ |
64 | perl-module-getopt-std \ | 73 | perl-module-getopt-std \ |
65 | perl-module-posix \ | 74 | perl-module-posix \ |
diff --git a/meta/recipes-support/attr/attr.inc b/meta/recipes-support/attr/attr.inc index 97bca46982..75d616893a 100644 --- a/meta/recipes-support/attr/attr.inc +++ b/meta/recipes-support/attr/attr.inc | |||
@@ -1,16 +1,14 @@ | |||
1 | SUMMARY = "Utilities for manipulating filesystem extended attributes" | 1 | SUMMARY = "Utilities for manipulating filesystem extended attributes" |
2 | DESCRIPTION = "A set of tools for manipulating extended attributes on filesystem \ | 2 | DESCRIPTION = "Implement the ability for a user to attach name:value pairs to objects within the XFS filesystem." |
3 | objects, in particular getfattr(1) and setfattr(1). An attr(1) command \ | 3 | |
4 | is also provided which is largely compatible with the SGI IRIX tool of \ | ||
5 | the same name." | ||
6 | HOMEPAGE = "http://savannah.nongnu.org/projects/attr/" | 4 | HOMEPAGE = "http://savannah.nongnu.org/projects/attr/" |
7 | SECTION = "libs" | 5 | SECTION = "libs" |
8 | 6 | ||
9 | DEPENDS = "virtual/libintl" | 7 | DEPENDS = "virtual/libintl" |
10 | 8 | ||
11 | LICENSE = "LGPLv2.1+ & GPLv2+" | 9 | LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later" |
12 | LICENSE_${PN} = "GPLv2+" | 10 | LICENSE:${PN} = "GPL-2.0-or-later" |
13 | LICENSE_lib${BPN} = "LGPLv2.1+" | 11 | LICENSE:lib${BPN} = "LGPL-2.1-or-later" |
14 | LIC_FILES_CHKSUM = "file://doc/COPYING;md5=2d0aa14b3fce4694e4f615e30186335f \ | 12 | LIC_FILES_CHKSUM = "file://doc/COPYING;md5=2d0aa14b3fce4694e4f615e30186335f \ |
15 | file://doc/COPYING.LGPL;md5=b8d31f339300bc239d73461d68e77b9c \ | 13 | file://doc/COPYING.LGPL;md5=b8d31f339300bc239d73461d68e77b9c \ |
16 | file://tools/attr.c;endline=17;md5=be0403261f0847e5f43ed5b08d19593c \ | 14 | file://tools/attr.c;endline=17;md5=be0403261f0847e5f43ed5b08d19593c \ |
@@ -18,16 +16,17 @@ LIC_FILES_CHKSUM = "file://doc/COPYING;md5=2d0aa14b3fce4694e4f615e30186335f \ | |||
18 | 16 | ||
19 | SRC_URI = "${SAVANNAH_GNU_MIRROR}/attr/${BP}.tar.gz \ | 17 | SRC_URI = "${SAVANNAH_GNU_MIRROR}/attr/${BP}.tar.gz \ |
20 | file://run-ptest \ | 18 | file://run-ptest \ |
19 | file://0001-attr.c-Include-libgen.h-for-posix-version-of-basenam.patch \ | ||
21 | " | 20 | " |
22 | 21 | ||
23 | inherit ptest update-alternatives autotools gettext | 22 | inherit ptest update-alternatives autotools gettext |
24 | 23 | ||
25 | PACKAGES =+ "lib${BPN}" | 24 | PACKAGES =+ "lib${BPN}" |
26 | 25 | ||
27 | FILES_lib${BPN} = "${libdir}/lib*${SOLIBS}" | 26 | FILES:lib${BPN} = "${libdir}/lib*${SOLIBS} ${sysconfdir}" |
28 | 27 | ||
29 | ALTERNATIVE_PRIORITY = "100" | 28 | ALTERNATIVE_PRIORITY = "100" |
30 | ALTERNATIVE_${PN} = "setfattr" | 29 | ALTERNATIVE:${PN} = "setfattr" |
31 | ALTERNATIVE_TARGET[setfattr] = "${bindir}/setfattr" | 30 | ALTERNATIVE_TARGET[setfattr] = "${bindir}/setfattr" |
32 | 31 | ||
33 | PTEST_BUILD_HOST_FILES = "builddefs" | 32 | PTEST_BUILD_HOST_FILES = "builddefs" |
@@ -50,8 +49,14 @@ do_install_ptest() { | |||
50 | cp -rf ${S}/test/ ${D}${PTEST_PATH} | 49 | cp -rf ${S}/test/ ${D}${PTEST_PATH} |
51 | } | 50 | } |
52 | 51 | ||
53 | RDEPENDS_${PN}-ptest = "attr \ | 52 | do_install_ptest:append:libc-musl() { |
53 | sed -i -e 's|f: Operation n|f: N|g' ${D}${PTEST_PATH}/test/attr.test | ||
54 | } | ||
55 | |||
56 | RDEPENDS:${PN}-ptest = "attr \ | ||
57 | bash \ | ||
54 | coreutils \ | 58 | coreutils \ |
59 | perl-module-constant \ | ||
55 | perl-module-filehandle \ | 60 | perl-module-filehandle \ |
56 | perl-module-getopt-std \ | 61 | perl-module-getopt-std \ |
57 | perl-module-posix \ | 62 | perl-module-posix \ |
diff --git a/meta/recipes-support/attr/attr/0001-attr.c-Include-libgen.h-for-posix-version-of-basenam.patch b/meta/recipes-support/attr/attr/0001-attr.c-Include-libgen.h-for-posix-version-of-basenam.patch new file mode 100644 index 0000000000..1e2bea5067 --- /dev/null +++ b/meta/recipes-support/attr/attr/0001-attr.c-Include-libgen.h-for-posix-version-of-basenam.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From 6d9e827bcacf387bb3cfae64bd4fe520168ccad4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 3 Dec 2023 19:29:27 -0800 | ||
4 | Subject: [PATCH] attr.c: Include libgen.h for posix version of basename API | ||
5 | |||
6 | Musl has removed the definition from string.h [1] which results in | ||
7 | compile failures with clang | ||
8 | |||
9 | | ../attr-2.5.1/tools/attr.c:69:13: error: call to undeclared function 'basename'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] | ||
10 | | 69 | progname = basename(argv[0]); | ||
11 | | | ^ | ||
12 | |||
13 | [1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 | ||
14 | |||
15 | Upstream-Status: Submitted [https://savannah.nongnu.org/bugs/index.php?64972] | ||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
17 | --- | ||
18 | tools/attr.c | 1 + | ||
19 | 1 file changed, 1 insertion(+) | ||
20 | |||
21 | diff --git a/tools/attr.c b/tools/attr.c | ||
22 | index 312aef1..90dab83 100644 | ||
23 | --- a/tools/attr.c | ||
24 | +++ b/tools/attr.c | ||
25 | @@ -26,6 +26,7 @@ | ||
26 | #include <stdlib.h> | ||
27 | #include <unistd.h> | ||
28 | #include <errno.h> | ||
29 | +#include <libgen.h> | ||
30 | #include <string.h> | ||
31 | #include <locale.h> | ||
32 | |||
33 | -- | ||
34 | 2.43.0 | ||
35 | |||
diff --git a/meta/recipes-support/attr/attr/run-ptest b/meta/recipes-support/attr/attr/run-ptest index f64244f239..3e7a3a17a0 100644 --- a/meta/recipes-support/attr/attr/run-ptest +++ b/meta/recipes-support/attr/attr/run-ptest | |||
@@ -1,3 +1,10 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | set +e | ||
3 | make test-suite.log | 4 | make test-suite.log |
5 | exitcode=$? | ||
6 | if [ $exitcode -ne 0 -a -e test-suite.log ]; then | ||
7 | cat test-suite.log | ||
8 | fi | ||
9 | exit $exitcode | ||
10 | |||
diff --git a/meta/recipes-support/attr/attr_2.4.48.bb b/meta/recipes-support/attr/attr_2.4.48.bb deleted file mode 100644 index 530d4e4883..0000000000 --- a/meta/recipes-support/attr/attr_2.4.48.bb +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | require attr.inc | ||
2 | |||
3 | SRC_URI[md5sum] = "bc1e5cb5c96d99b24886f1f527d3bb3d" | ||
4 | SRC_URI[sha256sum] = "5ead72b358ec709ed00bbf7a9eaef1654baad937c001c044fe8b74c57f5324e7" | ||
5 | |||
6 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta/recipes-support/attr/attr_2.5.2.bb b/meta/recipes-support/attr/attr_2.5.2.bb new file mode 100644 index 0000000000..2110c6d885 --- /dev/null +++ b/meta/recipes-support/attr/attr_2.5.2.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require attr.inc | ||
2 | |||
3 | SRC_URI[sha256sum] = "39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87" | ||
4 | |||
5 | BBCLASSEXTEND = "native nativesdk" | ||