summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-04-22 18:55:40 (UTC)
committer kergoth <kergoth>2003-04-22 18:55:40 (UTC)
commit01fce94491cd4ceaffaaf7564f762b86ddf47241 (patch) (unidiff)
treea91acf2ead94bc5fb0154863be126d9f1ed88f91
parent868ff4fcf16fea8a1f89c5b94e3acee18d224073 (diff)
downloadopie-01fce94491cd4ceaffaaf7564f762b86ddf47241.zip
opie-01fce94491cd4ceaffaaf7564f762b86ddf47241.tar.gz
opie-01fce94491cd4ceaffaaf7564f762b86ddf47241.tar.bz2
Thinko.
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xmkipks4
1 files changed, 1 insertions, 3 deletions
diff --git a/mkipks b/mkipks
index ec5a659..53ef8f5 100755
--- a/mkipks
+++ b/mkipks
@@ -202,28 +202,26 @@ do
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