[arch-projects] [PATCH] [mkinitcpio] Fix some install hooks due recent change in all_modules()
[fw] Avoid inclusion of kernel/sound/firewire [pcmcia] Avoid inclusion of kernel/sound/pcmcia [usb] and [usbinput] Avoid inclusion of ignored modules (via grep cmd) Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- install/fw | 2 +- install/pcmcia | 2 +- install/usb | 2 +- install/usbinput | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/install/fw b/install/fw index 9f4ed26..67355a5 100644 --- a/install/fw +++ b/install/fw @@ -2,7 +2,7 @@ install () { - MODULES=" $(checked_modules "/firewire/") " + MODULES=" $(checked_modules '/drivers/firewire/') " MODULES=$(echo ${MODULES}) #trim whitespace if [ -n "${MODULES}" ]; then diff --git a/install/pcmcia b/install/pcmcia index 8b685c5..105b92b 100644 --- a/install/pcmcia +++ b/install/pcmcia @@ -2,7 +2,7 @@ install () { - MODULES=" $(checked_modules '/pcmcia/' | grep -ve 'sound' -e 'net') $(checked_modules '/ide/legacy')" + MODULES=" $(checked_modules '/drivers/pcmcia/' | grep -ve 'sound' -e 'net') $(checked_modules '/ide/legacy')" MODULES=$(echo ${MODULES}) #trim whitespace if [ -n "${MODULES}" ]; then MODULES="${MODULES} sd_mod" diff --git a/install/usb b/install/usb index 605912c..1a30a53 100644 --- a/install/usb +++ b/install/usb @@ -2,7 +2,7 @@ install () { - MODULES=" $(checked_modules "/usb/host" | grep -ve "_cs" -e "sl811-hcd" -e "isp116x-hcd")" + MODULES=" $(checked_modules "/usb/host" | grep -ve "_cs" -e "sl811_hcd" -e "isp116x_hcd")" MODULES=$(echo ${MODULES}) #trim whitespace if [ -n "${MODULES}" ]; then diff --git a/install/usbinput b/install/usbinput index 0d293ae..4f46979 100644 --- a/install/usbinput +++ b/install/usbinput @@ -2,7 +2,7 @@ install () { - MODULES=" $(checked_modules "/usb/host" | grep -ve "_cs" -e "sl811-hcd" -e "isp116x-hcd") " + MODULES=" $(checked_modules "/usb/host" | grep -ve "_cs" -e "sl811_hcd" -e "isp116x_hcd") " MODULES=" $(echo ${MODULES}) $(all_modules "/hid/hid-") " MODULES=$(echo ${MODULES}) #trim whitespace -- 1.7.5.2
Am 20.06.2011 03:45, schrieb Gerardo Exequiel Pozzi:
[fw] Avoid inclusion of kernel/sound/firewire [pcmcia] Avoid inclusion of kernel/sound/pcmcia [usb] and [usbinput] Avoid inclusion of ignored modules (via grep cmd)
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
I now applied Dave's branch before this, and it doesn't apply anymore. Can you check again if these are still needed?
[fw] Avoid inclusion of kernel/sound/firewire [pcmcia] Avoid inclusion of kernel/sound/pcmcia [usb] and [usbinput] Avoid inclusion of ignored modules (via grep cmd) Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- install/fw | 2 +- install/pcmcia | 2 +- install/usb | 2 +- install/usbinput | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/install/fw b/install/fw index a5a77cb..7d7f06f 100644 --- a/install/fw +++ b/install/fw @@ -2,7 +2,7 @@ build() { - MODULES=" $(checked_modules "/firewire/") " + MODULES=" $(checked_modules "/drivers/firewire/") " MODULES=$(echo ${MODULES}) #trim whitespace if [ -n "${MODULES}" ]; then diff --git a/install/pcmcia b/install/pcmcia index a9920c1..7930d83 100644 --- a/install/pcmcia +++ b/install/pcmcia @@ -2,7 +2,7 @@ build() { - MODULES=" $(checked_modules '/pcmcia/' | grep -ve 'sound' -e 'net') $(checked_modules '/ide/legacy')" + MODULES=" $(checked_modules '/drivers/pcmcia/' | grep -ve 'sound' -e 'net') $(checked_modules '/ide/legacy')" MODULES=$(echo ${MODULES}) #trim whitespace if [ -n "${MODULES}" ]; then MODULES="${MODULES} sd_mod" diff --git a/install/usb b/install/usb index 620f695..db2d08e 100644 --- a/install/usb +++ b/install/usb @@ -2,7 +2,7 @@ build() { - MODULES=" $(checked_modules "/usb/host" | grep -ve "_cs" -e "sl811-hcd" -e "isp116x-hcd")" + MODULES=" $(checked_modules "/usb/host" | grep -ve "_cs" -e "sl811_hcd" -e "isp116x_hcd")" MODULES=$(echo ${MODULES}) #trim whitespace if [ -n "${MODULES}" ]; then diff --git a/install/usbinput b/install/usbinput index a90cd15..e4bf27e 100644 --- a/install/usbinput +++ b/install/usbinput @@ -2,7 +2,7 @@ build() { - MODULES=" $(checked_modules "/usb/host" | grep -ve "_cs" -e "sl811-hcd" -e "isp116x-hcd") " + MODULES=" $(checked_modules "/usb/host" | grep -ve "_cs" -e "sl811_hcd" -e "isp116x_hcd") " MODULES=" $(echo ${MODULES}) $(all_modules "/hid/hid-") " MODULES=$(echo ${MODULES}) #trim whitespace -- 1.7.5.2
participants (2)
-
Gerardo Exequiel Pozzi
-
Thomas Bächler