summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2013-01-08 20:38:19 +0100
committerMarc Kleine-Budde <mkl@pengutronix.de>2017-11-28 16:56:42 +0100
commitc54850d8ec7b2037fc54b697236a046a69d4ffb7 (patch)
tree235ac484b52b31dc6d681688c005e15c80befc4f
parentc11b9726dee098b8ccc4fc6e5aef9a2b90c6cc9f (diff)
downloadptxdist-stable/ptxdist-2010.08.x.tar.gz
ipkg-utils: fix ipkg-index for ipkg with outer tarptxdist-2010.08.3stable/ptxdist-2010.08.x
Don't use wildcards for tar ipkg with outer tar, too. Fixes this error: index 'platform/packages/Packages'... tar: Pattern matching characters used in file names. Please, tar: use --wildcards to enable pattern matching, or --no-wildcards to tar: suppress this warning. tar: *data.tar.gz: Not found in archive tar: Exiting with failure status due to previous errors gzip: stdin: unexpected end of file Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> (cherry picked from commit b658a2577b3fc2b07c85b3059f63437b93c989ee) Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-rw-r--r--patches/ipkg-utils-050831/0008-ipkg.py-don-t-use-wildcards.patch15
1 files changed, 12 insertions, 3 deletions
diff --git a/patches/ipkg-utils-050831/0008-ipkg.py-don-t-use-wildcards.patch b/patches/ipkg-utils-050831/0008-ipkg.py-don-t-use-wildcards.patch
index 1a00ab5..452038a 100644
--- a/patches/ipkg-utils-050831/0008-ipkg.py-don-t-use-wildcards.patch
+++ b/patches/ipkg-utils-050831/0008-ipkg.py-don-t-use-wildcards.patch
@@ -6,11 +6,11 @@ it's not portable
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
- ipkg.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ ipkg.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ipkg.py b/ipkg.py
-index d6f7e69..c951371 100644
+index d6f7e69..02ca3e9 100644
--- a/ipkg.py
+++ b/ipkg.py
@@ -166,7 +166,7 @@ class Package:
@@ -22,3 +22,12 @@ index d6f7e69..c951371 100644
self.read_control(control)
control.close()
+@@ -321,7 +321,7 @@ class Package:
+ self.file_list = tarf.getnames()
+ f.close()
+ else:
+- f = os.popen("tar xfzO " + self.fn + " '*data.tar.gz' | tar tfz -","r")
++ f = os.popen("tar xfzO " + self.fn + " './data.tar.gz' | tar tfz -","r")
+ while 1:
+ line = f.readline()
+ if not line: break