|
diff --git a/mkipks b/mkipks index 73bff3c..f142029 100755 --- a/ mkipks+++ b/ mkipks |
|
@@ -168,94 +168,94 @@ do |
168 | fi |
168 | fi |
169 | if [ -n "$RPM" ] |
169 | if [ -n "$RPM" ] |
170 | then |
170 | then |
171 | case "$ff" in |
171 | case "$ff" in |
172 | /*) RPMFILES="$RPMFILES $ff" |
172 | /*) RPMFILES="$RPMFILES $ff" |
173 | ;; *) RPMFILES="$RPMFILES $OPIEDIR/$ff" |
173 | ;; *) RPMFILES="$RPMFILES $OPIEDIR/$ff" |
174 | esac |
174 | esac |
175 | else |
175 | else |
176 | mkdir -p $D |
176 | mkdir -p $D |
177 | if cp -a $ff $D |
177 | if cp -a $ff $D |
178 | then |
178 | then |
179 | true |
179 | true |
180 | else |
180 | else |
181 | ERROR=1 |
181 | ERROR=1 |
182 | fi |
182 | fi |
183 | fi |
183 | fi |
184 | else |
184 | else |
185 | echo >&2 "$0: $i: No such file: $ff" |
185 | echo >&2 "$0: $i: No such file: $ff" |
186 | ERROR=1 |
186 | ERROR=1 |
187 | fi |
187 | fi |
188 | done |
188 | done |
189 | done |
189 | done |
190 | fi |
190 | fi |
191 | if [ -z "$ERROR" ] |
191 | if [ -z "$ERROR" ] |
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 |
241 | cp ${base}.$pf $CTRLDIR/$pf |
241 | cp ${base}.$pf $CTRLDIR/$pf |
242 | chmod 755 $CTRLDIR/$pf |
242 | chmod 755 $CTRLDIR/$pf |
243 | fi |
243 | fi |
244 | done |
244 | done |
245 | cd $ORIGDIR; $OPIEDIR/scripts/ipkg-build $classicopts -o root -g root $TDIR; cd $OPIEDIR; |
245 | cd $ORIGDIR; $OPIEDIR/scripts/ipkg-build $classicopts -o root -g root $TDIR; cd $OPIEDIR; |
246 | RESULT=$package.ipk |
246 | RESULT=$package.ipk |
247 | if [ -n "$VERB" ] |
247 | if [ -n "$VERB" ] |
248 | then |
248 | then |
249 | echo >&2 "Built $RESULT ($size)" |
249 | echo >&2 "Built $RESULT ($size)" |
250 | fi |
250 | fi |
251 | if [ -n "$LIST" ] |
251 | if [ -n "$LIST" ] |
252 | then |
252 | then |
253 | echo $RESULT |
253 | echo $RESULT |
254 | fi |
254 | fi |
255 | fi |
255 | fi |
256 | else |
256 | else |
257 | echo >&2 "Not building $package package" |
257 | echo >&2 "Not building $package package" |
258 | fi |
258 | fi |
259 | done |
259 | done |
260 | # clean up |
260 | # clean up |
261 | rm -rf $TDIR |
261 | rm -rf $TDIR |
|