[haiku-bugs] Re: [Haiku] #5455: [patch] rule AddWirelessFirmwareToHaikuImage
- From: "mmadia" <trac@xxxxxxxxxxxx>
- Date: Sat, 27 Feb 2010 04:22:46 -0000
#5455: [patch] rule AddWirelessFirmwareToHaikuImage
--------------------------+-------------------------------------------------
Reporter: mmadia | Owner: bonefish
Type: enhancement | Status: new
Priority: normal | Milestone: R1
Component: Build System | Version: R1/Development
Keywords: | Blockedby: 5479
Platform: All | Blocking: 5457
--------------------------+-------------------------------------------------
Comment(by mmadia):
Replying to [comment:8 bonefish]:
> Replying to [comment:6 mmadia]:
> > After updating the jamfiles & build/scripts to support this, I
remembered that as opposed to simply extracting the archive, we need to
specify if the archive contains a subdirectory and if it does to copy only
the contents of that subdirectory.
>
> OK, that could be easily solved by adding the subdir as another argument
to ExtractArchiveToContainer and passing it through to the extractFile()
function in the scripts. It would just be an adjustment of the source
argument in the "$cp" line.
>
Is this patch along the lines of what you were thinking?
The patch + #5479 worked as expected in a {{{ jam -q @nightly-raw }}}.
Applying #5457 also worked as expected. Here's a snippet of the output
with a debug echo statement:
{{{
Populating image ...
Extracting /haiku-
src/haiku/data/system/data/firmware/iprowifi3945/iwlwifi-3945-ucode-2.14.1.5.tgz
...
/generated/x86gcc2/objects/haiku_host/x86/release/tools/fs_shell/fs_shell_command
cp -f -r :/generated/x86gcc2/tmp/extract/iwlwifi-3945-ucode-2.14.1.5/.
/myfs/system/data/firmware/iprowifi3945
Extracting /haiku-
src/haiku/data/system/data/firmware/iprowifi4965/iwlwifi-4965-ucode-4.44.1.20.tgz
...
/generated/x86gcc2/objects/haiku_host/x86/release/tools/fs_shell/fs_shell_command
cp -f -r :/generated/x86gcc2/tmp/extract/iwlwifi-4965-ucode-4.44.1.20/.
/myfs/system/data/firmware/iprowifi4965
Extracting /haiku-
src/haiku/data/system/data/firmware/marvell88w8363/88w8363-fw-3.6.2.2.zip
...
/generated/x86gcc2/objects/haiku_host/x86/release/tools/fs_shell/fs_shell_command
cp -f -r :/generated/x86gcc2/tmp/extract//.
/myfs/system/data/firmware/marvell88w8363
Extracting /haiku-
src/haiku/data/system/data/firmware/ralinkwifi/RT61_Firmware_V1.2.zip ...
/generated/x86gcc2/objects/haiku_host/x86/release/tools/fs_shell/fs_shell_command
cp -f -r :/generated/x86gcc2/tmp/extract/RT61_Firmware_V1.2/.
/myfs/system/data/firmware/ralinkwifi
Extracting /generated/x86gcc2/download/apr-1.3.9-x86-gcc2-2009-10-18.zip
...
/generated/x86gcc2/objects/haiku_host/x86/release/tools/fs_shell/fs_shell_command
cp -f -r :/generated/x86gcc2/tmp/extract//. /myfs/.
}}}
--
Ticket URL: <http://dev.haiku-os.org/ticket/5455#comment:9>
Haiku <http://dev.haiku-os.org>
Haiku - the operating system.
Other related posts:
