mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2024-12-18 04:44:42 +00:00
24 lines
640 B
Diff
24 lines
640 B
Diff
--- a/ipkg-build
|
|
+++ b/ipkg-build
|
|
@@ -160,12 +160,15 @@ You probably want to chown these to a sy
|
|
done
|
|
|
|
if [ -f $CONTROL/conffiles ]; then
|
|
- for cf in `cat $CONTROL/conffiles`; do
|
|
- if [ ! -f ./$cf ]; then
|
|
- echo "*** Error: $CONTROL/conffiles mentions conffile $cf which does not exist" >&2
|
|
- PKG_ERROR=1
|
|
- fi
|
|
+ rm -f $CONTROL/conffiles.resolved
|
|
+
|
|
+ for cf in `$FIND $(sed -e "s!^/!$pkg_dir/!" $CONTROL/conffiles) -type f`; do
|
|
+ echo "${cf#$pkg_dir}" >> $CONTROL/conffiles.resolved
|
|
done
|
|
+
|
|
+ rm $CONTROL/conffiles
|
|
+ mv $CONTROL/conffiles.resolved $CONTROL/conffiles
|
|
+ chmod 0644 $CONTROL/conffiles
|
|
fi
|
|
|
|
cd $owd
|