summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorAnders Darander <anders@chargestorm.se>2011-07-01 15:07:57 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-01 23:34:17 +0100
commit33ca841082c90aef3c28fa08f1b0d56719d178ac (patch)
tree796d43a417845924b351fd3b1dee5b1392fda787 /meta/classes
parent8511d1ec1bac699c742952e6fe4c306e1aaa2f9f (diff)
downloadpoky-33ca841082c90aef3c28fa08f1b0d56719d178ac.tar.gz
Remove support for building 2.4 kernels
(From OE-Core rev: 06285501667a025893b56f66eae082f88ef08427) Signed-off-by: Anders Darander <anders@chargestorm.se> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/kernel.bbclass12
-rw-r--r--meta/classes/module-base.bbclass2
2 files changed, 3 insertions, 11 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 6700d0e8ee..f23f0273eb 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -73,9 +73,6 @@ KERNEL_ALT_IMAGETYPE ??= ""
73kernel_do_compile() { 73kernel_do_compile() {
74 unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE 74 unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
75 oe_runmake include/linux/version.h CC="${KERNEL_CC}" LD="${KERNEL_LD}" 75 oe_runmake include/linux/version.h CC="${KERNEL_CC}" LD="${KERNEL_LD}"
76 if [ "${KERNEL_MAJOR_VERSION}" != "2.6" ]; then
77 oe_runmake dep CC="${KERNEL_CC}" LD="${KERNEL_LD}"
78 fi
79 oe_runmake ${KERNEL_IMAGETYPE} ${KERNEL_ALT_IMAGETYPE} CC="${KERNEL_CC}" LD="${KERNEL_LD}" 76 oe_runmake ${KERNEL_IMAGETYPE} ${KERNEL_ALT_IMAGETYPE} CC="${KERNEL_CC}" LD="${KERNEL_LD}"
80} 77}
81 78
@@ -111,9 +108,7 @@ kernel_do_install() {
111 install -m 0644 vmlinux ${D}/boot/vmlinux-${KERNEL_VERSION} 108 install -m 0644 vmlinux ${D}/boot/vmlinux-${KERNEL_VERSION}
112 [ -e Module.symvers ] && install -m 0644 Module.symvers ${D}/boot/Module.symvers-${KERNEL_VERSION} 109 [ -e Module.symvers ] && install -m 0644 Module.symvers ${D}/boot/Module.symvers-${KERNEL_VERSION}
113 install -d ${D}/etc/modutils 110 install -d ${D}/etc/modutils
114 if [ "${KERNEL_MAJOR_VERSION}" = "2.6" ]; then 111 install -d ${D}/etc/modprobe.d
115 install -d ${D}/etc/modprobe.d
116 fi
117 112
118 # 113 #
119 # Support for external module building - create a minimal copy of the 114 # Support for external module building - create a minimal copy of the
@@ -403,10 +398,7 @@ python populate_packages_prepend () {
403 # Write out any modconf fragment 398 # Write out any modconf fragment
404 modconf = bb.data.getVar('module_conf_%s' % basename, d, 1) 399 modconf = bb.data.getVar('module_conf_%s' % basename, d, 1)
405 if modconf: 400 if modconf:
406 if bb.data.getVar("KERNEL_MAJOR_VERSION", d, 1) == "2.6": 401 name = '%s/etc/modprobe.d/%s.conf' % (dvar, basename)
407 name = '%s/etc/modprobe.d/%s.conf' % (dvar, basename)
408 else:
409 name = '%s/etc/modutils/%s.conf' % (dvar, basename)
410 f = open(name, 'w') 402 f = open(name, 'w')
411 f.write("%s\n" % modconf) 403 f.write("%s\n" % modconf)
412 f.close() 404 f.close()
diff --git a/meta/classes/module-base.bbclass b/meta/classes/module-base.bbclass
index c98baceeab..a7cf233d75 100644
--- a/meta/classes/module-base.bbclass
+++ b/meta/classes/module-base.bbclass
@@ -7,7 +7,7 @@ export CROSS_COMPILE = "${TARGET_PREFIX}"
7 7
8export KERNEL_VERSION = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion')}" 8export KERNEL_VERSION = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion')}"
9export KERNEL_SOURCE = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-source')}" 9export KERNEL_SOURCE = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-source')}"
10KERNEL_OBJECT_SUFFIX = "${@[".o", ".ko"][base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion') > "2.6.0"]}" 10KERNEL_OBJECT_SUFFIX = ".ko"
11KERNEL_CCSUFFIX = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-ccsuffix')}" 11KERNEL_CCSUFFIX = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-ccsuffix')}"
12KERNEL_LDSUFFIX = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-ldsuffix')}" 12KERNEL_LDSUFFIX = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-ldsuffix')}"
13KERNEL_ARSUFFIX = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-arsuffix')}" 13KERNEL_ARSUFFIX = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-arsuffix')}"