From 35e7b34d3b5b96ed11bc7ed6b2a5d08e6183d8a3 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 3 Jun 2009 01:25:43 +0000 Subject: fix for MACHINE_KERNEL_PR stuff This patch unbreaks current behaviour which was introduced by MACHINE_KERNEL_PR variable. As most of target machines do not use it they have PR with broken value (set to "r0" instead of value in recipe). I took other way which makes both types of users happy -- those with MACHINE_KERNEL_PR in use and those without it. By default we set M_K_PR to empty string instead of "r0" - this allows to check is it set at all or not. If it is set then we set PR to this value. Otherwise we ignore existance of that variable and use PR from recipe. Signed-off-by: Marcin Juszkiewicz --- classes/kernel.bbclass | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'classes') diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 1323228a74..b18dfab796 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -20,6 +20,12 @@ python __anonymous () { image = bb.data.getVar('INITRAMFS_IMAGE', d, True) if image != '' and image is not None: bb.data.setVar('INITRAMFS_TASK', '${INITRAMFS_IMAGE}:do_rootfs', d) + + pr = bb.data.getVar('PR', d, True) + machine_kernel_pr = bb.data.getVar('MACHINE_KERNEL_PR', d, True) + + if machine_kernel_pr: + bb.data.setVar('PR', machine_kernel_pr, d) } INITRAMFS_IMAGE ?= "" @@ -64,10 +70,6 @@ export CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "tt KERNEL_VERSION = "${@get_kernelversion('${S}')}" KERNEL_MAJOR_VERSION = "${@get_kernelmajorversion('${KERNEL_VERSION}')}" -# A machine.conf or local.conf can increase MACHINE_KERNEL_PR to force -# rebuilds for kernel and external modules -PR = "${MACHINE_KERNEL_PR}" - KERNEL_LOCALVERSION ?= "" # kernels are generally machine specific -- cgit v1.2.3 From 4c0ec23a5f34d92b679c413aee3bf022bc4df228 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Thu, 11 Jun 2009 15:21:00 +0200 Subject: siteinfo.bbclass: add support for via C3 host --- classes/siteinfo.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/siteinfo.bbclass b/classes/siteinfo.bbclass index 0221b123f1..e51d7ab8a6 100644 --- a/classes/siteinfo.bbclass +++ b/classes/siteinfo.bbclass @@ -32,7 +32,7 @@ def get_siteinfo_list(d): "arm-linux-uclibc": "endian-little bit-32 common-linux common-uclibc arm-common",\ "arm-linux-uclibcgnueabi": "endian-little bit-32 common-linux common-uclibc arm-common arm-linux-uclibc",\ "avr32-linux-uclibc": "endian-big bit-32 common-linux common-uclibc avr32-common",\ - "bfin-uclinux-uclibc": "endian-little bit-32 common-uclibc bfin-common",\ + "bfin-uclinux-uclibc": "endian-little bit-32 common-uclibc bfin-common",\ "i386-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\ "i486-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\ "i586-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\ @@ -64,6 +64,7 @@ def get_siteinfo_list(d): "sh4-linux": "endian-little bit-32 common-linux common-glibc sh-common",\ "sh4-linux-uclibc": "endian-little bit-32 common-linux common-uclibc sh-common",\ "sparc-linux": "endian-big bit-32 common-linux common-glibc",\ + "viac3-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\ "x86_64-linux": "endian-little bit-64 common-linux common-glibc",\ "x86_64-linux-uclibc": "endian-little bit-64 common-linux common-uclibc"} if target in targetinfo: -- cgit v1.2.3 From 40c8b7516530ad65160841f6e79e40475d02d471 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 17 Jun 2009 14:38:33 +0200 Subject: kernel.bbclass: remove not used 'pr' variable - spotten by Koen --- classes/kernel.bbclass | 1 - 1 file changed, 1 deletion(-) (limited to 'classes') diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index b18dfab796..75a9077445 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -21,7 +21,6 @@ python __anonymous () { if image != '' and image is not None: bb.data.setVar('INITRAMFS_TASK', '${INITRAMFS_IMAGE}:do_rootfs', d) - pr = bb.data.getVar('PR', d, True) machine_kernel_pr = bb.data.getVar('MACHINE_KERNEL_PR', d, True) if machine_kernel_pr: -- cgit v1.2.3