|
diff --git a/mkipks b/mkipks index 6a1d46e..ec5a659 100755 --- a/ mkipks+++ b/ mkipks |
|
@@ -198,33 +198,37 @@ do |
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 | echo "Package: $packagename" >$CTRLDIR/control |
214 | if ! (cat $f|grep -q ^Package); then |
| |
215 | echo "Package: $packagename" >$CTRLDIR/control |
| |
216 | else |
| |
217 | cat $f|grep ^Package >$CTRLDIR/control |
| |
218 | fi |
215 | if [ ! -z "$size" ]; then |
219 | if [ ! -z "$size" ]; then |
216 | echo "Installed-Size: $size" >>$CTRLDIR/control |
220 | echo "Installed-Size: $size" >>$CTRLDIR/control |
217 | else |
221 | else |
218 | if [ -z "$SIZEWARNED" ] |
222 | if [ -z "$SIZEWARNED" ] |
219 | then |
223 | then |
220 | echo "Warning, no mkfs.jffs2 found, unable to set Installed-Size." |
224 | echo "Warning, no mkfs.jffs2 found, unable to set Installed-Size." |
221 | SIZEWARNED=1 |
225 | SIZEWARNED=1 |
222 | fi |
226 | fi |
223 | fi |
227 | fi |
224 | echo "Architecture: $ARCH" >>$CTRLDIR/control |
228 | echo "Architecture: $ARCH" >>$CTRLDIR/control |
225 | echo "Version: $version" >>$CTRLDIR/control |
229 | echo "Version: $version" >>$CTRLDIR/control |
226 | [ ! -z "$depends" ] && echo "Depends: $depends" >>$CTRLDIR/control |
230 | [ ! -z "$depends" ] && echo "Depends: $depends" >>$CTRLDIR/control |
227 | [ ! -z "$provides" ] && echo "Provides: $provides" >>$CTRLDIR/control |
231 | [ ! -z "$provides" ] && echo "Provides: $provides" >>$CTRLDIR/control |
228 | [ ! -z "$conflicts" ] && echo "Conflicts: $conflicts" >>$CTRLDIR/control |
232 | [ ! -z "$conflicts" ] && echo "Conflicts: $conflicts" >>$CTRLDIR/control |
229 | egrep -v "^(Files|Version|Depends|Provides|Conflicts|Architecture):" >>$CTRLDIR/control $i |
233 | egrep -v "^(Files|Version|Depends|Provides|Conflicts|Architecture):" >>$CTRLDIR/control $i |
230 | [ -n "$classicopts" ] && echo "$DEB_VERSION" >$TDIR/debian-binary |
234 | [ -n "$classicopts" ] && echo "$DEB_VERSION" >$TDIR/debian-binary |
|