diff options
12 files changed, 69 insertions, 58 deletions
diff --git a/patches/ipkg-utils-050831/0001-ipkg-utils-fix.patch b/patches/ipkg-utils-050831/0001-ipkg-utils-fix.patch index 1eb0bb7a3..50eb2b6a6 100644 --- a/patches/ipkg-utils-050831/0001-ipkg-utils-fix.patch +++ b/patches/ipkg-utils-050831/0001-ipkg-utils-fix.patch @@ -3,8 +3,8 @@ Date: Fri, 22 Jan 2010 11:05:05 +0100 Subject: [PATCH] ipkg-utils-fix --- - ipkg.py | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + ipkg.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ipkg.py b/ipkg.py index 02aab22..e175c8d 100644 @@ -22,6 +22,3 @@ index 02aab22..e175c8d 100644 line = control.readline() while 1: if not line: break --- -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 db080bee4..e0ecb38f1 100644 --- a/patches/ipkg-utils-050831/0002-ipkg-py-sane-vercompare.patch +++ b/patches/ipkg-utils-050831/0002-ipkg-py-sane-vercompare.patch @@ -4,8 +4,8 @@ Subject: [PATCH] ipkg-py-sane-vercompare Only in ipkg-utils: ipkg-py-sane-vercompare.patch --- - ipkg.py | 26 ++++++++++++++++++++++---- - 1 files changed, 22 insertions(+), 4 deletions(-) + ipkg.py | 26 ++++++++++++++++++++++---- + 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/ipkg.py b/ipkg.py index e175c8d..824ba4d 100644 @@ -58,6 +58,3 @@ index e175c8d..824ba4d 100644 package = Package() package.set_package("FooBar") --- -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 cd5c79702..2df6f2ec8 100644 --- a/patches/ipkg-utils-050831/0003-ipkg-py-tarfile.patch +++ b/patches/ipkg-utils-050831/0003-ipkg-py-tarfile.patch @@ -3,9 +3,9 @@ Date: Fri, 22 Jan 2010 11:05:07 +0100 Subject: [PATCH] ipkg-py-tarfile --- - arfile.py | 124 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - ipkg.py | 121 +++++++++++++++++++++++++++++++++-------------------------- - setup.py | 2 +- + arfile.py | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + ipkg.py | 121 +++++++++++++++++++++++++++++++++--------------------------- + setup.py | 2 +- 3 files changed, 192 insertions(+), 55 deletions(-) create mode 100644 arfile.py @@ -326,6 +326,3 @@ index 1c0c96c..8b28392 100644 + py_modules = [ 'ipkg', 'arfile' ], scripts = ['ipkg-compare-indexes', 'ipkg-make-index', 'ipkg-update-index', 'ipkg-build', 'ipkg-unbuild', 'ipkg-upload'] ) --- -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 6c0d99f87..1eda788ff 100644 --- a/patches/ipkg-utils-050831/0004-arfile_even_alignment.patch +++ b/patches/ipkg-utils-050831/0004-arfile_even_alignment.patch @@ -3,8 +3,8 @@ Date: Fri, 22 Jan 2010 11:05:12 +0100 Subject: [PATCH] arfile_even_alignment --- - arfile.py | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + arfile.py | 2 ++ + 1 file changed, 2 insertions(+) diff --git a/arfile.py b/arfile.py index 0bcd8d0..597cb3d 100644 @@ -19,6 +19,3 @@ index 0bcd8d0..597cb3d 100644 data = self.f.seek(size, 1) # print hex(f.tell()) --- -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 086b39766..4c2e14d78 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 @@ -3,8 +3,8 @@ Date: Fri, 22 Jan 2010 11:05:14 +0100 Subject: [PATCH] ipkg-make-index-track-stamps --- - ipkg-make-index | 29 ++++++++++++++++++++++++++--- - 1 files changed, 26 insertions(+), 3 deletions(-) + ipkg-make-index | 29 ++++++++++++++++++++++++++--- + 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/ipkg-make-index b/ipkg-make-index index 8924dd0..6a49849 100755 @@ -90,6 +90,3 @@ index 8924dd0..6a49849 100755 if opt_s: sys.exit(0) --- -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 7700594f7..4acb01879 100644 --- a/patches/ipkg-utils-050831/0006-fields_tweaks.patch +++ b/patches/ipkg-utils-050831/0006-fields_tweaks.patch @@ -3,10 +3,10 @@ Date: Fri, 22 Jan 2010 11:05:15 +0100 Subject: [PATCH] fields_tweaks --- - Makefile | 2 ++ - ipkg-list-fields | 13 +++++++++++++ - ipkg.py | 8 +++++++- - 3 files changed, 22 insertions(+), 1 deletions(-) + Makefile | 2 ++ + ipkg-list-fields | 13 +++++++++++++ + ipkg.py | 8 +++++++- + 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 ipkg-list-fields diff --git a/Makefile b/Makefile @@ -74,6 +74,3 @@ index 67c2aa3..d6f7e69 100644 out = out + "\n" return out --- -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 4bbd91f5c..1483163ab 100644 --- a/patches/ipkg-utils-050831/0007-ipkg-env.patch +++ b/patches/ipkg-utils-050831/0007-ipkg-env.patch @@ -3,12 +3,12 @@ Date: Fri, 22 Jan 2010 11:05:16 +0100 Subject: [PATCH] ipkg-env --- - ipkg-list-fields | 2 +- - ipkg-make-index | 2 +- - ipkg-show-deps | 2 +- - ipkg-unbuild | 2 +- - ipkg-update-index | 2 +- - ipkg-upload | 2 +- + ipkg-list-fields | 2 +- + ipkg-make-index | 2 +- + ipkg-show-deps | 2 +- + ipkg-unbuild | 2 +- + ipkg-update-index | 2 +- + ipkg-upload | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ipkg-list-fields b/ipkg-list-fields @@ -71,6 +71,3 @@ index 2fe5186..01e5815 100755 import sys, os, os.path, re --- -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 5fd76c8ff..1a00ab579 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,8 +6,8 @@ it's not portable Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- - ipkg.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + ipkg.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ipkg.py b/ipkg.py index d6f7e69..c951371 100644 @@ -22,6 +22,3 @@ index d6f7e69..c951371 100644 self.read_control(control) control.close() --- -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 7d67f766d..f0db44bb9 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 @@ -4,8 +4,8 @@ Subject: [PATCH] Makefile: add prefix to python install Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- - Makefile | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7093a0d..249c687 100644 @@ -20,6 +20,3 @@ index 7093a0d..249c687 100644 chmod agu+rx ipkg-make-index cp -f ipkg-make-index $(PREFIX)/bin chmod agu+rx ipkg-list-fields --- -1.7.2.3 - diff --git a/patches/ipkg-utils-050831/0010-ipkg-make-ar-deterministic.patch b/patches/ipkg-utils-050831/0010-ipkg-make-ar-deterministic.patch index 61196502b..b985ba473 100644 --- a/patches/ipkg-utils-050831/0010-ipkg-make-ar-deterministic.patch +++ b/patches/ipkg-utils-050831/0010-ipkg-make-ar-deterministic.patch @@ -29,8 +29,8 @@ Not for upstream! Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- - ipkg-build | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) + ipkg-build | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ipkg-build b/ipkg-build index 77367ac..7234e64 100755 @@ -48,6 +48,3 @@ index 77367ac..7234e64 100755 else ( cd $tmp_dir && tar -zcf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz ) fi --- -1.7.2.3 - diff --git a/patches/ipkg-utils-050831/0011-ipkg-build-force-tar-gnu-format.patch b/patches/ipkg-utils-050831/0011-ipkg-build-force-tar-gnu-format.patch new file mode 100644 index 000000000..d312f365c --- /dev/null +++ b/patches/ipkg-utils-050831/0011-ipkg-build-force-tar-gnu-format.patch @@ -0,0 +1,39 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Tue, 11 Dec 2012 11:29:25 +0100 +Subject: [PATCH] ipkg-build: force tar gnu format + +Since openSUSE 12.2 the installed tar uses posix instead of gnu encoding by +default. This format is not fully supported by ipkg and results in ipk +packages not installable at the target. + +Based on a patch from OpenWrt. + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + ipkg-build | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/ipkg-build b/ipkg-build +index 7234e64..528c1ef 100755 +--- a/ipkg-build ++++ b/ipkg-build +@@ -226,8 +226,8 @@ tmp_dir=$dest_dir/IPKG_BUILD.$$ + mkdir $tmp_dir + + echo $CONTROL > $tmp_dir/tarX +-( cd $pkg_dir && tar $ogargs -X $tmp_dir/tarX -czf $tmp_dir/data.tar.gz . ) +-( cd $pkg_dir/$CONTROL && tar $ogargs -czf $tmp_dir/control.tar.gz . ) ++( cd $pkg_dir && tar $ogargs -X $tmp_dir/tarX --format=gnu -czf $tmp_dir/data.tar.gz . ) ++( cd $pkg_dir/$CONTROL && tar $ogargs --format=gnu -czf $tmp_dir/control.tar.gz . ) + rm $tmp_dir/tarX + + echo "2.0" > $tmp_dir/debian-binary +@@ -240,7 +240,7 @@ if [ "$outer" = "ar" ] ; then + ( cd $tmp_dir && chown 0:0 ./debian-binary ./data.tar.gz ./control.tar.gz && + ar -crf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz ) + else +- ( cd $tmp_dir && tar -zcf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz ) ++ ( cd $tmp_dir && tar --format=gnu -zcf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz ) + fi + + rm $tmp_dir/debian-binary $tmp_dir/data.tar.gz $tmp_dir/control.tar.gz diff --git a/patches/ipkg-utils-050831/series b/patches/ipkg-utils-050831/series index 96fc5fe56..dca7fd8df 100644 --- a/patches/ipkg-utils-050831/series +++ b/patches/ipkg-utils-050831/series @@ -1,4 +1,5 @@ # generated by git-ptx-patches +#tag:base --start-number 1 0001-ipkg-utils-fix.patch 0002-ipkg-py-sane-vercompare.patch 0003-ipkg-py-tarfile.patch @@ -9,4 +10,5 @@ 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 +0011-ipkg-build-force-tar-gnu-format.patch +# 0d3699dca0b0443b020659319eb092d9 - git-ptx-patches magic |