Re: [RFC v2 PATCH 1/9] Remove support for building 2.4 kernels

[Jonathan Cameron <jic23@cam.ac.uk>]

Hi Anders,

All seems to work for me.  For anyone just dropping these on OE, note there is
a local variable of kernel.bbclass that also needs updating as per this file
in meta-openembedded/meta-oe/

> Signed-off-by: Anders Darander <anders-7UjN0b3lYz2SbKU13Z4Etw@public.gmane.org>
> ---
>  meta/classes/kernel.bbclass      |   12 ++----------
>  meta/classes/module-base.bbclass |    2 +-
>  2 files changed, 3 insertions(+), 11 deletions(-)
> 
> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> index fd27832..6bdfd3e 100644
> --- a/meta/classes/kernel.bbclass
> +++ b/meta/classes/kernel.bbclass
> @@ -73,9 +73,6 @@ KERNEL_ALT_IMAGETYPE ??= ""
>  kernel_do_compile() {
>  	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
>  	oe_runmake include/linux/version.h CC="${KERNEL_CC}" LD="${KERNEL_LD}"
> -	if [ "${KERNEL_MAJOR_VERSION}" != "2.6" ]; then
> -		oe_runmake dep CC="${KERNEL_CC}" LD="${KERNEL_LD}"
> -	fi
>  	oe_runmake ${KERNEL_IMAGETYPE} ${KERNEL_ALT_IMAGETYPE} CC="${KERNEL_CC}" LD="${KERNEL_LD}"
>  }
>  
> @@ -111,9 +108,7 @@ kernel_do_install() {
>  	install -m 0644 vmlinux ${D}/boot/vmlinux-${KERNEL_VERSION}
>  	[ -e Module.symvers ] && install -m 0644 Module.symvers ${D}/boot/Module.symvers-${KERNEL_VERSION}
>  	install -d ${D}/etc/modutils
> -	if [ "${KERNEL_MAJOR_VERSION}" = "2.6" ]; then
> -		install -d ${D}/etc/modprobe.d
> -	fi
> +	install -d ${D}/etc/modprobe.d
>  
>  	#
>  	# Support for external module building - create a minimal copy of the
> @@ -397,10 +392,7 @@ python populate_packages_prepend () {
>  		# Write out any modconf fragment
>  		modconf = bb.data.getVar('module_conf_%s' % basename, d, 1)
>  		if modconf:
> -			if bb.data.getVar("KERNEL_MAJOR_VERSION", d, 1) == "2.6":
> -				name = '%s/etc/modprobe.d/%s.conf' % (dvar, basename)
> -			else:
> -				name = '%s/etc/modutils/%s.conf' % (dvar, basename)
> +			name = '%s/etc/modprobe.d/%s.conf' % (dvar, basename)
>  			f = open(name, 'w')
>  			f.write("%s\n" % modconf)
>  			f.close()
> diff --git a/meta/classes/module-base.bbclass b/meta/classes/module-base.bbclass
> index c98bace..a7cf233 100644
> --- a/meta/classes/module-base.bbclass
> +++ b/meta/classes/module-base.bbclass
> @@ -7,7 +7,7 @@ export CROSS_COMPILE = "${TARGET_PREFIX}"
>  
>  export KERNEL_VERSION = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion')}"
>  export KERNEL_SOURCE = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-source')}"
> -KERNEL_OBJECT_SUFFIX = "${@[".o", ".ko"][base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion') > "2.6.0"]}"
> +KERNEL_OBJECT_SUFFIX = ".ko"
>  KERNEL_CCSUFFIX = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-ccsuffix')}"
>  KERNEL_LDSUFFIX = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-ldsuffix')}"
>  KERNEL_ARSUFFIX = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-arsuffix')}"