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
@@ -53,13 +53,13 @@ You probably want to chown these to a system user: " >&2
53 return 1 53 return 1
54 fi 54 fi
55 55
56 pkg=`required_field Package` 56 pkg=`required_field Package`
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
62 arch=`required_field Architecture` 62 arch=`required_field Architecture`
63 [ "$?" -ne 0 ] && PKG_ERROR=1 63 [ "$?" -ne 0 ] && PKG_ERROR=1
64 64
65 required_field Maintainer >/dev/null 65 required_field Maintainer >/dev/null
@@ -118,23 +118,24 @@ You probably want to chown these to a system user: " >&2
118} 118}
119 119
120### 120###
121# ipkg-build "main" 121# ipkg-build "main"
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
128 ogargs="--owner=$owner" 129 ogargs="--owner=$owner"
129 ;; 130 ;;
130 g ) group=$OPTARG 131 g ) group=$OPTARG
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
137done 138done
138 139
139 140
140shift $(($OPTIND - 1)) 141shift $(($OPTIND - 1))
@@ -183,17 +184,18 @@ tar $ogargs -C $pkg_dir -czf $tmp_dir/data.tar.gz . --exclude=$CONTROL
183tar $ogargs -C $pkg_dir/$CONTROL -czf $tmp_dir/control.tar.gz . 184tar $ogargs -C $pkg_dir/$CONTROL -czf $tmp_dir/control.tar.gz .
184 185
185echo "2.0" > $tmp_dir/debian-binary 186echo "2.0" > $tmp_dir/debian-binary
186 187
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
196rm $tmp_dir/debian-binary $tmp_dir/data.tar.gz $tmp_dir/control.tar.gz 198rm $tmp_dir/debian-binary $tmp_dir/data.tar.gz $tmp_dir/control.tar.gz
197rmdir $tmp_dir 199rmdir $tmp_dir
198 200
199echo "Packaged contents of $pkg_dir into $pkg_file" 201echo "Packaged contents of $pkg_dir into $pkg_file"