summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Schmelzer2012-04-23 19:03:26 +0200
committerSebastian Schmelzer2012-04-23 19:03:26 +0200
commit49ed487571fe04ec6a0a77c64a02c0b847d7e4f2 (patch)
tree9cbb4044ce0e0a2547d8fbb079a9061a91b166ea
parentupdate profile plugin (diff)
downloadcore-49ed487571fe04ec6a0a77c64a02c0b847d7e4f2.tar.gz
core-49ed487571fe04ec6a0a77c64a02c0b847d7e4f2.tar.xz
core-49ed487571fe04ec6a0a77c64a02c0b847d7e4f2.zip
(quick)fix problems with alternative firmware locations..
-rw-r--r--src/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm10
1 files changed, 9 insertions, 1 deletions
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