summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/kernel-module-split.bbclass2
-rw-r--r--meta/classes/kernel.bbclass14
-rw-r--r--meta/classes/module.bbclass2
3 files changed, 9 insertions, 9 deletions
diff --git a/meta/classes/kernel-module-split.bbclass b/meta/classes/kernel-module-split.bbclass
index ba9cc1517e..5e10dcf735 100644
--- a/meta/classes/kernel-module-split.bbclass
+++ b/meta/classes/kernel-module-split.bbclass
@@ -138,7 +138,7 @@ python split_kernel_module_packages () {
138 postinst = d.getVar('pkg_postinst_modules') 138 postinst = d.getVar('pkg_postinst_modules')
139 postrm = d.getVar('pkg_postrm_modules') 139 postrm = d.getVar('pkg_postrm_modules')
140 140
141 modules = do_split_packages(d, root='/lib/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='kernel-%s' % (d.getVar("KERNEL_VERSION"))) 141 modules = do_split_packages(d, root='${nonarch_base_libdir}/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='kernel-%s' % (d.getVar("KERNEL_VERSION")))
142 if modules: 142 if modules:
143 metapkg = d.getVar('KERNEL_MODULES_META_PACKAGE') 143 metapkg = d.getVar('KERNEL_MODULES_META_PACKAGE')
144 d.appendVar('RDEPENDS_' + metapkg, ' '+' '.join(modules)) 144 d.appendVar('RDEPENDS_' + metapkg, ' '+' '.join(modules))
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 1e0646a437..244087a59d 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -299,11 +299,11 @@ kernel_do_install() {
299 # 299 #
300 unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE 300 unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
301 if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then 301 if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
302 oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" modules_install 302 oe_runmake DEPMOD=echo MODLIB=${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION} INSTALL_FW_PATH=${D}${nonarch_base_libdir}/firmware modules_install
303 rm "${D}/lib/modules/${KERNEL_VERSION}/build" 303 rm "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/build"
304 rm "${D}/lib/modules/${KERNEL_VERSION}/source" 304 rm "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/source"
305 # If the kernel/ directory is empty remove it to prevent QA issues 305 # If the kernel/ directory is empty remove it to prevent QA issues
306 rmdir --ignore-fail-on-non-empty "${D}/lib/modules/${KERNEL_VERSION}/kernel" 306 rmdir --ignore-fail-on-non-empty "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel"
307 else 307 else
308 bbnote "no modules to install" 308 bbnote "no modules to install"
309 fi 309 fi
@@ -485,9 +485,9 @@ EXPORT_FUNCTIONS do_compile do_install do_configure
485# kernel-image becomes kernel-image-${KERNEL_VERSION} 485# kernel-image becomes kernel-image-${KERNEL_VERSION}
486PACKAGES = "kernel kernel-base kernel-vmlinux kernel-image kernel-dev kernel-modules" 486PACKAGES = "kernel kernel-base kernel-vmlinux kernel-image kernel-dev kernel-modules"
487FILES_${PN} = "" 487FILES_${PN} = ""
488FILES_kernel-base = "/lib/modules/${KERNEL_VERSION}/modules.order /lib/modules/${KERNEL_VERSION}/modules.builtin" 488FILES_kernel-base = "${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.order ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.builtin"
489FILES_kernel-image = "" 489FILES_kernel-image = ""
490FILES_kernel-dev = "/boot/System.map* /boot/Module.symvers* /boot/config* ${KERNEL_SRC_PATH} /lib/modules/${KERNEL_VERSION}/build" 490FILES_kernel-dev = "/boot/System.map* /boot/Module.symvers* /boot/config* ${KERNEL_SRC_PATH} ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/build"
491FILES_kernel-vmlinux = "/boot/vmlinux-${KERNEL_VERSION_NAME}" 491FILES_kernel-vmlinux = "/boot/vmlinux-${KERNEL_VERSION_NAME}"
492FILES_kernel-modules = "" 492FILES_kernel-modules = ""
493RDEPENDS_kernel = "kernel-base" 493RDEPENDS_kernel = "kernel-base"
@@ -518,7 +518,7 @@ pkg_postinst_kernel-base () {
518PACKAGESPLITFUNCS_prepend = "split_kernel_packages " 518PACKAGESPLITFUNCS_prepend = "split_kernel_packages "
519 519
520python split_kernel_packages () { 520python split_kernel_packages () {
521 do_split_packages(d, root='/lib/firmware', file_regex='^(.*)\.(bin|fw|cis|csp|dsp)$', output_pattern='kernel-firmware-%s', description='Firmware for %s', recursive=True, extra_depends='') 521 do_split_packages(d, root='${nonarch_base_libdir}/firmware', file_regex='^(.*)\.(bin|fw|cis|csp|dsp)$', output_pattern='kernel-firmware-%s', description='Firmware for %s', recursive=True, extra_depends='')
522} 522}
523 523
524# Many scripts want to look in arch/$arch/boot for the bootable 524# Many scripts want to look in arch/$arch/boot for the bootable
diff --git a/meta/classes/module.bbclass b/meta/classes/module.bbclass
index 99b7ebc060..802476bc7a 100644
--- a/meta/classes/module.bbclass
+++ b/meta/classes/module.bbclass
@@ -31,7 +31,7 @@ module_do_compile() {
31 31
32module_do_install() { 32module_do_install() {
33 unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS 33 unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
34 oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" \ 34 oe_runmake DEPMOD=echo MODLIB="${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}" \
35 CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ 35 CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
36 O=${STAGING_KERNEL_BUILDDIR} \ 36 O=${STAGING_KERNEL_BUILDDIR} \
37 ${MODULES_INSTALL_TARGET} 37 ${MODULES_INSTALL_TARGET}