mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
merge intel_wireless into wireless hook
This commit is contained in:
parent
3ac6663826
commit
fc006abb5f
3 changed files with 5 additions and 22 deletions
|
@ -11,7 +11,7 @@ FILES=()
|
||||||
#
|
#
|
||||||
# Please change the hooks only if you know what you are doing.
|
# Please change the hooks only if you know what you are doing.
|
||||||
HOOKS=(archboot_kms udev archboot_base_common archboot_base archboot_installer_common \
|
HOOKS=(archboot_kms udev archboot_base_common archboot_base archboot_installer_common \
|
||||||
archboot_installer archboot_tz archboot_keymap archboot_acpi archboot_motd archboot_intel_wireless \
|
archboot_installer archboot_tz archboot_keymap archboot_acpi archboot_motd \
|
||||||
archboot_hwdetect block archboot_pcspkr archboot_net_common archboot_net keyboard \
|
archboot_hwdetect block archboot_pcspkr archboot_net_common archboot_net keyboard \
|
||||||
dmraid archboot_devicemapper archboot_mdadm mdadm_udev lvm2 archboot_lvm2 encrypt \
|
dmraid archboot_devicemapper archboot_mdadm mdadm_udev lvm2 archboot_lvm2 encrypt \
|
||||||
btrfs archboot_filesystems archboot_remote archboot_cpufreq archboot_kexec archboot_ppp \
|
btrfs archboot_filesystems archboot_remote archboot_cpufreq archboot_kexec archboot_ppp \
|
||||||
|
|
|
@ -1,19 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
# Created by Tobias Powalowski <tpowa@archlinux.org>
|
|
||||||
|
|
||||||
build ()
|
|
||||||
{
|
|
||||||
# ipw2100 support
|
|
||||||
map add_file "/usr/lib/firmware/ipw2100-1.3-i.fw" "/usr/lib/firmware/ipw2100-1.3-p.fw" \
|
|
||||||
"/usr/lib/firmware/ipw2100-1.3.fw" "/usr/share/licenses/ipw2100-fw/LICENSE"
|
|
||||||
# ipw2200 support
|
|
||||||
map add_file "/usr/lib/firmware/ipw2200-bss.fw" "/usr/lib/firmware/ipw2200-ibss.fw" \
|
|
||||||
"/usr/lib/firmware/ipw2200-sniffer.fw" "/usr/share/licenses/ipw2200-fw/LICENSE"
|
|
||||||
}
|
|
||||||
|
|
||||||
help ()
|
|
||||||
{
|
|
||||||
cat<<HELPEOF
|
|
||||||
This hook includes intel wireless on an archboot image.
|
|
||||||
HELPEOF
|
|
||||||
}
|
|
|
@ -19,8 +19,10 @@ build ()
|
||||||
map add_file "/etc/conf.d/wireless-regdom" "/usr/lib/crda/regulatory.bin" \
|
map add_file "/etc/conf.d/wireless-regdom" "/usr/lib/crda/regulatory.bin" \
|
||||||
"/usr/lib/crda/pubkeys/sforshee.key.pub.pem"
|
"/usr/lib/crda/pubkeys/sforshee.key.pub.pem"
|
||||||
# fixing licenses
|
# fixing licenses
|
||||||
map add_file "/usr/share/licenses/expat/COPYING" \
|
map add_file "/usr/share/licenses/expat/COPYING" "/usr/share/licenses/wireless-regdb/LICENSE"
|
||||||
"/usr/share/licenses/wireless-regdb/LICENSE"
|
if [[ "$(uname -m)" == "x86_64" ]]; then
|
||||||
|
map add_file "/usr/share/licenses/ipw2200-fw/LICENSE" "/usr/share/licenses/ipw2100-fw/LICENSE"
|
||||||
|
fi
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue