Adding uclibs to the library path (not completed yet) to render the

uclib-wrapper unneeded ...


git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@3096 95ad53e4-c205-0410-b2fa-d234c58c8868

2 files changed, 15 insertions, 1 deletions

diff --git a/installer/OpenSLX/OSSetup/Distro/Base.pm b/installer/OpenSLX/OSSetup/Distro/Base.pm
index fe56f03e..93e2fcaa 100644
--- a/installer/OpenSLX/OSSetup/Distro/Base.pm
+++ b/installer/OpenSLX/OSSetup/Distro/Base.pm
@@ -220,6 +220,18 @@ sub getDefaultPathList
     ) ];
 }
 
+sub addUclibLdconfig
+{
+    my $self       = shift;
+    my $ldpath     = shift;
+
+    open(OUTFILE, ">", "$ldpath/etc/ld.so.conf.d/uclib.conf") 
+      or die ("something went wrong");
+    print OUTFILE "/opt/openslx/uclib-rootfs/lib\n";
+    print OUTFILE "/opt/openslx/uclib-rootfs/usr/lib\n";
+    close(OUTFILE);
+}
+
 sub updateDistroConfig
 {
     if (slxsystem("ldconfig")) {
diff --git a/installer/OpenSLX/OSSetup/Engine.pm b/installer/OpenSLX/OSSetup/Engine.pm
index c614c081..0f4d725a 100644
--- a/installer/OpenSLX/OSSetup/Engine.pm
+++ b/installer/OpenSLX/OSSetup/Engine.pm
@@ -266,6 +266,7 @@ sub installVendorOS
     );
 
     $self->_copyUclibcRootfs();
+    $self->{distro}->updateDistroConfig();
     $self->_touchVendorOS();
     $self->addInstalledVendorOSToConfigDB();
     return;
@@ -1051,10 +1052,10 @@ sub _copyUclibcRootfs
 {
     my $self = shift;
     my $targetRoot = shift || $self->{'vendor-os-path'};
+    my $distro = $self->{distro};
 
     vlog(0, _tr("copying uclibc-rootfs into vendor-OS ...\n"));
 
-    # my $targetRoot = $self->{'vendor-os-path'};
     my $target     = "$targetRoot/opt/openslx/uclib-rootfs";
 
     if (system("mkdir -p $target")) {
@@ -1097,6 +1098,7 @@ sub _copyUclibcRootfs
         or die _tr("unable to copy to target '%s', giving up! (%s)",
                    $target, $!);
     # add the uclibs to the ld.so.conf
+    $distro->addUclibLdconfig($targetRoot);
 
     # write version of uclibc-rootfs original into a file in order to be
     # able to check the up-to-date state later (in the config-demuxer)