[PATCH V2] opkg-build: add detection if using GNU tar.

[PATCH V2] opkg-build: add detection if using GNU tar.

[tom]

From: Thomas Ingleby <thomas.c.ingleby@intel.com>

* Some options of GNU tar do not exist on other implementations

Signed-off-by: Thomas Ingleby <thomas.c.ingleby@intel.com>
---
 opkg-build | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/opkg-build b/opkg-build
index e314712..ed1c93b 100755
--- a/opkg-build
+++ b/opkg-build
@@ -159,6 +159,13 @@ ogargs=""
 outer=ar
 noclean=0
 opkext=0
+
+tarformat=""
+if tar --help 2>&1 | grep -- "--format" > /dev/null;
+then
+    tarformat="--format=gnu"
+fi
+
 usage="Usage: $0 [-c] [-C] [-O] [-o owner] [-g group] <pkg_directory> [<destination_directory>]"
 while getopts "cCg:ho:vO" opt; do
     case $opt in
@@ -233,8 +240,8 @@ tmp_dir=$dest_dir/IPKG_BUILD.$$
 mkdir $tmp_dir
 
 echo $CONTROL > $tmp_dir/tarX
-( cd $pkg_dir && tar $ogargs -X $tmp_dir/tarX -cz --format=gnu -f $tmp_dir/data.tar.gz . )
-( cd $pkg_dir/$CONTROL && tar $ogargs -cz --format=gnu -f $tmp_dir/control.tar.gz . )
+( cd $pkg_dir && tar $ogargs -X $tmp_dir/tarX -cz $tarformat -f $tmp_dir/data.tar.gz . )
+( cd $pkg_dir/$CONTROL && tar $ogargs -cz $tarformat -f $tmp_dir/control.tar.gz . )
 rm $tmp_dir/tarX
 
 echo "2.0" > $tmp_dir/debian-binary
@@ -249,7 +256,7 @@ rm -f $pkg_file
 if [ "$outer" = "ar" ] ; then
   ( cd $tmp_dir && ar -crf $pkg_file ./debian-binary ./control.tar.gz ./data.tar.gz )
 else
-  ( cd $tmp_dir && tar -cz --format=gnu -f $pkg_file ./debian-binary ./control.tar.gz ./data.tar.gz )
+  ( cd $tmp_dir && tar -cz $tarformat -f $pkg_file ./debian-binary ./control.tar.gz ./data.tar.gz )
 fi
 
 rm $tmp_dir/debian-binary $tmp_dir/data.tar.gz $tmp_dir/control.tar.gz
-- 
1.9.2

Re: [PATCH V2] opkg-build: add detection if using GNU tar.

[Paul Barker]

[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]

On Tue, Jun 03, 2014 at 11:25:35AM +0100, tom@ewsting.org wrote:
> From: Thomas Ingleby <thomas.c.ingleby@intel.com>
> 
> * Some options of GNU tar do not exist on other implementations
> 
> Signed-off-by: Thomas Ingleby <thomas.c.ingleby@intel.com>

I've made a couple of slight further changes, hope you don't mind.

I've changed the subject to:

    opkg-build: Detect if tar supports '--format' option

I've also added a comment before the block of code which sets tarformat:

+# Determine if tar supports the --format argument by checking the help output.
+#
+# This is needed because:
+#    - Busybox tar doesn't support '--format'
+#    - On some Linux distros, tar now defaults to posix format if '--format'
+#      isn't explictly specified
+#    - Opkg doesn't currently support posix format archives
+#
+# It's easier to check for mention of the '--format' option than to detect the
+# tar implementation and maintain a list of which support '--format'.

I've merged this to master with those changes. Sadly I made an error writing the
comment and pushed too soon so I've pushed another commit to fix that.

Many thanks,

-- 
Paul Barker

Email: paul@paulbarker.me.uk
http://www.paulbarker.me.uk

[-- Attachment #2: Type: application/pgp-signature, Size: 501 bytes --]

Re: [PATCH V2] opkg-build: add detection if using GNU tar.

[Tom Ingleby]

Great!,

Have a good evening,
Tom

On 5 June 2014 20:56, Paul Barker <paul@paulbarker.me.uk> wrote:
> On Tue, Jun 03, 2014 at 11:25:35AM +0100, tom@ewsting.org wrote:
>> From: Thomas Ingleby <thomas.c.ingleby@intel.com>
>>
>> * Some options of GNU tar do not exist on other implementations
>>
>> Signed-off-by: Thomas Ingleby <thomas.c.ingleby@intel.com>
>
> I've made a couple of slight further changes, hope you don't mind.
>
> I've changed the subject to:
>
>     opkg-build: Detect if tar supports '--format' option
>
> I've also added a comment before the block of code which sets tarformat:
>
> +# Determine if tar supports the --format argument by checking the help output.
> +#
> +# This is needed because:
> +#    - Busybox tar doesn't support '--format'
> +#    - On some Linux distros, tar now defaults to posix format if '--format'
> +#      isn't explictly specified
> +#    - Opkg doesn't currently support posix format archives
> +#
> +# It's easier to check for mention of the '--format' option than to detect the
> +# tar implementation and maintain a list of which support '--format'.
>
> I've merged this to master with those changes. Sadly I made an error writing the
> comment and pushed too soon so I've pushed another commit to fix that.
>
> Many thanks,
>
> --
> Paul Barker
>
> Email: paul@paulbarker.me.uk
> http://www.paulbarker.me.uk