Bug#521370: mkinitramfs doesn't find firmware files

2009-03-30 Thread Rogério Brito
Hi, maks.

On Mar 27 2009, maximilian attems wrote:
 right thanks for report.
 
 you can try belows patch,
 you will need to apply it to /usr/share/initramfs-tools/hook-functions
 
 commit dabf87a52411c729536051e78b2ad587f767be54
 Author: maximilian attems m...@debian.org
 Date:   Fri Mar 27 10:35:20 2009 +0100
 
 hook-functions: Add firmware from versioned directories too.
 
 First see if there is a $(uname -a) versioned firmware around
 and if there is add it first.

Builds the cpio image fine.


Thanks, Rogério Brito.

-- 
Rogério Brito : rbr...@{mackenzie,ime.usp}.br : GPG key 1024D/7C2CAEB8
http://www.ime.usp.br/~rbrito : http://meusite.mackenzie.com.br/rbrito
Projects: algorithms.berlios.de : lame.sf.net : vrms.alioth.debian.org



--
To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#521370: mkinitramfs doesn't find firmware files

2009-03-27 Thread maximilian attems
hello,

On Thu, 26 Mar 2009, Rogério Brito wrote:

 
 I am just experimenting with initramfs-based kernels and I tried to use
 mkinitramfs, with the following command taken from the manpage:
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 (...)
 Adding module /lib/modules/2.6.29-rc6-2/kernel/drivers/net/b44.ko
 Adding module /lib/modules/2.6.29-rc6-2/kernel/drivers/net/e100.ko
 W: Possible missing firmware /lib/firmware/e100/d102e_ucode.bin for module 
 e100
 W: Possible missing firmware /lib/firmware/e100/d101s_ucode.bin for module 
 e100
 W: Possible missing firmware /lib/firmware/e100/d101m_ucode.bin for module 
 e100
 Adding module /lib/modules/2.6.29-rc6-2/kernel/drivers/net/r8169.ko
 Adding module /lib/modules/2.6.29-rc6-2/kernel/drivers/net/slhc.ko
 Copying module directory kernel/drivers/scsi
 (...)

right thanks for report.

 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 Please notice that it tries to find the firmware in a directory that is
 version agnostic, but it is not always present. It should also seek
 directories that have the version of the kernel in its name, like:
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 rbr...@chagas:~$ tree /lib/firmware/2.6.29-rc6-2/
 /lib/firmware/2.6.29-rc6-2/
 `-- e100
 |-- d101m_ucode.bin
 |-- d101s_ucode.bin
 `-- d102e_ucode.bin
 
 1 directory, 3 files
 rbr...@chagas:~$ 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 It would, then, find the files without any problems.
 
 
 Thanks for the package, Rogério Brito.

you can try belows patch,
you will need to apply it to /usr/share/initramfs-tools/hook-functions

commit dabf87a52411c729536051e78b2ad587f767be54
Author: maximilian attems m...@debian.org
Date:   Fri Mar 27 10:35:20 2009 +0100

hook-functions: Add firmware from versioned directories too.

First see if there is a $(uname -a) versioned firmware around
and if there is add it first.


diff --git a/hook-functions b/hook-functions
index 2368b8d..e549c81 100644
--- a/hook-functions
+++ b/hook-functions
@@ -62,14 +62,16 @@ manual_add_modules()
continue
fi
for firmware in $firmwares; do
-   if [ -e ${DESTDIR}/lib/firmware/${firmware} ]; then
+   if [ -e ${DESTDIR}/lib/firmware/${firmware} ] \
+   || [ -e 
${DESTDIR}/lib/firmware/${version}/${firmware} ]; then
continue
fi
 
# Only print warning for missing fw of loaded module
# or forced loaded module
-   if [ ! -e /lib/firmware/${firmware} ]; then
-   if grep -q ^$(basename ${mam_x} .ko) \
+   if [ ! -e /lib/firmware/${firmware} ] \
+[ ! -e /lib/firmware/${version}/${firmware} ]; then
+   if grep -q ^$(basename ${mam_x} 
.ko)[[:space:]] \
/proc/modules \
|| grep -q ^$(basename ${mam_x} .ko) \
${CONFDIR}/modules; then
@@ -83,7 +85,11 @@ manual_add_modules()
copy_exec /lib/udev/firmware.agent
fi
 
-   copy_exec /lib/firmware/${firmware}
+   if [ -e /lib/firmware/${version}/${firmware} ]; then
+   copy_exec /lib/firmware/${version}/${firmware}
+   else
+   copy_exec /lib/firmware/${firmware}
+   fi
if [ ${verbose} = y ]; then
echo Adding firmware ${firmware}
fi



--
To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#521370: mkinitramfs doesn't find firmware files

2009-03-26 Thread Rogério Brito
Package: initramfs-tools
Version: 0.93.1
Severity: normal

Hi.

I am just experimenting with initramfs-based kernels and I tried to use
mkinitramfs, with the following command taken from the manpage:

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
(...)
Adding module /lib/modules/2.6.29-rc6-2/kernel/drivers/net/b44.ko
Adding module /lib/modules/2.6.29-rc6-2/kernel/drivers/net/e100.ko
W: Possible missing firmware /lib/firmware/e100/d102e_ucode.bin for module e100
W: Possible missing firmware /lib/firmware/e100/d101s_ucode.bin for module e100
W: Possible missing firmware /lib/firmware/e100/d101m_ucode.bin for module e100
Adding module /lib/modules/2.6.29-rc6-2/kernel/drivers/net/r8169.ko
Adding module /lib/modules/2.6.29-rc6-2/kernel/drivers/net/slhc.ko
Copying module directory kernel/drivers/scsi
(...)
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Please notice that it tries to find the firmware in a directory that is
version agnostic, but it is not always present. It should also seek
directories that have the version of the kernel in its name, like:

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
rbr...@chagas:~$ tree /lib/firmware/2.6.29-rc6-2/
/lib/firmware/2.6.29-rc6-2/
`-- e100
|-- d101m_ucode.bin
|-- d101s_ucode.bin
`-- d102e_ucode.bin

1 directory, 3 files
rbr...@chagas:~$ 
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

It would, then, find the files without any problems.


Thanks for the package, Rogério Brito.


-- Package-specific info:
-- /proc/cmdline
root=/dev/hda3 ro 

-- /proc/filesystems
ext3
hfsplus
fuseblk
udf
iso9660

-- lsmod
Module  Size  Used by
isofs  31384  0 
zlib_inflate   13592  1 isofs
udf69128  0 
crc_itu_t   1928  1 udf
nfs   137960  1 
lockd  66852  1 nfs
nfs_acl 2888  1 nfs
sunrpc177928  9 nfs,lockd,nfs_acl
sd_mod 24088  0 
usb_storage53264  0 
usblp  12520  0 
scsi_mod   95080  2 sd_mod,usb_storage
i915  149288  1 
fb 44040  1 i915
cfbcopyarea 3640  1 i915
cfbimgblt   2680  1 i915
cfbfillrect 3752  1 i915
battery 7688  0 
fuse   54272  1 
nls_utf81872  1 
hfsplus71488  1 
nls_base7852  4 isofs,udf,nls_utf8,hfsplus
8139too23692  0 
iTCO_wdt   12496  0 
evdev  10464  0 
fan 3960  0 
e100   31552  0 
bitrev  1928  1 8139too
crc32   3944  1 8139too
iTCO_vendor_support 3324  1 iTCO_wdt
8250_pnp   17592  0 
8250   26952  1 8250_pnp
serial_core19096  1 8250
thermal18904  0 
button  7352  0 
processor  44032  1 thermal

-- /etc/kernel-img.conf
# Kernel image management overrides
# See kernel-img.conf(5) for details
do_symlinks = yes
relative_links = yes
do_bootloader = no
do_bootfloppy = no
do_initrd = yes
link_in_boot = no
postinst_hook = update-grub
postrm_hook   = update-grub

-- /etc/initramfs-tools/initramfs.conf
MODULES=most
BUSYBOX=y
KEYMAP=n
BOOT=local
DEVICE=eth0
NFSROOT=auto


-- System Information:
Debian Release: squeeze/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.29-rc6-2 (SMP w/2 CPU cores; PREEMPT)
Locale: LANG=en_US.utf-8, LC_CTYPE=pt_BR.utf-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages initramfs-tools depends on:
ii  cpio  2.9.90-3   GNU cpio -- a program to manage ar
ii  findutils 4.4.0-3utilities for finding files--find,
ii  klibc-utils   1.5.15-1   small utilities built with klibc f
ii  module-init-tools 3.7-pre9-1 tools for managing Linux kernel mo
ii  udev  0.125-7/dev/ and hotplug management daemo

Versions of packages initramfs-tools recommends:
ii  busybox   1:1.10.2-2 Tiny utilities for small and embed

initramfs-tools suggests no packages.

-- no debconf information

-- 
Rogério Brito : rbr...@{mackenzie,ime.usp}.br : GPG key 1024D/7C2CAEB8
http://www.ime.usp.br/~rbrito : http://meusite.mackenzie.com.br/rbrito
Projects: algorithms.berlios.de : lame.sf.net : vrms.alioth.debian.org



--
To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org