Control: tags -1 pending On 07/15/2014 08:26 AM, jhcha54008 wrote: > That's right. Here is a first try. How could we make this clear for the > reader of the script in > some months or years ? > > 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-14 17:12:20.000000000 > +0200 > @@ -28,3 +28,20 @@ > > # setup dynamically updated /etc/mtab > ln -sf /proc/mounts "$DEBIRF_ROOT/etc/mtab" > + > +# ldconfig can't work in a fakechroot environment (see fakechroot(1)) > +# So we use the build host ldconfig to setup ld.so cache > +/sbin/ldconfig -r "$DEBIRF_ROOT" > + > +# debootstrap's variant 'fakechroot' replaced ldconfig with a dummy > +# version, and ldd with a script devised for a fakechroot environment. > +# At this point we restore the original ldconfig and ldd in the final > +# debirf image, and remove diversions added by debootstrap > +# (see 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
Thanks for this, i've gone ahead and pushed a minor variation on this patch into my debirf repo: git://lair.fifthhorseman.net/~dkg/debirf It'll be in the next version (though i don't have immediate plans to release a new version at the moment). hopefully we can figure out a clean way to resolve some of the other problems you've identified as well. Regards, --dkg
signature.asc
Description: OpenPGP digital signature