From 41f83f83f26d15c503e78bd1b8a7fe4d406c7730 Mon Sep 17 00:00:00 2001
From: Alex Stewart <alex.stewart@ni.com>
Date: Tue, 15 Aug 2023 17:52:20 -0400
Subject: [PATCH] Revert "opkg-build: Add acls and xattrs support"

This reverts commit dc50e85ff1ceb2ffae2634a001f524a84a1b40e7.
---
 opkg-build | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/opkg-build b/opkg-build
index 8d9bcfa..a9e45d4 100755
--- a/opkg-build
+++ b/opkg-build
@@ -145,7 +145,6 @@ You probably want to chown these to a system user: " >&2
 ###
 # opkg-build "main"
 ###
-attributesargs=""
 ogargs=""
 outer=ar
 noclean=0
@@ -167,7 +166,7 @@ compressorargs=""
 tarformat=""
 if tar --help 2>&1 | grep -- "--format" > /dev/null;
 then
-    tarformat="--format=posix"
+    tarformat="--format=gnu"
 fi
 
 compressor_ext() {
@@ -198,17 +197,13 @@ compressor_ext() {
 : <<=cut
 =head1 SYNOPSIS
 
-B<opkg-build> [B<-A>] [B<-X>] [B<-c>] [B<-C>] [B<-Z> I<compressor>] [B<-a>] [B<-O>] [B<-o> I<owner>] [B<-g> I<group>] I<pkg_directory> [I<destination_directory>]
+B<opkg-build> [B<-c>] [B<-C>] [B<-Z> I<compressor>] [B<-a>] [B<-O>] [B<-o> I<owner>] [B<-g> I<group>] I<pkg_directory> [I<destination_directory>]
 
 =cut
 
-usage="Usage: $0 [-A] [-X] [-c] [-C] [-Z compressor] [-a compressor_args] [-O] [-o owner] [-g group] <pkg_directory> [<destination_directory>]"
-while getopts "Aa:cCg:ho:vOXZ:" opt; do
+usage="Usage: $0 [-c] [-C] [-Z compressor] [-a compressor_args] [-O] [-o owner] [-g group] <pkg_directory> [<destination_directory>]"
+while getopts "a:cCg:ho:vOZ:" opt; do
     case $opt in
-        A ) attributesargs="--acls"
-            ;;
-        X ) attributesargs="$attributesargs --xattrs"
-            ;;
 	o ) owner=$OPTARG
 	    ogargs="--owner=$owner"
 	    ;;
@@ -319,7 +314,7 @@ export LANG=C
 export LC_ALL=C
 ( cd $pkg_dir/$CONTROL && find . -type f | sort > $tmp_dir/control_list )
 ( cd $pkg_dir && find . -path ./$CONTROL -prune -o -path . -o -print  | sort > $tmp_dir/file_list )
-( cd $pkg_dir && tar $attributesargs $ogargs $tsortargs --no-recursion $mtime_args -c $tarformat -T $tmp_dir/file_list | $compressor $compressorargs > $tmp_dir/data.tar.$cext )
+( cd $pkg_dir && tar $ogargs $tsortargs --no-recursion $mtime_args -c $tarformat -T $tmp_dir/file_list | $compressor $compressorargs > $tmp_dir/data.tar.$cext )
 ( cd $pkg_dir/$CONTROL && tar $ogargs $tsortargs --no-recursion --mtime=@$build_date -c $tarformat -T $tmp_dir/control_list | gzip $zipargs > $tmp_dir/control.tar.gz )
 rm $tmp_dir/file_list
 rm $tmp_dir/control_list