summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-04-24 17:10:10 (UTC)
committer kergoth <kergoth>2003-04-24 17:10:10 (UTC)
commit786111b4ee9a950519d2ec36fabf0eb53c03770d (patch) (unidiff)
treede055f5c4a5121490d0e2bb81c51ddaaf114b672
parent9bedd27d07bcd1d9f2737f023e917f27499ba4b8 (diff)
downloadopie-786111b4ee9a950519d2ec36fabf0eb53c03770d.zip
opie-786111b4ee9a950519d2ec36fabf0eb53c03770d.tar.gz
opie-786111b4ee9a950519d2ec36fabf0eb53c03770d.tar.bz2
Make mkipks check for existing Package field more explicit
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xmkipks2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkipks b/mkipks
index 73bff3c..f142029 100755
--- a/mkipks
+++ b/mkipks
@@ -192,49 +192,49 @@ do
192 then 192 then
193 if [ -n "$RPM" ] 193 if [ -n "$RPM" ]
194 then 194 then
195 SPEC=/tmp/mkipks-rpm-$$.spec 195 SPEC=/tmp/mkipks-rpm-$$.spec
196 echo >$SPEC "Summary: $summary" 196 echo >$SPEC "Summary: $summary"
197 echo >>$SPEC "Name: $packagename" 197 echo >>$SPEC "Name: $packagename"
198 echo >>$SPEC "Group: $section" ########## 198 echo >>$SPEC "Group: $section" ##########
199 echo >>$SPEC "License: $license" 199 echo >>$SPEC "License: $license"
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
233 egrep -v "^(Files|Version|Depends|Provides|Conflicts|Architecture):" >>$CTRLDIR/control $i 233 egrep -v "^(Files|Version|Depends|Provides|Conflicts|Architecture):" >>$CTRLDIR/control $i
234 [ -n "$classicopts" ] && echo "$DEB_VERSION" >$TDIR/debian-binary 234 [ -n "$classicopts" ] && echo "$DEB_VERSION" >$TDIR/debian-binary
235 base=${i%.control} 235 base=${i%.control}
236 scripts="preinst postinst prerm postrm" 236 scripts="preinst postinst prerm postrm"
237 for pf in $scripts 237 for pf in $scripts
238 do 238 do
239 if [ -e ${base}.$pf ] 239 if [ -e ${base}.$pf ]
240 then 240 then