[PATCH 06/45] attr: upgrade 2.5.2 -> 2.6.0

[Alexander Kanavin <alex.kanavin@gmail.com>]

From: Alexander Kanavin <alex@linutronix.de>

Drop patch (issue fixed upstream).

Adjust file names in ptest packaging.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...ibgen.h-for-posix-version-of-basenam.patch | 35 -------------------
 meta/recipes-support/attr/attr/run-ptest      |  2 +-
 .../attr/{attr_2.5.2.bb => attr_2.6.0.bb}     |  7 ++--
 3 files changed, 4 insertions(+), 40 deletions(-)
 delete mode 100644 meta/recipes-support/attr/attr/0001-attr.c-Include-libgen.h-for-posix-version-of-basenam.patch
 rename meta/recipes-support/attr/{attr_2.5.2.bb => attr_2.6.0.bb} (88%)

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
deleted file mode 100644
index 1e2bea5067..0000000000
--- a/meta/recipes-support/attr/attr/0001-attr.c-Include-libgen.h-for-posix-version-of-basenam.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 6d9e827bcacf387bb3cfae64bd4fe520168ccad4 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 3 Dec 2023 19:29:27 -0800
-Subject: [PATCH] attr.c: Include libgen.h for posix version of basename API
-
-Musl has removed the definition from string.h [1] which results in
-compile failures with clang
-
-| ../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]
-|    69 |         progname = basename(argv[0]);
-|       |                    ^
-
-[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7
-
-Upstream-Status: Submitted [https://savannah.nongnu.org/bugs/index.php?64972]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- tools/attr.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tools/attr.c b/tools/attr.c
-index 312aef1..90dab83 100644
---- a/tools/attr.c
-+++ b/tools/attr.c
-@@ -26,6 +26,7 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <errno.h>
-+#include <libgen.h>
- #include <string.h>
- #include <locale.h>
- 
--- 
-2.43.0
-
diff --git a/meta/recipes-support/attr/attr/run-ptest b/meta/recipes-support/attr/attr/run-ptest
index 028671a9bd..50970d5b65 100644
--- a/meta/recipes-support/attr/attr/run-ptest
+++ b/meta/recipes-support/attr/attr/run-ptest
@@ -3,7 +3,7 @@
 failed=0
 all=0
 
-for f in *.test; do
+for f in *.run; do
     ./run $f
     case "$?" in
         0)
diff --git a/meta/recipes-support/attr/attr_2.5.2.bb b/meta/recipes-support/attr/attr_2.6.0.bb
similarity index 88%
rename from meta/recipes-support/attr/attr_2.5.2.bb
rename to meta/recipes-support/attr/attr_2.6.0.bb
index 390445b959..aa5e7eb98f 100644
--- a/meta/recipes-support/attr/attr_2.5.2.bb
+++ b/meta/recipes-support/attr/attr_2.6.0.bb
@@ -16,10 +16,9 @@ LIC_FILES_CHKSUM = "file://doc/COPYING;md5=2d0aa14b3fce4694e4f615e30186335f \
 
 SRC_URI = "${SAVANNAH_GNU_MIRROR}/attr/${BP}.tar.gz \
            file://run-ptest \
-           file://0001-attr.c-Include-libgen.h-for-posix-version-of-basenam.patch \
 "
 
-SRC_URI[sha256sum] = "39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87"
+SRC_URI[sha256sum] = "d42fa374513180bb48cb11a46696f488240e5124ff1e6ad88b0abff706985612"
 
 inherit ptest update-alternatives autotools gettext
 
@@ -35,7 +34,7 @@ ALTERNATIVE_TARGET[getfattr] = "${bindir}/getfattr"
 do_install_ptest() {
     install -m755 ${S}/test/run ${S}/test/sort-getfattr-output ${D}${PTEST_PATH}/
 
-    for t in $(makefile-getvar ${S}/test/Makemodule.am TESTS); do
+    for t in $(makefile-getvar ${B}/Makefile TESTS); do
         install -m644 ${S}/$t ${D}${PTEST_PATH}/
     done
 }
@@ -44,7 +43,7 @@ do_install_ptest:append:libc-musl() {
     # With glibc strerror(ENOTSUP) is "Operation not supported" but
     # musl is "Not supported".
     # https://savannah.nongnu.org/bugs/?62370
-    sed -i -e 's|f: Operation not supported|f: Not supported|g' ${D}${PTEST_PATH}/attr.test
+    sed -i -e 's|f: Operation not supported|f: Not supported|g' ${D}${PTEST_PATH}/attr.run
 }
 
 RDEPENDS:${PN}-ptest = "attr \
-- 
2.47.3