[backfire] backport r27648
[openwrt-10.03/.git] / tools / ipkg-utils / patches / 170-resolve_conffiles.patch
1 --- a/ipkg-build
2 +++ b/ipkg-build
3 @@ -160,12 +160,15 @@ You probably want to chown these to a sy
4         done
5  
6         if [ -f $CONTROL/conffiles ]; then
7 -               for cf in `cat $CONTROL/conffiles`; do
8 -                       if [ ! -f ./$cf ]; then
9 -                               echo "*** Error: $CONTROL/conffiles mentions conffile $cf which does not exist" >&2
10 -                               PKG_ERROR=1
11 -                       fi
12 +               rm -f $CONTROL/conffiles.resolved
13 +
14 +               for cf in `$FIND $(sed -e "s!^/!$pkg_dir/!" $CONTROL/conffiles) -type f`; do
15 +                       echo "${cf#$pkg_dir}" >> $CONTROL/conffiles.resolved
16                 done
17 +
18 +               rm $CONTROL/conffiles
19 +               mv $CONTROL/conffiles.resolved $CONTROL/conffiles
20 +               chmod 0644 $CONTROL/conffiles
21         fi
22  
23         cd $owd