Skip to contentSkip to conversation

Fix use of tar's --exclude option for tar >= 1.29

PATCH New [email protected] 1 participant 1 message Aug 5, 2016 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

[email protected]

author
#1 lore raw

PATCH 1/1 Fix use of tar's --exclude option for tar >= 1.29

From: Mariano Lopez <[email protected]>

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 <[email protected]>
---
 meta/recipes-devtools/quilt/quilt.inc                   | 8 ++++----
 meta/recipes-extended/sed/sed-4.2.2/sed-add-ptest.patch | 2 +-
 meta/recipes-support/attr/acl.inc                       | 2 +-
 meta/recipes-support/attr/attr.inc                      | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
meta/recipes-devtools/quilt/quilt.inc +4 -4
index 4e393c4..512b798 100644
@@ -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}
 }
meta/recipes-extended/sed/sed-4.2.2/sed-add-ptest.patch +1 -1
index 105e8b7..0293900 100644
@@ -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
meta/recipes-support/attr/acl.inc +1 -1
index aebebfd..37a0218 100644
@@ -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/
 }
meta/recipes-support/attr/attr.inc +1 -1
index 6860978..a1b0829 100644
@@ -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/; \
Signature · 1 line
2.6.6