diff options
| author |   Phil Blundell <philb@gnu.org> | 2009-06-17 14:35:30 +0100 |
|---|---|---|
| committer | Phil Blundell <philb@gnu.org> | 2009-06-17 14:35:30 +0100 |
| commit | c31afe4d59396126aed32352f00ef66f2bcb5f17 (patch) | |
| tree | 493be0a8c2baa3560a94dab167c749933c58b3ec /classes | |
| parent | cbef7988989e4a0ca7822c78a58b5da6bbc6eb6b (diff) | |
| parent | 40c8b7516530ad65160841f6e79e40475d02d471 (diff) | |
| download | openembedded-c31afe4d59396126aed32352f00ef66f2bcb5f17.tar.gz | |
Merge branch 'org.openembedded.dev' of git@new.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/kernel.bbclass | 9 | ||||
| -rw-r--r-- | classes/siteinfo.bbclass | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index ae7e643ca7..ef16669c3d 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -20,6 +20,11 @@ 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) + + 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 +69,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 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: |