|
diff --git a/mkipks b/mkipks index 85eeb5d..6a1d46e 100755 --- a/ mkipks+++ b/ mkipks |
|
@@ -177,82 +177,81 @@ do |
177 | true |
177 | true |
178 | else |
178 | else |
179 | ERROR=1 |
179 | ERROR=1 |
180 | fi |
180 | fi |
181 | fi |
181 | fi |
182 | else |
182 | else |
183 | echo >&2 "$0: $i: No such file: $ff" |
183 | echo >&2 "$0: $i: No such file: $ff" |
184 | ERROR=1 |
184 | ERROR=1 |
185 | fi |
185 | fi |
186 | done |
186 | done |
187 | done |
187 | done |
188 | fi |
188 | fi |
189 | if [ -z "$ERROR" ] |
189 | if [ -z "$ERROR" ] |
190 | then |
190 | then |
191 | if [ -n "$RPM" ] |
191 | if [ -n "$RPM" ] |
192 | then |
192 | then |
193 | SPEC=/tmp/mkipks-rpm-$$.spec |
193 | SPEC=/tmp/mkipks-rpm-$$.spec |
194 | echo >$SPEC "Summary: $summary" |
194 | echo >$SPEC "Summary: $summary" |
195 | echo >>$SPEC "Name: $packagename" |
195 | echo >>$SPEC "Name: $packagename" |
196 | echo >>$SPEC "Group: $section" ########## |
196 | echo >>$SPEC "Group: $section" ########## |
197 | echo >>$SPEC "License: $license" |
197 | echo >>$SPEC "License: $license" |
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 | echo "Package: $packagename" >$CTRLDIR/control |
215 | if [ ! -z "$size" ]; then |
215 | if [ ! -z "$size" ]; then |
216 | echo "Installed-Size: $size" >>$CTRLDIR/control |
216 | echo "Installed-Size: $size" >>$CTRLDIR/control |
217 | else |
217 | else |
218 | if [ -z "$SIZEWARNED" ] |
218 | if [ -z "$SIZEWARNED" ] |
219 | then |
219 | then |
220 | echo "Warning, no mkfs.jffs2 found, unable to set Installed-Size." |
220 | echo "Warning, no mkfs.jffs2 found, unable to set Installed-Size." |
221 | SIZEWARNED=1 |
221 | SIZEWARNED=1 |
222 | fi |
222 | fi |
223 | fi |
223 | fi |
224 | echo "Architecture: $ARCH" >>$CTRLDIR/control |
224 | echo "Architecture: $ARCH" >>$CTRLDIR/control |
225 | echo "Filename: ./$package.ipk" >>$CTRLDIR/control |
| |
226 | echo "Version: $version" >>$CTRLDIR/control |
225 | echo "Version: $version" >>$CTRLDIR/control |
227 | [ ! -z "$depends" ] && echo "Depends: $depends" >>$CTRLDIR/control |
226 | [ ! -z "$depends" ] && echo "Depends: $depends" >>$CTRLDIR/control |
228 | [ ! -z "$provides" ] && echo "Provides: $provides" >>$CTRLDIR/control |
227 | [ ! -z "$provides" ] && echo "Provides: $provides" >>$CTRLDIR/control |
229 | [ ! -z "$conflicts" ] && echo "Conflicts: $conflicts" >>$CTRLDIR/control |
228 | [ ! -z "$conflicts" ] && echo "Conflicts: $conflicts" >>$CTRLDIR/control |
230 | egrep -v "^(Files|Version|Depends|Provides|Conflicts|Architecture):" >>$CTRLDIR/control $i |
229 | egrep -v "^(Files|Version|Depends|Provides|Conflicts|Architecture):" >>$CTRLDIR/control $i |
231 | [ -n "$classicopts" ] && echo "$DEB_VERSION" >$TDIR/debian-binary |
230 | [ -n "$classicopts" ] && echo "$DEB_VERSION" >$TDIR/debian-binary |
232 | base=${i%.control} |
231 | base=${i%.control} |
233 | scripts="preinst postinst prerm postrm" |
232 | scripts="preinst postinst prerm postrm" |
234 | for pf in $scripts |
233 | for pf in $scripts |
235 | do |
234 | do |
236 | if [ -e ${base}.$pf ] |
235 | if [ -e ${base}.$pf ] |
237 | then |
236 | then |
238 | cp ${base}.$pf $CTRLDIR/$pf |
237 | cp ${base}.$pf $CTRLDIR/$pf |
239 | chmod 755 $CTRLDIR/$pf |
238 | chmod 755 $CTRLDIR/$pf |
240 | fi |
239 | fi |
241 | done |
240 | done |
242 | cd $ORIGDIR; $OPIEDIR/scripts/ipkg-build $classicopts -o root -g root $TDIR; cd $OPIEDIR; |
241 | cd $ORIGDIR; $OPIEDIR/scripts/ipkg-build $classicopts -o root -g root $TDIR; cd $OPIEDIR; |
243 | RESULT=$package.ipk |
242 | RESULT=$package.ipk |
244 | if [ -n "$VERB" ] |
243 | if [ -n "$VERB" ] |
245 | then |
244 | then |
246 | echo >&2 "Built $RESULT ($size)" |
245 | echo >&2 "Built $RESULT ($size)" |
247 | fi |
246 | fi |
248 | if [ -n "$LIST" ] |
247 | if [ -n "$LIST" ] |
249 | then |
248 | then |
250 | echo $RESULT |
249 | echo $RESULT |
251 | fi |
250 | fi |
252 | fi |
251 | fi |
253 | else |
252 | else |
254 | echo >&2 "Not building $package package" |
253 | echo >&2 "Not building $package package" |
255 | fi |
254 | fi |
256 | done |
255 | done |
257 | # clean up |
256 | # clean up |
258 | rm -rf $TDIR |
257 | rm -rf $TDIR |
|