diff options
| author |   Mariano Lopez <mariano.lopez@linux.intel.com> | 2016-08-05 11:25:20 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-10 10:45:13 +0100 |
| commit | 2ba55933c81f78f4e4c36e21c59e935f74ce0f52 (patch) | |
| tree | 3f9da5b7d75f56b1ff2ec72b8708702e004c47cc | |
| parent | 3a9551479678f97a83db22f213a54169ab4fc989 (diff) | |
| download | openembedded-core-contrib-2ba55933c81f78f4e4c36e21c59e935f74ce0f52.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]
Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-devtools/quilt/quilt.inc | 8 | ||||
| -rw-r--r-- | meta/recipes-extended/sed/sed-4.2.2/sed-add-ptest.patch | 2 | ||||
| -rw-r--r-- | meta/recipes-support/attr/acl.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-support/attr/attr.inc | 2 |
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() { } do_install_ptest() { - tar -cf - bin/ --exclude \*.in | ( cd ${D}${PTEST_PATH} && tar -xf - ) - tar -cf - compat/ --exclude \*.in | ( cd ${D}${PTEST_PATH} && tar -xf - ) - tar -cf - quilt/ --exclude \*.in | ( cd ${D}${PTEST_PATH} && tar -xf - ) - tar -cf - test/ --exclude mail.test --exclude delete.test | ( cd ${D}${PTEST_PATH} && tar -xf - && chmod 777 test) + tar -c --exclude=\*.in bin/ | ( cd ${D}${PTEST_PATH} && tar -xf - ) + tar -c --exclude=\*.in compat/ | ( cd ${D}${PTEST_PATH} && tar -xf - ) + tar -c --exclude=\*.in quilt/ | ( cd ${D}${PTEST_PATH} && tar -xf - ) + tar -c --exclude=mail.test --exclude=delete.test test/ | ( cd ${D}${PTEST_PATH} && tar -xf - && chmod 777 test) cp ${WORKDIR}/Makefile ${D}${PTEST_PATH} cp ${WORKDIR}/test.sh ${D}${PTEST_PATH} } 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 # dummy targets for $(TESTS) so that make does not complain. +install-ptest: -+ cd $(BUILDDIR); tar -cf - $(TESTDIR) --exclude *.o | ( cd $(DESTDIR) && tar -xf - ) ++ cd $(BUILDDIR); tar -c --exclude=*.o $(TESTDIR) | ( cd $(DESTDIR) && tar -xf - ) + for i in $(EXTRA_DIST) tst-regex2.c; do install $(srcdir)/$$i $(DESTDIR)/$(TESTDIR); done + sed -e 's/^Makefile:/_Makefile:/' -e 's/^srcdir = \(.*\)/srcdir = ./' -e 's/bash/sh/' -i $(DESTDIR)/$(TESTDIR)/Makefile + 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() { inherit ptest do_install_ptest() { - tar -cf - test/ --exclude nfs | ( cd ${D}${PTEST_PATH} && tar -xf - ) + 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/ } 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() { inherit ptest do_install_ptest() { - tar -cf - test/ --exclude ext | ( cd ${D}${PTEST_PATH} && tar -xf - ) + 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/; \ |