summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-11-14 13:09:11 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-31 14:43:01 +0000
commit5ffd69e25711eb0a64aaf0b2934357d79117e1e8 (patch)
tree3b6ccf76ad14ba281ff5d245ae78223df5fec7bf
parent88825076d24d63f39efe9678900fa31e6c4b5fe9 (diff)
downloadpoky-5ffd69e25711eb0a64aaf0b2934357d79117e1e8.tar.gz
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>
-rw-r--r--meta/recipes-support/attr/acl.inc42
-rw-r--r--meta/recipes-support/attr/acl_2.2.52.bb43
2 files changed, 41 insertions, 44 deletions
diff --git a/meta/recipes-support/attr/acl.inc b/meta/recipes-support/attr/acl.inc
deleted file mode 100644
index 37a0218cbb..0000000000
--- a/meta/recipes-support/attr/acl.inc
+++ /dev/null
@@ -1,42 +0,0 @@
1SUMMARY = "Utilities for managing POSIX Access Control Lists"
2HOMEPAGE = "http://savannah.nongnu.org/projects/acl/"
3SECTION = "libs"
4
5LICENSE = "LGPLv2.1+ & GPLv2+"
6LICENSE_${PN} = "GPLv2+"
7LICENSE_lib${BPN} = "LGPLv2.1+"
8LIC_FILES_CHKSUM = "file://doc/COPYING;md5=c781d70ed2b4d48995b790403217a249 \
9 file://doc/COPYING.LGPL;md5=9e9a206917f8af112da634ce3ab41764"
10
11DEPENDS = "attr"
12SRC_URI = "${SAVANNAH_GNU_MIRROR}/acl/${BP}.src.tar.gz \
13 file://run-ptest \
14 file://acl-fix-the-order-of-expected-output-of-getfacl.patch \
15 file://test-fix-insufficient-quoting-of.patch \
16 file://test-fixups-on-SELinux-machines-for-root-testcases.patch \
17 file://test-fix-directory-permissions.patch \
18"
19
20require ea-acl.inc
21
22# avoid RPATH hardcode to staging dir
23do_configure_append() {
24 sed -i ${S}/config.status -e s,^\\\(hardcode_into_libs=\\\).*$,\\1\'no\',
25 ${S}/config.status
26}
27
28# libdir should point to .la
29do_install_append() {
30 sed -i ${D}${libdir}/libacl.la -e \
31 s,^libdir=\'${base_libdir}\'$,libdir=\'${libdir}\',
32}
33
34inherit ptest
35
36do_install_ptest() {
37 tar -c --exclude=nfs test/ | ( cd ${D}${PTEST_PATH} && tar -xf - )
38 mkdir ${D}${PTEST_PATH}/include
39 cp ${S}/include/builddefs ${S}/include/buildmacros ${S}/include/buildrules ${D}${PTEST_PATH}/include/
40}
41
42RDEPENDS_${PN}-ptest = "acl bash coreutils perl perl-module-filehandle perl-module-getopt-std perl-module-posix shadow"
diff --git a/meta/recipes-support/attr/acl_2.2.52.bb b/meta/recipes-support/attr/acl_2.2.52.bb
index ecdbdb6b79..4b1ebe0d02 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 @@
1require acl.inc 1SUMMARY = "Utilities for managing POSIX Access Control Lists"
2HOMEPAGE = "http://savannah.nongnu.org/projects/acl/"
3SECTION = "libs"
2 4
3SRC_URI += "file://add-missing-configure.ac.patch" 5LICENSE = "LGPLv2.1+ & GPLv2+"
6LICENSE_${PN} = "GPLv2+"
7LICENSE_lib${BPN} = "LGPLv2.1+"
8LIC_FILES_CHKSUM = "file://doc/COPYING;md5=c781d70ed2b4d48995b790403217a249 \
9 file://doc/COPYING.LGPL;md5=9e9a206917f8af112da634ce3ab41764"
10
11DEPENDS = "attr"
12
13SRC_URI = "${SAVANNAH_GNU_MIRROR}/acl/${BP}.src.tar.gz \
14 file://run-ptest \
15 file://acl-fix-the-order-of-expected-output-of-getfacl.patch \
16 file://test-fix-insufficient-quoting-of.patch \
17 file://test-fixups-on-SELinux-machines-for-root-testcases.patch \
18 file://test-fix-directory-permissions.patch \
19 file://add-missing-configure.ac.patch"
4 20
5SRC_URI[md5sum] = "a61415312426e9c2212bd7dc7929abda" 21SRC_URI[md5sum] = "a61415312426e9c2212bd7dc7929abda"
6SRC_URI[sha256sum] = "179074bb0580c06c4b4137be4c5a92a701583277967acdb5546043c7874e0d23" 22SRC_URI[sha256sum] = "179074bb0580c06c4b4137be4c5a92a701583277967acdb5546043c7874e0d23"
7 23
24require ea-acl.inc
25
26# avoid RPATH hardcode to staging dir
27do_configure_append() {
28 sed -i ${S}/config.status -e s,^\\\(hardcode_into_libs=\\\).*$,\\1\'no\',
29 ${S}/config.status
30}
31
32# libdir should point to .la
33do_install_append() {
34 sed -i ${D}${libdir}/libacl.la -e \
35 s,^libdir=\'${base_libdir}\'$,libdir=\'${libdir}\',
36}
37
38inherit ptest
39
40do_install_ptest() {
41 tar -c --exclude=nfs test/ | ( cd ${D}${PTEST_PATH} && tar -xf - )
42 mkdir ${D}${PTEST_PATH}/include
43 cp ${S}/include/builddefs ${S}/include/buildmacros ${S}/include/buildrules ${D}${PTEST_PATH}/include/
44}
45
46RDEPENDS_${PN}-ptest = "acl bash coreutils perl perl-module-filehandle perl-module-getopt-std perl-module-posix shadow"
8 47
9BBCLASSEXTEND = "native nativesdk" 48BBCLASSEXTEND = "native nativesdk"