summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMariano Lopez <mariano.lopez@linux.intel.com>2016-08-05 11:25:20 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-10 10:46:31 +0100
commit262c81e3ca2583be2d44b7195747f1a42a10a9f3 (patch)
tree30a2d61eb80728c8effcea81f068ee2588cd9e56
parent1f00fa182b615cfa1862cb5dcb6b0d868a508d84 (diff)
downloadpoky-262c81e3ca2583be2d44b7195747f1a42a10a9f3.tar.gz
quilt/acl/attc/sed: Fix use of tar's --exclude option for tar >= 1.29
Starting from tar 1.29 the --exclude option won't work anymore if is not used before the path. There are some recipes that copy the ptest using tar and --exclude option. This fixes these for OE-Core recipes. [YOCTO #9763] (From OE-Core rev: 2ba55933c81f78f4e4c36e21c59e935f74ce0f52) Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/quilt/quilt.inc8
-rw-r--r--meta/recipes-extended/sed/sed-4.2.2/sed-add-ptest.patch2
-rw-r--r--meta/recipes-support/attr/acl.inc2
-rw-r--r--meta/recipes-support/attr/attr.inc2
4 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc
index 4e393c4d8f..512b798d73 100644
--- a/meta/recipes-devtools/quilt/quilt.inc
+++ b/meta/recipes-devtools/quilt/quilt.inc
@@ -48,10 +48,10 @@ do_compile_ptest() {
48} 48}
49 49
50do_install_ptest() { 50do_install_ptest() {
51 tar -cf - bin/ --exclude \*.in | ( cd ${D}${PTEST_PATH} && tar -xf - ) 51 tar -c --exclude=\*.in bin/ | ( cd ${D}${PTEST_PATH} && tar -xf - )
52 tar -cf - compat/ --exclude \*.in | ( cd ${D}${PTEST_PATH} && tar -xf - ) 52 tar -c --exclude=\*.in compat/ | ( cd ${D}${PTEST_PATH} && tar -xf - )
53 tar -cf - quilt/ --exclude \*.in | ( cd ${D}${PTEST_PATH} && tar -xf - ) 53 tar -c --exclude=\*.in quilt/ | ( cd ${D}${PTEST_PATH} && tar -xf - )
54 tar -cf - test/ --exclude mail.test --exclude delete.test | ( cd ${D}${PTEST_PATH} && tar -xf - && chmod 777 test) 54 tar -c --exclude=mail.test --exclude=delete.test test/ | ( cd ${D}${PTEST_PATH} && tar -xf - && chmod 777 test)
55 cp ${WORKDIR}/Makefile ${D}${PTEST_PATH} 55 cp ${WORKDIR}/Makefile ${D}${PTEST_PATH}
56 cp ${WORKDIR}/test.sh ${D}${PTEST_PATH} 56 cp ${WORKDIR}/test.sh ${D}${PTEST_PATH}
57} 57}
diff --git a/meta/recipes-extended/sed/sed-4.2.2/sed-add-ptest.patch b/meta/recipes-extended/sed/sed-4.2.2/sed-add-ptest.patch
index 105e8b745b..0293900fbf 100644
--- a/meta/recipes-extended/sed/sed-4.2.2/sed-add-ptest.patch
+++ b/meta/recipes-extended/sed/sed-4.2.2/sed-add-ptest.patch
@@ -54,7 +54,7 @@ index d80e72c..b05f01e 100644
54 # dummy targets for $(TESTS) so that make does not complain. 54 # dummy targets for $(TESTS) so that make does not complain.
55 55
56+install-ptest: 56+install-ptest:
57+ cd $(BUILDDIR); tar -cf - $(TESTDIR) --exclude *.o | ( cd $(DESTDIR) && tar -xf - ) 57+ cd $(BUILDDIR); tar -c --exclude=*.o $(TESTDIR) | ( cd $(DESTDIR) && tar -xf - )
58+ for i in $(EXTRA_DIST) tst-regex2.c; do install $(srcdir)/$$i $(DESTDIR)/$(TESTDIR); done 58+ for i in $(EXTRA_DIST) tst-regex2.c; do install $(srcdir)/$$i $(DESTDIR)/$(TESTDIR); done
59+ sed -e 's/^Makefile:/_Makefile:/' -e 's/^srcdir = \(.*\)/srcdir = ./' -e 's/bash/sh/' -i $(DESTDIR)/$(TESTDIR)/Makefile 59+ sed -e 's/^Makefile:/_Makefile:/' -e 's/^srcdir = \(.*\)/srcdir = ./' -e 's/bash/sh/' -i $(DESTDIR)/$(TESTDIR)/Makefile
60+ for i in `grep -rl "../sed/sed" $(DESTDIR)/$(TESTDIR)`; do sed -e 's/..\/sed\/sed/sed/' -i $$i; done 60+ for i in `grep -rl "../sed/sed" $(DESTDIR)/$(TESTDIR)`; do sed -e 's/..\/sed\/sed/sed/' -i $$i; done
diff --git a/meta/recipes-support/attr/acl.inc b/meta/recipes-support/attr/acl.inc
index aebebfd965..37a0218cbb 100644
--- a/meta/recipes-support/attr/acl.inc
+++ b/meta/recipes-support/attr/acl.inc
@@ -34,7 +34,7 @@ do_install_append() {
34inherit ptest 34inherit ptest
35 35
36do_install_ptest() { 36do_install_ptest() {
37 tar -cf - test/ --exclude nfs | ( cd ${D}${PTEST_PATH} && tar -xf - ) 37 tar -c --exclude=nfs test/ | ( cd ${D}${PTEST_PATH} && tar -xf - )
38 mkdir ${D}${PTEST_PATH}/include 38 mkdir ${D}${PTEST_PATH}/include
39 cp ${S}/include/builddefs ${S}/include/buildmacros ${S}/include/buildrules ${D}${PTEST_PATH}/include/ 39 cp ${S}/include/builddefs ${S}/include/buildmacros ${S}/include/buildrules ${D}${PTEST_PATH}/include/
40} 40}
diff --git a/meta/recipes-support/attr/attr.inc b/meta/recipes-support/attr/attr.inc
index 68609784d9..a1b0829e1f 100644
--- a/meta/recipes-support/attr/attr.inc
+++ b/meta/recipes-support/attr/attr.inc
@@ -26,7 +26,7 @@ do_install_append() {
26inherit ptest 26inherit ptest
27 27
28do_install_ptest() { 28do_install_ptest() {
29 tar -cf - test/ --exclude ext | ( cd ${D}${PTEST_PATH} && tar -xf - ) 29 tar -c --exclude=ext test/ | ( cd ${D}${PTEST_PATH} && tar -xf - )
30 mkdir ${D}${PTEST_PATH}/include 30 mkdir ${D}${PTEST_PATH}/include
31 for i in builddefs buildmacros buildrules; \ 31 for i in builddefs buildmacros buildrules; \
32 do cp ${S}/include/$i ${D}${PTEST_PATH}/include/; \ 32 do cp ${S}/include/$i ${D}${PTEST_PATH}/include/; \