summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2010-11-08 13:33:12 +0100
committerMarc Kleine-Budde <mkl@pengutronix.de>2017-11-28 16:56:42 +0100
commite8f53eba170d3babb1496f95204c28d66b8d51a7 (patch)
tree488e8131552d2abc4034d44fda9c7900cb8284a2 /patches
parentd30207ecbc012885e40b0e3147a04c6bdae15470 (diff)
downloadptxdist-e8f53eba170d3babb1496f95204c28d66b8d51a7.tar.gz
ptxdist-e8f53eba170d3babb1496f95204c28d66b8d51a7.tar.xz
ipkg-utils: regenerate patches
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> (cherry picked from commit 5b1589e4d873554d82aedff61f5f5f2bcc778ff3) Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r--patches/ipkg-utils-050831/0001-ipkg-utils-fix.patch5
-rw-r--r--patches/ipkg-utils-050831/0002-ipkg-py-sane-vercompare.patch5
-rw-r--r--patches/ipkg-utils-050831/0003-ipkg-py-tarfile.patch6
-rw-r--r--patches/ipkg-utils-050831/0004-arfile_even_alignment.patch5
-rw-r--r--patches/ipkg-utils-050831/0005-ipkg-make-index-track-stamps.patch5
-rw-r--r--patches/ipkg-utils-050831/0006-fields_tweaks.patch5
-rw-r--r--patches/ipkg-utils-050831/0007-ipkg-env.patch5
-rw-r--r--patches/ipkg-utils-050831/0008-ipkg.py-don-t-use-wildcards.patch5
-rw-r--r--patches/ipkg-utils-050831/0009-Makefile-add-prefix-to-python-install.patch5
-rw-r--r--patches/ipkg-utils-050831/series2
10 files changed, 20 insertions, 28 deletions
diff --git a/patches/ipkg-utils-050831/0001-ipkg-utils-fix.patch b/patches/ipkg-utils-050831/0001-ipkg-utils-fix.patch
index bf7f96bbf..1eb0bb7a3 100644
--- a/patches/ipkg-utils-050831/0001-ipkg-utils-fix.patch
+++ b/patches/ipkg-utils-050831/0001-ipkg-utils-fix.patch
@@ -1,7 +1,6 @@
-From bbb913851e688056a254de00fa9d90d44ce1d3e5 Mon Sep 17 00:00:00 2001
From: the openembedded project <http://openembedded.net/>
Date: Fri, 22 Jan 2010 11:05:05 +0100
-Subject: [PATCH 1/9] ipkg-utils-fix
+Subject: [PATCH] ipkg-utils-fix
---
ipkg.py | 4 ++--
@@ -24,5 +23,5 @@ index 02aab22..e175c8d 100644
while 1:
if not line: break
--
-1.6.6
+1.7.2.3
diff --git a/patches/ipkg-utils-050831/0002-ipkg-py-sane-vercompare.patch b/patches/ipkg-utils-050831/0002-ipkg-py-sane-vercompare.patch
index a1d14513d..db080bee4 100644
--- a/patches/ipkg-utils-050831/0002-ipkg-py-sane-vercompare.patch
+++ b/patches/ipkg-utils-050831/0002-ipkg-py-sane-vercompare.patch
@@ -1,7 +1,6 @@
-From 1c5e0061551041643689960302212a31263b4a2b Mon Sep 17 00:00:00 2001
From: the openembedded project <http://openembedded.net/>
Date: Fri, 22 Jan 2010 11:05:06 +0100
-Subject: [PATCH 2/9] ipkg-py-sane-vercompare
+Subject: [PATCH] ipkg-py-sane-vercompare
Only in ipkg-utils: ipkg-py-sane-vercompare.patch
---
@@ -60,5 +59,5 @@ index e175c8d..824ba4d 100644
package.set_package("FooBar")
--
-1.6.6
+1.7.2.3
diff --git a/patches/ipkg-utils-050831/0003-ipkg-py-tarfile.patch b/patches/ipkg-utils-050831/0003-ipkg-py-tarfile.patch
index 205063f9b..cd5c79702 100644
--- a/patches/ipkg-utils-050831/0003-ipkg-py-tarfile.patch
+++ b/patches/ipkg-utils-050831/0003-ipkg-py-tarfile.patch
@@ -1,9 +1,7 @@
-From 58d97dac258ba1c2930f21b560c92e84ffd70319 Mon Sep 17 00:00:00 2001
From: the openembedded project <http://openembedded.net/>
Date: Fri, 22 Jan 2010 11:05:07 +0100
-Subject: [PATCH 3/9] ipkg-py-tarfile
+Subject: [PATCH] ipkg-py-tarfile
-===================================================================
---
arfile.py | 124 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
ipkg.py | 121 +++++++++++++++++++++++++++++++++--------------------------
@@ -329,5 +327,5 @@ index 1c0c96c..8b28392 100644
scripts = ['ipkg-compare-indexes', 'ipkg-make-index', 'ipkg-update-index', 'ipkg-build', 'ipkg-unbuild', 'ipkg-upload']
)
--
-1.6.6
+1.7.2.3
diff --git a/patches/ipkg-utils-050831/0004-arfile_even_alignment.patch b/patches/ipkg-utils-050831/0004-arfile_even_alignment.patch
index d22d9e516..6c0d99f87 100644
--- a/patches/ipkg-utils-050831/0004-arfile_even_alignment.patch
+++ b/patches/ipkg-utils-050831/0004-arfile_even_alignment.patch
@@ -1,7 +1,6 @@
-From f6efdc7de100f6177f3bbb70416e722ce1fda660 Mon Sep 17 00:00:00 2001
From: the openembedded project <http://openembedded.net/>
Date: Fri, 22 Jan 2010 11:05:12 +0100
-Subject: [PATCH 4/9] arfile_even_alignment
+Subject: [PATCH] arfile_even_alignment
---
arfile.py | 2 ++
@@ -21,5 +20,5 @@ index 0bcd8d0..597cb3d 100644
# print hex(f.tell())
--
-1.6.6
+1.7.2.3
diff --git a/patches/ipkg-utils-050831/0005-ipkg-make-index-track-stamps.patch b/patches/ipkg-utils-050831/0005-ipkg-make-index-track-stamps.patch
index 7e8245de3..086b39766 100644
--- a/patches/ipkg-utils-050831/0005-ipkg-make-index-track-stamps.patch
+++ b/patches/ipkg-utils-050831/0005-ipkg-make-index-track-stamps.patch
@@ -1,7 +1,6 @@
-From 7977d6e578b9bbb3e61dd43cae1961bf355b3a6d Mon Sep 17 00:00:00 2001
From: the openembedded project <http://openembedded.net/>
Date: Fri, 22 Jan 2010 11:05:14 +0100
-Subject: [PATCH 5/9] ipkg-make-index-track-stamps
+Subject: [PATCH] ipkg-make-index-track-stamps
---
ipkg-make-index | 29 ++++++++++++++++++++++++++---
@@ -92,5 +91,5 @@ index 8924dd0..6a49849 100755
sys.exit(0)
--
-1.6.6
+1.7.2.3
diff --git a/patches/ipkg-utils-050831/0006-fields_tweaks.patch b/patches/ipkg-utils-050831/0006-fields_tweaks.patch
index 7f692e362..7700594f7 100644
--- a/patches/ipkg-utils-050831/0006-fields_tweaks.patch
+++ b/patches/ipkg-utils-050831/0006-fields_tweaks.patch
@@ -1,7 +1,6 @@
-From 9c30d24f076333a5176ad9741551e8c12d174a44 Mon Sep 17 00:00:00 2001
From: the openembedded project <http://openembedded.net/>
Date: Fri, 22 Jan 2010 11:05:15 +0100
-Subject: [PATCH 6/9] fields_tweaks
+Subject: [PATCH] fields_tweaks
---
Makefile | 2 ++
@@ -76,5 +75,5 @@ index 67c2aa3..d6f7e69 100644
return out
--
-1.6.6
+1.7.2.3
diff --git a/patches/ipkg-utils-050831/0007-ipkg-env.patch b/patches/ipkg-utils-050831/0007-ipkg-env.patch
index 299b42840..4bbd91f5c 100644
--- a/patches/ipkg-utils-050831/0007-ipkg-env.patch
+++ b/patches/ipkg-utils-050831/0007-ipkg-env.patch
@@ -1,7 +1,6 @@
-From d4b08628c7c7f257c7b231ad60958300eed48db8 Mon Sep 17 00:00:00 2001
From: the openembedded project <http://openembedded.net/>
Date: Fri, 22 Jan 2010 11:05:16 +0100
-Subject: [PATCH 7/9] ipkg-env
+Subject: [PATCH] ipkg-env
---
ipkg-list-fields | 2 +-
@@ -73,5 +72,5 @@ index 2fe5186..01e5815 100755
import sys, os, os.path, re
--
-1.6.6
+1.7.2.3
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 e32e1feeb..5fd76c8ff 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
@@ -1,7 +1,6 @@
-From 3495129e1a3de5f72c8669735fa65d65a7d80d20 Mon Sep 17 00:00:00 2001
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Fri, 22 Jan 2010 11:22:41 +0100
-Subject: [PATCH 8/9] ipkg.py: don't use wildcards
+Subject: [PATCH] ipkg.py: don't use wildcards
it's not portable
@@ -24,5 +23,5 @@ index d6f7e69..c951371 100644
self.read_control(control)
control.close()
--
-1.6.6
+1.7.2.3
diff --git a/patches/ipkg-utils-050831/0009-Makefile-add-prefix-to-python-install.patch b/patches/ipkg-utils-050831/0009-Makefile-add-prefix-to-python-install.patch
index ce88544dc..7d67f766d 100644
--- a/patches/ipkg-utils-050831/0009-Makefile-add-prefix-to-python-install.patch
+++ b/patches/ipkg-utils-050831/0009-Makefile-add-prefix-to-python-install.patch
@@ -1,7 +1,6 @@
-From 58ae8050e076f2cd4a073b3090c71606160ea4eb Mon Sep 17 00:00:00 2001
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Fri, 22 Jan 2010 11:27:37 +0100
-Subject: [PATCH 9/9] Makefile: add prefix to python install
+Subject: [PATCH] Makefile: add prefix to python install
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
@@ -22,5 +21,5 @@ index 7093a0d..249c687 100644
cp -f ipkg-make-index $(PREFIX)/bin
chmod agu+rx ipkg-list-fields
--
-1.6.6
+1.7.2.3
diff --git a/patches/ipkg-utils-050831/series b/patches/ipkg-utils-050831/series
index 8840abe4e..96fc5fe56 100644
--- a/patches/ipkg-utils-050831/series
+++ b/patches/ipkg-utils-050831/series
@@ -1,3 +1,4 @@
+# generated by git-ptx-patches
0001-ipkg-utils-fix.patch
0002-ipkg-py-sane-vercompare.patch
0003-ipkg-py-tarfile.patch
@@ -8,3 +9,4 @@
0008-ipkg.py-don-t-use-wildcards.patch
0009-Makefile-add-prefix-to-python-install.patch
0010-ipkg-make-ar-deterministic.patch
+# 15e754b052c20bbbef97578c9ec3e691 - git-ptx-patches magic