From 49ed487571fe04ec6a0a77c64a02c0b847d7e4f2 Mon Sep 17 00:00:00 2001
From: Sebastian Schmelzer
Date: Mon, 23 Apr 2012 19:03:26 +0200
Subject: (quick)fix problems with alternative firmware locations..

---
 src/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm b/src/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm
index 24b999e4..1842edad 100644
--- a/src/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm
+++ b/src/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm
@@ -301,13 +301,21 @@ sub _copyKernelModules
         my $source = followLink(
             "$self->{'root-path'}/lib/firmware/$self->{'kernel-version'}/$firmwareToBeCopied", $self->{'root-path'}
         );
+        my $alternative_source = followLink(
+            "$self->{'root-path'}/lib/firmware/$firmwareToBeCopied", $self->{'root-path'}
+        );
         if (-e $source){
-        	my $target = "$self->{'build-path'}/lib/firmware/";
+        	my $target = "$self->{'build-path'}/lib/firmware/$self->{'kernel-version'}/";
         	
         	$self->addCMD("cp -pr --dereference $source $target");
         } else {
             vlog(3,"unable to find $source for copying purposes");
         }
+        if (-e $alternative_source){
+        	my $target = "$self->{'build-path'}/lib/firmware/";
+        	
+        	$self->addCMD("cp -pr --dereference $alternative_source $target");
+        }
     }	
     
     # copy all the modules that we think are required
-- 
cgit v1.2.3-55-g7522