remove uClibc stuff - part I

35 files changed, 12 insertions, 12 deletions

diff --git a/src/boot-env/OpenSLX/BootEnvironment/Preboot.pm b/src/boot-env/OpenSLX/BootEnvironment/Preboot.pm
index b06de7d2..370009ad 100644
--- a/src/boot-env/OpenSLX/BootEnvironment/Preboot.pm
+++ b/src/boot-env/OpenSLX/BootEnvironment/Preboot.pm
@@ -112,7 +112,7 @@ sub writeBootloaderMenuFor
     End-of-Here
     
     if (!$self->{'dry-run'}) {
-        # default to iso encoding, let's see how uclibc copes with it ...
+        # default to iso encoding ...
         spitFile($menuFile, $bootmenu, { 'io-layer' => 'encoding(iso8859-1)' });
 
         # copy the preboot script into the folder to be tared
diff --git a/src/boot-env/OpenSLX/MakeInitRamFS/Engine/PBS.pm b/src/boot-env/OpenSLX/MakeInitRamFS/Engine/PBS.pm
index 571057ad..83d848d0 100644
--- a/src/boot-env/OpenSLX/MakeInitRamFS/Engine/PBS.pm
+++ b/src/boot-env/OpenSLX/MakeInitRamFS/Engine/PBS.pm
@@ -28,12 +28,12 @@ sub _copyPrebootSpecificFiles
 
     # write secondary rootfs-layer (including init) on top of base layer
     my $prebootRootfs 
-        = "$openslxConfig{'base-path'}/share/boot-env/preboot/uclib-rootfs";
+        = "$openslxConfig{'base-path'}/share/boot-env/preboot/rootfs";
     $self->addCMD("rsync -rlpt $prebootRootfs/ $self->{'build-path'}");
 
     # overwrite preboot defaults
     my $pbsRootfs 
-        = "$openslxConfig{'base-path'}/share/boot-env/pbs/uclib-rootfs";
+        = "$openslxConfig{'base-path'}/share/boot-env/pbs/rootfs";
     $self->addCMD("rsync -rlpt $pbsRootfs/ $self->{'build-path'}");
 
     return 1;
diff --git a/src/boot-env/OpenSLX/MakeInitRamFS/Engine/Preboot.pm b/src/boot-env/OpenSLX/MakeInitRamFS/Engine/Preboot.pm
index aecfd00f..1a68bfd0 100644
--- a/src/boot-env/OpenSLX/MakeInitRamFS/Engine/Preboot.pm
+++ b/src/boot-env/OpenSLX/MakeInitRamFS/Engine/Preboot.pm
@@ -36,7 +36,7 @@ sub _collectCMDs
     $self->_writeInitramfsSetup();
     $self->_writeSlxSystemConf();
 
-    $self->_copyUclibcRootfs();
+    $self->_copyRootfs();
     $self->_copyPrebootSpecificFiles();
 
     $self->{distro}->applyChanges($self);
@@ -107,11 +107,11 @@ sub _writeInitramfsSetup
     return;
 }
 
-sub _copyUclibcRootfs
+sub _copyRootfs
 {
     my $self = shift;
 
-    my $uclibcRootfs = "$openslxConfig{'base-path'}/share/uclib-rootfs";
+    my $rootfs = "$openslxConfig{'base-path'}/share/rootfs";
     
     my @excludes = qw(
     );
@@ -123,7 +123,7 @@ sub _copyUclibcRootfs
 
     my $exclOpts = join ' ', map { "--exclude $_" } @excludes;
 
-    $self->addCMD("rsync $exclOpts -rlpt $uclibcRootfs/ $self->{'build-path'}");
+    $self->addCMD("rsync $exclOpts -rlpt $rootfs/ $self->{'build-path'}");
     
     return 1;
 }
@@ -134,7 +134,7 @@ sub _copyPrebootSpecificFiles
 
     # write secondary rootfs-layer (including init) on top of base layer
     my $prebootRootfs 
-        = "$openslxConfig{'base-path'}/share/boot-env/preboot/uclib-rootfs";
+        = "$openslxConfig{'base-path'}/share/boot-env/preboot/rootfs";
     $self->addCMD("rsync -rlpt $prebootRootfs/ $self->{'build-path'}");
 
     return 1;
diff --git a/src/boot-env/OpenSLX/MakeInitRamFS/Engine/SlxBoot.pm b/src/boot-env/OpenSLX/MakeInitRamFS/Engine/SlxBoot.pm
index 1334c444..82f46103 100644
--- a/src/boot-env/OpenSLX/MakeInitRamFS/Engine/SlxBoot.pm
+++ b/src/boot-env/OpenSLX/MakeInitRamFS/Engine/SlxBoot.pm
@@ -40,7 +40,7 @@ sub _collectCMDs
     $self->_writeInitramfsSetup();
     $self->_writeSlxSystemConf();
 
-    $self->_copyUclibcRootfs();
+    $self->_copyRootfs();
     $self->_copyHwinfo();
     $self->_copyDistroSpecificFiles();
     $self->_copyInitramfsFiles();
@@ -115,11 +115,11 @@ sub _copyDistroSpecificFiles
     return 1;
 }
 
-sub _copyUclibcRootfs
+sub _copyRootfs
 {
     my $self = shift;
 
-    my $uclibcRootfs = "$openslxConfig{'base-path'}/share/uclib-rootfs";
+    my $rootfs = "$openslxConfig{'base-path'}/share/rootfs";
     
     my @excludes = qw(
         dialog
@@ -136,7 +136,7 @@ sub _copyUclibcRootfs
 
     my $exclOpts = join ' ', map { "--exclude $_" } @excludes;
 
-    $self->addCMD("rsync $exclOpts -rlpt $uclibcRootfs/ $self->{'build-path'}");
+    $self->addCMD("rsync $exclOpts -rlpt $rootfs/ $self->{'build-path'}");
     
     return 1;
 }
diff --git a/src/boot-env/pbs/uclib-rootfs/bin/bbinit b/src/boot-env/pbs/rootfs/bin/bbinit
index 3fd67612..3fd67612 100755
--- a/src/boot-env/pbs/uclib-rootfs/bin/bbinit
+++ b/src/boot-env/pbs/rootfs/bin/bbinit
diff --git a/src/boot-env/pbs/uclib-rootfs/bin/handleEvents b/src/boot-env/pbs/rootfs/bin/handleEvents
index 9bb78951..9bb78951 100755
--- a/src/boot-env/pbs/uclib-rootfs/bin/handleEvents
+++ b/src/boot-env/pbs/rootfs/bin/handleEvents
diff --git a/src/boot-env/pbs/uclib-rootfs/etc/bbinit.d/example b/src/boot-env/pbs/rootfs/etc/bbinit.d/example
index 122cf566..122cf566 100755
--- a/src/boot-env/pbs/uclib-rootfs/etc/bbinit.d/example
+++ b/src/boot-env/pbs/rootfs/etc/bbinit.d/example
diff --git a/src/boot-env/pbs/uclib-rootfs/etc/events/example b/src/boot-env/pbs/rootfs/etc/events/example
index 75768967..75768967 100644
--- a/src/boot-env/pbs/uclib-rootfs/etc/events/example
+++ b/src/boot-env/pbs/rootfs/etc/events/example
diff --git a/src/boot-env/pbs/uclib-rootfs/init b/src/boot-env/pbs/rootfs/init
index 847cad87..847cad87 100755
--- a/src/boot-env/pbs/uclib-rootfs/init
+++ b/src/boot-env/pbs/rootfs/init
diff --git a/src/boot-env/pbs/uclib-rootfs/preboot/preboot-scripts/dialog.functions b/src/boot-env/pbs/rootfs/preboot/preboot-scripts/dialog.functions
index 7c6dd784..7c6dd784 100644
--- a/src/boot-env/pbs/uclib-rootfs/preboot/preboot-scripts/dialog.functions
+++ b/src/boot-env/pbs/rootfs/preboot/preboot-scripts/dialog.functions
diff --git a/src/boot-env/preboot/uclib-rootfs/init b/src/boot-env/preboot/rootfs/init
index ab2f9ca0..ab2f9ca0 100755
--- a/src/boot-env/preboot/uclib-rootfs/init
+++ b/src/boot-env/preboot/rootfs/init
diff --git a/src/boot-env/preboot/uclib-rootfs/lib/libcurses.so b/src/boot-env/preboot/rootfs/lib/libcurses.so
index c7b1e02a..c7b1e02a 120000
--- a/src/boot-env/preboot/uclib-rootfs/lib/libcurses.so
+++ b/src/boot-env/preboot/rootfs/lib/libcurses.so
diff --git a/src/boot-env/preboot/uclib-rootfs/lib/libncurses.so b/src/boot-env/preboot/rootfs/lib/libncurses.so
index 7257b6af..7257b6af 120000
--- a/src/boot-env/preboot/uclib-rootfs/lib/libncurses.so
+++ b/src/boot-env/preboot/rootfs/lib/libncurses.so
diff --git a/src/boot-env/preboot/uclib-rootfs/lib/libncurses.so.5 b/src/boot-env/preboot/rootfs/lib/libncurses.so.5
index c7b1e02a..c7b1e02a 120000
--- a/src/boot-env/preboot/uclib-rootfs/lib/libncurses.so.5
+++ b/src/boot-env/preboot/rootfs/lib/libncurses.so.5
diff --git a/src/boot-env/preboot/uclib-rootfs/lib/libncurses.so.5.6 b/src/boot-env/preboot/rootfs/lib/libncurses.so.5.6
index a395c6b7..a395c6b7 100755
--- a/src/boot-env/preboot/uclib-rootfs/lib/libncurses.so.5.6
+++ b/src/boot-env/preboot/rootfs/lib/libncurses.so.5.6
diff --git a/src/boot-env/preboot/uclib-rootfs/usr/bin/clear b/src/boot-env/preboot/rootfs/usr/bin/clear
index acc13246..acc13246 100755
--- a/src/boot-env/preboot/uclib-rootfs/usr/bin/clear
+++ b/src/boot-env/preboot/rootfs/usr/bin/clear
diff --git a/src/boot-env/preboot/uclib-rootfs/usr/bin/dialog b/src/boot-env/preboot/rootfs/usr/bin/dialog
index 6929569f..6929569f 100755
--- a/src/boot-env/preboot/uclib-rootfs/usr/bin/dialog
+++ b/src/boot-env/preboot/rootfs/usr/bin/dialog
diff --git a/src/boot-env/preboot/uclib-rootfs/usr/bin/w3m b/src/boot-env/preboot/rootfs/usr/bin/w3m
index 2766a681..2766a681 100755
--- a/src/boot-env/preboot/uclib-rootfs/usr/bin/w3m
+++ b/src/boot-env/preboot/rootfs/usr/bin/w3m
diff --git a/src/boot-env/preboot/uclib-rootfs/usr/lib/libcrypto.so b/src/boot-env/preboot/rootfs/usr/lib/libcrypto.so
index cda623f3..cda623f3 120000
--- a/src/boot-env/preboot/uclib-rootfs/usr/lib/libcrypto.so
+++ b/src/boot-env/preboot/rootfs/usr/lib/libcrypto.so
diff --git a/src/boot-env/preboot/uclib-rootfs/usr/lib/libcrypto.so.0.9.8 b/src/boot-env/preboot/rootfs/usr/lib/libcrypto.so.0.9.8
index bb1b8163..bb1b8163 100755
--- a/src/boot-env/preboot/uclib-rootfs/usr/lib/libcrypto.so.0.9.8
+++ b/src/boot-env/preboot/rootfs/usr/lib/libcrypto.so.0.9.8
diff --git a/src/boot-env/preboot/uclib-rootfs/usr/lib/libcurses.so b/src/boot-env/preboot/rootfs/usr/lib/libcurses.so
index 32ad8efe..32ad8efe 100755
--- a/src/boot-env/preboot/uclib-rootfs/usr/lib/libcurses.so
+++ b/src/boot-env/preboot/rootfs/usr/lib/libcurses.so
diff --git a/src/boot-env/preboot/uclib-rootfs/usr/lib/libform.so b/src/boot-env/preboot/rootfs/usr/lib/libform.so
index 10e91696..10e91696 120000
--- a/src/boot-env/preboot/uclib-rootfs/usr/lib/libform.so
+++ b/src/boot-env/preboot/rootfs/usr/lib/libform.so
diff --git a/src/boot-env/preboot/uclib-rootfs/usr/lib/libform.so.5 b/src/boot-env/preboot/rootfs/usr/lib/libform.so.5
index 4a80f6b6..4a80f6b6 120000
--- a/src/boot-env/preboot/uclib-rootfs/usr/lib/libform.so.5
+++ b/src/boot-env/preboot/rootfs/usr/lib/libform.so.5
diff --git a/src/boot-env/preboot/uclib-rootfs/usr/lib/libform.so.5.6 b/src/boot-env/preboot/rootfs/usr/lib/libform.so.5.6
index 888adb22..888adb22 100755
--- a/src/boot-env/preboot/uclib-rootfs/usr/lib/libform.so.5.6
+++ b/src/boot-env/preboot/rootfs/usr/lib/libform.so.5.6
diff --git a/src/boot-env/preboot/uclib-rootfs/usr/lib/libmenu.so b/src/boot-env/preboot/rootfs/usr/lib/libmenu.so
index b12b5cfb..b12b5cfb 120000
--- a/src/boot-env/preboot/uclib-rootfs/usr/lib/libmenu.so
+++ b/src/boot-env/preboot/rootfs/usr/lib/libmenu.so
diff --git a/src/boot-env/preboot/uclib-rootfs/usr/lib/libmenu.so.5 b/src/boot-env/preboot/rootfs/usr/lib/libmenu.so.5
index 869f4a57..869f4a57 120000
--- a/src/boot-env/preboot/uclib-rootfs/usr/lib/libmenu.so.5
+++ b/src/boot-env/preboot/rootfs/usr/lib/libmenu.so.5
diff --git a/src/boot-env/preboot/uclib-rootfs/usr/lib/libmenu.so.5.6 b/src/boot-env/preboot/rootfs/usr/lib/libmenu.so.5.6
index fb190a90..fb190a90 100755
--- a/src/boot-env/preboot/uclib-rootfs/usr/lib/libmenu.so.5.6
+++ b/src/boot-env/preboot/rootfs/usr/lib/libmenu.so.5.6
diff --git a/src/boot-env/preboot/uclib-rootfs/usr/lib/libncurses.so b/src/boot-env/preboot/rootfs/usr/lib/libncurses.so
index e7122a85..e7122a85 100755
--- a/src/boot-env/preboot/uclib-rootfs/usr/lib/libncurses.so
+++ b/src/boot-env/preboot/rootfs/usr/lib/libncurses.so
diff --git a/src/boot-env/preboot/uclib-rootfs/usr/lib/libpanel.so b/src/boot-env/preboot/rootfs/usr/lib/libpanel.so
index b5cd4a70..b5cd4a70 120000
--- a/src/boot-env/preboot/uclib-rootfs/usr/lib/libpanel.so
+++ b/src/boot-env/preboot/rootfs/usr/lib/libpanel.so
diff --git a/src/boot-env/preboot/uclib-rootfs/usr/lib/libpanel.so.5 b/src/boot-env/preboot/rootfs/usr/lib/libpanel.so.5
index ff2e80a5..ff2e80a5 120000
--- a/src/boot-env/preboot/uclib-rootfs/usr/lib/libpanel.so.5
+++ b/src/boot-env/preboot/rootfs/usr/lib/libpanel.so.5
diff --git a/src/boot-env/preboot/uclib-rootfs/usr/lib/libpanel.so.5.6 b/src/boot-env/preboot/rootfs/usr/lib/libpanel.so.5.6
index 4acbc076..4acbc076 100755
--- a/src/boot-env/preboot/uclib-rootfs/usr/lib/libpanel.so.5.6
+++ b/src/boot-env/preboot/rootfs/usr/lib/libpanel.so.5.6
diff --git a/src/boot-env/preboot/uclib-rootfs/usr/lib/libssl.so b/src/boot-env/preboot/rootfs/usr/lib/libssl.so
index 7874414f..7874414f 120000
--- a/src/boot-env/preboot/uclib-rootfs/usr/lib/libssl.so
+++ b/src/boot-env/preboot/rootfs/usr/lib/libssl.so
diff --git a/src/boot-env/preboot/uclib-rootfs/usr/lib/libssl.so.0.9.8 b/src/boot-env/preboot/rootfs/usr/lib/libssl.so.0.9.8
index 194078c5..194078c5 100755
--- a/src/boot-env/preboot/uclib-rootfs/usr/lib/libssl.so.0.9.8
+++ b/src/boot-env/preboot/rootfs/usr/lib/libssl.so.0.9.8
diff --git a/src/boot-env/preboot/uclib-rootfs/usr/sbin/kdump b/src/boot-env/preboot/rootfs/usr/sbin/kdump
index 07226a4b..07226a4b 100755
--- a/src/boot-env/preboot/uclib-rootfs/usr/sbin/kdump
+++ b/src/boot-env/preboot/rootfs/usr/sbin/kdump
diff --git a/src/boot-env/preboot/uclib-rootfs/usr/sbin/kexec b/src/boot-env/preboot/rootfs/usr/sbin/kexec
index cc49c45c..cc49c45c 100755
--- a/src/boot-env/preboot/uclib-rootfs/usr/sbin/kexec
+++ b/src/boot-env/preboot/rootfs/usr/sbin/kexec