diff options
Diffstat (limited to 'poky/meta/recipes-kernel')
| -rw-r--r-- | poky/meta/recipes-kernel/linux-firmware/linux-firmware_20201118.bb (renamed from poky/meta/recipes-kernel/linux-firmware/linux-firmware_20201022.bb) | 11 | ||||
| -rw-r--r-- | poky/meta/recipes-kernel/linux/linux-dummy.bb | 4 | ||||
| -rwxr-xr-x | poky/meta/recipes-kernel/modutils-initscripts/files/modutils.sh | 8 | ||||
| -rw-r--r-- | poky/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb | 2 |
4 files changed, 17 insertions, 8 deletions
diff --git a/poky/meta/recipes-kernel/linux-firmware/linux-firmware_20201022.bb b/poky/meta/recipes-kernel/linux-firmware/linux-firmware_20201118.bb index 93b9d5308..baac26c51 100644 --- a/poky/meta/recipes-kernel/linux-firmware/linux-firmware_20201022.bb +++ b/poky/meta/recipes-kernel/linux-firmware/linux-firmware_20201118.bb @@ -126,7 +126,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ - file://WHENCE;md5=daf28db5d6353de0a886f08106cffa22 \ + file://WHENCE;md5=ef221e03fc58f4d34a132b801dfa1d68 \ " # These are not common licenses, set NO_GENERIC_LICENSE for them @@ -198,7 +198,7 @@ PE = "1" SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/firmware/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "bf586e0beb4c65f22bf0a79811f259aa0a5a7cc9f70eebecb260525b6914cef7" +SRC_URI[sha256sum] = "863d5a31da725b856a917280d1e3014929b3bc3d4e6e5faecf530c13afb7e2b9" inherit allarch @@ -261,7 +261,7 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ ${PN}-bcm43xx-hdr \ ${PN}-atheros-license ${PN}-ar9170 ${PN}-ath6k ${PN}-ath9k \ ${PN}-gplv2-license ${PN}-carl9170 \ - ${PN}-ar3k-license ${PN}-ar3k ${PN}-ath10k-license ${PN}-ath10k ${PN}-qca \ + ${PN}-ar3k-license ${PN}-ar3k ${PN}-ath10k-license ${PN}-ath10k ${PN}-ath11k ${PN}-qca \ \ ${PN}-imx-sdma-license ${PN}-imx-sdma-imx6q ${PN}-imx-sdma-imx7d \ \ @@ -356,12 +356,17 @@ FILES_${PN}-ath10k = " \ ${nonarch_base_libdir}/firmware/ath10k \ " +FILES_${PN}-ath11k = " \ + ${nonarch_base_libdir}/firmware/ath11k \ +" + FILES_${PN}-qca = " \ ${nonarch_base_libdir}/firmware/qca \ " RDEPENDS_${PN}-ar3k += "${PN}-ar3k-license" RDEPENDS_${PN}-ath10k += "${PN}-ath10k-license" +RDEPENDS_${PN}-ath11k += "${PN}-ath10k-license" RDEPENDS_${PN}-qca += "${PN}-ath10k-license" # For ralink diff --git a/poky/meta/recipes-kernel/linux/linux-dummy.bb b/poky/meta/recipes-kernel/linux/linux-dummy.bb index 62cf6f5ea..649fc04dd 100644 --- a/poky/meta/recipes-kernel/linux/linux-dummy.bb +++ b/poky/meta/recipes-kernel/linux/linux-dummy.bb @@ -5,10 +5,12 @@ where you wish to build the kernel externally from the build system." SECTION = "kernel" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe" +LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe" PROVIDES += "virtual/kernel" +inherit deploy + PACKAGES_DYNAMIC += "^kernel-module-.*" PACKAGES_DYNAMIC += "^kernel-image-.*" PACKAGES_DYNAMIC += "^kernel-firmware-.*" diff --git a/poky/meta/recipes-kernel/modutils-initscripts/files/modutils.sh b/poky/meta/recipes-kernel/modutils-initscripts/files/modutils.sh index a78adf572..3274c25a6 100755 --- a/poky/meta/recipes-kernel/modutils-initscripts/files/modutils.sh +++ b/poky/meta/recipes-kernel/modutils-initscripts/files/modutils.sh @@ -13,14 +13,16 @@ LOAD_MODULE=modprobe [ -f /proc/modules ] || exit 0 -[ -f /etc/modules ] || [ -d /etc/modules-load.d ] || exit 0 -[ -e /sbin/modprobe ] || LOAD_MODULE=insmod -if [ ! -f /lib/modules/`uname -r`/modules.dep ]; then +# Test if modules.dep exists and has a size greater than zero +if [ ! -s /lib/modules/`uname -r`/modules.dep ]; then [ "$VERBOSE" != no ] && echo "Calculating module dependencies ..." depmod -Ae fi +[ -f /etc/modules ] || [ -d /etc/modules-load.d ] || exit 0 +[ -e /sbin/modprobe ] || LOAD_MODULE=insmod + loaded_modules=" " process_file() { diff --git a/poky/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb b/poky/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb index 881b7db92..97b4ddb88 100644 --- a/poky/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb +++ b/poky/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb @@ -10,7 +10,7 @@ PR = "r7" S = "${WORKDIR}" INITSCRIPT_NAME = "modutils.sh" -INITSCRIPT_PARAMS = "start 05 S ." +INITSCRIPT_PARAMS = "start 06 S ." inherit update-rc.d |