From 6ad6d7707e893016e82eeb75f4f08131d12700e7 Mon Sep 17 00:00:00 2001
From: Sebastian Schmelzer
Date: Mon, 4 Oct 2010 17:42:02 +0200
Subject: remove uClibc stuff - part I

---
 src/boot-env/OpenSLX/BootEnvironment/Preboot.pm      |  2 +-
 src/boot-env/OpenSLX/MakeInitRamFS/Engine/PBS.pm     |  4 ++--
 src/boot-env/OpenSLX/MakeInitRamFS/Engine/Preboot.pm | 10 +++++-----
 src/boot-env/OpenSLX/MakeInitRamFS/Engine/SlxBoot.pm |  8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/boot-env/OpenSLX')

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;
 }
-- 
cgit v1.2.3-55-g7522