|
diff --git a/mkipks b/mkipks index ec5a659..53ef8f5 100755 --- a/ mkipks+++ b/ mkipks |
|
@@ -182,68 +182,66 @@ do |
182 | else |
182 | else |
183 | echo >&2 "$0: $i: No such file: $ff" |
183 | echo >&2 "$0: $i: No such file: $ff" |
184 | ERROR=1 |
184 | ERROR=1 |
185 | fi |
185 | fi |
186 | done |
186 | done |
187 | done |
187 | done |
188 | fi |
188 | fi |
189 | if [ -z "$ERROR" ] |
189 | if [ -z "$ERROR" ] |
190 | then |
190 | then |
191 | if [ -n "$RPM" ] |
191 | if [ -n "$RPM" ] |
192 | then |
192 | then |
193 | SPEC=/tmp/mkipks-rpm-$$.spec |
193 | SPEC=/tmp/mkipks-rpm-$$.spec |
194 | echo >$SPEC "Summary: $summary" |
194 | echo >$SPEC "Summary: $summary" |
195 | echo >>$SPEC "Name: $packagename" |
195 | echo >>$SPEC "Name: $packagename" |
196 | echo >>$SPEC "Group: $section" ########## |
196 | echo >>$SPEC "Group: $section" ########## |
197 | echo >>$SPEC "License: $license" |
197 | echo >>$SPEC "License: $license" |
198 | echo >>$SPEC "Version: ${version%-*}" |
198 | echo >>$SPEC "Version: ${version%-*}" |
199 | echo >>$SPEC "Release: ${version#*-}" |
199 | echo >>$SPEC "Release: ${version#*-}" |
200 | |
200 | |
201 | echo >>$SPEC "%description" |
201 | echo >>$SPEC "%description" |
202 | sed -n -e '/^Description:/,$ p' $i | tail +2 >>$SPEC |
202 | sed -n -e '/^Description:/,$ p' $i | tail +2 >>$SPEC |
203 | echo >>$SPEC "%files" |
203 | echo >>$SPEC "%files" |
204 | echo >>$SPEC "%defattr(-,root,root)" |
204 | echo >>$SPEC "%defattr(-,root,root)" |
205 | /bin/ls $RPMFILES >>$SPEC |
205 | /bin/ls $RPMFILES >>$SPEC |
206 | rpm -bb --target $ARCH-unknown-linux $SPEC |
206 | rpm -bb --target $ARCH-unknown-linux $SPEC |
207 | # rm $SPEC |
207 | # rm $SPEC |
208 | elif [ -z "$IMAGEDIR" ] |
208 | elif [ -z "$IMAGEDIR" ] |
209 | then |
209 | then |
210 | #size=$(du -h -s $DATADIR | sed -e 's/[ ].*//') |
210 | #size=$(du -h -s $DATADIR | sed -e 's/[ ].*//') |
211 | if (which mkfs.jffs2 >/dev/null 2>&1); then |
211 | if (which mkfs.jffs2 >/dev/null 2>&1); then |
212 | size=$(mkfs.jffs2 -r $DATADIR | wc -c) |
212 | size=$(mkfs.jffs2 -r $DATADIR | wc -c) |
213 | fi |
213 | fi |
214 | if ! (cat $f|grep -q ^Package); then |
214 | if ! (cat $i|grep -q ^Package); then |
215 | echo "Package: $packagename" >$CTRLDIR/control |
215 | echo "Package: $packagename" >$CTRLDIR/control |
216 | else |
| |
217 | cat $f|grep ^Package >$CTRLDIR/control |
| |
218 | fi |
216 | fi |
219 | if [ ! -z "$size" ]; then |
217 | if [ ! -z "$size" ]; then |
220 | echo "Installed-Size: $size" >>$CTRLDIR/control |
218 | echo "Installed-Size: $size" >>$CTRLDIR/control |
221 | else |
219 | else |
222 | if [ -z "$SIZEWARNED" ] |
220 | if [ -z "$SIZEWARNED" ] |
223 | then |
221 | then |
224 | echo "Warning, no mkfs.jffs2 found, unable to set Installed-Size." |
222 | echo "Warning, no mkfs.jffs2 found, unable to set Installed-Size." |
225 | SIZEWARNED=1 |
223 | SIZEWARNED=1 |
226 | fi |
224 | fi |
227 | fi |
225 | fi |
228 | echo "Architecture: $ARCH" >>$CTRLDIR/control |
226 | echo "Architecture: $ARCH" >>$CTRLDIR/control |
229 | echo "Version: $version" >>$CTRLDIR/control |
227 | echo "Version: $version" >>$CTRLDIR/control |
230 | [ ! -z "$depends" ] && echo "Depends: $depends" >>$CTRLDIR/control |
228 | [ ! -z "$depends" ] && echo "Depends: $depends" >>$CTRLDIR/control |
231 | [ ! -z "$provides" ] && echo "Provides: $provides" >>$CTRLDIR/control |
229 | [ ! -z "$provides" ] && echo "Provides: $provides" >>$CTRLDIR/control |
232 | [ ! -z "$conflicts" ] && echo "Conflicts: $conflicts" >>$CTRLDIR/control |
230 | [ ! -z "$conflicts" ] && echo "Conflicts: $conflicts" >>$CTRLDIR/control |
233 | egrep -v "^(Files|Version|Depends|Provides|Conflicts|Architecture):" >>$CTRLDIR/control $i |
231 | egrep -v "^(Files|Version|Depends|Provides|Conflicts|Architecture):" >>$CTRLDIR/control $i |
234 | [ -n "$classicopts" ] && echo "$DEB_VERSION" >$TDIR/debian-binary |
232 | [ -n "$classicopts" ] && echo "$DEB_VERSION" >$TDIR/debian-binary |
235 | base=${i%.control} |
233 | base=${i%.control} |
236 | scripts="preinst postinst prerm postrm" |
234 | scripts="preinst postinst prerm postrm" |
237 | for pf in $scripts |
235 | for pf in $scripts |
238 | do |
236 | do |
239 | if [ -e ${base}.$pf ] |
237 | if [ -e ${base}.$pf ] |
240 | then |
238 | then |
241 | cp ${base}.$pf $CTRLDIR/$pf |
239 | cp ${base}.$pf $CTRLDIR/$pf |
242 | chmod 755 $CTRLDIR/$pf |
240 | chmod 755 $CTRLDIR/$pf |
243 | fi |
241 | fi |
244 | done |
242 | done |
245 | cd $ORIGDIR; $OPIEDIR/scripts/ipkg-build $classicopts -o root -g root $TDIR; cd $OPIEDIR; |
243 | cd $ORIGDIR; $OPIEDIR/scripts/ipkg-build $classicopts -o root -g root $TDIR; cd $OPIEDIR; |
246 | RESULT=$package.ipk |
244 | RESULT=$package.ipk |
247 | if [ -n "$VERB" ] |
245 | if [ -n "$VERB" ] |
248 | then |
246 | then |
249 | echo >&2 "Built $RESULT ($size)" |
247 | echo >&2 "Built $RESULT ($size)" |
|