|
diff --git a/mkipks b/mkipks index 73bff3c..f142029 100755 --- a/ mkipks+++ b/ mkipks |
|
@@ -200,33 +200,33 @@ do |
200 | echo >>$SPEC "Version: ${version%-*}" |
200 | echo >>$SPEC "Version: ${version%-*}" |
201 | echo >>$SPEC "Release: ${version#*-}" |
201 | echo >>$SPEC "Release: ${version#*-}" |
202 | |
202 | |
203 | echo >>$SPEC "%description" |
203 | echo >>$SPEC "%description" |
204 | sed -n -e '/^Description:/,$ p' $i | tail +2 >>$SPEC |
204 | sed -n -e '/^Description:/,$ p' $i | tail +2 >>$SPEC |
205 | echo >>$SPEC "%files" |
205 | echo >>$SPEC "%files" |
206 | echo >>$SPEC "%defattr(-,root,root)" |
206 | echo >>$SPEC "%defattr(-,root,root)" |
207 | /bin/ls $RPMFILES >>$SPEC |
207 | /bin/ls $RPMFILES >>$SPEC |
208 | rpm -bb --target $ARCH-unknown-linux $SPEC |
208 | rpm -bb --target $ARCH-unknown-linux $SPEC |
209 | # rm $SPEC |
209 | # rm $SPEC |
210 | elif [ -z "$IMAGEDIR" ] |
210 | elif [ -z "$IMAGEDIR" ] |
211 | then |
211 | then |
212 | #size=$(du -h -s $DATADIR | sed -e 's/[ ].*//') |
212 | #size=$(du -h -s $DATADIR | sed -e 's/[ ].*//') |
213 | if (which mkfs.jffs2 >/dev/null 2>&1); then |
213 | if (which mkfs.jffs2 >/dev/null 2>&1); then |
214 | size=$(mkfs.jffs2 -r $DATADIR | wc -c) |
214 | size=$(mkfs.jffs2 -r $DATADIR | wc -c) |
215 | fi |
215 | fi |
216 | if ! (cat $i|grep -q ^Package); then |
216 | if ! (cat $i|grep -q ^Package:); then |
217 | echo "Package: $packagename" >$CTRLDIR/control |
217 | echo "Package: $packagename" >$CTRLDIR/control |
218 | fi |
218 | fi |
219 | if [ ! -z "$size" ]; then |
219 | if [ ! -z "$size" ]; then |
220 | echo "Installed-Size: $size" >>$CTRLDIR/control |
220 | echo "Installed-Size: $size" >>$CTRLDIR/control |
221 | else |
221 | else |
222 | if [ -z "$SIZEWARNED" ] |
222 | if [ -z "$SIZEWARNED" ] |
223 | then |
223 | then |
224 | echo "Warning, no mkfs.jffs2 found, unable to set Installed-Size." |
224 | echo "Warning, no mkfs.jffs2 found, unable to set Installed-Size." |
225 | SIZEWARNED=1 |
225 | SIZEWARNED=1 |
226 | fi |
226 | fi |
227 | fi |
227 | fi |
228 | echo "Architecture: $ARCH" >>$CTRLDIR/control |
228 | echo "Architecture: $ARCH" >>$CTRLDIR/control |
229 | echo "Version: $version" >>$CTRLDIR/control |
229 | echo "Version: $version" >>$CTRLDIR/control |
230 | [ ! -z "$depends" ] && echo "Depends: $depends" >>$CTRLDIR/control |
230 | [ ! -z "$depends" ] && echo "Depends: $depends" >>$CTRLDIR/control |
231 | [ ! -z "$provides" ] && echo "Provides: $provides" >>$CTRLDIR/control |
231 | [ ! -z "$provides" ] && echo "Provides: $provides" >>$CTRLDIR/control |
232 | [ ! -z "$conflicts" ] && echo "Conflicts: $conflicts" >>$CTRLDIR/control |
232 | [ ! -z "$conflicts" ] && echo "Conflicts: $conflicts" >>$CTRLDIR/control |
|