host-opkg-utils: add patch to fix opkg package creation on openSUSE 12.2

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

8 files changed, 51 insertions, 11 deletions

diff --git a/patches/opkg-utils-r4747/0001-opkg-utils-use-env-python-instead-of-fixed-path.patch b/patches/opkg-utils-r4747/0001-opkg-utils-use-env-python-instead-of-fixed-path.patch
index 4d968f78a..7f2fe24ff 100644
--- a/patches/opkg-utils-r4747/0001-opkg-utils-use-env-python-instead-of-fixed-path.patch
+++ b/patches/opkg-utils-r4747/0001-opkg-utils-use-env-python-instead-of-fixed-path.patch
@@ -16,7 +16,7 @@ Signed-off-by: George McCollister <george.mccollister@gmail.com>
  5 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/opkg-list-fields b/opkg-list-fields
-index d263b90..96057f0 100755
+index d263b90..da78d53 100755
 --- a/opkg-list-fields
 +++ b/opkg-list-fields
 @@ -1,4 +1,4 @@
@@ -26,7 +26,7 @@ index d263b90..96057f0 100755
  import sys, opkg
  
 diff --git a/opkg-make-index b/opkg-make-index
-index ae829e6..e691f3c 100755
+index ae829e6..6ebba5f 100755
 --- a/opkg-make-index
 +++ b/opkg-make-index
 @@ -1,4 +1,4 @@
@@ -36,7 +36,7 @@ index ae829e6..e691f3c 100755
  import sys, os, posixpath
  from glob import glob
 diff --git a/opkg-show-deps b/opkg-show-deps
-index a6681f4..af6e7e5 100755
+index a6681f4..9de1aac 100755
 --- a/opkg-show-deps
 +++ b/opkg-show-deps
 @@ -1,4 +1,4 @@
@@ -46,7 +46,7 @@ index a6681f4..af6e7e5 100755
  import sys, os, posixpath
  from glob import glob
 diff --git a/opkg-unbuild b/opkg-unbuild
-index eff604b..d39791c 100755
+index eff604b..b5c5227 100755
 --- a/opkg-unbuild
 +++ b/opkg-unbuild
 @@ -1,4 +1,4 @@
@@ -56,7 +56,7 @@ index eff604b..d39791c 100755
  import sys, os, re
  
 diff --git a/opkg-update-index b/opkg-update-index
-index 807f8f4..3f3a98f 100755
+index 807f8f4..3864fa5 100755
 --- a/opkg-update-index
 +++ b/opkg-update-index
 @@ -1,4 +1,4 @@
diff --git a/patches/opkg-utils-r4747/0002-opkg-make-ar-deterministic.patch b/patches/opkg-utils-r4747/0002-opkg-make-ar-deterministic.patch
index a0d219f91..9f4067a16 100644
--- a/patches/opkg-utils-r4747/0002-opkg-make-ar-deterministic.patch
+++ b/patches/opkg-utils-r4747/0002-opkg-make-ar-deterministic.patch
@@ -30,7 +30,7 @@ Not for upstream!
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
  opkg-build |    5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
+ 1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/opkg-build b/opkg-build
 index 012afd3..1c323c3 100755
diff --git a/patches/opkg-utils-r4747/0003-opkg-build-don-t-use-bashism.patch b/patches/opkg-utils-r4747/0003-opkg-build-don-t-use-bashism.patch
index 582fe1e6e..027fb4962 100644
--- a/patches/opkg-utils-r4747/0003-opkg-build-don-t-use-bashism.patch
+++ b/patches/opkg-utils-r4747/0003-opkg-build-don-t-use-bashism.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] opkg-build: don't use bashism
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
  opkg-build |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/opkg-build b/opkg-build
 index 1c323c3..f9251ea 100755
diff --git a/patches/opkg-utils-r4747/0004-opkg-Added-sha256-support.patch b/patches/opkg-utils-r4747/0004-opkg-Added-sha256-support.patch
index 1e94faaff..ed1ce15ee 100644
--- a/patches/opkg-utils-r4747/0004-opkg-Added-sha256-support.patch
+++ b/patches/opkg-utils-r4747/0004-opkg-Added-sha256-support.patch
@@ -7,7 +7,7 @@ MD5 and SHA256 hashes are generated for each package now.
 Signed-off-by: George McCollister <george.mccollister@gmail.com>
 ---
  opkg.py |   24 +++++++++++++++++++++---
- 1 files changed, 21 insertions(+), 3 deletions(-)
+ 1 file changed, 21 insertions(+), 3 deletions(-)
 
 diff --git a/opkg.py b/opkg.py
 index 3fda9b5..b000082 100644
diff --git a/patches/opkg-utils-r4747/0005-opkg-build-use-CROSS_COMPILE-ar.patch b/patches/opkg-utils-r4747/0005-opkg-build-use-CROSS_COMPILE-ar.patch
index 486eae5fe..ad6ee5b27 100644
--- a/patches/opkg-utils-r4747/0005-opkg-build-use-CROSS_COMPILE-ar.patch
+++ b/patches/opkg-utils-r4747/0005-opkg-build-use-CROSS_COMPILE-ar.patch
@@ -11,7 +11,7 @@ to cross-ar here.
 Signed-off-by: Andreas Bießmann <andreas@biessmann.de>
 ---
  opkg-build |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/opkg-build b/opkg-build
 index f9251ea..425faea 100755
diff --git a/patches/opkg-utils-r4747/0006-Fill-out-Installed-Size.patch b/patches/opkg-utils-r4747/0006-Fill-out-Installed-Size.patch
index fbdde2f88..c2b2f649b 100644
--- a/patches/opkg-utils-r4747/0006-Fill-out-Installed-Size.patch
+++ b/patches/opkg-utils-r4747/0006-Fill-out-Installed-Size.patch
@@ -8,7 +8,7 @@ space to install the package before attempting to do so.
 Signed-off-by: George McCollister <george.mccollister@gmail.com>
 ---
  opkg.py |    6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
+ 1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/opkg.py b/opkg.py
 index b000082..2531871 100644
diff --git a/patches/opkg-utils-r4747/0007-opkg-build-force-tar-gnu-format.patch b/patches/opkg-utils-r4747/0007-opkg-build-force-tar-gnu-format.patch
new file mode 100644
index 000000000..a297f2d20
--- /dev/null
+++ b/patches/opkg-utils-r4747/0007-opkg-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] opkg-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 opkg 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>
+---
+ opkg-build |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/opkg-build b/opkg-build
+index 425faea..dc53982 100755
+--- a/opkg-build
++++ b/opkg-build
+@@ -233,8 +233,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
+@@ -252,7 +252,7 @@ if [ "$outer" = "ar" ] ; then
+   ( cd $tmp_dir && chown 0:0 ./debian-binary ./data.tar.gz ./control.tar.gz &&
+ 	${CROSS_COMPILE}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/opkg-utils-r4747/series b/patches/opkg-utils-r4747/series
index 32581398a..e9c42678c 100644
--- a/patches/opkg-utils-r4747/series
+++ b/patches/opkg-utils-r4747/series
@@ -6,4 +6,5 @@
 0004-opkg-Added-sha256-support.patch
 0005-opkg-build-use-CROSS_COMPILE-ar.patch
 0006-Fill-out-Installed-Size.patch
-# 5aded1e9c50a39f9e0f80584cc2f2aaf  - git-ptx-patches magic
+0007-opkg-build-force-tar-gnu-format.patch
+# fd5b7b6773ea606e9581496ef7e369f4  - git-ptx-patches magic