summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmarnath Valluri <amarnath.valluri@intel.com>2017-01-04 13:58:23 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-16 18:05:12 +0000
commit9c2158c0733cd4e6e44faa526d41cd07f6a00c25 (patch)
tree09efeb89052ce03de63890783c443cd2eb1422aa
parent970b76a728509854ee5048f4e2ee8cdab827f25f (diff)
downloadpoky-9c2158c0733cd4e6e44faa526d41cd07f6a00c25.tar.gz
kernel: Modify kernel modules installation path.
Use ${base_libdir}/modules inplace of /lib/modules for kernel modules installation path. (From OE-Core rev: 0ccb2efe9837e2915c093341a662dffc1df00866) Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 efe1b42656..0e4e110f0c 100644
--- a/meta/classes/kernel-module-split.bbclass
+++ b/meta/classes/kernel-module-split.bbclass
@@ -127,7 +127,7 @@ python split_kernel_module_packages () {
127 postinst = d.getVar('pkg_postinst_modules') 127 postinst = d.getVar('pkg_postinst_modules')
128 postrm = d.getVar('pkg_postrm_modules') 128 postrm = d.getVar('pkg_postrm_modules')
129 129
130 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"))) 130 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")))
131 if modules: 131 if modules:
132 metapkg = d.getVar('KERNEL_MODULES_META_PACKAGE') 132 metapkg = d.getVar('KERNEL_MODULES_META_PACKAGE')
133 d.appendVar('RDEPENDS_' + metapkg, ' '+' '.join(modules)) 133 d.appendVar('RDEPENDS_' + metapkg, ' '+' '.join(modules))
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 3630042dbd..74517e8d92 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 INSTALL_MOD_PATH="${D}" modules_install 299 oe_runmake DEPMOD=echo MODLIB=${D}${base_libdir}/modules/${KERNEL_VERSION} INSTALL_FW_PATH=${D}${base_libdir}/firmware modules_install
300 rm "${D}/lib/modules/${KERNEL_VERSION}/build" 300 rm "${D}${base_libdir}/modules/${KERNEL_VERSION}/build"
301 rm "${D}/lib/modules/${KERNEL_VERSION}/source" 301 rm "${D}${base_libdir}/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}/lib/modules/${KERNEL_VERSION}/kernel" 303 rmdir --ignore-fail-on-non-empty "${D}${base_libdir}/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 = "/lib/modules/${KERNEL_VERSION}/modules.order /lib/modules/${KERNEL_VERSION}/modules.builtin" 481FILES_kernel-base = "${base_libdir}/modules/${KERNEL_VERSION}/modules.order ${base_libdir}/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='/lib/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='${base_libdir}/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