summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-04-22 18:50:52 (UTC)
committer kergoth <kergoth>2003-04-22 18:50:52 (UTC)
commit868ff4fcf16fea8a1f89c5b94e3acee18d224073 (patch) (unidiff)
tree6d96d46726a3ec74da219e5eb286a426c21ce5b6
parent1af9ae95fe7e3f58b1efc6f9bd1e8cf8f6f7481d (diff)
downloadopie-868ff4fcf16fea8a1f89c5b94e3acee18d224073.zip
opie-868ff4fcf16fea8a1f89c5b94e3acee18d224073.tar.gz
opie-868ff4fcf16fea8a1f89c5b94e3acee18d224073.tar.bz2
Alter mkipks to obey Packages field in a control file if its set, otherwise use filename
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xmkipks6
1 files changed, 5 insertions, 1 deletions
diff --git a/mkipks b/mkipks
index 6a1d46e..ec5a659 100755
--- a/mkipks
+++ b/mkipks
@@ -202,25 +202,29 @@ 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 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