summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xscripts/ipkg-build18
1 files changed, 10 insertions, 8 deletions
diff --git a/scripts/ipkg-build b/scripts/ipkg-build
index 0533048..c6af056 100755
--- a/scripts/ipkg-build
+++ b/scripts/ipkg-build
@@ -57,5 +57,5 @@ You probably want to chown these to a system user: " >&2
57 [ "$?" -ne 0 ] && PKG_ERROR=1 57 [ "$?" -ne 0 ] && PKG_ERROR=1
58 58
59 version=`required_field Version | sed 's/.*://;'` 59 version=`required_field Version | sed 's/Version://; s/^.://g;'`
60 [ "$?" -ne 0 ] && PKG_ERROR=1 60 [ "$?" -ne 0 ] && PKG_ERROR=1
61 61
@@ -122,6 +122,7 @@ You probably want to chown these to a system user: " >&2
122### 122###
123ogargs="" 123ogargs=""
124usage="Usage: $0 [-o owner] [-g group] [-c] <pkg_directory> [<destination_directory>]" 124outer=ar
125while getopts ":o:g:c" opt; do 125usage="Usage: $0 [-c] [-o owner] [-g group] <pkg_directory> [<destination_directory>]"
126while getopts "cg:o:" opt; do
126 case $opt in 127 case $opt in
127 o ) owner=$OPTARG 128 o ) owner=$OPTARG
@@ -131,6 +132,6 @@ while getopts ":o:g:c" opt; do
131 ogargs="$ogargs --group=$group" 132 ogargs="$ogargs --group=$group"
132 ;; 133 ;;
133 c ) classic=1 134 c ) outer=tar
134 ;; 135 ;;
135 \? ) echo $usage >&2 136 \? ) echo $usage >&2
136 esac 137 esac
@@ -187,9 +188,10 @@ echo "2.0" > $tmp_dir/debian-binary
187pkg_file=$dest_dir/${pkg}_${version}_${arch}.ipk 188pkg_file=$dest_dir/${pkg}_${version}_${arch}.ipk
188here_dir=$PWD 189here_dir=$PWD
190## tar -C $tmp_dir -czf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz
189rm -f $pkg_file 191rm -f $pkg_file
190if [ -n "$classic" ]; then 192if [ "$outer" = "ar" ] ; then
191 tar -C $tmp_dir -czf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz 193 cd $tmp_dir ; ar crf $here_dir/$pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz
192else 194else
193 cd $tmp_dir ; ar crf $here_dir/$pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz 195 cd $tmp_dir ; tar -zcf $here_dir/$pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz
194fi 196fi
195cd $here_dir 197cd $here_dir