LM
/
meta-netmodule-distro
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wireless-regdb: fix: install firmware files into initrd 

crda is not longer required since kernel >=4.15 and kernel
is able to load wireless regulatory database as firmware file

Install wifi and regulatory firmware files in initrd and default rootfs

BugzID: 60107

Signed-off-by: Ramon Moesching <ramon.moesching@netmodule.com>
This commit is contained in:
Ramon Moesching 2019-11-01 16:43:44 +01:00 committed by Gogs
parent 229fdd629e
commit e244ba6d10
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
conf/distro/netmodule-linux-ostree.conf
View File

@ -11,3 +11,10 @@ OSTREE_COMMIT_SUBJECT = "${IMAGE_BASENAME};${EXTERNALSRC_GIT_SRCREV}"
KERNEL_IMAGETYPES_sota = "fitImage" KERNEL_IMAGETYPES_sota = "fitImage"
KERNEL_IMAGETYPE_sota = "fitImage" KERNEL_IMAGETYPE_sota = "fitImage"
OSTREE_KERNEL = "${KERNEL_IMAGETYPE}-${INITRAMFS_IMAGE}-${MACHINE}-${MACHINE}" OSTREE_KERNEL = "${KERNEL_IMAGETYPE}-${INITRAMFS_IMAGE}-${MACHINE}-${MACHINE}"
INITRAMFS_PACKAGES = "wireless-regdb-static \
linux-firmware-wl12xx \
linux-firmware-wl18xx \
wlconf-bin \
"
ROOTFS_BOOTSTRAP_INSTALL_append = " ${INITRAMFS_PACKAGES}"

8
recipes-core/images/initramfs-ostree-image.bbappend Normal file
View File

@ -0,0 +1,8 @@
ROOTFS_POSTINSTALL_COMMAND_am335x-nmhw21 += " remove_firmware_bin; "
remove_firmware_bin() {
pwd=$PWD
cd ${IMAGE_ROOTFS}/lib/firmware
find . | egrep "wl128x-fw-4-plt.bin|wl18xx-fw-4.bin|wl18xx-conf.bin|TIInit_11.8.32.bts" -v | egrep 'bts|bin' | xargs rm
cd ${pwd}
}

3
recipes-core/images/netmodule-linux-image.bb
View File

@ -27,6 +27,7 @@ FIRMWARE_am335x-nrhw20 = " \
" "
FIRMWARE_am335x-nmhw21 = " \ FIRMWARE_am335x-nmhw21 = " \
linux-firmware-wl12xx\
linux-firmware-wl18xx\ linux-firmware-wl18xx\
wlconf-bin \ wlconf-bin \
" "
@ -52,7 +53,6 @@ BT_TOOLS = " \
IMAGE_INSTALL_append = " \ IMAGE_INSTALL_append = " \
hostapd \ hostapd \
iw \ iw \
crda \
wpa-supplicant \ wpa-supplicant \
openssh-sftp-server \ openssh-sftp-server \
haveged \ haveged \
@ -81,6 +81,7 @@ IMAGE_INSTALL_append = " \
${@bb.utils.contains("MACHINE_FEATURES", "toby-l2", "ublox-gsm-config", "", d)} \ ${@bb.utils.contains("MACHINE_FEATURES", "toby-l2", "ublox-gsm-config", "", d)} \
${@bb.utils.contains("MACHINE_FEATURES", "bluetooth", "${BT_TOOLS}", "", d)} \ ${@bb.utils.contains("MACHINE_FEATURES", "bluetooth", "${BT_TOOLS}", "", d)} \
${FIRMWARE} \ ${FIRMWARE} \
wireless-regdb-static \
" "
IMAGE_INSTALL_append_am335x-nrhw16 = " \ IMAGE_INSTALL_append_am335x-nrhw16 = " \