From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from stoexhub01.domain01.net ([83.145.59.142]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1QZ5b6-0002AR-3z for openembedded-core@lists.openembedded.org; Tue, 21 Jun 2011 20:22:48 +0200 Received: from localhost (193.235.91.228) by STOEXHUB01.domain01.net (10.12.10.1) with Microsoft SMTP Server id 8.3.137.0; Tue, 21 Jun 2011 20:19:14 +0200 From: Anders Darander To: Date: Tue, 21 Jun 2011 20:18:53 +0200 Message-ID: X-Mailer: git-send-email 1.7.4.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [RFC PATCH 1/5] Remove support for building 2.4 kernels X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Jun 2011 18:22:48 -0000 Content-Type: text/plain Signed-off-by: Anders Darander --- meta/classes/kernel.bbclass | 22 +++++++--------------- meta/classes/module-base.bbclass | 2 +- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 1bb69f5..3b6fc6b 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}" } @@ -102,7 +99,7 @@ kernel_do_install() { # # Install various kernel output (zImage, map file, config, module support files) - # + # install -d ${D}/${KERNEL_IMAGEDEST} install -d ${D}/boot install -m 0644 ${KERNEL_OUTPUT} ${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION} @@ -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 @@ -211,7 +206,7 @@ FILES_kernel-vmlinux = "/boot/vmlinux*" # misc is a package to contain files we need in staging FILES_kernel-misc = "/kernel/include/config /kernel/scripts /kernel/drivers/crypto /kernel/drivers/media" RDEPENDS_kernel = "kernel-base" -# Allow machines to override this dependency if kernel image files are +# Allow machines to override this dependency if kernel image files are # not wanted in images as standard RDEPENDS_kernel-base ?= "kernel-image" PKG_kernel-image = "kernel-image-${@legitimize_package_name('${KERNEL_VERSION}')}" @@ -295,7 +290,7 @@ python populate_packages_prepend () { continue vals[m.group(1)] = m.group(2) return vals - + def parse_depmod(): import re @@ -346,7 +341,7 @@ python populate_packages_prepend () { line = f.readline() f.close() return deps - + def get_dependencies(file, pattern, format): # file no longer includes PKGD file = file.replace(bb.data.getVar('PKGD', d, 1) or '', '', 1) @@ -390,10 +385,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() @@ -469,7 +461,7 @@ kernel_do_deploy() { tar -cvzf ${DEPLOYDIR}/modules-${KERNEL_VERSION}-${PR}-${MACHINE}.tgz -C ${D} lib fi - if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then + if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then if test -e arch/${ARCH}/boot/uImage ; then cp arch/${ARCH}/boot/uImage ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin elif test -e arch/${ARCH}/boot/compressed/vmlinux ; then 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')}" -- 1.7.4.1