|
diff --git a/mkipks b/mkipks index 4685f5f..ffa4ef5 100755 --- a/ mkipks+++ b/ mkipks |
|
@@ -155,86 +155,87 @@ do |
155 | esac |
155 | esac |
156 | else |
156 | else |
157 | mkdir -p $D |
157 | mkdir -p $D |
158 | if cp -a $ff $D |
158 | if cp -a $ff $D |
159 | then |
159 | then |
160 | true |
160 | true |
161 | else |
161 | else |
162 | ERROR=1 |
162 | ERROR=1 |
163 | fi |
163 | fi |
164 | fi |
164 | fi |
165 | else |
165 | else |
166 | echo >&2 "$0: $i: No such file: $ff" |
166 | echo >&2 "$0: $i: No such file: $ff" |
167 | ERROR=1 |
167 | ERROR=1 |
168 | fi |
168 | fi |
169 | done |
169 | done |
170 | done |
170 | done |
171 | fi |
171 | fi |
172 | if [ -z "$ERROR" ] |
172 | if [ -z "$ERROR" ] |
173 | then |
173 | then |
174 | if [ -n "$RPM" ] |
174 | if [ -n "$RPM" ] |
175 | then |
175 | then |
176 | SPEC=/tmp/mkipks-rpm-$$.spec |
176 | SPEC=/tmp/mkipks-rpm-$$.spec |
177 | echo >$SPEC "Summary: $summary" |
177 | echo >$SPEC "Summary: $summary" |
178 | echo >>$SPEC "Name: $packagename" |
178 | echo >>$SPEC "Name: $packagename" |
179 | echo >>$SPEC "Group: $section" ########## |
179 | echo >>$SPEC "Group: $section" ########## |
180 | echo >>$SPEC "License: $license" |
180 | echo >>$SPEC "License: $license" |
181 | echo >>$SPEC "Version: ${version%-*}" |
181 | echo >>$SPEC "Version: ${version%-*}" |
182 | echo >>$SPEC "Release: ${version#*-}" |
182 | echo >>$SPEC "Release: ${version#*-}" |
183 | |
183 | |
184 | echo >>$SPEC "%description" |
184 | echo >>$SPEC "%description" |
185 | sed -n -e '/^Description:/,$ p' $i | tail +2 >>$SPEC |
185 | sed -n -e '/^Description:/,$ p' $i | tail +2 >>$SPEC |
186 | echo >>$SPEC "%files" |
186 | echo >>$SPEC "%files" |
187 | echo >>$SPEC "%defattr(-,root,root)" |
187 | echo >>$SPEC "%defattr(-,root,root)" |
188 | /bin/ls $RPMFILES >>$SPEC |
188 | /bin/ls $RPMFILES >>$SPEC |
189 | rpm -bb --target $ARCH-unknown-linux $SPEC |
189 | rpm -bb --target $ARCH-unknown-linux $SPEC |
190 | # rm $SPEC |
190 | # rm $SPEC |
191 | elif [ -z "$IMAGEDIR" ] |
191 | elif [ -z "$IMAGEDIR" ] |
192 | then |
192 | then |
193 | #size=$(du -h -s $DATADIR | sed -e 's/[ ].*//') |
193 | #size=$(du -h -s $DATADIR | sed -e 's/[ ].*//') |
194 | if (which mkfs.jffs2 >/dev/null 2>&1); then |
194 | if (which mkfs.jffs2 >/dev/null 2>&1); then |
195 | size=$(mkfs.jffs2 -r $DATADIR | wc -c) |
195 | size=$(mkfs.jffs2 -r $DATADIR | wc -c) |
196 | fi |
196 | fi |
197 | echo "Package: $packagename" >$CTRLDIR/control |
197 | echo "Package: $packagename" >$CTRLDIR/control |
198 | if [ ! -z "$size" ]; then |
198 | if [ ! -z "$size" ]; then |
199 | echo "Installed-Size: $size" >>$CTRLDIR/control |
199 | echo "Installed-Size: $size" >>$CTRLDIR/control |
200 | else |
200 | else |
201 | if [ -z "$SIZEWARNED" ] |
201 | if [ -z "$SIZEWARNED" ] |
202 | then |
202 | then |
203 | echo "Warning, no mkfs.jffs2 found, unable to set Installed-Size." |
203 | echo "Warning, no mkfs.jffs2 found, unable to set Installed-Size." |
204 | SIZEWARNED=1 |
204 | SIZEWARNED=1 |
205 | fi |
205 | fi |
206 | fi |
206 | fi |
207 | echo "Architecture: $ARCH" >>$CTRLDIR/control |
207 | echo "Architecture: $ARCH" >>$CTRLDIR/control |
208 | echo "Filename: ./$package.ipk" >>$CTRLDIR/control |
208 | echo "Filename: ./$package.ipk" >>$CTRLDIR/control |
209 | echo "Version: $version" >>$CTRLDIR/control |
209 | echo "Version: $version" >>$CTRLDIR/control |
210 | [ ! -z "$depends" ] && echo "Depends: $depends" >>$CTRLDIR/control |
210 | [ ! -z "$depends" ] && echo "Depends: $depends" >>$CTRLDIR/control |
211 | [ ! -z "$provides" ] && echo "Provides: $provides" >>$CTRLDIR/control |
211 | [ ! -z "$provides" ] && echo "Provides: $provides" >>$CTRLDIR/control |
212 | [ ! -z "$conflicts" ] && echo "Conflicts: $conflicts" >>$CTRLDIR/control |
212 | [ ! -z "$conflicts" ] && echo "Conflicts: $conflicts" >>$CTRLDIR/control |
213 | egrep -v "^(Files|Version|Depends|Provides|Conflicts|Architecture):" >>$CTRLDIR/control $i |
213 | egrep -v "^(Files|Version|Depends|Provides|Conflicts|Architecture):" >>$CTRLDIR/control $i |
214 | [ -n "$classicopts" ] && echo "$DEB_VERSION" >$TDIR/debian-binary |
214 | [ -n "$classicopts" ] && echo "$DEB_VERSION" >$TDIR/debian-binary |
215 | base=${i%.control} |
215 | base=${i%.control} |
216 | scripts="preinst postinst prerm postrm" |
216 | scripts="preinst postinst prerm postrm" |
217 | for pf in $scripts |
217 | for pf in $scripts |
218 | do |
218 | do |
219 | if [ -x ${base}.$pf ] |
219 | if [ -e ${base}.$pf ] |
220 | then |
220 | then |
221 | cp ${base}.$pf $CTRLDIR/$pf |
221 | cp ${base}.$pf $CTRLDIR/$pf |
| |
222 | chmod 755 $CTRLDIR/$pf |
222 | fi |
223 | fi |
223 | done |
224 | done |
224 | cd $ORIGDIR; $OPIEDIR/scripts/ipkg-build $classicopts -o root -g root $TDIR; cd $OPIEDIR; |
225 | cd $ORIGDIR; $OPIEDIR/scripts/ipkg-build $classicopts -o root -g root $TDIR; cd $OPIEDIR; |
225 | RESULT=$package.ipk |
226 | RESULT=$package.ipk |
226 | if [ -n "$VERB" ] |
227 | if [ -n "$VERB" ] |
227 | then |
228 | then |
228 | echo >&2 "Built $RESULT ($size)" |
229 | echo >&2 "Built $RESULT ($size)" |
229 | fi |
230 | fi |
230 | if [ -n "$LIST" ] |
231 | if [ -n "$LIST" ] |
231 | then |
232 | then |
232 | echo $RESULT |
233 | echo $RESULT |
233 | fi |
234 | fi |
234 | fi |
235 | fi |
235 | else |
236 | else |
236 | echo >&2 "Not building $package package" |
237 | echo >&2 "Not building $package package" |
237 | fi |
238 | fi |
238 | done |
239 | done |
239 | # clean up |
240 | # clean up |
240 | rm -rf $TDIR |
241 | rm -rf $TDIR |
|