[OE-core] [PATCH 2/2] Revert "kernel: Modify kernel modules installation path."

[Jason Wessel]

The issue here is that in a multilib build the ${base_libdir} is resolving to /lib64 which completely breaks some tools that fully expect /lib/modules to be a fixed location regardless if the target is 32/64 or something else.

It may be fixable by using, ${nonarch_base_libdir}, but it wasn't quite that simple because it didn't fully work for the firmware loader so for now it would be best to just revert the two patches and keep oe-core working.

Cheers,
Jason.


On 01/19/2017 03:14 PM, Jason Wessel wrote:
> 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.
>
> Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
> ---
>   meta/classes/kernel-module-split.bbclass |  2 +-
>   meta/classes/kernel.bbclass              | 12 ++++++------
>   2 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/meta/classes/kernel-module-split.bbclass b/meta/classes/kernel-module-split.bbclass
> index 0e4e110f0c..efe1b42656 100644
> --- a/meta/classes/kernel-module-split.bbclass
> +++ b/meta/classes/kernel-module-split.bbclass
> @@ -127,7 +127,7 @@ python split_kernel_module_packages () {
>       postinst = d.getVar('pkg_postinst_modules')
>       postrm = d.getVar('pkg_postrm_modules')
>   
> -    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")))
> +    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")))
>       if modules:
>           metapkg = d.getVar('KERNEL_MODULES_META_PACKAGE')
>           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() {
>   	#
>   	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
>   	if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
> -		oe_runmake DEPMOD=echo MODLIB=${D}${base_libdir}/modules/${KERNEL_VERSION} INSTALL_FW_PATH=${D}${base_libdir}/firmware modules_install
> -		rm "${D}${base_libdir}/modules/${KERNEL_VERSION}/build"
> -		rm "${D}${base_libdir}/modules/${KERNEL_VERSION}/source"
> +		oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" modules_install
> +		rm "${D}/lib/modules/${KERNEL_VERSION}/build"
> +		rm "${D}/lib/modules/${KERNEL_VERSION}/source"
>   		# If the kernel/ directory is empty remove it to prevent QA issues
> -		rmdir --ignore-fail-on-non-empty "${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel"
> +		rmdir --ignore-fail-on-non-empty "${D}/lib/modules/${KERNEL_VERSION}/kernel"
>   	else
>   		bbnote "no modules to install"
>   	fi
> @@ -478,7 +478,7 @@ EXPORT_FUNCTIONS do_compile do_install do_configure
>   # kernel-image becomes kernel-image-${KERNEL_VERSION}
>   PACKAGES = "kernel kernel-base kernel-vmlinux kernel-image kernel-dev kernel-modules"
>   FILES_${PN} = ""
> -FILES_kernel-base = "${base_libdir}/modules/${KERNEL_VERSION}/modules.order ${base_libdir}/modules/${KERNEL_VERSION}/modules.builtin"
> +FILES_kernel-base = "/lib/modules/${KERNEL_VERSION}/modules.order /lib/modules/${KERNEL_VERSION}/modules.builtin"
>   FILES_kernel-image = ""
>   FILES_kernel-dev = "/boot/System.map* /boot/Module.symvers* /boot/config* ${KERNEL_SRC_PATH} /lib/modules/${KERNEL_VERSION}/build"
>   FILES_kernel-vmlinux = "/boot/vmlinux-${KERNEL_VERSION_NAME}"
> @@ -511,7 +511,7 @@ pkg_postinst_kernel-base () {
>   PACKAGESPLITFUNCS_prepend = "split_kernel_packages "
>   
>   python split_kernel_packages () {
> -    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='')
> +    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='')
>   }
>   
>   # Many scripts want to look in arch/$arch/boot for the bootable