|
diff --git a/mkipks b/mkipks index 572c8f1..b355689 100755 --- a/ mkipks+++ b/ mkipks |
|
@@ -160,65 +160,65 @@ do |
160 | done |
160 | done |
161 | done |
161 | done |
162 | fi |
162 | fi |
163 | if [ -z "$ERROR" ] |
163 | if [ -z "$ERROR" ] |
164 | then |
164 | then |
165 | if [ -n "$RPM" ] |
165 | if [ -n "$RPM" ] |
166 | then |
166 | then |
167 | SPEC=/tmp/mkipks-rpm-$$.spec |
167 | SPEC=/tmp/mkipks-rpm-$$.spec |
168 | echo >$SPEC "Summary: $summary" |
168 | echo >$SPEC "Summary: $summary" |
169 | echo >>$SPEC "Name: $packagename" |
169 | echo >>$SPEC "Name: $packagename" |
170 | echo >>$SPEC "Group: $section" ########## |
170 | echo >>$SPEC "Group: $section" ########## |
171 | echo >>$SPEC "License: $license" |
171 | echo >>$SPEC "License: $license" |
172 | echo >>$SPEC "Version: ${version%-*}" |
172 | echo >>$SPEC "Version: ${version%-*}" |
173 | echo >>$SPEC "Release: ${version#*-}" |
173 | echo >>$SPEC "Release: ${version#*-}" |
174 | |
174 | |
175 | echo >>$SPEC "%description" |
175 | echo >>$SPEC "%description" |
176 | sed -n -e '/^Description:/,$ p' $i | tail +2 >>$SPEC |
176 | sed -n -e '/^Description:/,$ p' $i | tail +2 >>$SPEC |
177 | echo >>$SPEC "%files" |
177 | echo >>$SPEC "%files" |
178 | echo >>$SPEC "%defattr(-,root,root)" |
178 | echo >>$SPEC "%defattr(-,root,root)" |
179 | /bin/ls $RPMFILES >>$SPEC |
179 | /bin/ls $RPMFILES >>$SPEC |
180 | rpm -bb --target $ARCH-unknown-linux $SPEC |
180 | rpm -bb --target $ARCH-unknown-linux $SPEC |
181 | # rm $SPEC |
181 | # rm $SPEC |
182 | elif [ -z "$IMAGEDIR" ] |
182 | elif [ -z "$IMAGEDIR" ] |
183 | then |
183 | then |
184 | #size=$(du -h -s $DATADIR | sed -e 's/[ ].*//') |
184 | #size=$(du -h -s $DATADIR | sed -e 's/[ ].*//') |
185 | size=$(mkfs.jffs2 -r $DATADIR | wc -c) |
185 | size=$(mkfs.jffs2 -r $DATADIR | wc -c) |
186 | echo "Package: $packagename" >$CTRLDIR/control |
186 | echo "Package: $packagename" >$CTRLDIR/control |
187 | echo "Installed-Size: $size" >>$CTRLDIR/control |
187 | echo "Installed-Size: $size" >>$CTRLDIR/control |
188 | echo "Filename: ./$package.ipk" >>$CTRLDIR/control |
188 | echo "Filename: ./$package.ipk" >>$CTRLDIR/control |
189 | echo "Version: $version" >>$CTRLDIR/control |
189 | echo "Version: $version" >>$CTRLDIR/control |
190 | echo "Depends: $depends" >>$CTRLDIR/control |
190 | echo "Depends: $depends" >>$CTRLDIR/control |
191 | egrep -v "^(Files|Version|Depends):" >>$CTRLDIR/control $i |
191 | egrep -v "^(Files|Version|Depends):" >>$CTRLDIR/control $i |
192 | echo "$DEB_VERSION" >$TDIR/debian-binary |
192 | echo "$DEB_VERSION" >$TDIR/debian-binary |
193 | base=${i%.control} |
193 | base=${i%.control} |
194 | scripts="preinst postinst prerm postrm" |
194 | scripts="preinst postinst prerm postrm" |
195 | for pf in $scripts |
195 | for pf in $scripts |
196 | do |
196 | do |
197 | if [ -x ${base}.$pf ] |
197 | if [ -x ${base}.$pf ] |
198 | then |
198 | then |
199 | cp ${base}.$pf $CTRLDIR/$pf |
199 | cp ${base}.$pf $CTRLDIR/$pf |
200 | fi |
200 | fi |
201 | done |
201 | done |
202 | if [ "$UID" = 0 ] |
202 | if [ "$UID" = 0 ] |
203 | then |
203 | then |
204 | chown -R root.root $TDIR |
204 | chown -R root.root $TDIR |
205 | else |
205 | else |
206 | echo "Warning: You are not root. Unable to squash permissions." |
206 | echo "Warning: You are not root. Unable to squash permissions." |
207 | fi |
207 | fi |
208 | ( cd $CTRLDIR; tar --owner=root --group=root cfz ../control.tar.gz ./*; ) |
208 | ( cd $CTRLDIR; tar cfz ../control.tar.gz ./*; ) |
209 | ( cd $DATADIR; tar --owner=root --group=root cfz ../data.tar.gz ./*; ) |
209 | ( cd $DATADIR; tar cfz ../data.tar.gz ./*; ) |
210 | ( cd $TDIR; rm -rf control data; tar cf - ./debian-binary ./control.tar.gz ./data.tar.gz; ) | gzip >$RDIR/$package.ipk |
210 | ( cd $TDIR; rm -rf control data; tar cf - ./debian-binary ./control.tar.gz ./data.tar.gz; ) | gzip >$RDIR/$package.ipk |
211 | RESULT=$package.ipk |
211 | RESULT=$package.ipk |
212 | if [ -n "$VERB" ] |
212 | if [ -n "$VERB" ] |
213 | then |
213 | then |
214 | echo >&2 "Built $RESULT ($size)" |
214 | echo >&2 "Built $RESULT ($size)" |
215 | fi |
215 | fi |
216 | if [ -n "$LIST" ] |
216 | if [ -n "$LIST" ] |
217 | then |
217 | then |
218 | echo $RESULT |
218 | echo $RESULT |
219 | fi |
219 | fi |
220 | fi |
220 | fi |
221 | else |
221 | else |
222 | echo >&2 "Not building $package package" |
222 | echo >&2 "Not building $package package" |
223 | fi |
223 | fi |
224 | done |
224 | done |
|