[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4391/8267] acl: merge pointless .inc

[Emmanuele Bassi <ebassi src gnome org>]

commit 5ffd69e25711eb0a64aaf0b2934357d79117e1e8
Author: Ross Burton <ross burton intel com>
Date:   Mon Nov 14 13:09:11 2016 +0000

    acl: merge pointless .inc
    
    (From OE-Core rev: 362d55794c39e09ca25e52ab672274e693cb7a1a)
    
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-support/attr/acl.inc       |   42 ------------------------------
 meta/recipes-support/attr/acl_2.2.52.bb |   43 +++++++++++++++++++++++++++++-
 2 files changed, 41 insertions(+), 44 deletions(-)
---
diff --git a/meta/recipes-support/attr/acl_2.2.52.bb b/meta/recipes-support/attr/acl_2.2.52.bb
index ecdbdb6..4b1ebe0 100644
--- a/meta/recipes-support/attr/acl_2.2.52.bb
+++ b/meta/recipes-support/attr/acl_2.2.52.bb
@@ -1,9 +1,48 @@
-require acl.inc
+SUMMARY = "Utilities for managing POSIX Access Control Lists"
+HOMEPAGE = "http://savannah.nongnu.org/projects/acl/";
+SECTION = "libs"
 
-SRC_URI += "file://add-missing-configure.ac.patch"
+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://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://add-missing-configure.ac.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
+
+do_install_ptest() {
+       tar -c --exclude=nfs test/ | ( cd ${D}${PTEST_PATH} && tar -xf - )
+       mkdir ${D}${PTEST_PATH}/include
+       cp ${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"