summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJason Wessel <jason.wessel@windriver.com>2017-01-19 13:14:41 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-20 11:53:49 +0000
commit70851481165de030b07cbd28b1c3a27c2db3052b (patch)
tree33b4e349ece0c123874b1be801f92ba1a3ee2131 /meta
parent78f4011210eacd38859b59357f719c5c1bc7b060 (diff)
downloadpoky-70851481165de030b07cbd28b1c3a27c2db3052b.tar.gz
Revert "kernel: Modify kernel modules installation path."
This reverts commit 0ccb2efe9837e2915c093341a662dffc1df00866. The OVS fails to function and the kernel modules cannot be found by any of the kernel tools such as depmod because they are installed into the wrong directory in multilib 64bit/32bit bulids. (From OE-Core rev: 85cec1e3df68e932c7b210956ef5f17b85f3616f) Signed-off-by: Jason Wessel <jason.wessel@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/kernel-module-split.bbclass2
-rw-r--r--meta/classes/kernel.bbclass12
2 files changed, 7 insertions, 7 deletions
diff --git a/meta/classes/kernel-module-split.bbclass b/meta/classes/kernel-module-split.bbclass
index fd04b72f03..742320cee2 100644
--- a/meta/classes/kernel-module-split.bbclass
+++ b/meta/classes/kernel-module-split.bbclass
@@ -134,7 +134,7 @@ python split_kernel_module_packages () {
134 postinst = d.getVar('pkg_postinst_modules') 134 postinst = d.getVar('pkg_postinst_modules')
135 postrm = d.getVar('pkg_postrm_modules') 135 postrm = d.getVar('pkg_postrm_modules')
136 136
137 modules = do_split_packages(d, root='${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"))) 137 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")))
138 if modules: 138 if modules:
139 metapkg = d.getVar('KERNEL_MODULES_META_PACKAGE') 139 metapkg = d.getVar('KERNEL_MODULES_META_PACKAGE')
140 d.appendVar('RDEPENDS_' + metapkg, ' '+' '.join(modules)) 140 d.appendVar('RDEPENDS_' + metapkg, ' '+' '.join(modules))
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 74517e8d92..3630042dbd 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -296,11 +296,11 @@ kernel_do_install() {
296 # 296 #
297 unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE 297 unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
298 if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then 298 if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
299 oe_runmake DEPMOD=echo MODLIB=${D}${base_libdir}/modules/${KERNEL_VERSION} INSTALL_FW_PATH=${D}${base_libdir}/firmware modules_install 299 oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" modules_install
300 rm "${D}${base_libdir}/modules/${KERNEL_VERSION}/build" 300 rm "${D}/lib/modules/${KERNEL_VERSION}/build"
301 rm "${D}${base_libdir}/modules/${KERNEL_VERSION}/source" 301 rm "${D}/lib/modules/${KERNEL_VERSION}/source"
302 # If the kernel/ directory is empty remove it to prevent QA issues 302 # If the kernel/ directory is empty remove it to prevent QA issues
303 rmdir --ignore-fail-on-non-empty "${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel" 303 rmdir --ignore-fail-on-non-empty "${D}/lib/modules/${KERNEL_VERSION}/kernel"
304 else 304 else
305 bbnote "no modules to install" 305 bbnote "no modules to install"
306 fi 306 fi
@@ -478,7 +478,7 @@ EXPORT_FUNCTIONS do_compile do_install do_configure
478# kernel-image becomes kernel-image-${KERNEL_VERSION} 478# kernel-image becomes kernel-image-${KERNEL_VERSION}
479PACKAGES = "kernel kernel-base kernel-vmlinux kernel-image kernel-dev kernel-modules" 479PACKAGES = "kernel kernel-base kernel-vmlinux kernel-image kernel-dev kernel-modules"
480FILES_${PN} = "" 480FILES_${PN} = ""
481FILES_kernel-base = "${base_libdir}/modules/${KERNEL_VERSION}/modules.order ${base_libdir}/modules/${KERNEL_VERSION}/modules.builtin" 481FILES_kernel-base = "/lib/modules/${KERNEL_VERSION}/modules.order /lib/modules/${KERNEL_VERSION}/modules.builtin"
482FILES_kernel-image = "" 482FILES_kernel-image = ""
483FILES_kernel-dev = "/boot/System.map* /boot/Module.symvers* /boot/config* ${KERNEL_SRC_PATH} /lib/modules/${KERNEL_VERSION}/build" 483FILES_kernel-dev = "/boot/System.map* /boot/Module.symvers* /boot/config* ${KERNEL_SRC_PATH} /lib/modules/${KERNEL_VERSION}/build"
484FILES_kernel-vmlinux = "/boot/vmlinux-${KERNEL_VERSION_NAME}" 484FILES_kernel-vmlinux = "/boot/vmlinux-${KERNEL_VERSION_NAME}"
@@ -511,7 +511,7 @@ pkg_postinst_kernel-base () {
511PACKAGESPLITFUNCS_prepend = "split_kernel_packages " 511PACKAGESPLITFUNCS_prepend = "split_kernel_packages "
512 512
513python split_kernel_packages () { 513python split_kernel_packages () {
514 do_split_packages(d, root='${base_libdir}/firmware', file_regex='^(.*)\.(bin|fw|cis|csp|dsp)$', output_pattern='kernel-firmware-%s', description='Firmware for %s', recursive=True, extra_depends='') 514 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='')
515} 515}
516 516
517# Many scripts want to look in arch/$arch/boot for the bootable 517# Many scripts want to look in arch/$arch/boot for the bootable