diff options
author | Alexander Hoppe | 2009-09-29 17:32:08 +0200 |
---|---|---|
committer | Alexander Hoppe | 2009-09-29 17:32:08 +0200 |
commit | 76dfdc66237765c1df07e70ed5905cf4a655f5a4 (patch) | |
tree | 85e1edafc1e8be15da74fc337c094f4f25b0c184 /boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm | |
parent | add new busybox (1.15.1) to initramfs (diff) | |
download | core-76dfdc66237765c1df07e70ed5905cf4a655f5a4.tar.gz core-76dfdc66237765c1df07e70ed5905cf4a655f5a4.tar.xz core-76dfdc66237765c1df07e70ed5905cf4a655f5a4.zip |
bugfix of "target is a directory" error
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@3164 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm')
-rw-r--r-- | boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm b/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm index d014852e..1fee62a8 100644 --- a/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm +++ b/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm @@ -280,8 +280,11 @@ sub _copyKernelModules vlog(1,$1); switch ($1){ case "e100.ko" {push @firmwares, split ' ', "e100"} + case "iwlwifi" { + push @firmwares, split ' ', + "iwlwifi-3945-1.ucode iwlwifi-3945-2.ucode iwlwifi-4965-1.ucode iwlwifi-4965-2.ucode iwlwifi-5000-1.ucode" + } case "tg3.ko" {push @firmwares, split ' ', "tigon/"} - } } # copy all the firmwares that we think are required @@ -291,7 +294,8 @@ sub _copyKernelModules ); if (-e $source){ my $target = "$self->{'build-path'}/lib/firmware/"; - $self->addCMD("cp -pa --dereference $source $target"); + + $self->addCMD("cp -pr --dereference $source $target"); } else { vlog(3,"unable to find $source for copying purposes"); } @@ -303,6 +307,9 @@ sub _copyKernelModules "$self->{'root-path'}$moduleToBeCopied", $self->{'root-path'} ); my $target = "$self->{'build-path'}$moduleToBeCopied"; + my ($targetdir) = $target =~m/(.*\/).*$/; + vlog(5,"Trying to make directory: $targetdir"); + $self->addCMD("mkdir -p $targetdir"); $self->addCMD("cp -p --dereference $source $target"); } |