On 07/11/2014 08:41 AM, jhcha54008 wrote:
> The following patch replaces fakechroot ldd and ldconfig by
> original versions, and build /etc/ld.so.cache.
> 
> Regards,
> JH Chatenet
> 
> diff -Naur a/usr/share/debirf/modules/z1_clean-root 
> b/usr/share/debirf/modules/z1_clean-root
> --- a/usr/share/debirf/modules/z1_clean-root  2014-07-09 22:28:14.000000000 
> +0200
> +++ b/usr/share/debirf/modules/z1_clean-root  2014-07-09 22:37:49.000000000 
> +0200
> @@ -28,3 +28,16 @@
>  
>  # setup dynamically updated /etc/mtab
>  ln -sf /proc/mounts "$DEBIRF_ROOT/etc/mtab"
> +
> +# remove diversions added by debootstrap
> +# (debootstrap 1.0.60, function install_fakechroot_tools,
> +# file /usr/share/debootstrap/functions lines 1397-1582 )
> +if [ "$ROOT_BUILD" = 'false' ]; then
> +    debirf_exec dpkg-divert --remove /sbin/ldconfig
> +    mv -f "$DEBIRF_ROOT/sbin/ldconfig.REAL" "$DEBIRF_ROOT/sbin/ldconfig"
> +    debirf_exec dpkg-divert --remove /usr/bin/ldd
> +    mv -f "$DEBIRF_ROOT/usr/bin/ldd.REAL" "$DEBIRF_ROOT/usr/bin/ldd"
> +fi
> +
> +# setup ld.so cache
> +/sbin/ldconfig -r "$DEBIRF_ROOT"

This all seems reasonable to me, but i wonder if we shouldn't try to
debirf_exec ldconfig instead of using the host's ldconfig with -r.  did
you try it the other way and reject it for some reason?

Thanks for your feedback and useful suggestions on debirf!

        --dkg

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to