From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qt1-f173.google.com (mail-qt1-f173.google.com [209.85.160.173]) by mail.openembedded.org (Postfix) with ESMTP id 00CE37F99E for ; Thu, 9 Jan 2020 01:30:56 +0000 (UTC) Received: by mail-qt1-f173.google.com with SMTP id e5so4543585qtm.6 for ; Wed, 08 Jan 2020 17:30:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=P+0+UlHpr1WU/+2Wbu5s5s4jLae0nGyDi7d7qBZ+QaI=; b=YlNKWhII7O1+cHo8NKZP6Q9CoQOUm1k08e8ph4d10y2Ot7Ma+1Ofro4ZI040bEMTL9 L29AsN2oORUIE2o7Y3X1dfhj4LcgPDgYsL8rjWHY31VOnLCOvdGE8brzYP55nW9cBpW4 D82P7xONYUNvnCf+R3pkXKgcwyc/KeOZLKwlE+rdPeslezAqv6g94I5n0O86yf3qs+iv g+BAHeUWTwJneiqIszaxBNT4eE//T36kURRSLHx9h8dgFjviIASvmUThpOEvnZcfsQN2 LEMSxeUOb1HMOlFnK7yP/r+5LJbYhf9zdHgDMvaC/oeQsU095SJms3oF6NVrdH35YjPk OkJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=P+0+UlHpr1WU/+2Wbu5s5s4jLae0nGyDi7d7qBZ+QaI=; b=hKOlkwDIc/HYhCPEEW9V0gj4nfrum14cNLfYFZmcBkXnbMYAB9JKpriyF0GAqm5f/2 djPYFqfzx2gNBULc5CXwbZ0WhfS/sduAipWNYHzTWqgMm9b9LeaFn7mbmsb4gKTnqD6s roifTSAFu4UBl4siP/5lmUWy6jbKd17EiTGoZISXLUQPzAdsKMN1NB8Nq1dykfYS61mS SC+edaSlWoXsNgiUw32NplwpHA2h4zpO5alL7w1qMixakzieQ66VGZ1amx4zsEO1Dqgv 3ujbNlrJbmiq9K2EDpQFT+Fymjwe/ESCr9l1C97yCmvG51Zb9cn5rj97wux3Z5olyZ9M ZDjA== X-Gm-Message-State: APjAAAW06m1M56CYYU6iWYLlRzFqGJdJ/ojZzHHIys5I/gvp2r9hMXQE 08nl4aZs2zOA/OACQm6uOJGBtJaC6Bgex6WcYbZfRfSHy6M= X-Google-Smtp-Source: APXvYqy7UMURz/1GblyowvABXQj4ZsE4ec/XckzWLvX0rvXrTvkZtDlEPY3l5CK8nu4cpX4Alz4QfvXXdn5x0Cuv10s= X-Received: by 2002:aed:2c03:: with SMTP id f3mr5992185qtd.80.1578533455856; Wed, 08 Jan 2020 17:30:55 -0800 (PST) MIME-Version: 1.0 References: <20200108132759.95603-1-alex.kanavin@gmail.com> <20200108132759.95603-7-alex.kanavin@gmail.com> In-Reply-To: <20200108132759.95603-7-alex.kanavin@gmail.com> From: Khem Raj Date: Wed, 8 Jan 2020 17:30:28 -0800 Message-ID: To: Alexander Kanavin Cc: Patches and discussions about the oe-core layer Subject: Re: [PATCH 07/28] acl/attr: update to latest upstream releases X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Jan 2020 01:30:57 -0000 Content-Type: text/plain; charset="UTF-8" Fails smbnetfs, perhaps xattr/attr.h -> sys/attr.h fix is needed here too https://errors.yoctoproject.org/Errors/Details/305698/ On Wed, Jan 8, 2020 at 5:29 AM Alexander Kanavin wrote: > > 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. > > Signed-off-by: Alexander Kanavin > --- > .../0001-test-patch-out-failing-bits.patch | 63 ++ > ...dcode-the-build-path-into-a-helper-l.patch | 24 + > ...file-libacl-should-depend-on-include.patch | 51 -- > ...-order-of-expected-output-of-getfacl.patch | 198 ------ > meta/recipes-support/attr/acl/configure.ac | 49 -- > meta/recipes-support/attr/acl/run-ptest | 60 +- > .../acl/test-fix-directory-permissions.patch | 37 - > .../test-fix-insufficient-quoting-of.patch | 100 --- > ...-SELinux-machines-for-root-testcases.patch | 84 --- > meta/recipes-support/attr/acl_2.2.52.bb | 52 -- > meta/recipes-support/attr/acl_2.2.53.bb | 64 ++ > meta/recipes-support/attr/attr.inc | 41 +- > .../0001-Use-stdint-types-consistently.patch | 69 -- > .../attr/attr/attr-Missing-configure.ac.patch | 63 -- > .../attr/attr/dont-use-decl-macros.patch | 56 -- > meta/recipes-support/attr/attr/run-ptest | 3 + > meta/recipes-support/attr/attr_2.4.47.bb | 15 - > meta/recipes-support/attr/attr_2.4.48.bb | 6 + > meta/recipes-support/attr/ea-acl.inc | 52 -- > ...option-to-enable-disable-static-libr.patch | 70 -- > ...e-attr.5-man-page-moved-to-man-pages.patch | 240 ------- > .../Remove-the-section-2-man-pages.patch | 666 ------------------ > .../attr/files/relative-libdir.patch | 25 - > meta/recipes-support/attr/files/run-ptest | 5 - > 24 files changed, 188 insertions(+), 1905 deletions(-) > create mode 100644 meta/recipes-support/attr/acl/0001-test-patch-out-failing-bits.patch > create mode 100644 meta/recipes-support/attr/acl/0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch > delete mode 100644 meta/recipes-support/attr/acl/Makefile-libacl-should-depend-on-include.patch > delete mode 100644 meta/recipes-support/attr/acl/acl-fix-the-order-of-expected-output-of-getfacl.patch > delete mode 100644 meta/recipes-support/attr/acl/configure.ac > delete mode 100644 meta/recipes-support/attr/acl/test-fix-directory-permissions.patch > delete mode 100644 meta/recipes-support/attr/acl/test-fix-insufficient-quoting-of.patch > delete mode 100644 meta/recipes-support/attr/acl/test-fixups-on-SELinux-machines-for-root-testcases.patch > delete mode 100644 meta/recipes-support/attr/acl_2.2.52.bb > create mode 100644 meta/recipes-support/attr/acl_2.2.53.bb > delete mode 100644 meta/recipes-support/attr/attr/0001-Use-stdint-types-consistently.patch > delete mode 100644 meta/recipes-support/attr/attr/attr-Missing-configure.ac.patch > delete mode 100644 meta/recipes-support/attr/attr/dont-use-decl-macros.patch > create mode 100644 meta/recipes-support/attr/attr/run-ptest > delete mode 100644 meta/recipes-support/attr/attr_2.4.47.bb > create mode 100644 meta/recipes-support/attr/attr_2.4.48.bb > delete mode 100644 meta/recipes-support/attr/ea-acl.inc > delete mode 100644 meta/recipes-support/attr/files/0001-Added-configure-option-to-enable-disable-static-libr.patch > delete mode 100644 meta/recipes-support/attr/files/Remove-the-attr.5-man-page-moved-to-man-pages.patch > delete mode 100644 meta/recipes-support/attr/files/Remove-the-section-2-man-pages.patch > delete mode 100644 meta/recipes-support/attr/files/relative-libdir.patch > delete mode 100644 meta/recipes-support/attr/files/run-ptest > > 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 > new file mode 100644 > index 00000000000..ba2ffee5d27 > --- /dev/null > +++ b/meta/recipes-support/attr/acl/0001-test-patch-out-failing-bits.patch > @@ -0,0 +1,63 @@ > +From 9e08219e0e99ee2589cf35fa8d52cef3515accce Mon Sep 17 00:00:00 2001 > +From: Alexander Kanavin > +Date: Thu, 12 Dec 2019 15:47:49 +0100 > +Subject: [PATCH] test: patch out failing bits > + > +I have confirmed on the host distro (Ubuntu 18.04) that they > +fail as well; upstream probably haven't noticed because the > +test is only executed under sudo. > + > +Upstream-Status: Inappropriate [disabling tests instead of fixing them properly] > +Signed-off-by: Alexander Kanavin > +--- > + test/root/permissions.test | 13 ------------- > + 1 file changed, 13 deletions(-) > + > +diff --git a/test/root/permissions.test b/test/root/permissions.test > +index 8f8f825..21e8a95 100644 > +--- a/test/root/permissions.test > ++++ b/test/root/permissions.test > +@@ -50,10 +50,6 @@ User daemon is a member in the owning group, which has only read access. > + Verify this. > + > + $ su daemon > +- $ cat f > +- > root > +- > bin > +- > + $ echo daemon >> f > + >~ .*f: Permission denied$ > + > +@@ -146,8 +142,6 @@ the owning group, he should still have no write access. > + $ setfacl -x g:daemon f > + > + $ su daemon > +- $ echo daemon4 >> f > +- >~ .*f: Permission denied$ > + > + > + Change the owning group. The other permissions should now grant user > +@@ -158,12 +152,6 @@ daemon write access. > + > + $ su daemon > + $ echo daemon5 >> f > +- $ cat f > +- > root > +- > bin > +- > daemon > +- > daemon2 > +- > daemon5 > + > + > + Verify that permissions in separate matching ACL entries do not > +@@ -173,7 +161,6 @@ accumulate. > + $ setfacl -m g:bin:r,g:daemon:w f > + > + $ su daemon > +- $ : < f > + $ : > f > + $ : <> f > + >~ .*f: Permission denied$ > +-- > +2.17.1 > + > 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 > new file mode 100644 > index 00000000000..57ef0bb728c > --- /dev/null > +++ b/meta/recipes-support/attr/acl/0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch > @@ -0,0 +1,24 @@ > +From 39d332a8801de5d9ef09dacb3dba85c208b7b2ad Mon Sep 17 00:00:00 2001 > +From: Alexander Kanavin > +Date: Thu, 12 Dec 2019 13:45:52 +0100 > +Subject: [PATCH] tests: do not hardcode the build path into a helper library > + > +Upstream-Status: Inappropriate [oe-core specific] > +Signed-off-by: Alexander Kanavin > +--- > + test/Makemodule.am | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/test/Makemodule.am b/test/Makemodule.am > +index 17d4927..015de7f 100644 > +--- a/test/Makemodule.am > ++++ b/test/Makemodule.am > +@@ -30,7 +30,7 @@ EXTRA_DIST += \ > + check_LTLIBRARIES = libtestlookup.la > + > + libtestlookup_la_SOURCES = test/test_passwd.c test/test_group.c > +-libtestlookup_la_CFLAGS = -DBASEDIR=\"$(abs_srcdir)\" > ++libtestlookup_la_CFLAGS = -DBASEDIR=\"/tmp/acl-ptest\" > + libtestlookup_la_LDFLAGS = -rpath $(abs_builddir) > + > + AM_TESTS_ENVIRONMENT = PATH="$(abs_top_builddir):$$PATH"; > diff --git a/meta/recipes-support/attr/acl/Makefile-libacl-should-depend-on-include.patch b/meta/recipes-support/attr/acl/Makefile-libacl-should-depend-on-include.patch > deleted file mode 100644 > index 4c7cba3b88d..00000000000 > --- a/meta/recipes-support/attr/acl/Makefile-libacl-should-depend-on-include.patch > +++ /dev/null > @@ -1,51 +0,0 @@ > -From d82457ce5ca7455e336da5e244d95f90e52aaef8 Mon Sep 17 00:00:00 2001 > -From: Robert Yang > -Date: Tue, 18 Apr 2017 01:17:26 -0700 > -Subject: [PATCH] Makefile: libacl should depend on include > - > -Fixed race issue: > - In file included from acl_copy_entry.c:22:0: > - libacl.h:19:21: fatal error: sys/acl.h: No such file or directory > - #include > - > -[snip] > - > - compilation terminated. > - acl_get_file.c:27:24: fatal error: acl/libacl.h: No such file or directory > - #include > - ^ > - > -The acl.h is in "include" directory, and include/Makefile creates > -symlink "sys" and "acl" poinst to current dirctory: > -$ ls include/ -l > -acl -> . > -sys -> . > - > -So if "libacl" target runs before "include", the error would happen > -since no "acl" or "sys" directory. > - > -Let libacl depend on include can fix the problem. > - > -Upstream-Status: Pending > - > -Signed-off-by: Robert Yang > ---- > - Makefile | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/Makefile b/Makefile > -index dce32d3..8a79379 100644 > ---- a/Makefile > -+++ b/Makefile > -@@ -48,7 +48,7 @@ else > - endif > - > - # tool/lib dependencies > --libacl: libmisc > -+libacl: include libmisc > - getfacl setfacl chacl: libacl > - > - ifeq ($(HAVE_BUILDDEFS), yes) > --- > -2.10.2 > - > diff --git a/meta/recipes-support/attr/acl/acl-fix-the-order-of-expected-output-of-getfacl.patch b/meta/recipes-support/attr/acl/acl-fix-the-order-of-expected-output-of-getfacl.patch > deleted file mode 100644 > index cf765fdbb89..00000000000 > --- a/meta/recipes-support/attr/acl/acl-fix-the-order-of-expected-output-of-getfacl.patch > +++ /dev/null > @@ -1,198 +0,0 @@ > -acl: fix the order of expected output of getfacl > - > -The result of getfacl is sorted by user id. > -In Centos or RHEL, bin user id is 1 and daemon user id is 2. > -But in our image, bin user id is 2 and daemon user id is 1. > -The patch fixes this issue to make ptest pass. > - > -Upstream-Status: Inappropriate [embedded specific] > - > -Signed-off-by: Chong Lu > ---- > - test/misc.test | 38 +++++++++++++++++++------------------- > - 1 file changed, 19 insertions(+), 19 deletions(-) > - > -diff --git a/test/misc.test b/test/misc.test > -index 6e98053..53ae5b0 100644 > ---- a/test/misc.test > -+++ b/test/misc.test > -@@ -79,8 +79,8 @@ Multiple users > - > - $ getfacl --omit-header f > - > user::rw- > -- > user:bin:rw- > - > user:daemon:r-- > -+ > user:bin:rw- > - > group::r-- > - > mask::rw- > - > other::r-- > -@@ -94,8 +94,8 @@ Multiple groups > - > - $ getfacl --omit-header f > - > user::rw- > -- > user:bin:rw- > - > user:daemon:r-- > -+ > user:bin:rw- > - > group::r-- > - > group:daemon:r-- > - > group:users:rw- > -@@ -111,8 +111,8 @@ Remove one group > - > - $ getfacl --omit-header f > - > user::rw- > -- > user:bin:rw- > - > user:daemon:r-- > -+ > user:bin:rw- > - > group::r-- > - > group:daemon:r-- > - > mask::rw- > -@@ -146,8 +146,8 @@ Default ACL > - > - $ getfacl --omit-header d > - > user::rwx > -- > user:bin:rwx > - > user:daemon:rw- > -+ > user:bin:rwx > - > group::r-x > - > mask::rwx > - > other::--- > -@@ -236,16 +236,16 @@ Add some users and groups > - > - $ getfacl --omit-header d/d > - > user::rwx > -- > user:bin:rwx #effective:r-x > - > user:daemon:r-x > -+ > user:bin:rwx #effective:r-x > - > group::r-x > - > group:daemon:rwx #effective:r-x > - > group:users:r-x > - > mask::r-x > - > other::--- > - > default:user::rwx > -- > default:user:bin:rwx #effective:r-x > - > default:user:daemon:r-x > -+ > default:user:bin:rwx #effective:r-x > - > default:group::r-x > - > default:mask::r-x > - > default:other::--- > -@@ -262,16 +262,16 @@ Symlink in directory with default ACL? > - > - $ getfacl --omit-header d/l > - > user::rwx > -- > user:bin:rwx #effective:r-x > - > user:daemon:r-x > -+ > user:bin:rwx #effective:r-x > - > group::r-x > - > group:daemon:rwx #effective:r-x > - > group:users:r-x > - > mask::r-x > - > other::--- > - > default:user::rwx > -- > default:user:bin:rwx #effective:r-x > - > default:user:daemon:r-x > -+ > default:user:bin:rwx #effective:r-x > - > default:group::r-x > - > default:mask::r-x > - > default:other::--- > -@@ -287,16 +287,16 @@ Does mask manipulation work? > - > - $ getfacl --omit-header d/d > - > user::rwx > -- > user:bin:r-x > - > user:daemon:r-x > -+ > user:bin:r-x > - > group::r-x > - > group:daemon:r-x > - > group:users:r-x > - > mask::r-x > - > other::--- > - > default:user::rwx > -- > default:user:bin:rwx #effective:r-x > - > default:user:daemon:r-x > -+ > default:user:bin:rwx #effective:r-x > - > default:group::r-x > - > default:mask::r-x > - > default:other::--- > -@@ -308,16 +308,16 @@ Does mask manipulation work? > - > - $ getfacl --omit-header d/d > - > user::rwx > -- > user:bin:r-x > - > user:daemon:r-x > -+ > user:bin:r-x > - > group::r-x > - > group:daemon:r-x > - > group:users:r-x > - > mask::r-x > - > other::--- > - > default:user::rwx > -- > default:user:bin:rwx > - > default:user:daemon:r-x > -+ > default:user:bin:rwx > - > default:group::r-x > - > default:mask::rwx > - > default:other::--- > -@@ -333,8 +333,8 @@ Remove the default ACL > - > - $ getfacl --omit-header d > - > user::rwx > -- > user:bin:rwx > - > user:daemon:rw- > -+ > user:bin:rwx > - > group::r-x > - > mask::rwx > - > other::--- > -@@ -373,14 +373,14 @@ Now, chmod should change the group_obj entry > - > - $ getfacl --omit-header d > - > user::rwx > -- > user:bin:r-x > - > user:daemon:rwx > -+ > user:bin:r-x > - > group::rwx > - > mask::rwx > - > other::r-x > - > default:user::rwx > -- > default:user:bin:r-x > - > default:user:daemon:rwx > -+ > default:user:bin:r-x > - > default:group::rwx > - > default:mask::rwx > - > default:other::r-x > -@@ -392,14 +392,14 @@ Now, chmod should change the group_obj entry > - > - $ getfacl --omit-header d > - > user::rwx > -- > user:bin:r-x > - > user:daemon:rwx #effective:r-x > -+ > user:bin:r-x > - > group::rwx #effective:r-x > - > mask::r-x > - > other::--- > - > default:user::rwx > -- > default:user:bin:r-x > - > default:user:daemon:rwx > -+ > default:user:bin:r-x > - > default:group::rwx > - > default:mask::rwx > - > default:other::r-x > -@@ -411,14 +411,14 @@ Now, chmod should change the group_obj entry > - > - $ getfacl --omit-header d > - > user::rwx > -- > user:bin:r-x > - > user:daemon:rwx #effective:r-x > -+ > user:bin:r-x > - > group::rwx #effective:r-x > - > mask::r-x > - > other::--- > - > default:user::rwx > -- > default:user:bin:r-x > - > default:user:daemon:rwx > -+ > default:user:bin:r-x > - > default:group::rwx > - > default:mask::rwx > - > default:other::r-x > --- > -1.7.9.5 > - > diff --git a/meta/recipes-support/attr/acl/configure.ac b/meta/recipes-support/attr/acl/configure.ac > deleted file mode 100644 > index 7af2e8d886e..00000000000 > --- a/meta/recipes-support/attr/acl/configure.ac > +++ /dev/null > @@ -1,49 +0,0 @@ > -# Copyright (C) 2009 Andreas Gruenbacher > -# > -# This program is free software: you can redistribute it and/or modify it > -# under the terms of the GNU General Public License as published by > -# the Free Software Foundation, either version 2 of the License, or > -# (at your option) any later version. > -# > -# This program is distributed in the hope that it will be useful, > -# but WITHOUT ANY WARRANTY; without even the implied warranty of > -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > -# GNU General Public License for more details. > -# > -# You should have received a copy of the GNU General Public License > -# along with this program. If not, see . > -# > -AC_INIT(include/acl.h) > -AC_CONFIG_AUX_DIR([.]) > -AC_CONFIG_MACRO_DIR([m4]) > -AC_CONFIG_HEADER(include/config.h) > -AC_PREFIX_DEFAULT(/usr) > - > -AC_PROG_LIBTOOL > - > -AC_ARG_ENABLE(shared, > -[ --enable-shared=[yes/no] Enable use of shared libraries [default=yes]],, > - enable_shared=yes) > -AC_SUBST(enable_shared) > - > -AC_ARG_ENABLE(gettext, > -[ --enable-gettext=[yes/no] Enable alternate language support [default=yes]],, > - enable_gettext=yes) > -AC_SUBST(enable_gettext) > - > -AC_ARG_ENABLE(lib64, > -[ --enable-lib64=[yes/no] Enable lib64 support [default=no]],, > - enable_lib64=no) > -AC_SUBST(enable_lib64) > - > -AC_PACKAGE_GLOBALS(acl) > -AC_PACKAGE_UTILITIES(acl) > -AC_PACKAGE_NEED_ATTR_XATTR_H > -AC_PACKAGE_NEED_ATTR_ERROR_H > -AC_MULTILIB($enable_lib64) > -AC_PACKAGE_NEED_GETXATTR_LIBATTR > -AC_MANUAL_FORMAT > - > -AC_FUNC_GCC_VISIBILITY > - > -AC_OUTPUT(include/builddefs) > diff --git a/meta/recipes-support/attr/acl/run-ptest b/meta/recipes-support/attr/acl/run-ptest > index a56946d8e6f..43128233654 100644 > --- a/meta/recipes-support/attr/acl/run-ptest > +++ b/meta/recipes-support/attr/acl/run-ptest > @@ -4,61 +4,7 @@ > > #umask 077 > > -EXT3_IMAGE=ext3.img > -EXT3_MOUNT_POINT=/mnt/ext3 > +mkdir -p /tmp/acl-ptest/test > +cp test/test.* /tmp/acl-ptest/test > > -trap 'rm -f ${EXT3_IMAGE}' EXIT > - > -dd if=/dev/zero of=${EXT3_IMAGE} bs=1M count=1 > -if [ "$?" -eq 0 ]; then > - echo "PASS: dump ext3.img" > -else > - echo "FAIL: dump ext3.img" > - exit 1 > -fi > - > -mkfs.ext3 -F ${EXT3_IMAGE} > -if [ "$?" -eq 0 ]; then > - echo "PASS: mkfs.ext3 -F ext3.img" > -else > - echo "FAIL: mkfs.ext3 -F ext3.img" > - exit 1 > -fi > - > -if [ -d $EXT3_MOUNT_POINT ]; then > - echo "mount point exist" > -else > - mkdir -p $EXT3_MOUNT_POINT > -fi > - > - > -mount -o loop,rw,acl ${EXT3_IMAGE} $EXT3_MOUNT_POINT > -if [ "$?" -eq 0 ]; then > - echo "PASS: mount ext3.img" > -else > - echo "FAIL: mount ext3.img" > - exit 1 > -fi > - > -cp -rf ./test/ $EXT3_MOUNT_POINT > - > -cd $EXT3_MOUNT_POINT/test/ > - > -if sed -e 's!^bin:x:2:$!bin:x:2:daemon!' < /etc/group > gtmp > -then if cp /etc/group group.orig; > - then cp gtmp /etc/group > - make -k tests root-tests | sed \ > - -e 's|^\[.*\] \(.*\) -- ok$|PASS: \1|' \ > - -e 's|^\[.*\] \(.*\) -- failed|FAIL: \1|' > - cp group.orig /etc/group > - else echo "FAIL: couldn't save original group file." > - exit 1 > - fi > -else echo "FAIL: couldn't create modified group file." > - exit 1 > -fi > - > -cd - > -umount $EXT3_MOUNT_POINT > -rm -rf $EXT3_MOUNT_POINT > -rm $EXT3_IMAGE > +make test-suite.log > diff --git a/meta/recipes-support/attr/acl/test-fix-directory-permissions.patch b/meta/recipes-support/attr/acl/test-fix-directory-permissions.patch > deleted file mode 100644 > index e64990ad5b9..00000000000 > --- a/meta/recipes-support/attr/acl/test-fix-directory-permissions.patch > +++ /dev/null > @@ -1,37 +0,0 @@ > -From 311589fedf196168382d8f0db303ab328bcf9d83 Mon Sep 17 00:00:00 2001 > -From: Peter Seebach > -Date: Wed, 11 May 2016 15:16:06 -0500 > -Subject: [PATCH] acl.inc, run-ptest: improve ptest functionality on limited > - > -commit c45bae84817a70fef6c2b661a07a492a0d23ae85 > - > - Fix permissions on temporary directory > - > - The temporary directory's permissions have to allow other users to > - view the directory. A default umask of 022 is common, but not mandatory, > - and secure systems may have more restrictive defaults. > - > - Signed-off-by: Peter Seebach > - > -Upstream-Status: Backport [ http://git.savannah.gnu.org/cgit/acl.git/commit/?id=c6772a958800de064482634f77c20a0faafc5af6 ] > - > -Signed-off-by: Dengke Du > ---- > - test/root/permissions.test | 1 + > - 1 file changed, 1 insertion(+) > - > -diff --git a/test/root/permissions.test b/test/root/permissions.test > -index 42615f5..098b52a 100644 > ---- a/test/root/permissions.test > -+++ b/test/root/permissions.test > -@@ -16,6 +16,7 @@ Cry immediately if we are not running as root. > - First, set up a temporary directory and create a regular file with > - defined permissions. > - > -+ $ umask 022 > - $ mkdir d > - $ cd d > - $ umask 027 > --- > -2.8.1 > - > diff --git a/meta/recipes-support/attr/acl/test-fix-insufficient-quoting-of.patch b/meta/recipes-support/attr/acl/test-fix-insufficient-quoting-of.patch > deleted file mode 100644 > index f392465b58e..00000000000 > --- a/meta/recipes-support/attr/acl/test-fix-insufficient-quoting-of.patch > +++ /dev/null > @@ -1,100 +0,0 @@ > -From e98ce8acf84d12ea67a3ac76bf63c6d87d9af86d Mon Sep 17 00:00:00 2001 > -From: Kamil Dudka > -Date: Mon, 20 May 2013 16:38:06 +0200 > -Subject: [PATCH] test: fix insufficient quoting of '\' > - > -This is a follow-up to 7f2c91b8369242a8dbc2b304a5b71b2a85f5b855, which > -caused sbits-restore.test to fail in the following way in case SELinux > -was disabled: > - > -*** sbits-restore.test *** > -[3] $ umask 022 -- ok > -[4] $ mkdir d -- ok > -[5] $ touch d/g -- ok > -[6] $ touch d/u -- ok > -[7] $ chmod u+s d/u -- ok > -[8] $ chmod g+s d/g -- ok > -[9] $ chmod +t d -- ok > -[10] $ getfacl -R d > d.acl -- ok > -[11] $ rm -R d -- ok > -[12] $ mkdir d -- ok > -[13] $ touch d/g -- ok > -[14] $ touch d/u -- ok > -[15] $ setfacl --restore d.acl -- ok > -[16] $ ls -dl d | awk '{print $1}' | sed 's/.$//g' -- failed > -drwxr-xr- != drwxr-xr-t > -[18] $ ls -dl d/u | awk '{print $1}' | sed 's/.$//g' -- failed > --rwSr--r- != -rwSr--r-- > -[20] $ ls -dl d/g | awk '{print $1}' | sed 's/.$//g' -- failed > --rw-r-Sr- != -rw-r-Sr-- > -[22] $ rm -Rf d -- ok > -17 commands (14 passed, 3 failed) > - > -Upstream-Status: Backport > -http://git.savannah.gnu.org/cgit/acl.git/commit/?id=e98ce8acf84d12ea67a3ac76bf63c6d87d9af86d > - > -Signed-off-by: Kamil Dudka > -Signed-off-by: He Zhe > - > -Index: acl-2.2.52/test/cp.test > -=================================================================== > ---- acl-2.2.52.orig/test/cp.test > -+++ acl-2.2.52/test/cp.test > -@@ -9,7 +9,7 @@ The cp utility should only copy ACLs if > - > -rw-rw-r--+ > - > - $ cp f g > -- $ ls -l g | awk -- '{ print $1 }' | sed 's/\.$//g' > -+ $ ls -l g | awk -- '{ print $1 }' | sed 's/\\.$//g' > - > -rw-r--r-- > - > - $ rm g > -Index: acl-2.2.52/test/misc.test > -=================================================================== > ---- acl-2.2.52.orig/test/misc.test > -+++ acl-2.2.52/test/misc.test > -@@ -254,7 +254,7 @@ Add some users and groups > - Symlink in directory with default ACL? > - > - $ ln -s d d/l > -- $ ls -dl d/l | awk '{print $1}' | sed 's/\.$//g' > -+ $ ls -dl d/l | awk '{print $1}' | sed 's/\\.$//g' > - > lrwxrwxrwx > - > - $ ls -dl -L d/l | awk '{print $1}' > -@@ -343,7 +343,7 @@ Remove the default ACL > - Reset to base entries > - > - $ setfacl -b d > -- $ ls -dl d | awk '{print $1}' | sed 's/\.$//g' > -+ $ ls -dl d | awk '{print $1}' | sed 's/\\.$//g' > - > drwxr-x--- > - > - $ getfacl --omit-header d > -@@ -355,7 +355,7 @@ Reset to base entries > - Now, chmod should change the group_obj entry > - > - $ chmod 775 d > -- $ ls -dl d | awk '{print $1}' | sed 's/\.$//g' > -+ $ ls -dl d | awk '{print $1}' | sed 's/\\.$//g' > - > drwxrwxr-x > - > - $ getfacl --omit-header d > -Index: acl-2.2.52/test/sbits-restore.test > -=================================================================== > ---- acl-2.2.52.orig/test/sbits-restore.test > -+++ acl-2.2.52/test/sbits-restore.test > -@@ -13,10 +13,10 @@ Ensure setting of SUID/SGID/sticky via - > - $ touch d/g > - $ touch d/u > - $ setfacl --restore d.acl > -- $ ls -dl d | awk '{print $1}' | sed 's/\.$//g' > -+ $ ls -dl d | awk '{print $1}' | sed 's/\\.$//g' > - > drwxr-xr-t > -- $ ls -dl d/u | awk '{print $1}' | sed 's/\.$//g' > -+ $ ls -dl d/u | awk '{print $1}' | sed 's/\\.$//g' > - > -rwSr--r-- > -- $ ls -dl d/g | awk '{print $1}' | sed 's/\.$//g' > -+ $ ls -dl d/g | awk '{print $1}' | sed 's/\\.$//g' > - > -rw-r-Sr-- > - $ rm -Rf d > diff --git a/meta/recipes-support/attr/acl/test-fixups-on-SELinux-machines-for-root-testcases.patch b/meta/recipes-support/attr/acl/test-fixups-on-SELinux-machines-for-root-testcases.patch > deleted file mode 100644 > index 8cc11a63e12..00000000000 > --- a/meta/recipes-support/attr/acl/test-fixups-on-SELinux-machines-for-root-testcases.patch > +++ /dev/null > @@ -1,84 +0,0 @@ > -From d2f49ee6fe4850b8dda5b08676b36201d3c43710 Mon Sep 17 00:00:00 2001 > -From: He Zhe > -Date: Wed, 2 Mar 2016 15:46:57 +0800 > -Subject: [PATCH] test: fixups on SELinux machines for root testcases > - > -ls adds a '.' at the end of the permission field list on SELinux > -machines, filter this out so root tests work on SELinux machines. > - > -Upstream-Status: Accepted > -http://git.savannah.gnu.org/cgit/acl.git/commit/?id=26a87d36f80d5e98bccb5878834d9e69dadfe3e9 > - > -Signed-off-by: He Zhe > ---- > - test/root/permissions.test | 8 ++++---- > - test/root/restore.test | 2 +- > - test/root/setfacl.test | 2 +- > - 3 files changed, 6 insertions(+), 6 deletions(-) > - > -diff --git a/test/root/permissions.test b/test/root/permissions.test > -index 9b9e3de..665339a 100644 > ---- a/test/root/permissions.test > -+++ b/test/root/permissions.test > -@@ -19,7 +19,7 @@ defined permissions. > - $ cd d > - $ umask 027 > - $ touch f > -- $ ls -l f | awk -- '{ print $1, $3, $4 }' > -+ $ ls -l f | awk -- '{ print $1, $3, $4 }' | sed 's/\\.//g' > - > -rw-r----- root root > - > - > -@@ -39,7 +39,7 @@ Now, change the ownership of the file to bin:bin and verify that this > - gives user bin write access. > - > - $ chown bin:bin f > -- $ ls -l f | awk -- '{ print $1, $3, $4 }' > -+ $ ls -l f | awk -- '{ print $1, $3, $4 }' | sed 's/\\.//g' > - > -rw-r----- bin bin > - $ su bin > - $ echo bin >> f > -@@ -256,12 +256,12 @@ directories if the file has an ACL and only CAP_FOWNER would grant them. > - $ mkdir -m 600 x > - $ chown daemon:daemon x > - $ echo j > x/j > -- $ ls -l x/j | awk -- '{ print $1, $3, $4 }' > -+ $ ls -l x/j | awk -- '{ print $1, $3, $4 }' | sed 's/\\.//g' > - > -rw-r----- root root > - > - $ setfacl -m u:daemon:r x > - > -- $ ls -l x/j | awk -- '{ print $1, $3, $4 }' > -+ $ ls -l x/j | awk -- '{ print $1, $3, $4 }' | sed 's/\\.//g' > - > -rw-r----- root root > - (With the bug this gives: `ls: x/j: Permission denied'.) > - > -diff --git a/test/root/restore.test b/test/root/restore.test > -index 63a9d01..c85097c 100644 > ---- a/test/root/restore.test > -+++ b/test/root/restore.test > -@@ -21,7 +21,7 @@ Cry immediately if we are not running as root. > - $ chown bin passwd > - $ chmod u+s passwd > - $ setfacl --restore passwd.acl > -- $ ls -dl passwd | awk '{print $1 " " $3 " " $4}' > -+ $ ls -dl passwd | awk '{print $1 " " $3 " " $4}' | sed 's/\\.//g' > - > -rwsr-xr-x root root > - > - $ rm passwd passwd.acl > -diff --git a/test/root/setfacl.test b/test/root/setfacl.test > -index a46a9f4..7efbad7 100644 > ---- a/test/root/setfacl.test > -+++ b/test/root/setfacl.test > -@@ -12,7 +12,7 @@ Cry immediately if we are not running as root. > - $ sg bin > - $ umask 027 > - $ touch g > -- $ ls -dl g | awk '{print $1}' > -+ $ ls -dl g | awk '{print $1}' | sed 's/\\.//g' > - > -rw-r----- > - > - $ setfacl -m m:- g > --- > -1.9.1 > - > diff --git a/meta/recipes-support/attr/acl_2.2.52.bb b/meta/recipes-support/attr/acl_2.2.52.bb > deleted file mode 100644 > index 6bc77d868d5..00000000000 > --- a/meta/recipes-support/attr/acl_2.2.52.bb > +++ /dev/null > @@ -1,52 +0,0 @@ > -SUMMARY = "Utilities for managing POSIX Access Control Lists" > -HOMEPAGE = "http://savannah.nongnu.org/projects/acl/" > -SECTION = "libs" > - > -LICENSE = "LGPLv2.1+ & GPLv2+" > -LICENSE_${PN} = "GPLv2+" > -LICENSE_lib${BPN} = "LGPLv2.1+" > -LIC_FILES_CHKSUM = "file://doc/COPYING;md5=c781d70ed2b4d48995b790403217a249 \ > - file://doc/COPYING.LGPL;md5=9e9a206917f8af112da634ce3ab41764" > - > -DEPENDS = "attr" > - > -SRC_URI = "${SAVANNAH_GNU_MIRROR}/acl/${BP}.src.tar.gz \ > - file://configure.ac;subdir=${BP} \ > - file://run-ptest \ > - file://acl-fix-the-order-of-expected-output-of-getfacl.patch \ > - file://test-fix-insufficient-quoting-of.patch \ > - file://test-fixups-on-SELinux-machines-for-root-testcases.patch \ > - file://test-fix-directory-permissions.patch \ > - file://Makefile-libacl-should-depend-on-include.patch \ > -" > - > -SRC_URI[md5sum] = "a61415312426e9c2212bd7dc7929abda" > -SRC_URI[sha256sum] = "179074bb0580c06c4b4137be4c5a92a701583277967acdb5546043c7874e0d23" > - > -require ea-acl.inc > - > -# avoid RPATH hardcode to staging dir > -do_configure_append() { > - sed -i ${S}/config.status -e s,^\\\(hardcode_into_libs=\\\).*$,\\1\'no\', > - ${S}/config.status > -} > - > -# libdir should point to .la > -do_install_append() { > - sed -i ${D}${libdir}/libacl.la -e \ > - s,^libdir=\'${base_libdir}\'$,libdir=\'${libdir}\', > -} > - > -inherit ptest > - > -PTEST_BUILD_HOST_FILES = "builddefs" > -PTEST_BUILD_HOST_PATTERN = "^RPM" > -do_install_ptest() { > - tar -c --exclude=nfs test/ | ( cd ${D}${PTEST_PATH} && tar -xf - ) > - install -d ${D}${PTEST_PATH}/include > - install -m 644 ${S}/include/builddefs ${S}/include/buildmacros ${S}/include/buildrules ${D}${PTEST_PATH}/include/ > -} > - > -RDEPENDS_${PN}-ptest = "acl bash coreutils perl perl-module-filehandle perl-module-getopt-std perl-module-posix shadow" > - > -BBCLASSEXTEND = "native nativesdk" > diff --git a/meta/recipes-support/attr/acl_2.2.53.bb b/meta/recipes-support/attr/acl_2.2.53.bb > new file mode 100644 > index 00000000000..6db4d940aae > --- /dev/null > +++ b/meta/recipes-support/attr/acl_2.2.53.bb > @@ -0,0 +1,64 @@ > +SUMMARY = "Utilities for managing POSIX Access Control Lists" > +HOMEPAGE = "http://savannah.nongnu.org/projects/acl/" > +SECTION = "libs" > + > +LICENSE = "LGPLv2.1+ & GPLv2+" > +LICENSE_${PN} = "GPLv2+" > +LICENSE_lib${BPN} = "LGPLv2.1+" > +LIC_FILES_CHKSUM = "file://doc/COPYING;md5=c781d70ed2b4d48995b790403217a249 \ > + file://doc/COPYING.LGPL;md5=9e9a206917f8af112da634ce3ab41764" > + > +DEPENDS = "attr" > + > +SRC_URI = "${SAVANNAH_GNU_MIRROR}/acl/${BP}.tar.gz \ > + file://run-ptest \ > + file://0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch \ > + file://0001-test-patch-out-failing-bits.patch \ > + " > + > +SRC_URI[md5sum] = "007aabf1dbb550bcddde52a244cd1070" > +SRC_URI[sha256sum] = "06be9865c6f418d851ff4494e12406568353b891ffe1f596b34693c387af26c7" > + > +inherit autotools gettext ptest > + > +PACKAGES =+ "lib${BPN}" > + > +FILES_lib${BPN} = "${libdir}/lib*${SOLIBS}" > + > +PTEST_BUILD_HOST_FILES = "builddefs" > +PTEST_BUILD_HOST_PATTERN = "^RPM" > + > +do_compile_ptest() { > + oe_runmake libtestlookup.la > +} > + > +do_install_ptest() { > + cp -rf ${S}/test/ ${D}${PTEST_PATH} > + cp -rf ${S}/build-aux/ ${D}${PTEST_PATH} > + mkdir -p ${D}${PTEST_PATH}/.libs > + cp -rf ${B}/.libs/libtestlookup* ${D}${PTEST_PATH}/.libs > + cp ${B}/Makefile ${D}${PTEST_PATH} > + sed -i "s|^srcdir =.*|srcdir = \.|g" ${D}${PTEST_PATH}/Makefile > + sed -i "s|^abs_srcdir =.*|abs_srcdir = \.|g" ${D}${PTEST_PATH}/Makefile > + sed -i "s|^abs_top_srcdir =.*|abs_top_srcdir = \.\.|g" ${D}${PTEST_PATH}/Makefile > + sed -i "s|^Makefile:.*|Makefile:|g" ${D}${PTEST_PATH}/Makefile > +} > + > +RDEPENDS_${PN}-ptest = "acl \ > + bash \ > + coreutils \ > + perl \ > + perl-module-filehandle \ > + perl-module-getopt-std \ > + perl-module-posix \ > + shadow \ > + make \ > + gawk \ > + e2fsprogs-mke2fs \ > + perl-module-cwd \ > + perl-module-file-basename \ > + perl-module-file-path \ > + perl-module-file-spec \ > + " > + > +BBCLASSEXTEND = "native nativesdk" > diff --git a/meta/recipes-support/attr/attr.inc b/meta/recipes-support/attr/attr.inc > index 3503d66b9e1..54b1a81d904 100644 > --- a/meta/recipes-support/attr/attr.inc > +++ b/meta/recipes-support/attr/attr.inc > @@ -8,22 +8,18 @@ LICENSE = "LGPLv2.1+ & GPLv2+" > LICENSE_${PN} = "GPLv2+" > LICENSE_lib${BPN} = "LGPLv2.1+" > LIC_FILES_CHKSUM = "file://doc/COPYING;md5=2d0aa14b3fce4694e4f615e30186335f \ > - file://attr/attr.c;endline=17;md5=be0403261f0847e5f43ed5b08d19593c \ > + file://tools/attr.c;endline=17;md5=be0403261f0847e5f43ed5b08d19593c \ > file://libattr/libattr.c;endline=17;md5=7970f77049f8fa1199fff62a7ab724fb" > > -SRC_URI = "${SAVANNAH_GNU_MIRROR}/attr/${BP}.src.tar.gz \ > +SRC_URI = "${SAVANNAH_GNU_MIRROR}/attr/${BP}.tar.gz \ > file://run-ptest \ > " > > -require ea-acl.inc > +inherit ptest update-alternatives autotools gettext > > -# libdir should point to .la > -do_install_append() { > - sed -i ${D}${libdir}/libattr.la -e \ > - s,^libdir=\'${base_libdir}\'$,libdir=\'${libdir}\', > -} > +PACKAGES =+ "lib${BPN}" > > -inherit ptest update-alternatives > +FILES_lib${BPN} = "${libdir}/lib*${SOLIBS}" > > ALTERNATIVE_PRIORITY = "100" > ALTERNATIVE_${PN} = "setfattr" > @@ -33,14 +29,27 @@ PTEST_BUILD_HOST_FILES = "builddefs" > PTEST_BUILD_HOST_PATTERN = "^RPM" > > do_install_ptest() { > - tar -c --exclude=ext test/ | ( cd ${D}${PTEST_PATH} && tar -xf - ) > - mkdir ${D}${PTEST_PATH}/include > - for i in builddefs buildmacros buildrules; \ > - do cp ${S}/include/$i ${D}${PTEST_PATH}/include/; \ > - done > - sed -e 's|; @echo|; echo|' -i ${D}${PTEST_PATH}/test/Makefile > + cp ${B}/Makefile ${D}${PTEST_PATH} > + sed -i "s|^srcdir =.*|srcdir = \.|g" ${D}${PTEST_PATH}/Makefile > + sed -i "s|^abs_srcdir =.*|abs_srcdir = \.|g" ${D}${PTEST_PATH}/Makefile > + sed -i "s|^abs_top_srcdir =.*|abs_top_srcdir = \.\.|g" ${D}${PTEST_PATH}/Makefile > + sed -i "s|^Makefile:.*|Makefile:|g" ${D}${PTEST_PATH}/Makefile > + cp -rf ${S}/build-aux/ ${D}${PTEST_PATH} > + cp -rf ${S}/test/ ${D}${PTEST_PATH} > } > > -RDEPENDS_${PN}-ptest = "attr coreutils perl-module-filehandle perl-module-getopt-std perl-module-posix make perl" > +RDEPENDS_${PN}-ptest = "attr \ > + coreutils \ > + perl-module-filehandle \ > + perl-module-getopt-std \ > + perl-module-posix \ > + make \ > + perl \ > + gawk \ > + perl-module-cwd \ > + perl-module-file-basename \ > + perl-module-file-path \ > + perl-module-file-spec \ > + " > > BBCLASSEXTEND = "native nativesdk" > 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 dcd6507bcc5..00000000000 > --- a/meta/recipes-support/attr/attr/0001-Use-stdint-types-consistently.patch > +++ /dev/null > @@ -1,69 +0,0 @@ > -From 37a27b6fd09ecb37097b85e5db74e4f77b80fe0a Mon Sep 17 00:00:00 2001 > -From: Felix Janda > -Date: Tue, 12 Jan 2016 22:20:33 +0100 > -Subject: [PATCH] Use stdint types consistently > - > ---- > -Upstream-Status: Backport > -Signed-off-by: Khem Raj > - > - include/attributes.h | 6 ++++-- > - man/man3/attr_list.3 | 8 ++++---- > - 2 files changed, 8 insertions(+), 6 deletions(-) > - > -Index: attr-2.4.47/include/attributes.h > -=================================================================== > ---- attr-2.4.47.orig/include/attributes.h > -+++ attr-2.4.47/include/attributes.h > -@@ -22,6 +22,7 @@ > - extern "C" { > - #endif > - > -+#include > - /* > - * An almost-IRIX-compatible extended attributes API > - * (the IRIX attribute "list" operation is missing, added ATTR_SECURE). > -@@ -69,7 +70,7 @@ typedef struct attrlist { > - * al_offset[i] entry points to. > - */ > - typedef struct attrlist_ent { /* data from attr_list() */ > -- u_int32_t a_valuelen; /* number bytes in value of attr */ > -+ uint32_t a_valuelen; /* number bytes in value of attr */ > - char a_name[1]; /* attr name (NULL terminated) */ > - } attrlist_ent_t; > - > -@@ -90,7 +91,7 @@ typedef struct attrlist_ent { /* data fr > - * operation on a cursor is to bzero() it. > - */ > - typedef struct attrlist_cursor { > -- u_int32_t opaque[4]; /* an opaque cookie */ > -+ uint32_t opaque[4]; /* an opaque cookie */ > - } attrlist_cursor_t; > - > - /* > -Index: attr-2.4.47/man/man3/attr_list.3 > -=================================================================== > ---- attr-2.4.47.orig/man/man3/attr_list.3 > -+++ attr-2.4.47/man/man3/attr_list.3 > -@@ -72,9 +72,9 @@ The contents of an \f4attrlist_t\fP stru > - .nf > - .ft 4 > - .ta 9n 22n > --__int32_t al_count; /\(** number of entries in attrlist \(**/ > --__int32_t al_more; /\(** T/F: more attrs (do syscall again) \(**/ > --__int32_t al_offset[1]; /\(** byte offsets of attrs [var-sized] \(**/ > -+int32_t al_count; /\(** number of entries in attrlist \(**/ > -+int32_t al_more; /\(** T/F: more attrs (do syscall again) \(**/ > -+int32_t al_offset[1]; /\(** byte offsets of attrs [var-sized] \(**/ > - .ft 1 > - .fi > - .RE > -@@ -113,7 +113,7 @@ include the following members: > - .nf > - .ft 4 > - .ta 9n 22n > --u_int32_t a_valuelen; /\(** number bytes in value of attr \(**/ > -+uint32_t a_valuelen; /\(** number bytes in value of attr \(**/ > - char a_name[]; /\(** attr name (NULL terminated) \(**/ > - .ft 1 > - .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 20fcc3cee7b..00000000000 > --- a/meta/recipes-support/attr/attr/attr-Missing-configure.ac.patch > +++ /dev/null > @@ -1,63 +0,0 @@ > -Subject: [PATCH] attr: Missing configure.ac > - > -Upstream-Status: Backport [Upstream released tarball missing this file] > -Signed-off-by: Nathan Rossi > ---- > - configure.ac | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ > - 1 file changed, 48 insertions(+) > - create mode 100644 configure.ac > - > -diff --git a/configure.ac b/configure.ac > -new file mode 100644 > -index 0000000..b966d0e > ---- /dev/null > -+++ b/configure.ac > -@@ -0,0 +1,48 @@ > -+# Copyright (C) 2009 Andreas Gruenbacher > -+# > -+# This program is free software: you can redistribute it and/or modify it > -+# under the terms of the GNU General Public License as published by > -+# the Free Software Foundation, either version 2 of the License, or > -+# (at your option) any later version. > -+# > -+# This program is distributed in the hope that it will be useful, > -+# but WITHOUT ANY WARRANTY; without even the implied warranty of > -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > -+# GNU General Public License for more details. > -+# > -+# You should have received a copy of the GNU General Public License > -+# along with this program. If not, see . > -+# > -+AC_INIT(include/attributes.h) > -+AC_CONFIG_AUX_DIR([.]) > -+AC_CONFIG_MACRO_DIR([m4]) > -+AC_CONFIG_HEADER(include/config.h) > -+AC_PREFIX_DEFAULT(/usr) > -+ > -+AC_PROG_LIBTOOL > -+ > -+AC_ARG_ENABLE(shared, > -+[ --enable-shared=[yes/no] Enable use of shared libraries [default=yes]],, > -+ enable_shared=yes) > -+AC_SUBST(enable_shared) > -+ > -+AC_ARG_ENABLE(gettext, > -+[ --enable-gettext=[yes/no] Enable alternate language support [default=yes]],, > -+ enable_gettext=yes) > -+AC_SUBST(enable_gettext) > -+ > -+AC_ARG_ENABLE(lib64, > -+[ --enable-lib64=[yes/no] Enable lib64 support [default=no]],, > -+ enable_lib64=no) > -+AC_SUBST(enable_lib64) > -+ > -+AC_PACKAGE_GLOBALS(attr) > -+AC_PACKAGE_UTILITIES(attr) > -+AC_MANUAL_FORMAT > -+AC_MULTILIB($enable_lib64) > -+ > -+AC_C_CONST > -+AC_TYPE_MODE_T > -+AC_FUNC_ALLOCA > -+ > -+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 9d4b8929e89..00000000000 > --- a/meta/recipes-support/attr/attr/dont-use-decl-macros.patch > +++ /dev/null > @@ -1,56 +0,0 @@ > -Use extern "C" instead of __BEGIN_DECL/__END_DECL macros > -these macros are defined in sys/cdefs.h for glibc and this header is not available on all libc > - > -anyway they defined like below > - > -#ifdef __cplusplus > -# define __BEGIN_DECLS extern "C" { > -# define __END_DECLS } > -#else > -# define __BEGIN_DECLS /* empty */ > -# define __END_DECLS /* empty */ > -#endif > - > -__THROW macro is also not available on musl, defined thusly > - > -Upstream-Status: Pending > - > -Signed-off-by: Khem Raj > - > -Index: attr-2.4.47/include/xattr.h > -=================================================================== > ---- attr-2.4.47.orig/include/xattr.h 2014-04-02 00:01:30.252091280 -0700 > -+++ attr-2.4.47/include/xattr.h 2014-04-02 00:12:57.985428099 -0700 > -@@ -30,8 +30,20 @@ > - #define XATTR_CREATE 0x1 /* set value, fail if attr already exists */ > - #define XATTR_REPLACE 0x2 /* set value, fail if attr does not exist */ > - > -- > --__BEGIN_DECLS > -+#ifndef __THROW > -+# ifndef __GNUC_PREREQ > -+# define __GNUC_PREREQ(maj, min) (0) > -+# endif > -+# if defined __cplusplus && __GNUC_PREREQ (2,8) > -+# define __THROW throw () > -+# else > -+# define __THROW > -+# endif > -+#endif > -+ > -+#ifdef __cplusplus > -+extern "C" { > -+#endif > - > - extern int setxattr (const char *__path, const char *__name, > - const void *__value, size_t __size, int __flags) __THROW; > -@@ -58,6 +70,8 @@ > - extern int lremovexattr (const char *__path, const char *__name) __THROW; > - extern int fremovexattr (int __filedes, const char *__name) __THROW; > - > --__END_DECLS > -+#ifdef __cplusplus > -+} > -+#endif > - > - #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 00000000000..f64244f2393 > --- /dev/null > +++ b/meta/recipes-support/attr/attr/run-ptest > @@ -0,0 +1,3 @@ > +#!/bin/sh > + > +make test-suite.log > diff --git a/meta/recipes-support/attr/attr_2.4.47.bb b/meta/recipes-support/attr/attr_2.4.47.bb > deleted file mode 100644 > index fc88bef830b..00000000000 > --- a/meta/recipes-support/attr/attr_2.4.47.bb > +++ /dev/null > @@ -1,15 +0,0 @@ > -require attr.inc > - > -# configure.ac was missing from the release tarball. This should be fixed in > -# future releases of attr, remove this when updating the recipe. > -SRC_URI += "file://attr-Missing-configure.ac.patch \ > - file://dont-use-decl-macros.patch \ > - file://Remove-the-section-2-man-pages.patch \ > - file://Remove-the-attr.5-man-page-moved-to-man-pages.patch \ > - file://0001-Use-stdint-types-consistently.patch \ > - " > - > -SRC_URI[md5sum] = "84f58dec00b60f2dc8fd1c9709291cc7" > -SRC_URI[sha256sum] = "25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859" > - > -BBCLASSEXTEND = "native nativesdk" > diff --git a/meta/recipes-support/attr/attr_2.4.48.bb b/meta/recipes-support/attr/attr_2.4.48.bb > new file mode 100644 > index 00000000000..530d4e48833 > --- /dev/null > +++ b/meta/recipes-support/attr/attr_2.4.48.bb > @@ -0,0 +1,6 @@ > +require attr.inc > + > +SRC_URI[md5sum] = "bc1e5cb5c96d99b24886f1f527d3bb3d" > +SRC_URI[sha256sum] = "5ead72b358ec709ed00bbf7a9eaef1654baad937c001c044fe8b74c57f5324e7" > + > +BBCLASSEXTEND = "native nativesdk" > diff --git a/meta/recipes-support/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc > deleted file mode 100644 > index 9336ffc9389..00000000000 > --- a/meta/recipes-support/attr/ea-acl.inc > +++ /dev/null > @@ -1,52 +0,0 @@ > -# this build system is mostly shared by attr and acl > - > -SRC_URI += "file://relative-libdir.patch;striplevel=0 \ > - " > -# This patch should be applied after '(attr\|acl)-Missing-configure.ac.patch' > -SRC_URI_append = " file://0001-Added-configure-option-to-enable-disable-static-libr.patch" > - > -inherit autotools-brokensep gettext > - > -# When upstream is using automake properly, this can be removed > -CLEANBROKEN = "1" > - > -# the package comes with a custom config.h.in, it cannot be > -# overwritten by autoheader > -EXTRA_AUTORECONF += "--exclude=autoheader" > -EXTRA_OECONF = "INSTALL_USER=root INSTALL_GROUP=root" > -EXTRA_OECONF_append_class-native = " --enable-gettext=no" > -EXTRA_OECONF_append_class-target = "${@['', ' --disable-gettext '][(d.getVar('USE_NLS') == 'no')]}" > - > -EXTRA_OEMAKE = "PKG_LIB_DIR=${base_libdir} PKG_DEVLIB_DIR=${libdir}" > - > -do_install () { > - oe_runmake install install-lib install-dev DIST_ROOT="${D}" ZIP="gzip -n" > -} > - > -do_install_append_class-native () { > - if test "${libdir}" = "${base_libdir}" ; then > - return > - fi > - librelpath=${@os.path.relpath(d.getVar('libdir'), d.getVar('base_libdir'))} > - baselibrelpath=${@os.path.relpath(d.getVar('base_libdir'), d.getVar('libdir'))} > - > - # Remove bad symlinks & create the correct symlinks > - if test -L ${D}${libdir}/lib${BPN}.so ; then > - rm -rf ${D}${libdir}/lib${BPN}.so > - ln -sf $baselibrelpath/lib${BPN}.so ${D}${libdir}/lib${BPN}.so > - fi > - if test -L ${D}${base_libdir}/lib${BPN}.a ; then > - rm -rf ${D}${base_libdir}/lib${BPN}.a > - ln -sf $librelpath/lib${BPN}.a ${D}${base_libdir}/lib${BPN}.a > - fi > - if test -L ${D}${base_libdir}/lib${BPN}.la ; then > - rm -rf ${D}${base_libdir}/lib${BPN}.la > - ln -sf $librelpath/lib${BPN}.la ${D}${base_libdir}/lib${BPN}.la > - fi > -} > - > -PACKAGES =+ "lib${BPN}" > - > -FILES_lib${BPN} = "${base_libdir}/lib*${SOLIBS}" > - > -BBCLASSEXTEND = "native" > diff --git a/meta/recipes-support/attr/files/0001-Added-configure-option-to-enable-disable-static-libr.patch b/meta/recipes-support/attr/files/0001-Added-configure-option-to-enable-disable-static-libr.patch > deleted file mode 100644 > index 1c1159f2c90..00000000000 > --- a/meta/recipes-support/attr/files/0001-Added-configure-option-to-enable-disable-static-libr.patch > +++ /dev/null > @@ -1,70 +0,0 @@ > -From 01256c61ba126449c46dd4ab5d5e145488b981fa Mon Sep 17 00:00:00 2001 > -From: Amarnath Valluri > -Date: Mon, 23 Jan 2017 13:25:13 +0200 > -Subject: [PATCH] Added configure option to enable/disable static library > - > -Create static library archive only in case of --enable-static. > - > -Upstream-Status: Pending > - > -Signed-off-by: Amarnath Valluri > ---- > - configure.ac | 6 ++++++ > - include/builddefs.in | 1 + > - include/buildmacros | 3 +++ > - 3 files changed, 10 insertions(+) > - > -diff --git a/configure.ac b/configure.ac > -index b966d0e..e48268b 100644 > ---- a/configure.ac > -+++ b/configure.ac > -@@ -26,6 +26,12 @@ AC_ARG_ENABLE(shared, > - enable_shared=yes) > - AC_SUBST(enable_shared) > - > -+AC_ARG_ENABLE(static, > -+[ --enable-static=[yes/no] Enable use of static libraries [default=yes]],, > -+ enable_static=yes) > -+AC_SUBST(enable_static) > -+ > -+ > - AC_ARG_ENABLE(gettext, > - [ --enable-gettext=[yes/no] Enable alternate language support [default=yes]],, > - enable_gettext=yes) > -diff --git a/include/builddefs.in b/include/builddefs.in > -index d9931db..3b3dbd2 100644 > ---- a/include/builddefs.in > -+++ b/include/builddefs.in > -@@ -71,6 +71,7 @@ RPMBUILD = @rpmbuild@ > - RPM_VERSION = @rpm_version@ > - > - ENABLE_SHARED = @enable_shared@ > -+ENABLE_STATIC = @enable_static@ > - ENABLE_GETTEXT = @enable_gettext@ > - > - HAVE_ZIPPED_MANPAGES = @have_zipped_manpages@ > -diff --git a/include/buildmacros b/include/buildmacros > -index 39fa7e2..b0f25c5 100644 > ---- a/include/buildmacros > -+++ b/include/buildmacros > -@@ -80,6 +80,7 @@ endif > - # /usr/lib. > - ifeq ($(ENABLE_SHARED),yes) > - INSTALL_LTLIB_DEV = \ > -+ set -x; \ > - cd $(TOPDIR)/$(LIBNAME)/.libs; \ > - ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \ > - ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR); \ > -@@ -88,7 +89,9 @@ INSTALL_LTLIB_DEV = \ > - ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \ > - if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \ > - rel_lib_prefix=$$(echo $(PKG_LIB_DIR) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ > -+ if test "$(ENABLE_STATIC)" = "yes" ; then \ > - ../$(INSTALL) -S $$rel_lib_prefix$(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \ > -+ fi ;\ > - ../$(INSTALL) -S $$rel_lib_prefix$(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \ > - rel_devlib_prefix=$$(echo $(PKG_DEVLIB_DIR) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ > - ../$(INSTALL) -S $$rel_devlib_prefix$(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \ > --- > -2.7.4 > - > diff --git a/meta/recipes-support/attr/files/Remove-the-attr.5-man-page-moved-to-man-pages.patch b/meta/recipes-support/attr/files/Remove-the-attr.5-man-page-moved-to-man-pages.patch > deleted file mode 100644 > index d5ab83d7c68..00000000000 > --- a/meta/recipes-support/attr/files/Remove-the-attr.5-man-page-moved-to-man-pages.patch > +++ /dev/null > @@ -1,240 +0,0 @@ > -From 6047c8522b91235ad1e835f44f5e36472d9d49b2 Mon Sep 17 00:00:00 2001 > -From: Andreas Gruenbacher > -Date: Wed, 22 Apr 2015 11:46:59 +0200 > -Subject: [PATCH 2/2] Remove the attr.5 man page (moved to man-pages) > - > -Commit dce9b4448c7f2b22bd206cd068fb05cb2f3255b9 from > -https://git.savannah.nongnu.org/git/attr.git > - > -The attr.5 page is part of the extended attribute system call documentation, > -which has been moved into the man-pages package. Move the attr.5 page there > -as well. > - > -Upstream-Status: Backport > - > -[MA: updated to apply directly to v2.4.47] > -Signed-off-by: Mark Asselstine > ---- > - man/Makefile | 2 +- > - man/man5/Makefile | 35 ------------- > - man/man5/attr.5 | 153 ------------------------------------------------------ > - 3 files changed, 1 insertion(+), 189 deletions(-) > - delete mode 100644 man/man5/Makefile > - delete mode 100644 man/man5/attr.5 > - > -diff --git a/man/Makefile b/man/Makefile > -index 755daed..9301f09 100644 > ---- a/man/Makefile > -+++ b/man/Makefile > -@@ -19,7 +19,7 @@ > - TOPDIR = .. > - include $(TOPDIR)/include/builddefs > - > --SUBDIRS = man1 man3 man5 > -+SUBDIRS = man1 man3 > - > - default : $(SUBDIRS) > - > -diff --git a/man/man5/Makefile b/man/man5/Makefile > -deleted file mode 100644 > -index 6b70d3d..0000000 > ---- a/man/man5/Makefile > -+++ /dev/null > -@@ -1,35 +0,0 @@ > --# > --# Copyright (c) 2000, 2002 Silicon Graphics, Inc. All Rights Reserved. > --# Copyright (C) 2009 Andreas Gruenbacher > --# > --# This program is free software: you can redistribute it and/or modify it > --# under the terms of the GNU General Public License as published by > --# the Free Software Foundation, either version 2 of the License, or > --# (at your option) any later version. > --# > --# This program is distributed in the hope that it will be useful, > --# but WITHOUT ANY WARRANTY; without even the implied warranty of > --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > --# GNU General Public License for more details. > --# > --# You should have received a copy of the GNU General Public License > --# along with this program. If not, see . > --# > -- > --TOPDIR = ../.. > --include $(TOPDIR)/include/builddefs > -- > --MAN_SECTION = 5 > -- > --MAN_PAGES = $(shell echo *.$(MAN_SECTION)) > --MAN_DEST = $(PKG_MAN_DIR)/man$(MAN_SECTION) > --LSRCFILES = $(MAN_PAGES) > -- > --default : $(MAN_PAGES) > -- > --include $(BUILDRULES) > -- > --install : default > -- $(INSTALL) -m 755 -d $(MAN_DEST) > -- $(INSTALL_MAN) > --install-dev install-lib: > -diff --git a/man/man5/attr.5 b/man/man5/attr.5 > -deleted file mode 100644 > -index a02757d..0000000 > ---- a/man/man5/attr.5 > -+++ /dev/null > -@@ -1,153 +0,0 @@ > --.\" Extended attributes manual page > --.\" > --.\" Copyright (C) 2000, 2002, 2007 Andreas Gruenbacher > --.\" Copyright (C) 2001, 2002, 2004, 2007 Silicon Graphics, Inc. > --.\" All rights reserved. > --.\" > --.\" This is free documentation; you can redistribute it and/or > --.\" modify it under the terms of the GNU General Public License as > --.\" published by the Free Software Foundation; either version 2 of > --.\" the License, or (at your option) any later version. > --.\" > --.\" The GNU General Public License's references to "object code" > --.\" and "executables" are to be interpreted as the output of any > --.\" document formatting or typesetting system, including > --.\" intermediate and printed output. > --.\" > --.\" This manual is distributed in the hope that it will be useful, > --.\" but WITHOUT ANY WARRANTY; without even the implied warranty of > --.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > --.\" GNU General Public License for more details. > --.\" > --.\" You should have received a copy of the GNU General Public > --.\" License along with this manual. If not, see > --.\" . > --.\" > --.TH ATTR 5 > --.SH NAME > --attr - Extended attributes > --.SH DESCRIPTION > --Extended attributes are name:value pairs associated permanently with > --files and directories, similar to the environment strings associated > --with a process. > --An attribute may be defined or undefined. > --If it is defined, its value may be empty or non-empty. > --.PP > --Extended attributes are extensions to the normal attributes which are > --associated with all inodes in the system (i.e. the > --.BR stat (2) > --data). > --They are often used to provide additional functionality > --to a filesystem \- for example, additional security features such as > --Access Control Lists (ACLs) may be implemented using extended attributes. > --.PP > --Users with search access to a file or directory may retrieve a list of > --attribute names defined for that file or directory. > --.PP > --Extended attributes are accessed as atomic objects. > --Reading retrieves the whole value of an attribute and stores it in a buffer. > --Writing replaces any previous value with the new value. > --.PP > --Space consumed for extended attributes is counted towards the disk quotas > --of the file owner and file group. > --.PP > --Currently, support for extended attributes is implemented on Linux by the > --ext2, ext3, ext4, XFS, JFS and reiserfs filesystems. > --.SH EXTENDED ATTRIBUTE NAMESPACES > --Attribute names are zero-terminated strings. > --The attribute name is always specified in the fully qualified > --.IR namespace.attribute > --form, eg. > --.IR user.mime_type , > --.IR trusted.md5sum , > --.IR system.posix_acl_access , > --or > --.IR security.selinux . > --.PP > --The namespace mechanism is used to define different classes of extended > --attributes. > --These different classes exist for several reasons, e.g. the permissions > --and capabilities required for manipulating extended attributes of one > --namespace may differ to another. > --.PP > --Currently the > --.IR security , > --.IR system , > --.IR trusted , > --and > --.IR user > --extended attribute classes are defined as described below. Additional > --classes may be added in the future. > --.SS Extended security attributes > --The security attribute namespace is used by kernel security modules, > --such as Security Enhanced Linux. > --Read and write access permissions to security attributes depend on the > --policy implemented for each security attribute by the security module. > --When no security module is loaded, all processes have read access to > --extended security attributes, and write access is limited to processes > --that have the CAP_SYS_ADMIN capability. > --.SS Extended system attributes > --Extended system attributes are used by the kernel to store system > --objects such as Access Control Lists and Capabilities. Read and write > --access permissions to system attributes depend on the policy implemented > --for each system attribute implemented by filesystems in the kernel. > --.SS Trusted extended attributes > --Trusted extended attributes are visible and accessible only to processes that > --have the CAP_SYS_ADMIN capability (the super user usually has this > --capability). > --Attributes in this class are used to implement mechanisms in user > --space (i.e., outside the kernel) which keep information in extended attributes > --to which ordinary processes should not have access. > --.SS Extended user attributes > --Extended user attributes may be assigned to files and directories for > --storing arbitrary additional information such as the mime type, > --character set or encoding of a file. The access permissions for user > --attributes are defined by the file permission bits. > --.PP > --The file permission bits of regular files and directories are > --interpreted differently from the file permission bits of special files > --and symbolic links. For regular files and directories the file > --permission bits define access to the file's contents, while for device special > --files they define access to the device described by the special file. > --The file permissions of symbolic links are not used in access > --checks. These differences would allow users to consume filesystem resources in > --a way not controllable by disk quotas for group or world writable special files and directories. > --.PP > --For this reason, extended user attributes are only allowed for regular files and directories, and access to extended user attributes is restricted to the > --owner and to users with appropriate capabilities for directories with the > --sticky bit set (see the > --.BR chmod (1) > --manual page for an explanation of Sticky Directories). > --.SH FILESYSTEM DIFFERENCES > --The kernel and the filesystem may place limits on the maximum number > --and size of extended attributes that can be associated with a file. > --Some file systems, such as ext2/3 and reiserfs, require the filesystem > --to be mounted with the > --.B user_xattr > --mount option in order for extended user attributes to be used. > --.PP > --In the current ext2, ext3 and ext4 filesystem implementations, each > --extended attribute must fit on a single filesystem block (1024, 2048 > --or 4096 bytes, depending on the block size specified when the > --filesystem was created). > --.PP > --In the XFS and reiserfs filesystem implementations, there is no > --practical limit on the number or size of extended attributes > --associated with a file, and the algorithms used to store extended > --attribute information on disk are scalable. > --.PP > --In the JFS filesystem implementation, names can be up to 255 bytes and > --values up to 65,535 bytes. > --.SH ADDITIONAL NOTES > --Since the filesystems on which extended attributes are stored might also > --be used on architectures with a different byte order and machine word > --size, care should be taken to store attribute values in an architecture > --independent format. > --.SH AUTHORS > --Andreas Gruenbacher, > --.RI < a.gruenbacher@bestbits.at > > --and the SGI XFS development team, > --.RI < linux-xfs@oss.sgi.com >. > --.SH SEE ALSO > --getfattr(1), > --setfattr(1). > --- > -2.7.4 > - > diff --git a/meta/recipes-support/attr/files/Remove-the-section-2-man-pages.patch b/meta/recipes-support/attr/files/Remove-the-section-2-man-pages.patch > deleted file mode 100644 > index 044c5a037c8..00000000000 > --- a/meta/recipes-support/attr/files/Remove-the-section-2-man-pages.patch > +++ /dev/null > @@ -1,666 +0,0 @@ > -From b972600a26f3a930e53e2fce2625266a5d29813e Mon Sep 17 00:00:00 2001 > -From: Andreas Gruenbacher > -Date: Tue, 14 Apr 2015 23:53:11 +0200 > -Subject: [PATCH 1/2] Remove the section 2 man pages > - > -Commit 8d1263bca95722d66a6f8e83450f49d0956ea534 from upstream > -https://git.savannah.nongnu.org/git/attr.git/ > - > -The section 2 man pages have long since been added to the man-pages package > -which documents all system calls; they were disabled in attr by default since > -January 2014. Get rid of them here. > - > -Upstream-Status: Backport > - > -[MA: modified to apply directly to v2.4.47] > -Signed-off-by: Mark Asselstine > ---- > - man/Makefile | 2 +- > - man/man2/Makefile | 35 ----------- > - man/man2/getxattr.2 | 143 -------------------------------------------- > - man/man2/listxattr.2 | 158 ------------------------------------------------- > - man/man2/removexattr.2 | 111 ---------------------------------- > - man/man2/setxattr.2 | 143 -------------------------------------------- > - 6 files changed, 1 insertion(+), 591 deletions(-) > - delete mode 100644 man/man2/Makefile > - delete mode 100644 man/man2/getxattr.2 > - delete mode 100644 man/man2/listxattr.2 > - delete mode 100644 man/man2/removexattr.2 > - delete mode 100644 man/man2/setxattr.2 > - > -diff --git a/man/Makefile b/man/Makefile > -index 9535426..755daed 100644 > ---- a/man/Makefile > -+++ b/man/Makefile > -@@ -19,7 +19,7 @@ > - TOPDIR = .. > - include $(TOPDIR)/include/builddefs > - > --SUBDIRS = man1 man2 man3 man5 > -+SUBDIRS = man1 man3 man5 > - > - default : $(SUBDIRS) > - > -diff --git a/man/man2/Makefile b/man/man2/Makefile > -deleted file mode 100644 > -index d77309d..0000000 > ---- a/man/man2/Makefile > -+++ /dev/null > -@@ -1,35 +0,0 @@ > --# > --# Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved. > --# Copyright (C) 2009 Andreas Gruenbacher > --# > --# This program is free software: you can redistribute it and/or modify it > --# under the terms of the GNU General Public License as published by > --# the Free Software Foundation, either version 2 of the License, or > --# (at your option) any later version. > --# > --# This program is distributed in the hope that it will be useful, > --# but WITHOUT ANY WARRANTY; without even the implied warranty of > --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > --# GNU General Public License for more details. > --# > --# You should have received a copy of the GNU General Public License > --# along with this program. If not, see . > --# > -- > --TOPDIR = ../.. > --include $(TOPDIR)/include/builddefs > -- > --MAN_SECTION = 2 > -- > --MAN_PAGES = $(shell echo *.$(MAN_SECTION)) > --MAN_DEST = $(PKG_MAN_DIR)/man$(MAN_SECTION) > --LSRCFILES = $(MAN_PAGES) > -- > --default install : $(MAN_PAGES) > -- > --include $(BUILDRULES) > -- > --install-dev : default > -- $(INSTALL) -m 755 -d $(MAN_DEST) > -- $(INSTALL_MAN) > --install-lib: > -diff --git a/man/man2/getxattr.2 b/man/man2/getxattr.2 > -deleted file mode 100644 > -index 405ad89..0000000 > ---- a/man/man2/getxattr.2 > -+++ /dev/null > -@@ -1,143 +0,0 @@ > --.\" > --.\" Extended attributes system calls manual pages > --.\" > --.\" (C) Andreas Gruenbacher, February 2001 > --.\" (C) Silicon Graphics Inc, September 2001 > --.\" > --.\" This is free documentation; you can redistribute it and/or > --.\" modify it under the terms of the GNU General Public License as > --.\" published by the Free Software Foundation; either version 2 of > --.\" the License, or (at your option) any later version. > --.\" > --.\" The GNU General Public License's references to "object code" > --.\" and "executables" are to be interpreted as the output of any > --.\" document formatting or typesetting system, including > --.\" intermediate and printed output. > --.\" > --.\" This manual is distributed in the hope that it will be useful, > --.\" but WITHOUT ANY WARRANTY; without even the implied warranty of > --.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > --.\" GNU General Public License for more details. > --.\" > --.\" You should have received a copy of the GNU General Public > --.\" License along with this manual. If not, see > --.\" . > --.\" > --.TH GETXATTR 2 "Extended Attributes" "Dec 2001" "System calls" > --.SH NAME > --getxattr, lgetxattr, fgetxattr \- retrieve an extended attribute value > --.SH SYNOPSIS > --.fam C > --.nf > --.B #include > --.B #include > --.sp > --.BI "ssize_t getxattr (const char\ *" path ", const char\ *" name ", > --.BI "\t\t\t\t void\ *" value ", size_t " size ); > --.BI "ssize_t lgetxattr (const char\ *" path ", const char\ *" name ", > --.BI "\t\t\t\t void\ *" value ", size_t " size ); > --.BI "ssize_t fgetxattr (int " filedes ", const char\ *" name ", > --.BI "\t\t\t\t void\ *" value ", size_t " size ); > --.fi > --.fam T > --.SH DESCRIPTION > --Extended attributes are > --.IR name :\c > --.I value > --pairs associated with inodes (files, directories, symlinks, etc). > --They are extensions to the normal attributes which are associated > --with all inodes in the system (i.e. the > --.BR stat (2) > --data). > --A complete overview of extended attributes concepts can be found in > --.BR attr (5). > --.PP > --.B getxattr > --retrieves the > --.I value > --of the extended attribute identified by > --.I name > --and associated with the given > --.I path > --in the filesystem. > --The length of the attribute > --.I value > --is returned. > --.PP > --.B lgetxattr > --is identical to > --.BR getxattr , > --except in the case of a symbolic link, where the link itself is > --interrogated, not the file that it refers to. > --.PP > --.B fgetxattr > --is identical to > --.BR getxattr , > --only the open file pointed to by > --.I filedes > --(as returned by > --.BR open (2)) > --is interrogated in place of > --.IR path . > --.PP > --An extended attribute > --.I name > --is a simple NULL-terminated string. > --The name includes a namespace prefix \- there may be several, disjoint > --namespaces associated with an individual inode. > --The value of an extended attribute is a chunk of arbitrary textual or > --binary data of specified length. > --.PP > --An empty buffer of > --.I size > --zero can be passed into these calls to return the current size of the > --named extended attribute, which can be used to estimate the size of a > --buffer which is sufficiently large to hold the value associated with > --the extended attribute. > --.PP > --The interface is designed to allow guessing of initial buffer > --sizes, and to enlarge buffers when the return value indicates > --that the buffer provided was too small. > --.SH RETURN VALUE > --On success, a positive number is returned indicating the size of the > --extended attribute value. > --On failure, \-1 is returned and > --.I errno > --is set appropriately. > --.PP > --If the named attribute does not exist, or the process has no access to > --this attribute, > --.I errno > --is set to ENOATTR. > --.PP > --If the > --.I size > --of the > --.I value > --buffer is too small to hold the result, > --.I errno > --is set to ERANGE. > --.PP > --If extended attributes are not supported by the filesystem, or are disabled, > --.I errno > --is set to ENOTSUP. > --.PP > --The errors documented for the > --.BR stat (2) > --system call are also applicable here. > --.SH AUTHORS > --Andreas Gruenbacher, > --.RI < a.gruenbacher@bestbits.at > > --and the SGI XFS development team, > --.RI < linux-xfs@oss.sgi.com >. > --Please send any bug reports or comments to these addresses. > --.SH SEE ALSO > --.BR getfattr (1), > --.BR setfattr (1), > --.BR open (2), > --.BR stat (2), > --.BR setxattr (2), > --.BR listxattr (2), > --.BR removexattr (2), > --and > --.BR attr (5). > -diff --git a/man/man2/listxattr.2 b/man/man2/listxattr.2 > -deleted file mode 100644 > -index 8b4371c..0000000 > ---- a/man/man2/listxattr.2 > -+++ /dev/null > -@@ -1,158 +0,0 @@ > --.\" > --.\" Extended attributes system calls manual pages > --.\" > --.\" (C) Andreas Gruenbacher, February 2001 > --.\" (C) Silicon Graphics Inc, September 2001 > --.\" > --.\" This is free documentation; you can redistribute it and/or > --.\" modify it under the terms of the GNU General Public License as > --.\" published by the Free Software Foundation; either version 2 of > --.\" the License, or (at your option) any later version. > --.\" > --.\" The GNU General Public License's references to "object code" > --.\" and "executables" are to be interpreted as the output of any > --.\" document formatting or typesetting system, including > --.\" intermediate and printed output. > --.\" > --.\" This manual is distributed in the hope that it will be useful, > --.\" but WITHOUT ANY WARRANTY; without even the implied warranty of > --.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > --.\" GNU General Public License for more details. > --.\" > --.\" You should have received a copy of the GNU General Public > --.\" License along with this manual. If not, see > --.\" . > --.\" > --.TH LISTXATTR 2 "Extended Attributes" "Dec 2001" "System calls" > --.SH NAME > --listxattr, llistxattr, flistxattr \- list extended attribute names > --.SH SYNOPSIS > --.fam C > --.nf > --.B #include > --.B #include > --.sp > --.BI "ssize_t listxattr (const char\ *" path ", > --.BI "\t\t\t\t char\ *" list ", size_t " size ); > --.BI "ssize_t llistxattr (const char\ *" path ", > --.BI "\t\t\t\t char\ *" list ", size_t " size ); > --.BI "ssize_t flistxattr (int " filedes ", > --.BI "\t\t\t\t char\ *" list ", size_t " size ); > --.fi > --.fam T > --.SH DESCRIPTION > --Extended attributes are name:value > --pairs associated with inodes (files, directories, symlinks, etc). > --They are extensions to the normal attributes which are associated > --with all inodes in the system (i.e. the > --.BR stat (2) > --data). > --A complete overview of extended attributes concepts can be found in > --.BR attr (5). > --.PP > --.B listxattr > --retrieves the > --.I list > --of extended attribute names associated with the given > --.I path > --in the filesystem. > --The list is the set of (NULL-terminated) names, one after the other. > --Names of extended attributes to which the calling process does not > --have access may be omitted from the list. > --The length of the attribute name > --.I list > --is returned. > --.PP > --.B llistxattr > --is identical to > --.BR listxattr , > --except in the case of a symbolic link, where the list of names of > --extended attributes associated with the link itself is retrieved, > --not the file that it refers to. > --.I list > --is a caller-allocated buffer of size > --.IR size . > --.PP > --.B flistxattr > --is identical to > --.BR listxattr , > --only the open file pointed to by > --.I filedes > --(as returned by > --.BR open (2)) > --is interrogated in place of > --.IR path . > --.PP > --A single extended attribute > --.I name > --is a simple NULL-terminated string. > --The name includes a namespace prefix \- there may be several, disjoint > --namespaces associated with an individual inode. > --.PP > --An empty buffer of > --.I size > --zero can be passed into these calls to return the current size of the > --list of extended attribute names, which can be used to estimate the > --size of a buffer which is sufficiently large to hold the list of names. > --.SH EXAMPLES > --The > --.I list > --of names is returned as an unordered array of NULL-terminated character > --strings (attribute names are separated by NULL characters), like this: > --.fam C > --.RS > --.nf > --user.name1\\0system.name1\\0user.name2\\0 > --.fi > --.RE > --.fam T > --.P > --Filesystems like ext2, ext3 and XFS which implement POSIX ACLs using > --extended attributes, might return a > --.I list > --like this: > --.fam C > --.RS > --.nf > --system.posix_acl_access\\0system.posix_acl_default\\0 > --.fi > --.RE > --.fam T > --.SH RETURN VALUE > --On success, a positive number is returned indicating the size of the > --extended attribute name list. > --On failure, \-1 is returned and > --.I errno > --is set appropriately. > --.PP > --If the > --.I size > --of the > --.I list > --buffer is too small to hold the result, > --.I errno > --is set to ERANGE. > --.PP > --If extended attributes are not supported by the filesystem, or are disabled, > --.I errno > --is set to ENOTSUP. > --.PP > --The errors documented for the > --.BR stat (2) > --system call are also applicable here. > --.SH AUTHORS > --Andreas Gruenbacher, > --.RI < a.gruenbacher@bestbits.at > > --and the SGI XFS development team, > --.RI < linux-xfs@oss.sgi.com >. > --Please send any bug reports or comments to these addresses. > --.SH SEE ALSO > --.BR getfattr (1), > --.BR setfattr (1), > --.BR open (2), > --.BR stat (2), > --.BR getxattr (2), > --.BR setxattr (2), > --.BR removexattr (2), > --and > --.BR attr (5). > -diff --git a/man/man2/removexattr.2 b/man/man2/removexattr.2 > -deleted file mode 100644 > -index 2c7d934..0000000 > ---- a/man/man2/removexattr.2 > -+++ /dev/null > -@@ -1,111 +0,0 @@ > --.\" > --.\" Extended attributes system calls manual pages > --.\" > --.\" (C) Andreas Gruenbacher, February 2001 > --.\" (C) Silicon Graphics Inc, September 2001 > --.\" > --.\" This is free documentation; you can redistribute it and/or > --.\" modify it under the terms of the GNU General Public License as > --.\" published by the Free Software Foundation; either version 2 of > --.\" the License, or (at your option) any later version. > --.\" > --.\" The GNU General Public License's references to "object code" > --.\" and "executables" are to be interpreted as the output of any > --.\" document formatting or typesetting system, including > --.\" intermediate and printed output. > --.\" > --.\" This manual is distributed in the hope that it will be useful, > --.\" but WITHOUT ANY WARRANTY; without even the implied warranty of > --.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > --.\" GNU General Public License for more details. > --.\" > --.\" You should have received a copy of the GNU General Public > --.\" License along with this manual. If not, see > --.\" . > --.\" > --.TH REMOVEXATTR 2 "Extended Attributes" "Dec 2001" "System calls" > --.SH NAME > --removexattr, lremovexattr, fremovexattr \- remove an extended attribute > --.SH SYNOPSIS > --.fam C > --.nf > --.B #include > --.B #include > --.sp > --.BI "int removexattr (const char\ *" path ", const char\ *" name ); > --.BI "int lremovexattr (const char\ *" path ", const char\ *" name ); > --.BI "int fremovexattr (int " filedes ", const char\ *" name ); > --.fi > --.fam T > --.SH DESCRIPTION > --Extended attributes are > --.IR name :\c > --value pairs associated with inodes (files, directories, symlinks, etc). > --They are extensions to the normal attributes which are associated > --with all inodes in the system (i.e. the > --.BR stat (2) > --data). > --A complete overview of extended attributes concepts can be found in > --.BR attr (5). > --.PP > --.B removexattr > --removes the extended attribute identified by > --.I name > --and associated with the given > --.I path > --in the filesystem. > --.PP > --.B lremovexattr > --is identical to > --.BR removexattr , > --except in the case of a symbolic link, where the extended attribute is > --removed from the link itself, not the file that it refers to. > --.PP > --.B fremovexattr > --is identical to > --.BR removexattr , > --only the extended attribute is removed from the open file pointed to by > --.I filedes > --(as returned by > --.BR open (2)) > --in place of > --.IR path . > --.PP > --An extended attribute name is a simple NULL-terminated string. > --The > --.I name > --includes a namespace prefix \- there may be several, disjoint > --namespaces associated with an individual inode. > --.SH RETURN VALUE > --On success, zero is returned. > --On failure, \-1 is returned and > --.I errno > --is set appropriately. > --.PP > --If the named attribute does not exist, > --.I errno > --is set to ENOATTR. > --.PP > --If extended attributes are not supported by the filesystem, or are disabled, > --.I errno > --is set to ENOTSUP. > --.PP > --The errors documented for the > --.BR stat (2) > --system call are also applicable here. > --.SH AUTHORS > --Andreas Gruenbacher, > --.RI < a.gruenbacher@bestbits.at > > --and the SGI XFS development team, > --.RI < linux-xfs@oss.sgi.com >. > --Please send any bug reports or comments to these addresses. > --.SH SEE ALSO > --.BR getfattr (1), > --.BR setfattr (1), > --.BR open (2), > --.BR stat (2), > --.BR setxattr (2), > --.BR getxattr (2), > --.BR listxattr (2), > --and > --.BR attr (5). > -diff --git a/man/man2/setxattr.2 b/man/man2/setxattr.2 > -deleted file mode 100644 > -index b20dc9f..0000000 > ---- a/man/man2/setxattr.2 > -+++ /dev/null > -@@ -1,143 +0,0 @@ > --.\" > --.\" Extended attributes system calls manual pages > --.\" > --.\" (C) Andreas Gruenbacher, February 2001 > --.\" (C) Silicon Graphics Inc, September 2001 > --.\" > --.\" This is free documentation; you can redistribute it and/or > --.\" modify it under the terms of the GNU General Public License as > --.\" published by the Free Software Foundation; either version 2 of > --.\" the License, or (at your option) any later version. > --.\" > --.\" The GNU General Public License's references to "object code" > --.\" and "executables" are to be interpreted as the output of any > --.\" document formatting or typesetting system, including > --.\" intermediate and printed output. > --.\" > --.\" This manual is distributed in the hope that it will be useful, > --.\" but WITHOUT ANY WARRANTY; without even the implied warranty of > --.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > --.\" GNU General Public License for more details. > --.\" > --.\" You should have received a copy of the GNU General Public > --.\" License along with this manual. If not, see > --.\" . > --.\" > --.TH SETXATTR 2 "Extended Attributes" "Dec 2001" "System calls" > --.SH NAME > --setxattr, lsetxattr, fsetxattr \- set an extended attribute value > --.SH SYNOPSIS > --.fam C > --.nf > --.B #include > --.B #include > --.sp > --.BI "int setxattr (const char\ *" path ", const char\ *" name ", > --.BI "\t\t\t const void\ *" value ", size_t " size ", int " flags ); > --.BI "int lsetxattr (const char\ *" path ", const char\ *" name ", > --.BI "\t\t\t const void\ *" value ", size_t " size ", int " flags ); > --.BI "int fsetxattr (int " filedes ", const char\ *" name ", > --.BI "\t\t\t const void\ *" value ", size_t " size ", int " flags ); > --.fi > --.fam T > --.SH DESCRIPTION > --Extended attributes are > --.IR name :\c > --.I value > --pairs associated with inodes (files, directories, symlinks, etc). > --They are extensions to the normal attributes which are associated > --with all inodes in the system (i.e. the > --.BR stat (2) > --data). > --A complete overview of extended attributes concepts can be found in > --.BR attr (5). > --.PP > --.B setxattr > --sets the > --.I value > --of the extended attribute identified by > --.I name > --and associated with the given > --.I path > --in the filesystem. > --The > --.I size > --of the > --.I value > --must be specified. > --.PP > --.B lsetxattr > --is identical to > --.BR setxattr , > --except in the case of a symbolic link, where the extended attribute is > --set on the link itself, not the file that it refers to. > --.PP > --.B fsetxattr > --is identical to > --.BR setxattr , > --only the extended attribute is set on the open file pointed to by > --.I filedes > --(as returned by > --.BR open (2)) > --in place of > --.IR path . > --.PP > --An extended attribute name is a simple NULL-terminated string. > --The > --.I name > --includes a namespace prefix \- there may be several, disjoint > --namespaces associated with an individual inode. > --The > --.I value > --of an extended attribute is a chunk of arbitrary textual or > --binary data of specified length. > --.PP > --The > --.I flags > --parameter can be used to refine the semantics of the operation. > --XATTR_CREATE specifies a pure create, which fails if the named > --attribute exists already. > --XATTR_REPLACE specifies a pure replace operation, which fails if the > --named attribute does not already exist. > --By default (no flags), the extended attribute will be created if > --need be, or will simply replace the value if the attribute exists. > --.SH RETURN VALUE > --On success, zero is returned. > --On failure, \-1 is returned and > --.I errno > --is set appropriately. > --.PP > --If XATTR_CREATE is specified, and the attribute exists already, > --.I errno > --is set to EEXIST. > --If XATTR_REPLACE is specified, and the attribute does not exist, > --.I errno > --is set to ENOATTR. > --.PP > --If there is insufficient space remaining to store the extended attribute, > --.I errno > --is set to either ENOSPC, or EDQUOT if quota enforcement was the cause. > --.PP > --If extended attributes are not supported by the filesystem, or are disabled, > --.I errno > --is set to ENOTSUP. > --.PP > --The errors documented for the > --.BR stat (2) > --system call are also applicable here. > --.SH AUTHORS > --Andreas Gruenbacher, > --.RI < a.gruenbacher@bestbits.at > > --and the SGI XFS development team, > --.RI < linux-xfs@oss.sgi.com >. > --Please send any bug reports or comments to these addresses. > --.SH SEE ALSO > --.BR getfattr (1), > --.BR setfattr (1), > --.BR open (2), > --.BR stat (2), > --.BR getxattr (2), > --.BR listxattr (2), > --.BR removexattr (2), > --and > --.BR attr (5). > --- > -2.7.4 > - > diff --git a/meta/recipes-support/attr/files/relative-libdir.patch b/meta/recipes-support/attr/files/relative-libdir.patch > deleted file mode 100644 > index b72bf184d6f..00000000000 > --- a/meta/recipes-support/attr/files/relative-libdir.patch > +++ /dev/null > @@ -1,25 +0,0 @@ > -Upstream-Status: Pending > - > -use relative path in symbolic links, or it fails in staging > -sed expression from udev > - > -7/29/2010 - created by Qing He > - > -diff -u include.orig/buildmacros include/buildmacros > ---- include.orig/buildmacros 2010-07-29 17:39:48.000000000 +0800 > -+++ include/buildmacros 2010-07-29 18:20:34.000000000 +0800 > -@@ -88,9 +88,11 @@ > - ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ > - ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \ > - if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \ > -- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \ > -- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \ > -- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \ > -+ rel_lib_prefix=$$(echo $(PKG_LIB_DIR) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ > -+ ../$(INSTALL) -S $$rel_lib_prefix$(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \ > -+ ../$(INSTALL) -S $$rel_lib_prefix$(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \ > -+ rel_devlib_prefix=$$(echo $(PKG_DEVLIB_DIR) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ > -+ ../$(INSTALL) -S $$rel_devlib_prefix$(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \ > - fi > - else > - INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC) > diff --git a/meta/recipes-support/attr/files/run-ptest b/meta/recipes-support/attr/files/run-ptest > deleted file mode 100644 > index a6c6867f2d9..00000000000 > --- a/meta/recipes-support/attr/files/run-ptest > +++ /dev/null > @@ -1,5 +0,0 @@ > -#!/bin/sh > - > -make -C test -k tests root-tests |sed \ > - -e 's|^\[.*\] \(.*\) -- ok$|PASS: \1|' \ > - -e 's|^\[.*\] \(.*\) -- failed|FAIL: \1|' > -- > 2.17.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core